From b2a820a2b535f0eeeb0e3074cbc32355ab54db4f Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Thu, 29 Jul 2004 22:44:51 +0000 Subject: Add support for newer ifort versions of the Intel Fortran compiler on Linux. (Jonathan Gurley) Fortran 90 tests for future use. (Chris Murray) --- doc/man/scons.1 | 1 + src/CHANGES.txt | 5 ++++ src/engine/MANIFEST.in | 1 + src/engine/SCons/Tool/__init__.py | 2 +- src/engine/SCons/Tool/ifl.py | 25 ++++++++-------- src/engine/SCons/Tool/ifort.py | 62 +++++++++++++++++++++++++++++++++++++++ test/Fortran/F90.py | 20 +++++++++++++ test/Fortran/F90FLAGS.py | 20 +++++++++++++ test/import.py | 5 ++++ 9 files changed, 127 insertions(+), 14 deletions(-) create mode 100644 src/engine/SCons/Tool/ifort.py diff --git a/doc/man/scons.1 b/doc/man/scons.1 index c9fed7a..b3e4ad4 100644 --- a/doc/man/scons.1 +++ b/doc/man/scons.1 @@ -1010,6 +1010,7 @@ hplink icc icl ifl +ifort ilink ilink32 jar diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 6626a90..9447c52 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -45,6 +45,11 @@ RELEASE 0.96 - XXX - Have SConsignFile() use, by default, a custom "dblite.py" that we can control and guarantee to work on all Python versions (or nearly so). + From Jonathan Gurley: + + - Add support for the newer "ifort" versions of the Intel Fortran + Compiler for Linux. + From Bob Halley: - Make the new *FLAGS variable type work with copied Environments. diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in index 4480713..373279e 100644 --- a/src/engine/MANIFEST.in +++ b/src/engine/MANIFEST.in @@ -85,6 +85,7 @@ SCons/Tool/javah.py SCons/Tool/icc.py SCons/Tool/icl.py SCons/Tool/ifl.py +SCons/Tool/ifort.py SCons/Tool/ilink.py SCons/Tool/ilink32.py SCons/Tool/latex.py diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index 53d288e..a040a55 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -297,7 +297,7 @@ def tool_list(platform, env): c_compilers = ['gcc', 'msvc', 'icc', 'cc'] cxx_compilers = ['g++', 'msvc', 'icc', 'c++'] assemblers = ['gas', 'nasm', 'masm'] - fortran_compilers = ['g77', 'ifl', 'fortran'] + fortran_compilers = ['g77', 'ifort', 'ifl', 'fortran'] ars = ['ar', 'mslib'] c_compiler = FindTool(c_compilers, env) or c_compilers[0] diff --git a/src/engine/SCons/Tool/ifl.py b/src/engine/SCons/Tool/ifl.py index 04c9d39..8d800e2 100644 --- a/src/engine/SCons/Tool/ifl.py +++ b/src/engine/SCons/Tool/ifl.py @@ -1,4 +1,4 @@ -"""engine.SCons.Tool.ifl +"""SCons.Tool.ifl Tool-specific initialization for the Intel Fortran compiler. @@ -33,22 +33,21 @@ selection method. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import SCons.Util +import SCons.Defaults -import f77 +import fortran def generate(env): """Add Builders and construction variables for ifl to an Environment.""" - f77.generate(env) - - env['F77'] = 'ifl' - env['F77FLAGS'] = SCons.Util.CLVar('') - env['F77COM'] = '$F77 $F77FLAGS $_F77INCFLAGS /c $SOURCES /Fo$TARGET' - env['F77PPCOM'] = '$F77 $F77FLAGS $CPPFLAGS $_CPPDEFFLAGS $_F77INCFLAGS /c $SOURCES /Fo$TARGET' - env['SHF77'] = '$F77' - env['SHF77FLAGS'] = SCons.Util.CLVar('$F77FLAGS') - env['SHF77COM'] = '$SHF77 $SHF77FLAGS $_F77INCFLAGS /c $SOURCES /Fo$TARGET' - env['SHF77PPCOM'] = '$SHF77 $SHF77FLAGS $CPPFLAGS $_CPPDEFFLAGS $_F77INCFLAGS /c $SOURCES /Fo$TARGET' + SCons.Defaults.ObjSourceScan.add_scanner('.i90', fortran.FortranScan) + fortran.FortranSuffixes.extend(['.i90']) + fortran.generate(env) + + env['_FORTRAND'] = 'ifl' + env['FORTRANCOM'] = '$FORTRAN $FORTRANFLAGS $_FORTRANINCFLAGS /c $SOURCES /Fo$TARGET' + env['FORTRANPPCOM'] = '$FORTRAN $FORTRANFLAGS $CPPFLAGS $_CPPDEFFLAGS $_FORTRANINCFLAGS /c $SOURCES /Fo$TARGET' + env['SHFORTRANCOM'] = '$SHFORTRAN $SHFORTRANFLAGS $_FORTRANINCFLAGS /c $SOURCES /Fo$TARGET' + env['SHFORTRANPPCOM'] = '$SHFORTRAN $SHFORTRANFLAGS $CPPFLAGS $_CPPDEFFLAGS $_FORTRANINCFLAGS /c $SOURCES /Fo$TARGET' def exists(env): return env.Detect('ifl') diff --git a/src/engine/SCons/Tool/ifort.py b/src/engine/SCons/Tool/ifort.py new file mode 100644 index 0000000..519f266 --- /dev/null +++ b/src/engine/SCons/Tool/ifort.py @@ -0,0 +1,62 @@ +"""SCons.Tool.ifort + +Tool-specific initialization for newer versions of the Intel Fortran Compiler +for Linux. + +There normally shouldn't be any need to import this module directly. +It will usually be imported through the generic SCons.Tool.Tool() +selection method. + +""" + +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +import SCons.Defaults + +import fortran + +def generate(env): + """Add Builders and construction variables for ifort to an Environment.""" + # ifort supports Fortran 90 and Fortran 95 + # Additionally, ifort recognizes more file extensions. + SCons.Defaults.ObjSourceScan.add_scanner('.i', fortran.FortranScan) + SCons.Defaults.ObjSourceScan.add_scanner('.i90', fortran.FortranScan) + fortran.FortranSuffixes.extend(['.i', '.i90']) + fortran.generate(env) + + env['_FORTRAND'] = 'ifort' + + # If files are compiled into objects, the Intel Fortran Compiler must use + # ld to link shared libraries. + env['SHLINK'] = 'ld' + + # Additionally, no symbols can be defined in an archive file; to use + # Intel Fortran to create shared libraries, all external symbols must + # be in shared libraries. + env['SHLINKFLAGS'] = '-shared -no_archive' + +def exists(env): + return env.Detect('ifort') diff --git a/test/Fortran/F90.py b/test/Fortran/F90.py index 4167410..7825ae6 100644 --- a/test/Fortran/F90.py +++ b/test/Fortran/F90.py @@ -166,18 +166,38 @@ bar.Program(target = 'bar', source = 'bar.f') test.write('foo.f', r""" PROGRAM FOO + USE MOD_BAR PRINT *,'foo.f' + CALL P STOP END + MODULE MOD_BAR + IMPLICIT NONE + CONTAINS + SUBROUTINE P + PRINT *,'mod_bar' + END SUBROUTINE P + END MODULE MOD_BAR """) test.write('bar.f', r""" PROGRAM BAR + USE MOD_FOO PRINT *,'bar.f' + CALL P STOP END """) + test.write('foo_mod.f', r""" + MODULE MOD_FOO + IMPLICIT NONE + CONTAINS + SUBROUTINE P + PRINT *,'mod_foo' + END SUBROUTINE P + END MODULE MOD_FOO +""") test.run(arguments = 'foo' + _exe, stderr = None) diff --git a/test/Fortran/F90FLAGS.py b/test/Fortran/F90FLAGS.py index f598986..375df71 100644 --- a/test/Fortran/F90FLAGS.py +++ b/test/Fortran/F90FLAGS.py @@ -170,18 +170,38 @@ bar.Program(target = 'bar', source = 'bar.f') test.write('foo.f', r""" PROGRAM FOO + USE MOD_BAR PRINT *,'foo.f' + CALL P STOP END + MODULE MOD_BAR + IMPLICIT NONE + CONTAINS + SUBROUTINE P + PRINT *,'mod_bar' + END SUBROUTINE P + END MODULE MOD_BAR """) test.write('bar.f', r""" PROGRAM BAR + USE MOD_FOO PRINT *,'bar.f' + CALL P STOP END """) + test.write('foo_mod.f', r""" + MODULE MOD_FOO + IMPLICIT NONE + CONTAINS + SUBROUTINE P + PRINT *,'mod_foo' + END SUBROUTINE P + END MODULE MOD_FOO +""") test.run(arguments = 'foo' + _exe, stderr = None) diff --git a/test/import.py b/test/import.py index e7e21f1..071e198 100644 --- a/test/import.py +++ b/test/import.py @@ -55,12 +55,16 @@ tools = [ 'BitKeeper', 'c++', 'cc', + 'cvf', 'CVS', 'default', 'dmd', 'dvipdf', 'dvips', 'f77', + 'f90', + 'f95', + 'fortran', 'g++', 'g77', 'gas', @@ -72,6 +76,7 @@ tools = [ 'hplink', 'icc', 'icl', + 'ifort', 'ifl', 'ilink', 'ilink32', -- cgit v0.12