/[escript]/branches/refine/SConstruct
ViewVC logotype

Diff of /branches/refine/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2423 by gross, Thu May 14 05:02:20 2009 UTC revision 3076 by jfenwick, Mon Aug 2 05:21:40 2010 UTC
# Line 1  Line 1 
1    
2  ########################################################  ########################################################
3  #  #
4  # Copyright (c) 2003-2008 by University of Queensland  # Copyright (c) 2003-2010 by University of Queensland
5  # Earth Systems Science Computational Center (ESSCC)  # Earth Systems Science Computational Center (ESSCC)
6  # http://www.uq.edu.au/esscc  # http://www.uq.edu.au/esscc
7  #  #
# Line 16  EnsureSConsVersion(0,96,91) Line 16  EnsureSConsVersion(0,96,91)
16  EnsurePythonVersion(2,3)  EnsurePythonVersion(2,3)
17    
18  import sys, os, re, socket, platform, stat  import sys, os, re, socket, platform, stat
19    # For copy()
20    import shutil
21    
22  # Add our extensions  # Add our extensions
23  if os.path.isdir('scons'): sys.path.append('scons')  if os.path.isdir('scons'): sys.path.append('scons')
# Line 33  IS_WINDOWS_PLATFORM = (os.name== "nt") Line 35  IS_WINDOWS_PLATFORM = (os.name== "nt")
35    
36  prefix = ARGUMENTS.get('prefix', Dir('#.').abspath)  prefix = ARGUMENTS.get('prefix', Dir('#.').abspath)
37    
38    #Holds names of variables from the calling environment which need to be passed
39    #to tools
40    env_export=[]
41    
42  #Determine where to read options from use:  #Determine where to read options from use:
43  #1. command line  #1. command line
44  #2. scons/<hostname>_options.py  #2. scons/<hostname>_options.py
45  #3. name as part of a cluster  #3. name as part of a cluster
46  options_file=ARGUMENTS.get('options_file', None)  options_file=ARGUMENTS.get('options_file', None)
47    effective_hostname=socket.gethostname().split('.')[0]
48  if not options_file:  if not options_file:
49    hostname = re.sub("[^0-9a-zA-Z]", "_", socket.gethostname().split('.')[0])    mangledhostname = re.sub("[^0-9a-zA-Z]", "_", effective_hostname)
50    options_file = os.path.join("scons",hostname+"_options.py")    options_file = os.path.join("scons",mangledhostname+"_options.py")
51    #If there is no options file with that name see if there is a substitute    #If there is no options file with that name see if there is a substitute
52    if not os.path.isfile(options_file):    if not os.path.isfile(options_file):
53      tmp = scons_extensions.effectiveName(hostname)      effective_hostname = scons_extensions.effectiveName(effective_hostname)
54      options_file = os.path.join("scons",tmp+"_options.py")      mangledhostname = re.sub("[^0-9a-zA-Z]", "_", effective_hostname)
55        options_file = os.path.join("scons",mangledhostname+"_options.py")
56    
57  if not os.path.isfile(options_file):  if not os.path.isfile(options_file):
58    print "Options file not found (expected '%s')" % options_file    print "Options file not found (expected '%s')" % options_file
# Line 52  if not os.path.isfile(options_file): Line 60  if not os.path.isfile(options_file):
60  else:  else:
61    print "Options file is", options_file    print "Options file is", options_file
62    
63  # Load options file and command-line arguments  #Does our scons support the newer Variables class or do we need to use Options?
64  opts = Options(options_file, ARGUMENTS)  
65    try:
66       dummyvar=Variables
67       opts = Variables(options_file, ARGUMENTS)
68       adder = opts.AddVariables
69    except:
70       opts = Options(options_file, ARGUMENTS)
71       adder = opts.AddOptions
72       BoolVariable = BoolOption
73    
74  ############ Load build options ################################  ############ Load build options ################################
75    
76  opts.AddOptions(  adder(
77    #opts.AddOptions(
78  # Where to install esys stuff  # Where to install esys stuff
79    ('prefix', 'where everything will be installed',                       Dir('#.').abspath),    ('prefix', 'where everything will be installed',                       Dir('#.').abspath),
80    ('incinstall', 'where the esys headers will be installed',             os.path.join(Dir('#.').abspath,'include')),    ('incinstall', 'where the esys headers will be installed',             os.path.join(Dir('#.').abspath,'include')),
# Line 65  opts.AddOptions( Line 82  opts.AddOptions(
82    ('libinstall', 'where the esys libraries will be installed',           os.path.join(prefix,'lib')),    ('libinstall', 'where the esys libraries will be installed',           os.path.join(prefix,'lib')),
83    ('pyinstall', 'where the esys python modules will be installed',       os.path.join(prefix,'esys')),    ('pyinstall', 'where the esys python modules will be installed',       os.path.join(prefix,'esys')),
84  # Compilation options  # Compilation options
85    BoolOption('dodebug', 'For backwards compatibility', 'no'),    BoolVariable('dodebug', 'For backwards compatibility', 'no'),
86    BoolOption('usedebug', 'Do you want a debug build?', 'no'),    BoolVariable('usedebug', 'Do you want a debug build?', 'no'),
87    BoolOption('usevtk', 'Do you want to use VTK?', 'yes'),    BoolVariable('usevtk', 'Do you want to use VTK?', 'yes'),
88    ('options_file', 'File of paths/options. Default: scons/<hostname>_options.py', options_file),    ('options_file', 'File of paths/options. Default: scons/<hostname>_options.py', options_file),
89      ('cc', 'path to C compiler', 'DEFAULT'),
90      ('cxx', 'path to C++ compiler', 'DEFAULT'),
91    ('win_cc_name', 'windows C compiler name if needed', 'msvc'),    ('win_cc_name', 'windows C compiler name if needed', 'msvc'),
92    # The strings -DDEFAULT_ get replaced by scons/<hostname>_options.py or by defaults below    # The strings -DDEFAULT_ get replaced by scons/<hostname>_options.py or by defaults below
93    ('cc_flags', 'C compiler flags to use', '-DEFAULT_1'),    ('cc_flags', 'C/C++ compiler flags to use', '-DEFAULT_1'),
94    ('cc_optim', 'C compiler optimization flags to use', '-DEFAULT_2'),    ('cc_optim', 'C/C++ optimization flags to use', '-DEFAULT_2'),
95    ('cc_debug', 'C compiler debug flags to use', '-DEFAULT_3'),    ('cc_debug', 'C/C++ debug flags to use', '-DEFAULT_3'),
96    ('omp_optim', 'OpenMP compiler flags to use (Release build)', '-DEFAULT_4'),    ('omp_optim', 'OpenMP compiler flags to use (Release build)', '-DEFAULT_4'),
97    ('omp_debug', 'OpenMP compiler flags to use (Debug build)', '-DEFAULT_5'),    ('omp_debug', 'OpenMP compiler flags to use (Debug build)', '-DEFAULT_5'),
98    ('omp_libs', 'OpenMP compiler libraries to link with', '-DEFAULT_6'),    ('omp_libs', 'OpenMP compiler libraries to link with', '-DEFAULT_6'),
99    ('cc_extra', 'Extra C/C++ flags', ''),    ('cc_extra', 'Extra C compiler flags', ''),
100      ('cxx_extra', 'Extra C++ compiler flags', ''),
101    ('ld_extra', 'Extra linker flags', ''),    ('ld_extra', 'Extra linker flags', ''),
102    ('sys_libs', 'System libraries to link with', []),    ('sys_libs', 'System libraries to link with', []),
103    ('ar_flags', 'Static library archiver flags to use', ''),    ('ar_flags', 'Static library archiver flags to use', ''),
104    BoolOption('useopenmp', 'Compile parallel version using OpenMP', 'no'),    BoolVariable('useopenmp', 'Compile parallel version using OpenMP', 'no'),
105    BoolOption('usepedantic', 'Compile with -pedantic if using gcc', 'no'),    BoolVariable('usepedantic', 'Compile with -pedantic if using gcc', 'no'),
106    BoolOption('usewarnings','Compile with warnings as errors if using gcc','yes'),    BoolVariable('usewarnings','Compile with warnings as errors if using gcc','yes'),
107    ('forcelazy','for testing use only - set the default value for autolazy','leave_alone'),    ('forcelazy','for testing use only - set the default value for autolazy','leave_alone'),
108      ('forcecollres','for testing use only - set the default value for force resolving collective ops','leave_alone'),
109  # Python  # Python
110    ('python_path', 'Path to Python includes', '/usr/include/'+python_version),    ('python_path', 'Path to Python includes', '/usr/include/'+python_version),
111    ('python_lib_path', 'Path to Python libs', usr_lib),    ('python_lib_path', 'Path to Python libs', usr_lib),
# Line 95  opts.AddOptions( Line 116  opts.AddOptions(
116    ('boost_lib_path', 'Path to Boost libs', usr_lib),    ('boost_lib_path', 'Path to Boost libs', usr_lib),
117    ('boost_libs', 'Boost libraries to link with', ['boost_python']),    ('boost_libs', 'Boost libraries to link with', ['boost_python']),
118  # NetCDF  # NetCDF
119    BoolOption('usenetcdf', 'switch on/off the usage of netCDF', 'yes'),    BoolVariable('usenetcdf', 'switch on/off the usage of netCDF', 'yes'),
120    ('netCDF_path', 'Path to netCDF includes', '/usr/include'),    ('netCDF_path', 'Path to netCDF includes', '/usr/include'),
121    ('netCDF_lib_path', 'Path to netCDF libs', usr_lib),    ('netCDF_lib_path', 'Path to netCDF libs', usr_lib),
122    ('netCDF_libs', 'netCDF C++ libraries to link with', ['netcdf_c++', 'netcdf']),    ('netCDF_libs', 'netCDF C++ libraries to link with', ['netcdf_c++', 'netcdf']),
123  # MPI  # MPI
124    BoolOption('useMPI', 'For backwards compatibility', 'no'),    BoolVariable('useMPI', 'For backwards compatibility', 'no'),
125    BoolOption('usempi', 'Compile parallel version using MPI', 'no'),    BoolVariable('usempi', 'Compile parallel version using MPI', 'no'),
126    ('MPICH_IGNORE_CXX_SEEK', 'name of macro to ignore MPI settings of C++ SEEK macro (for MPICH)' , 'MPICH_IGNORE_CXX_SEEK'),    ('MPICH_IGNORE_CXX_SEEK', 'name of macro to ignore MPI settings of C++ SEEK macro (for MPICH)' , 'MPICH_IGNORE_CXX_SEEK'),
127    ('mpi_path', 'Path to MPI includes', '/usr/include'),    ('mpi_path', 'Path to MPI includes', '/usr/include'),
128    ('mpi_run', 'mpirun name' , 'mpiexec -np 1'),    ('mpi_run', 'mpirun name' , 'mpiexec -np 1'),
129    ('mpi_lib_path', 'Path to MPI libs (needs to be added to the LD_LIBRARY_PATH)', usr_lib),    ('mpi_lib_path', 'Path to MPI libs (needs to be added to the LD_LIBRARY_PATH)', usr_lib),
130    ('mpi_libs', 'MPI libraries to link with (needs to be shared!)', ['mpich' , 'pthread', 'rt']),    ('mpi_libs', 'MPI libraries to link with (needs to be shared!)', []),
131    ('mpi_flavour','Type of MPI execution environment','none'),    ('mpi_flavour','Type of MPI execution environment','none'),
132  # ParMETIS  # ParMETIS
133    BoolOption('useparmetis', 'Compile parallel version using ParMETIS', 'yes'),    BoolVariable('useparmetis', 'Compile parallel version using ParMETIS', 'yes'),
134    ('parmetis_path', 'Path to ParMETIS includes', '/usr/include'),    ('parmetis_path', 'Path to ParMETIS includes', '/usr/include'),
135    ('parmetis_lib_path', 'Path to ParMETIS library', usr_lib),    ('parmetis_lib_path', 'Path to ParMETIS library', usr_lib),
136    ('parmetis_libs', 'ParMETIS library to link with', ['parmetis', 'metis']),    ('parmetis_libs', 'ParMETIS library to link with', ['parmetis', 'metis']),
137  # PAPI  # PAPI
138    BoolOption('usepapi', 'switch on/off the usage of PAPI', 'no'),    BoolVariable('usepapi', 'switch on/off the usage of PAPI', 'no'),
139    ('papi_path', 'Path to PAPI includes', '/usr/include'),    ('papi_path', 'Path to PAPI includes', '/usr/include'),
140    ('papi_lib_path', 'Path to PAPI libs', usr_lib),    ('papi_lib_path', 'Path to PAPI libs', usr_lib),
141    ('papi_libs', 'PAPI libraries to link with', ['papi']),    ('papi_libs', 'PAPI libraries to link with', ['papi']),
142    BoolOption('papi_instrument_solver', 'use PAPI in Solver.c to instrument each iteration of the solver', False),    BoolVariable('papi_instrument_solver', 'use PAPI in Solver.c to instrument each iteration of the solver', False),
143  # MKL  # MKL
144    BoolOption('usemkl', 'switch on/off the usage of MKL', 'no'),    BoolVariable('usemkl', 'switch on/off the usage of MKL', 'no'),
145    ('mkl_path', 'Path to MKL includes', '/sw/sdev/cmkl/10.0.2.18/include'),    ('mkl_path', 'Path to MKL includes', '/sw/sdev/cmkl/10.0.2.18/include'),
146    ('mkl_lib_path', 'Path to MKL libs', '/sw/sdev/cmkl/10.0.2.18/lib/em64t'),    ('mkl_lib_path', 'Path to MKL libs', '/sw/sdev/cmkl/10.0.2.18/lib/em64t'),
147    ('mkl_libs', 'MKL libraries to link with', ['mkl_solver', 'mkl_em64t', 'guide', 'pthread']),    ('mkl_libs', 'MKL libraries to link with', ['mkl_solver', 'mkl_em64t', 'guide', 'pthread']),
148  # UMFPACK  # UMFPACK
149    BoolOption('useumfpack', 'switch on/off the usage of UMFPACK', 'no'),    BoolVariable('useumfpack', 'switch on/off the usage of UMFPACK', 'no'),
150    ('ufc_path', 'Path to UFconfig includes', '/usr/include/suitesparse'),    ('ufc_path', 'Path to UFconfig includes', '/usr/include/suitesparse'),
151    ('umf_path', 'Path to UMFPACK includes', '/usr/include/suitesparse'),    ('umf_path', 'Path to UMFPACK includes', '/usr/include/suitesparse'),
152    ('umf_lib_path', 'Path to UMFPACK libs', usr_lib),    ('umf_lib_path', 'Path to UMFPACK libs', usr_lib),
153    ('umf_libs', 'UMFPACK libraries to link with', ['umfpack']),    ('umf_libs', 'UMFPACK libraries to link with', ['umfpack']),
154  # Silo  # Silo
155    BoolOption('usesilo', 'switch on/off the usage of Silo', 'yes'),    BoolVariable('usesilo', 'switch on/off the usage of Silo', 'yes'),
156    ('silo_path', 'Path to Silo includes', '/usr/include'),    ('silo_path', 'Path to Silo includes', '/usr/include'),
157    ('silo_lib_path', 'Path to Silo libs', usr_lib),    ('silo_lib_path', 'Path to Silo libs', usr_lib),
158    ('silo_libs', 'Silo libraries to link with', ['siloh5', 'hdf5']),    ('silo_libs', 'Silo libraries to link with', ['siloh5', 'hdf5']),
# Line 143  opts.AddOptions( Line 164  opts.AddOptions(
164    ('blas_path', 'Path to BLAS includes', '/usr/include/suitesparse'),    ('blas_path', 'Path to BLAS includes', '/usr/include/suitesparse'),
165    ('blas_lib_path', 'Path to BLAS libs', usr_lib),    ('blas_lib_path', 'Path to BLAS libs', usr_lib),
166    ('blas_libs', 'BLAS libraries to link with', ['blas']),    ('blas_libs', 'BLAS libraries to link with', ['blas']),
167    #Lapack options
168      BoolVariable('uselapack','switch on/off use of Lapack','no'),
169      ('lapack_path', 'Path to Lapack includes','/usr/include'),
170      ('lapack_lib_path', 'Path to Lapack libs', usr_lib),
171      ('lapack_libs', 'Lapack libraries to link with', []),
172      ('lapack_type', '{clapack,mkl}','clapack'),
173  # An option for specifying the compiler tools set (see windows branch).  # An option for specifying the compiler tools set (see windows branch).
174    ('tools_names', 'allow control over the tools in the env setup', ['intelc']),    ('tools_names', 'allow control over the tools in the env setup', ['default']),
175  # finer control over library building, intel aggressive global optimisation  # finer control over library building, intel aggressive global optimisation
176  # works with dynamic libraries on windows.  # works with dynamic libraries on windows.
177    ('share_esysUtils', 'control static or dynamic esysUtils lib', False),    ('share_esysUtils', 'control static or dynamic esysUtils lib', False),
178    ('share_paso', 'control static or dynamic paso lib', False)    ('share_paso', 'control static or dynamic paso lib', False),
179      ('env_export','Environment variables to be passed to children',[]),
180    #To enable passing function pointers through python
181      BoolVariable('iknowwhatimdoing','allow nonstandard C',False)
182  )  )
183    
184  ############ Specify which compilers to use ####################  ############ Specify which compilers to use ####################
# Line 161  if IS_WINDOWS_PLATFORM: Line 191  if IS_WINDOWS_PLATFORM:
191        env = Environment(tools = ['default'] + env['tools_names'],        env = Environment(tools = ['default'] + env['tools_names'],
192                          options = opts)                          options = opts)
193  else:  else:
194     if socket.gethostname().split('.')[0] == 'service0':      if os.uname()[4]=='ia64':
       env = Environment(tools = ['default', 'intelc'], options = opts)  
    elif os.uname()[4]=='ia64':  
195        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
196        if env['CXX'] == 'icpc':        if env['CXX'] == 'icpc':
197           env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not)           env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not)
198     else:     else:
199        env = Environment(tools = ['default'], options = opts)        env = Environment(tools = ['default'], options = opts)
200          if env['tools_names']!='default':
201        env=Environment(tools = ['default'] +env['tools_names'], options=opts)
202    
203    
204    
205    
206    # Override compiler choice if provided
207    if env['cc'] != 'DEFAULT': env['CC']=env['cc']
208    if env['cxx'] != 'DEFAULT': env['CXX']=env['cxx']
209    
210  Help(opts.GenerateHelpText(env))  Help(opts.GenerateHelpText(env))
211    
212    ############ Make sure target directories exist ################
213    
214    if not os.path.isdir(env['bininstall']):
215        os.makedirs(env['bininstall'])
216    if not os.path.isdir(env['libinstall']):
217        os.makedirs(env['libinstall'])
218    if not os.path.isdir(env['pyinstall']):
219        os.makedirs(env['pyinstall'])
220    
221    ########## Copy required environment vars ######################
222    
223    for i in env['env_export']:
224       env.Append(ENV = {i:os.environ[i]})
225    
226  ############ Fill in compiler options if not set above #########  ############ Fill in compiler options if not set above #########
227    
228  # Backwards compatibility: allow dodebug=yes and useMPI=yes  # Backwards compatibility: allow dodebug=yes and useMPI=yes
# Line 182  if env['useMPI']: env['usempi'] = 1 Line 234  if env['useMPI']: env['usempi'] = 1
234    
235  sysheaderopt = ""       # how do we indicate that a header is a system header. Use "" for no action.  sysheaderopt = ""       # how do we indicate that a header is a system header. Use "" for no action.
236    
237    cc_flags = ""
238    cc_optim = ""
239    cc_debug = ""
240    omp_optim = ""
241    omp_debug = ""
242    omp_libs = []
243    
244  if env["CC"] == "icc":  if env["CC"] == "icc":
245    # Intel compilers    # Intel compilers
246    cc_flags      = "-fPIC -ansi -wd161 -w1 -vec-report0 -DBLOCKTIMER -DCORE_ID1"    cc_flags      = "-std=c99 -fPIC -wd161 -w1 -vec-report0 -DBLOCKTIMER -DCORE_ID1"
247    cc_optim      = "-O3 -ftz -IPF_ftlacc- -IPF_fma -fno-alias"    cc_optim      = "-O3 -ftz -IPF_ftlacc- -IPF_fma -fno-alias"
248    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
249    omp_optim     = "-openmp -openmp_report0"    omp_optim     = "-openmp -openmp_report0"
# Line 193  if env["CC"] == "icc": Line 252  if env["CC"] == "icc":
252    pedantic      = ""    pedantic      = ""
253    fatalwarning      = ""        # Switch to turn warnings into errors    fatalwarning      = ""        # Switch to turn warnings into errors
254    sysheaderopt      = ""    sysheaderopt      = ""
255  elif env["CC"] == "gcc":  elif env["CC"][:3] == "gcc":
256    # GNU C on any system    # GNU C on any system
257    cc_flags      = "-pedantic -Wall -fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER  -Wno-sign-compare -Wno-system-headers -Wno-long-long -Wno-strict-aliasing"    cc_flags      = "-pedantic -Wall -fPIC -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER  -Wno-sign-compare -Wno-system-headers -Wno-long-long -Wno-strict-aliasing"
258  #the long long warning occurs on the Mac  #the long long warning occurs on the Mac
259    cc_optim      = "-O3"    cc_optim      = "-O3"
260    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
261    omp_optim     = "-fopenmp"    omp_optim     = "-fopenmp"
262    omp_debug     = "-fopenmp"    omp_debug     = "-fopenmp"
263    omp_libs      = ['gomp']    omp_libs      = []
264    pedantic      = "-pedantic-errors -Wno-long-long"    pedantic      = "-pedantic-errors -Wno-long-long"
265    fatalwarning      = "-Werror"    fatalwarning      = "-Werror"
266    sysheaderopt      = "-isystem "    sysheaderopt      = "-isystem "
# Line 234  if env["omp_libs"] == "-DEFAULT_6": env[ Line 293  if env["omp_libs"] == "-DEFAULT_6": env[
293  #set up the autolazy values  #set up the autolazy values
294  if env['forcelazy']    != "leave_alone":  if env['forcelazy']    != "leave_alone":
295    if env['forcelazy'] == 'on':    if env['forcelazy'] == 'on':
296      env.Append(CPPDEFINES='FAUTOLAZYON')      env.Append(CPPDEFINES=['FAUTOLAZYON'])
297    else:    else:
298       if env['forcelazy'] == 'off':       if env['forcelazy'] == 'off':
299      env.Append(CPPDEFINES='FAUTOLAZYOFF')      env.Append(CPPDEFINES=['FAUTOLAZYOFF'])
300    
301    #set up the colective resolve values
302    if env['forcecollres']    != "leave_alone":
303      print env['forcecollres']
304      if env['forcecollres'] == 'on':
305        env.Append(CPPDEFINES=['FRESCOLLECTON'])
306      else:
307         if env['forcecollres'] == 'off':
308        env.Append(CPPDEFINES=['FRESCOLLECTOFF'])
309    
310    
311    if env['iknowwhatimdoing']:
312        env.Append(CPPDEFINES=['IKNOWWHATIMDOING'])
313    
314  # OpenMP is disabled if useopenmp=no or both variables omp_optim and omp_debug are empty  # OpenMP is disabled if useopenmp=no or both variables omp_optim and omp_debug are empty
315  if not env["useopenmp"]:  if not env["useopenmp"]:
# Line 282  except KeyError: pass Line 354  except KeyError: pass
354  try: env['ENV']['CPLUS_INCLUDE_PATH'] = os.environ['CPLUS_INCLUDE_PATH']  try: env['ENV']['CPLUS_INCLUDE_PATH'] = os.environ['CPLUS_INCLUDE_PATH']
355  except KeyError: pass  except KeyError: pass
356    
357  try: PrependENVPath['ENV'][LD_LIBRARY_PATH_KEY] = os.environ['LD_LIBRARY_PATH']  try: env.PrependENVPath(LD_LIBRARY_PATH_KEY,os.environ['LD_LIBRARY_PATH'])
358  except KeyError: pass  except KeyError: pass
359    
360  try: env['ENV']['LIBRARY_PATH'] = os.environ['LIBRARY_PATH']  try: env['ENV']['LIBRARY_PATH'] = os.environ['LIBRARY_PATH']
# Line 318  env.Append(CPPPATH     = [Dir('include')]) Line 390  env.Append(CPPPATH     = [Dir('include')])
390  # Add cc option -L<Escript>/trunk/lib  # Add cc option -L<Escript>/trunk/lib
391  env.Append(LIBPATH      = [Dir(env['libinstall'])])  env.Append(LIBPATH      = [Dir(env['libinstall'])])
392    
393  if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])  if env['cc_extra'] != '': env.Append(CFLAGS = env['cc_extra'])
394    if env['cxx_extra'] != '': env.Append(CXXFLAGS = env['cxx_extra'])
395  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])
396    
397  if env['usepedantic']: env.Append(CCFLAGS = pedantic)  if env['usepedantic']: env.Append(CCFLAGS = pedantic)
# Line 347  except: Line 420  except:
420  if global_revision == "": global_revision="-2"  if global_revision == "": global_revision="-2"
421  env.Append(CPPDEFINES = ["SVN_VERSION="+global_revision])  env.Append(CPPDEFINES = ["SVN_VERSION="+global_revision])
422    
423  ############ numarray (required) ###############################  ############ numpy (required) ###############################
424    
425  try:  try:
426    from numarray import identity    from numpy import identity
427  except ImportError:  except ImportError:
428    print "Cannot import numarray, you need to set your PYTHONPATH"    print "Cannot import numpy, you need to set your PYTHONPATH"
429    sys.exit(1)    sys.exit(1)
430    
431  ############ C compiler (required) #############################  ############ C compiler (required) #############################
# Line 409  conf.env.PrependENVPath(LD_LIBRARY_PATH_ Line 482  conf.env.PrependENVPath(LD_LIBRARY_PATH_
482  conf.env.PrependENVPath('PYTHONPATH', prefix)  conf.env.PrependENVPath('PYTHONPATH', prefix)
483  conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])  conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])
484    
 if not conf.CheckCXXHeader('boost/python.hpp'):  
   print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])  
   sys.exit(1)  
485    
486  if not conf.CheckFunc('PyObject_SetAttr'):  #Yep we still cant figure this one out. - working on it.
487    print "Cannot find boost library method PyObject_SetAttr (tried method PyObject_SetAttr in library %s in directory %s)" % (env['boost_libs'], env['boost_lib_path'])  if not IS_WINDOWS_PLATFORM:
488    sys.exit(1)    if not conf.CheckCXXHeader('boost/python.hpp'):
489        print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])
490        sys.exit(1)
491    
492      if not conf.CheckFunc('PyObject_SetAttr'):
493        print "Cannot find boost library method PyObject_SetAttr (tried method PyObject_SetAttr in library %s in directory %s)" % (env['boost_libs'], env['boost_lib_path'])
494        sys.exit(1)
495    
496    
497  # Commit changes to environment  # Commit changes to environment
498  env = conf.Finish()  env = conf.Finish()
# Line 497  if env['usemkl']: Line 574  if env['usemkl']:
574  if env['usemkl'] and not conf.CheckCHeader('mkl_solver.h'): env['usemkl'] = 0  if env['usemkl'] and not conf.CheckCHeader('mkl_solver.h'): env['usemkl'] = 0
575  if env['usemkl'] and not conf.CheckFunc('pardiso'): env['usemkl'] = 0  if env['usemkl'] and not conf.CheckFunc('pardiso'): env['usemkl'] = 0
576    
577    
578  # Add MKL to environment env if it was found  # Add MKL to environment env if it was found
579  if env['usemkl']:  if env['usemkl']:
580    env = conf.Finish()    env = conf.Finish()
# Line 527  if env['useumfpack']: Line 605  if env['useumfpack']:
605    conf.env.PrependENVPath('PYTHONPATH', prefix)    conf.env.PrependENVPath('PYTHONPATH', prefix)
606    conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])    conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])
607    
 if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0  
608  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0
609    if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0
610  # if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0 # this does not work on shake73?  # if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0 # this does not work on shake73?
611    
612  # Add UMFPACK to environment env if it was found  # Add UMFPACK to environment env if it was found
# Line 551  if env['usesilo']: Line 629  if env['usesilo']:
629    
630  # Add the path to Silo to environment env if it was found.  # Add the path to Silo to environment env if it was found.
631  # Note that we do not add the libs since they are only needed for the  # Note that we do not add the libs since they are only needed for the
632  # escriptreader library and tools.  # weipa library and tools.
633  if env['usesilo']:  if env['usesilo']:
634    env.AppendUnique(CPPPATH = [env['silo_path']])    env.AppendUnique(CPPPATH = [env['silo_path']])
635    env.AppendUnique(LIBPATH = [env['silo_lib_path']])    env.AppendUnique(LIBPATH = [env['silo_lib_path']])
636    env.Append(CPPDEFINES = ['HAVE_SILO'])  
637    ########### Lapack (optional) ##################################
638    
639    if env['uselapack']:
640        env.AppendUnique(CPPDEFINES='USE_LAPACK')
641        env.AppendUnique(CPPPATH = [env['lapack_path']])
642        env.AppendUnique(LIBPATH =[env['lapack_lib_path']])
643    
644        env.Append(LIBPATH = '/usr/lib/atlas')
645        env.Append(LIBS = [env['lapack_libs']])
646        if env['lapack_type']=='mkl':
647           if not env['usemkl']:
648            env['uselapack']=0
649            print "mkl_lapack requires mkl"
650           else:
651            env.AppendUnique(CPPDEFINES='MKL_LAPACK')
652          
653    
654  ############ Add the compiler flags ############################  ############ Add the compiler flags ############################
655    
# Line 613  if env_mpi['usempi'] and not conf.CheckC Line 707  if env_mpi['usempi'] and not conf.CheckC
707  if env_mpi['usempi']:  if env_mpi['usempi']:
708    env_mpi = conf.Finish()    env_mpi = conf.Finish()
709    env_mpi.Append(CPPDEFINES = ['PASO_MPI', 'MPI_NO_CPPBIND', env_mpi['MPICH_IGNORE_CXX_SEEK']])    env_mpi.Append(CPPDEFINES = ['PASO_MPI', 'MPI_NO_CPPBIND', env_mpi['MPICH_IGNORE_CXX_SEEK']])
710      # NetCDF 4.1 defines MPI_Comm et al. if MPI_INCLUDED is not defined!
711      # On the other hand MPT and OpenMPI don't define the latter so we have to
712      # do that here
713      if env['usenetcdf'] and env_mpi['mpi_flavour'] in ["MPT","OPENMPI"]:
714        env_mpi.Append(CPPDEFINES = ['MPI_INCLUDED'])
715  else:  else:
716    conf.Finish()    conf.Finish()
717    
718  env['usempi'] = env_mpi['usempi']  env['usempi'] = env_mpi['usempi']
719    
   
720  ############ ParMETIS (optional) ###############################  ############ ParMETIS (optional) ###############################
721    
722  # Start a new configure environment that reflects what we've already found  # Start a new configure environment that reflects what we've already found
# Line 647  else: Line 745  else:
745    
746  env['useparmetis'] = env_mpi['useparmetis']  env['useparmetis'] = env_mpi['useparmetis']
747    
 ############ Now we switch on Warnings as errors ###############  
   
 #this needs to be done after configuration because the scons test files have warnings in them  
   
 if ((fatalwarning != "") and (env['usewarnings'])):  
   env.Append(CCFLAGS        = fatalwarning)  
   env_mpi.Append(CCFLAGS        = fatalwarning)  
   
748  ############ Summarize our environment #########################  ############ Summarize our environment #########################
749    
750  print ""  print ""
751  print "Summary of configuration (see ./config.log for information)"  print "Summary of configuration (see ./config.log for information)"
752  print " Using python libraries"  print " Using python libraries"
753  print " Using numarray"  print " Using numpy"
754  print " Using boost"  print " Using boost"
755  if env['usenetcdf']: print "    Using NetCDF"  if env['usenetcdf']: print "    Using NetCDF"
756  else: print "   Not using NetCDF"  else: print "   Not using NetCDF"
# Line 680  if env['useparmetis']: print " Using Par Line 770  if env['useparmetis']: print " Using Par
770  else: print "   Not using ParMETIS (requires MPI)"  else: print "   Not using ParMETIS (requires MPI)"
771  if env['usepapi']: print "  Using PAPI"  if env['usepapi']: print "  Using PAPI"
772  else: print "   Not using PAPI"  else: print "   Not using PAPI"
773    if env['uselapack']: print "    Using Lapack"
774    else: print "   Not using Lapack"
775  if env['usedebug']: print " Compiling for debug"  if env['usedebug']: print " Compiling for debug"
776  else: print "   Not compiling for debug"  else: print "   Not compiling for debug"
777  print " Installing in", prefix  print " Installing in", prefix
# Line 699  if not env['usempi']: Execute(Delete(os. Line 791  if not env['usempi']: Execute(Delete(os.
791    
792  ############ Build the subdirectories ##########################  ############ Build the subdirectories ##########################
793    
794    if env['usepedantic']: env_mpi.Append(CCFLAGS = pedantic)
795    
796    
797  from grouptest import *  from grouptest import *
798    
799  TestGroups=[]  TestGroups=[]
800    
801    dodgy_env=clone_env(env_mpi)    # Environment without pedantic options
802    
803    ############ Now we switch on Warnings as errors ###############
804    
805    #this needs to be done after configuration because the scons test files have warnings in them
806    
807    if ((fatalwarning != "") and (env['usewarnings'])):
808      env.Append(CCFLAGS        = fatalwarning)
809      env_mpi.Append(CCFLAGS        = fatalwarning)
810    
811    
812  Export(  Export(
813    ["env",    ["env",
814     "env_mpi",     "env_mpi",
815     "clone_env",     "clone_env",
816       "dodgy_env",
817     "IS_WINDOWS_PLATFORM",     "IS_WINDOWS_PLATFORM",
818     "TestGroups"     "TestGroups"
819     ]     ]
820    )    )
821    
822  env.SConscript(dirs = ['tools/CppUnitTest/src'], build_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)  env.SConscript(dirs = ['tools/CppUnitTest/src'], build_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)
823  env.SConscript(dirs = ['tools/libescriptreader/src'], build_dir='build/$PLATFORM/tools/libescriptreader', duplicate=0)  env.SConscript(dirs = ['tools/escriptconvert'], build_dir='build/$PLATFORM/tools/escriptconvert', duplicate=0)
824  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)
825    env.SConscript(dirs = ['weipa/src'], build_dir='build/$PLATFORM/weipa', duplicate=0)
826  env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)  env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)
827  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)
828  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)
# Line 746  env.Alias('remember_options', remember_l Line 854  env.Alias('remember_options', remember_l
854  ############### Record python interpreter version ##############  ############### Record python interpreter version ##############
855    
856  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:
857    
858    versionstring="Python "+str(sys.version_info[0])+"."+str(sys.version_info[1])+"."+str(sys.version_info[2])    versionstring="Python "+str(sys.version_info[0])+"."+str(sys.version_info[1])+"."+str(sys.version_info[2])
859      if sys.version_info[4] >0 : versionstring+="rc%s"%sys.version_info[4]
860    os.system("echo "+versionstring+" > "+os.path.join(env['libinstall'],"pyversion"))    os.system("echo "+versionstring+" > "+os.path.join(env['libinstall'],"pyversion"))
861    
862  ############## Populate the buildvars file #####################  ############## Populate the buildvars file #####################
# Line 783  else: Line 893  else:
893      out+="n"      out+="n"
894  buildvars.write(out+"\n")  buildvars.write(out+"\n")
895  buildvars.write("mpi_flavour="+env['mpi_flavour']+'\n')  buildvars.write("mpi_flavour="+env['mpi_flavour']+'\n')
896    out="lapack="
897    if env['uselapack']:
898       out+="y"
899    else:
900       out+="n"
901    out+="\nsilo="
902    if env['usesilo']:
903       out+="y"
904    else:
905       out+="n"
906    buildvars.write(out+"\n")
907  buildvars.close()  buildvars.close()
908    
909    
# Line 799  env.Alias('install_esysUtils', ['build_e Line 919  env.Alias('install_esysUtils', ['build_e
919  env.Alias('build_paso', ['target_install_paso_headers', 'target_paso_a'])  env.Alias('build_paso', ['target_install_paso_headers', 'target_paso_a'])
920  env.Alias('install_paso', ['build_paso', 'target_install_paso_a'])  env.Alias('install_paso', ['build_paso', 'target_install_paso_a'])
921    
922    env.Alias('build_weipa', ['target_install_weipa_headers', 'target_weipa_so', 'target_weipacpp_so'])
923    env.Alias('install_weipa', ['build_weipa', 'target_install_weipa_so', 'target_install_weipacpp_so', 'target_install_weipa_py'])
924    
925    env.Alias('build_escriptreader', ['target_install_weipa_headers', 'target_escriptreader_a'])
926    env.Alias('install_escriptreader', ['build_escriptreader', 'target_install_escriptreader_a'])
927    
928  env.Alias('build_escript', ['target_install_escript_headers', 'target_escript_so', 'target_escriptcpp_so'])  env.Alias('build_escript', ['target_install_escript_headers', 'target_escript_so', 'target_escriptcpp_so'])
929  env.Alias('install_escript', ['build_escript', 'target_install_escript_so', 'target_install_escriptcpp_so', 'target_install_escript_py'])  env.Alias('install_escript', ['build_escript', 'target_install_escript_so', 'target_install_escriptcpp_so', 'target_install_escript_py'])
930    
# Line 809  env.Alias('install_finley', ['build_finl Line 935  env.Alias('install_finley', ['build_finl
935  build_all_list = []  build_all_list = []
936  build_all_list += ['build_esysUtils']  build_all_list += ['build_esysUtils']
937  build_all_list += ['build_paso']  build_all_list += ['build_paso']
938    build_all_list += ['build_weipa']
939  build_all_list += ['build_escript']  build_all_list += ['build_escript']
940  build_all_list += ['build_finley']  build_all_list += ['build_finley']
941  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']
942  #if not IS_WINDOWS_PLATFORM:    build_all_list += ['target_escript_wrapper']  #if not IS_WINDOWS_PLATFORM:    build_all_list += ['target_escript_wrapper']
943  if env['usesilo']:  build_all_list += ['target_escript2silo']  build_all_list += ['target_escriptconvert']
944  env.Alias('build_all', build_all_list)  env.Alias('build_all', build_all_list)
945    
946  install_all_list = []  install_all_list = []
947  install_all_list += ['target_init']  install_all_list += ['target_init']
948  install_all_list += ['install_esysUtils']  install_all_list += ['install_esysUtils']
949  install_all_list += ['install_paso']  install_all_list += ['install_paso']
950    install_all_list += ['install_weipa']
951  install_all_list += ['install_escript']  install_all_list += ['install_escript']
952  install_all_list += ['install_finley']  install_all_list += ['install_finley']
953  install_all_list += ['target_install_pyvisi_py']  install_all_list += ['target_install_pyvisi_py']
# Line 827  install_all_list += ['target_install_mod Line 955  install_all_list += ['target_install_mod
955  install_all_list += ['target_install_pycad_py']  install_all_list += ['target_install_pycad_py']
956  if env['usempi']:       install_all_list += ['target_install_pythonMPI_exe']  if env['usempi']:       install_all_list += ['target_install_pythonMPI_exe']
957  #if not IS_WINDOWS_PLATFORM:    install_all_list += ['target_install_escript_wrapper']  #if not IS_WINDOWS_PLATFORM:    install_all_list += ['target_install_escript_wrapper']
958  if env['usesilo']:  install_all_list += ['target_install_escript2silo']  if env['usesilo']:  install_all_list += ['target_install_escriptconvert']
959  install_all_list += ['remember_options']  install_all_list += ['remember_options']
960  env.Alias('install_all', install_all_list)  env.Alias('install_all', install_all_list)
961    
# Line 842  env.Alias('run_tests', ['install_all', ' Line 970  env.Alias('run_tests', ['install_all', '
970  env.Alias('all_tests', ['install_all', 'target_install_cppunittest_a', 'run_tests', 'py_tests'])  env.Alias('all_tests', ['install_all', 'target_install_cppunittest_a', 'run_tests', 'py_tests'])
971  env.Alias('build_full',['install_all','build_tests','build_py_tests'])  env.Alias('build_full',['install_all','build_tests','build_py_tests'])
972    
973    
974  ############ Targets to build the documentation ################  ############ Targets to build the documentation ################
975    
976  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf'])  env.Alias('api_epydoc','install_all')
977    
978    env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf', 'cookbook_pdf'])
979    
980    build_platform=os.name
981    
982  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:
983     try:     try:
984      utest=open("utest.sh","w")      utest=open("utest.sh","w")
985      build_platform=os.name      #Sometimes Mac python says it is posix      #Sometimes Mac python says it is posix
986      if (build_platform=='posix') and platform.system()=="Darwin":      if (build_platform=='posix') and platform.system()=="Darwin":
987          build_platform='darwin'          build_platform='darwin'
988      utest.write(GroupTest.makeHeader(build_platform))      utest.write(GroupTest.makeHeader(build_platform))
# Line 862  if not IS_WINDOWS_PLATFORM: Line 995  if not IS_WINDOWS_PLATFORM:
995      print "Error attempting to write unittests file."      print "Error attempting to write unittests file."
996      sys.exit(1)      sys.exit(1)
997    
998       #Make sure that the escript wrapper is in place
999       if not os.path.isfile(os.path.join(env['bininstall'],'escript')):
1000           print "Copying escript wrapper"
1001           shutil.copy("bin/escript",os.path.join(env['bininstall'],'escript'))
1002    
1003    ############ Targets to build PasoTests suite ################
1004    
1005    env.Alias('build_PasoTests','build/'+build_platform+'/paso/profiling/PasoTests')
1006    
1007    env.Alias('release_prep', ['docs', 'install_all'])

Legend:
Removed from v.2423  
changed lines
  Added in v.3076

  ViewVC Help
Powered by ViewVC 1.1.26