/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2235 by jfenwick, Tue Feb 3 01:47:47 2009 UTC revision 2387 by jfenwick, Wed Apr 15 05:05:27 2009 UTC
# Line 15  Line 15 
15  EnsureSConsVersion(0,96,91)  EnsureSConsVersion(0,96,91)
16  EnsurePythonVersion(2,3)  EnsurePythonVersion(2,3)
17    
18  import sys, os, re, socket  import sys, os, re, socket, platform, stat
19    
20  # Add our extensions  # Add our extensions
21  if os.path.isdir('scons'): sys.path.append('scons')  if os.path.isdir('scons'): sys.path.append('scons')
# Line 72  opts.AddOptions( Line 72  opts.AddOptions(
72    ('ld_extra', 'Extra linker flags', ''),    ('ld_extra', 'Extra linker flags', ''),
73    ('sys_libs', 'System libraries to link with', []),    ('sys_libs', 'System libraries to link with', []),
74    ('ar_flags', 'Static library archiver flags to use', ''),    ('ar_flags', 'Static library archiver flags to use', ''),
75    BoolOption('useopenmp', 'Compile parallel version using OpenMP', 'yes'),    BoolOption('useopenmp', 'Compile parallel version using OpenMP', 'no'),
76    BoolOption('usepedantic', 'Compile with -pedantic if using gcc', 'no'),    BoolOption('usepedantic', 'Compile with -pedantic if using gcc', 'no'),
77    BoolOption('usewarnings','Compile with warnings as errors if using gcc','yes'),    BoolOption('usewarnings','Compile with warnings as errors if using gcc','yes'),
78      ('forcelazy','for testing use only - set the default value for autolazy','leave_alone'),
79  # Python  # Python
80    ('python_path', 'Path to Python includes', '/usr/include/'+python_version),    ('python_path', 'Path to Python includes', '/usr/include/'+python_version),
81    ('python_lib_path', 'Path to Python libs', usr_lib),    ('python_lib_path', 'Path to Python libs', usr_lib),
# Line 97  opts.AddOptions( Line 98  opts.AddOptions(
98    ('mpi_run', 'mpirun name' , 'mpiexec -np 1'),    ('mpi_run', 'mpirun name' , 'mpiexec -np 1'),
99    ('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),
100    ('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!)', ['mpich' , 'pthread', 'rt']),
101      ('mpi_flavour','Type of MPI execution environment','none'),
102  # ParMETIS  # ParMETIS
103    BoolOption('useparmetis', 'Compile parallel version using ParMETIS', 'yes'),    BoolOption('useparmetis', 'Compile parallel version using ParMETIS', 'yes'),
104    ('parmetis_path', 'Path to ParMETIS includes', '/usr/include'),    ('parmetis_path', 'Path to ParMETIS includes', '/usr/include'),
# Line 188  elif env["CC"] == "gcc": Line 190  elif env["CC"] == "gcc":
190  #the long long warning occurs on the Mac  #the long long warning occurs on the Mac
191    cc_optim      = "-O3"    cc_optim      = "-O3"
192    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
193    omp_optim     = ""    omp_optim     = "-fopenmp"
194    omp_debug     = ""    omp_debug     = "-fopenmp"
195    omp_libs      = []    omp_libs      = ['gomp']
196    pedantic      = "-pedantic-errors -Wno-long-long"    pedantic      = "-pedantic-errors -Wno-long-long"
197    fatalwarning      = "-Werror"    fatalwarning      = "-Werror"
198    sysheaderopt      = "-isystem "    sysheaderopt      = "-isystem "
# Line 220  if env["omp_optim"]    == "-DEFAULT_4": env Line 222  if env["omp_optim"]    == "-DEFAULT_4": env
222  if env["omp_debug"] == "-DEFAULT_5": env['omp_debug'] = omp_debug  if env["omp_debug"] == "-DEFAULT_5": env['omp_debug'] = omp_debug
223  if env["omp_libs"]  == "-DEFAULT_6": env['omp_libs'] = omp_libs  if env["omp_libs"]  == "-DEFAULT_6": env['omp_libs'] = omp_libs
224    
225    #set up the autolazy values
226    if env['forcelazy']    != "leave_alone":
227      if env['forcelazy'] == 'on':
228        env.Append(CPPDEFINES='FAUTOLAZYON')
229      else:
230         if env['forcelazy'] == 'off':
231        env.Append(CPPDEFINES='FAUTOLAZYOFF')
232    
233  # 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
234  if not env["useopenmp"]:  if not env["useopenmp"]:
235    env['omp_optim'] = ""    env['omp_optim'] = ""
# Line 233  if env['omp_optim'] == "" and env['omp_d Line 243  if env['omp_optim'] == "" and env['omp_d
243  try: env['ENV']['OMP_NUM_THREADS'] = os.environ['OMP_NUM_THREADS']  try: env['ENV']['OMP_NUM_THREADS'] = os.environ['OMP_NUM_THREADS']
244  except KeyError: env['ENV']['OMP_NUM_THREADS'] = 1  except KeyError: env['ENV']['OMP_NUM_THREADS'] = 1
245    
246    try: env['ENV']['ESCRIPT_NUM_THREADS'] = os.environ['ESCRIPT_NUM_THREADS']
247    except KeyError: pass
248    
249    try: env['ENV']['ESCRIPT_NUM_PROCS'] = os.environ['ESCRIPT_NUM_PROCS']
250    except KeyError: pass
251    
252    try: env['ENV']['ESCRIPT_NUM_NODES'] = os.environ['ESCRIPT_NUM_NODES']
253    except KeyError: pass
254    
255    try: env['ENV']['ESCRIPT_HOSTFILE'] = os.environ['ESCRIPT_HOSTFILE']
256    except KeyError: pass
257    
258  try: env['ENV']['PATH'] = os.environ['PATH']  try: env['ENV']['PATH'] = os.environ['PATH']
259  except KeyError: pass  except KeyError: pass
260    
# Line 287  if env['usepedantic']: env.Append(CCFLAG Line 309  if env['usepedantic']: env.Append(CCFLAG
309    
310  # MS Windows  # MS Windows
311  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
312    env.PrependENVPath('PATH',    [env['boost_lib_path']])    env.AppendENVPath('PATH', [env['boost_lib_path']])
313    env.PrependENVPath('PATH',    [env['libinstall']])    env.AppendENVPath('PATH', [env['libinstall']])
314    if not env['share_esysUtils'] :    if not env['share_esysUtils'] :
315      env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])      env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])
316    if not env['share_paso'] :    if not env['share_paso'] :
317      env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])      env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])
318    
319    if env['usenetcdf']:    if env['usenetcdf']:
320      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])      env.AppendENVPath('PATH',   [env['netCDF_lib_path']])
321    
322  env.Append(ARFLAGS = env['ar_flags'])  env.Append(ARFLAGS = env['ar_flags'])
323    
# Line 324  conf = Configure(clone_env(env)) Line 346  conf = Configure(clone_env(env))
346    
347  # Test that the compiler is working  # Test that the compiler is working
348  if not conf.CheckFunc('printf'):  if not conf.CheckFunc('printf'):
349    print "Cannot run C compiler '%s' (or libc is missing)" % (env['CC'])     print "Cannot run C compiler '%s' (or libc is missing)" % (env['CC'])
350    sys.exit(1)     sys.exit(1)
351    
352  if conf.CheckFunc('gethostname'):  if conf.CheckFunc('gethostname'):
353    conf.env.Append(CPPDEFINES = ['HAVE_GETHOSTNAME'])    conf.env.Append(CPPDEFINES = ['HAVE_GETHOSTNAME'])
# Line 342  conf.env.AppendUnique(LIBPATH      = [env['p Line 364  conf.env.AppendUnique(LIBPATH      = [env['p
364  conf.env.AppendUnique(LIBS      = [env['python_libs']])  conf.env.AppendUnique(LIBS      = [env['python_libs']])
365    
366  conf.env.PrependENVPath('LD_LIBRARY_PATH', env['python_lib_path'])  # The wrapper script needs to find these libs  conf.env.PrependENVPath('LD_LIBRARY_PATH', env['python_lib_path'])  # The wrapper script needs to find these libs
367    conf.env.PrependENVPath('PYTHONPATH', prefix)
368    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
369    
370  if not conf.CheckCHeader('Python.h'):  if not conf.CheckCHeader('Python.h'):
371    print "Cannot find python include files (tried 'Python.h' in directory %s)" % (env['python_path'])    print "Cannot find python include files (tried 'Python.h' in directory %s)" % (env['python_path'])
372    sys.exit(1)    sys.exit(1)
373  if not conf.CheckFunc('Py_Main'):  if not conf.CheckFunc('Py_Exit'):
374    print "Cannot find python library method Py_Main (tried lib %s in directory %s)" % (env['python_libs'], env['python_lib_path'])    print "Cannot find python library method Py_Main (tried lib %s in directory %s)" % (env['python_libs'], env['python_lib_path'])
375    sys.exit(1)    sys.exit(1)
376    
377  ############ boost (required) ##################################  ############ boost (required) ##################################
378    
379  if not sysheaderopt =="":  if not sysheaderopt =="":
380    conf.env.Append(CCFLAGS=sysheaderopt+env['boost_path']+'boost')  # This is required because we can't -isystem /usr/system because it breaks std includes
381      if os.path.normpath(env['boost_path']) =="/usr/include":
382        conf.env.Append(CCFLAGS=sysheaderopt+os.path.join(env['boost_path'],'boost'))
383      else:
384        conf.env.Append(CCFLAGS=sysheaderopt+env['boost_path'])
385  else:  else:
386    conf.env.AppendUnique(CPPPATH     = [env['boost_path']])    conf.env.AppendUnique(CPPPATH     = [env['boost_path']])
387    
# Line 361  conf.env.AppendUnique(LIBPATH      = [env['b Line 389  conf.env.AppendUnique(LIBPATH      = [env['b
389  conf.env.AppendUnique(LIBS      = [env['boost_libs']])  conf.env.AppendUnique(LIBS      = [env['boost_libs']])
390    
391  conf.env.PrependENVPath('LD_LIBRARY_PATH', env['boost_lib_path'])   # The wrapper script needs to find these libs  conf.env.PrependENVPath('LD_LIBRARY_PATH', env['boost_lib_path'])   # The wrapper script needs to find these libs
392    #ensure that our path entries remain at the front
393    conf.env.PrependENVPath('PYTHONPATH', prefix)
394    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
395    
396  if not conf.CheckCXXHeader('boost/python.hpp'):  if not conf.CheckCXXHeader('boost/python.hpp'):
397    print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])    print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])
398    sys.exit(1)    sys.exit(1)
399    
400  if not conf.CheckFunc('PyObject_SetAttr'):  if not conf.CheckFunc('PyObject_SetAttr'):
401    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'])    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'])
402    sys.exit(1)    sys.exit(1)
# Line 394  if env['usenetcdf']: Line 426  if env['usenetcdf']:
426    conf.env.AppendUnique(LIBPATH = [env['netCDF_lib_path']])    conf.env.AppendUnique(LIBPATH = [env['netCDF_lib_path']])
427    conf.env.AppendUnique(LIBS    = [env['netCDF_libs']])    conf.env.AppendUnique(LIBS    = [env['netCDF_libs']])
428    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['netCDF_lib_path'])    # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['netCDF_lib_path'])    # The wrapper script needs to find these libs
429      #ensure that our path entries remain at the front
430      conf.env.PrependENVPath('PYTHONPATH', prefix)
431      conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
432    
433  if env['usenetcdf'] and not conf.CheckCHeader('netcdf.h'): env['usenetcdf'] = 0  if env['usenetcdf'] and not conf.CheckCHeader('netcdf.h'): env['usenetcdf'] = 0
434  if env['usenetcdf'] and not conf.CheckFunc('nc_open'): env['usenetcdf'] = 0  if env['usenetcdf'] and not conf.CheckFunc('nc_open'): env['usenetcdf'] = 0
# Line 415  if env['usepapi']: Line 450  if env['usepapi']:
450    conf.env.AppendUnique(LIBPATH = [env['papi_lib_path']])    conf.env.AppendUnique(LIBPATH = [env['papi_lib_path']])
451    conf.env.AppendUnique(LIBS    = [env['papi_libs']])    conf.env.AppendUnique(LIBS    = [env['papi_libs']])
452    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['papi_lib_path'])  # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['papi_lib_path'])  # The wrapper script needs to find these libs
453      #ensure that our path entries remain at the front
454      conf.env.PrependENVPath('PYTHONPATH', prefix)
455      conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
456    
457  if env['usepapi'] and not conf.CheckCHeader('papi.h'): env['usepapi'] = 0  if env['usepapi'] and not conf.CheckCHeader('papi.h'): env['usepapi'] = 0
458  if env['usepapi'] and not conf.CheckFunc('PAPI_start_counters'): env['usepapi'] = 0  if env['usepapi'] and not conf.CheckFunc('PAPI_start_counters'): env['usepapi'] = 0
# Line 436  if env['usemkl']: Line 474  if env['usemkl']:
474    conf.env.AppendUnique(LIBPATH = [env['mkl_lib_path']])    conf.env.AppendUnique(LIBPATH = [env['mkl_lib_path']])
475    conf.env.AppendUnique(LIBS    = [env['mkl_libs']])    conf.env.AppendUnique(LIBS    = [env['mkl_libs']])
476    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['mkl_lib_path'])   # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['mkl_lib_path'])   # The wrapper script needs to find these libs
477      #ensure that our path entries remain at the front
478      conf.env.PrependENVPath('PYTHONPATH', prefix)
479      conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
480    
481  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
482  if env['usemkl'] and not conf.CheckFunc('pardiso_'): env['usemkl'] = 0  if env['usemkl'] and not conf.CheckFunc('pardiso'): env['usemkl'] = 0
483    
484  # Add MKL to environment env if it was found  # Add MKL to environment env if it was found
485  if env['usemkl']:  if env['usemkl']:
# Line 466  if env['useumfpack']: Line 507  if env['useumfpack']:
507    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['umf_lib_path'])   # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['umf_lib_path'])   # The wrapper script needs to find these libs
508    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['amd_lib_path'])   # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['amd_lib_path'])   # The wrapper script needs to find these libs
509    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['blas_lib_path'])  # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['blas_lib_path'])  # The wrapper script needs to find these libs
510      #ensure that our path entries remain at the front
511      conf.env.PrependENVPath('PYTHONPATH', prefix)
512      conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
513    
 if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0  
514  if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0  if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0
515  if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0 # this does not work on shake73?  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0
516    # if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0 # this does not work on shake73?
517    
518  # Add UMFPACK to environment env if it was found  # Add UMFPACK to environment env if it was found
519  if env['useumfpack']:  if env['useumfpack']:
# Line 511  else: Line 555  else:
555  env.Append(CCFLAGS      = env['cc_flags'])  env.Append(CCFLAGS      = env['cc_flags'])
556  env.Append(LIBS         = [env['omp_libs']])  env.Append(LIBS         = [env['omp_libs']])
557    
   
558  ############ Add some custom builders ##########################  ############ Add some custom builders ##########################
559    
560  py_builder = Builder(action = scons_extensions.build_py, suffix = '.pyc', src_suffix = '.py', single_source=True)  py_builder = Builder(action = scons_extensions.build_py, suffix = '.pyc', src_suffix = '.py', single_source=True)
# Line 523  env.Append(BUILDERS = {'RunUnitTest' : r Line 566  env.Append(BUILDERS = {'RunUnitTest' : r
566  runPyUnitTest_builder = Builder(action = scons_extensions.runPyUnitTest, suffix = '.passed', src_suffic='.py', single_source=True)  runPyUnitTest_builder = Builder(action = scons_extensions.runPyUnitTest, suffix = '.passed', src_suffic='.py', single_source=True)
567  env.Append(BUILDERS = {'RunPyUnitTest' : runPyUnitTest_builder});  env.Append(BUILDERS = {'RunPyUnitTest' : runPyUnitTest_builder});
568    
569    epstopdfbuilder = Builder(action = scons_extensions.eps2pdf, suffix=".pdf", src_suffix=".eps", single_source=True)
570    env.Append(BUILDERS = {'EpsToPDF' : epstopdfbuilder});
571    
572  ############ MPI (optional) ####################################  ############ MPI (optional) ####################################
573    if not env['usempi']: env['mpi_flavour']='none'
574    
575  # Create a modified environment for MPI programs (identical to env if usempi=no)  # Create a modified environment for MPI programs (identical to env if usempi=no)
576  env_mpi = clone_env(env)  env_mpi = clone_env(env)
# Line 532  env_mpi = clone_env(env) Line 579  env_mpi = clone_env(env)
579  conf = Configure(clone_env(env_mpi))  conf = Configure(clone_env(env_mpi))
580    
581  if env_mpi['usempi']:  if env_mpi['usempi']:
582      VALID_MPIs=[ "MPT", "MPICH", "MPICH2", "OPENMPI", "INTELMPI" ]
583      if not env_mpi['mpi_flavour'] in VALID_MPIs:
584          raise ValueError,"MPI is enabled but mpi_flavour = %s is not a valid key from %s."%( env_mpi['mpi_flavour'],VALID_MPIs)
585    conf.env.AppendUnique(CPPPATH = [env_mpi['mpi_path']])    conf.env.AppendUnique(CPPPATH = [env_mpi['mpi_path']])
586    conf.env.AppendUnique(LIBPATH = [env_mpi['mpi_lib_path']])    conf.env.AppendUnique(LIBPATH = [env_mpi['mpi_lib_path']])
587    conf.env.AppendUnique(LIBS    = [env_mpi['mpi_libs']])    conf.env.AppendUnique(LIBS    = [env_mpi['mpi_libs']])
588    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['mpi_lib_path'])   # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['mpi_lib_path'])   # The wrapper script needs to find these libs
589      #ensure that our path entries remain at the front
590      conf.env.PrependENVPath('PYTHONPATH', prefix)
591      conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
592    
593  if env_mpi['usempi'] and not conf.CheckCHeader('mpi.h'): env_mpi['usempi'] = 0  if env_mpi['usempi'] and not conf.CheckCHeader('mpi.h'): env_mpi['usempi'] = 0
594  if env_mpi['usempi'] and not conf.CheckFunc('MPI_Init'): env_mpi['usempi'] = 0  # if env_mpi['usempi'] and not conf.CheckFunc('MPI_Init'): env_mpi['usempi'] = 0
595    
596  # Add MPI to environment env_mpi if it was found  # Add MPI to environment env_mpi if it was found
597  if env_mpi['usempi']:  if env_mpi['usempi']:
# Line 549  else: Line 602  else:
602    
603  env['usempi'] = env_mpi['usempi']  env['usempi'] = env_mpi['usempi']
604    
605    
606  ############ ParMETIS (optional) ###############################  ############ ParMETIS (optional) ###############################
607    
608  # 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 561  if env_mpi['useparmetis']: Line 615  if env_mpi['useparmetis']:
615    conf.env.AppendUnique(LIBPATH = [env_mpi['parmetis_lib_path']])    conf.env.AppendUnique(LIBPATH = [env_mpi['parmetis_lib_path']])
616    conf.env.AppendUnique(LIBS    = [env_mpi['parmetis_libs']])    conf.env.AppendUnique(LIBS    = [env_mpi['parmetis_libs']])
617    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['parmetis_lib_path'])  # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['parmetis_lib_path'])  # The wrapper script needs to find these libs
618      #ensure that our path entries remain at the front
619      conf.env.PrependENVPath('PYTHONPATH', prefix)
620      conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
621    
622  if env_mpi['useparmetis'] and not conf.CheckCHeader('parmetis.h'): env_mpi['useparmetis'] = 0  if env_mpi['useparmetis'] and not conf.CheckCHeader('parmetis.h'): env_mpi['useparmetis'] = 0
623  if env_mpi['useparmetis'] and not conf.CheckFunc('ParMETIS_V3_PartGeomKway'): env_mpi['useparmetis'] = 0  if env_mpi['useparmetis'] and not conf.CheckFunc('ParMETIS_V3_PartGeomKway'): env_mpi['useparmetis'] = 0
# Line 601  if env['usesilo']: print " Using Silo" Line 658  if env['usesilo']: print " Using Silo"
658  else: print "   Not using Silo"  else: print "   Not using Silo"
659  if env['useopenmp']: print "    Using OpenMP"  if env['useopenmp']: print "    Using OpenMP"
660  else: print "   Not using OpenMP"  else: print "   Not using OpenMP"
661  if env['usempi']: print "   Using MPI"  if env['usempi']: print "   Using MPI (flavour = %s)"%env['mpi_flavour']
662  else: print "   Not using MPI"  else: print "   Not using MPI"
663  if env['useparmetis']: print "  Using ParMETIS"  if env['useparmetis']: print "  Using ParMETIS"
664  else: print "   Not using ParMETIS (requires MPI)"  else: print "   Not using ParMETIS (requires MPI)"
# Line 616  print "" Line 673  print ""
673    
674  ############ Delete option-dependent files #####################  ############ Delete option-dependent files #####################
675    
676  Execute(Delete(env['libinstall'] + "/Compiled.with.debug"))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.debug")))
677  Execute(Delete(env['libinstall'] + "/Compiled.with.mpi"))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.mpi")))
678  Execute(Delete(env['libinstall'] + "/Compiled.with.openmp"))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.openmp")))
679  if not env['usempi']: Execute(Delete(env['libinstall'] + "/pythonMPI"))  Execute(Delete(os.path.join(env['libinstall'],"pyversion")))
680    Execute(Delete(os.path.join(env['libinstall'],"buildvars")))
681    if not env['usempi']: Execute(Delete(os.path.join(env['libinstall'],"pythonMPI")))
682    
683    
684  ############ Build the subdirectories ##########################  ############ Build the subdirectories ##########################
# Line 657  env.SConscript(dirs = ['paso/profiling'] Line 716  env.SConscript(dirs = ['paso/profiling']
716  remember_list = []  remember_list = []
717    
718  if env['usedebug']:  if env['usedebug']:
719    remember_list += env.Command(env['libinstall'] + "/Compiled.with.debug", None, Touch('$TARGET'))    remember_list += env.Command(os.path.join(env['libinstall'],"Compiled.with.debug"), None, Touch('$TARGET'))
720    
721  if env['usempi']:  if env['usempi']:
722    remember_list += env.Command(env['libinstall'] + "/Compiled.with.mpi", None, Touch('$TARGET'))    remember_list += env.Command(os.path.join(env['libinstall'],"Compiled.with.mpi"), None, Touch('$TARGET'))
723    
724  if env['omp_optim'] != '':  if env['useopenmp']:
725    remember_list += env.Command(env['libinstall'] + "/Compiled.with.openmp", None, Touch('$TARGET'))    remember_list += env.Command(os.path.join(env['libinstall'],"Compiled.with.openmp"), None, Touch('$TARGET'))
726    
727  env.Alias('remember_options', remember_list)  env.Alias('remember_options', remember_list)
728    
729    
730    ############### Record python interpreter version ##############
731    
732    if not IS_WINDOWS_PLATFORM:
733      versionstring="Python "+str(sys.version_info[0])+"."+str(sys.version_info[1])+"."+str(sys.version_info[2])
734      os.system("echo "+versionstring+" > "+os.path.join(env['libinstall'],"pyversion"))
735    
736    ############## Populate the buildvars file #####################
737    
738    buildvars=open(os.path.join(env['libinstall'],'buildvars'),'w')
739    buildvars.write('python='+str(sys.version_info[0])+"."+str(sys.version_info[1])+"."+str(sys.version_info[2])+'\n')
740    
741    # Find the boost version by extracting it from version.hpp
742    boosthpp=open(os.path.join(env['boost_path'],'boost','version.hpp'))
743    boostversion='unknown'
744    try:
745        for line in boosthpp:
746            ver=re.match(r'#define BOOST_VERSION (\d+)',line)
747            if ver:
748                boostversion=ver.group(1)
749    except StopIteration:
750        pass
751    buildvars.write("boost="+boostversion+"\n")
752    buildvars.write("svn_revision="+str(global_revision)+"\n")
753    out="usedebug="
754    if env['usedebug']:
755        out+="y"
756    else:
757        out+="n"
758    out+="\nusempi="
759    if env['usempi']:
760        out+="y"
761    else:
762        out+="n"
763    out+="\nuseopenmp="
764    if env['useopenmp']:
765        out+="y"
766    else:
767        out+="n"
768    buildvars.write(out+"\n")
769    buildvars.write("mpi_flavour="+env['mpi_flavour']+'\n')
770    
771    buildvars.close()
772    
773    
774  ############ Targets to build and install libraries ############  ############ Targets to build and install libraries ############
775    
776  target_init = env.Command(env['pyinstall']+'/__init__.py', None, Touch('$TARGET'))  target_init = env.Command(env['pyinstall']+'/__init__.py', None, Touch('$TARGET'))
# Line 692  build_all_list += ['build_paso'] Line 796  build_all_list += ['build_paso']
796  build_all_list += ['build_escript']  build_all_list += ['build_escript']
797  build_all_list += ['build_finley']  build_all_list += ['build_finley']
798  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']
799  if not IS_WINDOWS_PLATFORM: build_all_list += ['target_finley_wrapper']  if not IS_WINDOWS_PLATFORM: build_all_list += ['target_escript_wrapper']
800  if env['usesilo']:  build_all_list += ['target_escript2silo']  if env['usesilo']:  build_all_list += ['target_escript2silo']
801  env.Alias('build_all', build_all_list)  env.Alias('build_all', build_all_list)
802    
# Line 706  install_all_list += ['target_install_pyv Line 810  install_all_list += ['target_install_pyv
810  install_all_list += ['target_install_modellib_py']  install_all_list += ['target_install_modellib_py']
811  install_all_list += ['target_install_pycad_py']  install_all_list += ['target_install_pycad_py']
812  if env['usempi']:       install_all_list += ['target_install_pythonMPI_exe']  if env['usempi']:       install_all_list += ['target_install_pythonMPI_exe']
813  if not IS_WINDOWS_PLATFORM: install_all_list += ['target_install_finley_wrapper']  if not IS_WINDOWS_PLATFORM: install_all_list += ['target_install_escript_wrapper']
814  if env['usesilo']:  install_all_list += ['target_install_escript2silo']  if env['usesilo']:  install_all_list += ['target_install_escript2silo']
815  install_all_list += ['remember_options']  install_all_list += ['remember_options']
816  env.Alias('install_all', install_all_list)  env.Alias('install_all', install_all_list)
# Line 720  env.Alias('build_cppunittest', ['target_ Line 824  env.Alias('build_cppunittest', ['target_
824  env.Alias('install_cppunittest', ['build_cppunittest', 'target_install_cppunittest_a'])  env.Alias('install_cppunittest', ['build_cppunittest', 'target_install_cppunittest_a'])
825  env.Alias('run_tests', ['install_all', 'target_install_cppunittest_a'])  env.Alias('run_tests', ['install_all', 'target_install_cppunittest_a'])
826  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'])
827    env.Alias('build_full',['install_all','build_tests','build_py_tests'])
828    
829  ############ Targets to build the documentation ################  ############ Targets to build the documentation ################
830    
831  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html'])  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf'])
832    
833  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:
834     try:     try:
835      utest=open("utest.sh","w")      utest=open("utest.sh","w")
836      utest.write(makeHeader())      build_platform=os.name      #Sometimes Mac python says it is posix
837        if (build_platform=='posix') and platform.system()=="Darwin":
838            build_platform='darwin'
839        utest.write(GroupTest.makeHeader(build_platform))
840      for tests in TestGroups:      for tests in TestGroups:
841          utest.write(tests.makeString())          utest.write(tests.makeString())
842      utest.close()      utest.close()
843        os.chmod("utest.sh",stat.S_IRWXU|stat.S_IRGRP|stat.S_IXGRP|stat.S_IROTH|stat.S_IXOTH)
844      print "utest.sh written"      print "utest.sh written"
845     except IOError:     except IOError:
846      print "Error attempting to write unittests file."      print "Error attempting to write unittests file."

Legend:
Removed from v.2235  
changed lines
  Added in v.2387

  ViewVC Help
Powered by ViewVC 1.1.26