/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1248 by phornby, Tue Aug 14 05:20:39 2007 UTC revision 1391 by gross, Mon Jan 14 03:54:57 2008 UTC
# Line 12  Line 12 
12  EnsureSConsVersion(0,96,91)  EnsureSConsVersion(0,96,91)
13  EnsurePythonVersion(2,3)  EnsurePythonVersion(2,3)
14    
15    
16  #===============================================================  #===============================================================
17  #   import tools:  #   import tools:
18  import glob  import glob
# Line 20  import sys, os, re Line 21  import sys, os, re
21  if sys.path.count('scons')==0: sys.path.append('scons')  if sys.path.count('scons')==0: sys.path.append('scons')
22  import scons_extensions  import scons_extensions
23    
24    # We may also need to know where python's site-packages subdirectory lives
25    python_version = 'python%s.%s'%(sys.version_info[0],sys.version_info[1])
26    
27  #===============================================================  #===============================================================
28    
29  tools_prefix="/usr"  tools_prefix="/usr"
# Line 28  tools_prefix="/usr" Line 32  tools_prefix="/usr"
32  #      #    
33  #    get the installation prefix  #    get the installation prefix
34  #  #
35  prefix = ARGUMENTS.get('prefix', '/usr')  prefix = ARGUMENTS.get('prefix', sys.prefix )
36    
37  # We may also need to know where python's site-packages subdirectory lives  # We may also need to know where python's site-packages subdirectory lives
38  python_version = 'python%s.%s'%(sys.version_info[0],sys.version_info[1])  python_version = 'python%s.%s'%(sys.version_info[0],sys.version_info[1])
   
39  # Install as a standard python package in /usr/lib64 if available, else in /usr/lib  # Install as a standard python package in /usr/lib64 if available, else in /usr/lib
40  if os.path.isdir(  prefix+"/lib64/"+python_version+"/site-packages"):  if os.path.isdir(  prefix+"/lib64/"+python_version+"/site-packages"):
41     sys_dir_packages =  prefix+"/lib64/"+python_version+"/site-packages/esys"     sys_dir_packages =  prefix+"/lib64/"+python_version+"/site-packages/esys"
# Line 49  dir_packages = os.path.join(source_root, Line 52  dir_packages = os.path.join(source_root,
52  dir_examples = os.path.join(source_root,"examples")  dir_examples = os.path.join(source_root,"examples")
53  dir_libraries = os.path.join(source_root,"lib")  dir_libraries = os.path.join(source_root,"lib")
54    
55    print "Source root is : ",source_root
56  print " Default packages local installation:    ", dir_packages  print " Default packages local installation:    ", dir_packages
57  print " Default library local installation  ", dir_libraries  print " Default library local installation  ", dir_libraries
58  print " Default example local  installation:    ", dir_examples  print " Default example local  installation:    ", dir_examples
# Line 75  if not os.path.isfile(options_file) : Line 79  if not os.path.isfile(options_file) :
79    
80  if not options_file :  if not options_file :
81     import socket     import socket
82     from string import ascii_letters,digits     hostname = re.sub("[^0-9a-zA-Z]", "_", socket.gethostname().split('.')[0])
    hostname=""  
    for s in socket.gethostname().split('.')[0]:  
       if s in ascii_letters+digits:  
          hostname+=s  
       else:  
          hostname+="_"  
83     tmp = os.path.join("scons",hostname+"_options.py")     tmp = os.path.join("scons",hostname+"_options.py")
84    
85     if os.path.isfile(tmp) :     if os.path.isfile(tmp) :
# Line 141  python_lib_default="python%s.%s"%(sys.ve Line 139  python_lib_default="python%s.%s"%(sys.ve
139  boost_path_default=os.path.join(tools_prefix,'include')  boost_path_default=os.path.join(tools_prefix,'include')
140  boost_lib_path_default=os.path.join(tools_prefix,'lib')  boost_lib_path_default=os.path.join(tools_prefix,'lib')
141  boost_lib_default=['boost_python']  boost_lib_default=['boost_python']
142    
143  #==========================================================================  #==========================================================================
144  #  #
145  #    check if netCDF is installed on the system:  #    check if netCDF is installed on the system:
146  #  #
147  netCDF_path_default=os.path.join(tools_prefix,'include','netcdf-3')  netCDF_path_default=os.path.join(tools_prefix,'include','netcdf-3')
148  netCDF_lib_path_default=os.path.join(tools_prefix,'lib','netcdf-3')  netCDF_lib_path_default=os.path.join(tools_prefix,'lib')
149    
150  if os.path.isdir(netCDF_path_default) and os.path.isdir(netCDF_lib_path_default):  if os.path.isdir(netCDF_path_default) and os.path.isdir(netCDF_lib_path_default):
151       useNetCDF_default='yes'       useNetCDF_default='yes'
# Line 159  else: Line 158  else:
158    
159  #==========================================================================  #==========================================================================
160  #  #
161    #  MPI:
162    #
163    if IS_WINDOWS_PLATFORM:
164       useMPI_default='no'
165       mpi_path_default=None
166       mpi_lib_path_default=None
167       mpi_libs_default=[]
168       mpi_run_default=None
169    else:
170       useMPI_default='no'
171       mpi_root='/usr/local'
172       mpi_path_default=os.path.join(mpi_root,'include')
173       mpi_lib_path_default=os.path.join(mpi_root,'lib')
174       mpi_libs_default=[ 'mpich' , 'pthread', 'rt' ]
175       mpi_run_default='mpiexec -np 1'
176    #
177    #==========================================================================
178    #
179  #    compile:  #    compile:
180  #  #
181  cc_flags_default='-O3 -std=c99 -ffast-math -fpic -Wno-unknown-pragmas -ansi -pedantic-errors'  cc_flags_default='-O3 -std=c99 -ffast-math -fpic -Wno-unknown-pragmas -ansi'
182  cc_flags_debug_default='-g -O0 -ffast-math -std=c99 -fpic -Wno-unknown-pragmas -ansi -pedantic-errors'  cc_flags_debug_default='-g -O0 -ffast-math -std=c99 -fpic -Wno-unknown-pragmas -ansi'
183  cxx_flags_default='--no-warn -ansi'  cxx_flags_default='--no-warn -ansi'
184  cxx_flags_debug_default='--no-warn -ansi -DDOASSERT'  cxx_flags_debug_default='--no-warn -ansi -DDOASSERT'
185    
186  #==============================================================================================      #==============================================================================================    
187  # Default options and options help text  # Default options and options help text
188  # These are defaults and can be overridden using command line arguments or an options file.  # These are defaults and can be overridden using command line arguments or an options file.
# Line 191  opts.AddOptions( Line 209  opts.AddOptions(
209    ('api_doxygen', 'name of the doxygen api docs directory',prefix+"/release/doc/doxygen"),    ('api_doxygen', 'name of the doxygen api docs directory',prefix+"/release/doc/doxygen"),
210  # Compilation options  # Compilation options
211    BoolOption('dodebug', 'Do you want a debug build?', 'no'),    BoolOption('dodebug', 'Do you want a debug build?', 'no'),
212      BoolOption('bounds_check', 'Do you want extra array bounds checking?', 'no'),
213    ('options_file', "Optional file containing preferred options. Ignored if it doesn't exist (default: scons/<hostname>_options.py)", options_file),    ('options_file', "Optional file containing preferred options. Ignored if it doesn't exist (default: scons/<hostname>_options.py)", options_file),
214    ('cc_defines','C/C++ defines to use', None),    ('cc_defines','C/C++ defines to use', None),
215    ('cc_flags','C compiler flags to use (Release build)', cc_flags_default),    ('cc_flags','C compiler flags to use (Release build)', cc_flags_default),
216    ('cc_flags_debug', 'C compiler flags to use (Debug build)', cc_flags_debug_default),    ('cc_flags_debug', 'C compiler flags to use (Debug build)', cc_flags_debug_default),
217    ('cxx_flags', 'C++ compiler flags to use (Release build)', cxx_flags_default),    ('cxx_flags', 'C++ compiler flags to use (Release build)', cxx_flags_default),
218    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', cxx_flags_debug_default),    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', cxx_flags_debug_default),
219      ('omp_flags', 'OpenMP compiler flags to use (Release build)', ''),
220      ('omp_flags_debug', 'OpenMP compiler flags to use (Debug build)', ''),
221    ('ar_flags', 'Static library archiver flags to use', None),    ('ar_flags', 'Static library archiver flags to use', None),
222    ('sys_libs', 'System libraries to link with', None),    ('sys_libs', 'System libraries to link with', None),
223    ('tar_flags','flags for zip files','-c -z'),    ('tar_flags','flags for zip files','-c -z'),
# Line 218  opts.AddOptions( Line 239  opts.AddOptions(
239    PathOption('amd_path', 'Path to AMD includes', amd_path_default),    PathOption('amd_path', 'Path to AMD includes', amd_path_default),
240    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),
241    ('amd_libs', 'AMD libraries to link with', amd_libs_default),    ('amd_libs', 'AMD libraries to link with', amd_libs_default),
242    # TRILINOS
243      PathOption('trilinos_path', 'Path to TRILINOS includes', None),
244      PathOption('trilinos_lib_path', 'Path to TRILINOS libs', None),
245      ('trilinos_libs', 'TRILINOS libraries to link with', None),
246  # BLAS  # BLAS
247    PathOption('blas_path', 'Path to BLAS includes', None),    PathOption('blas_path', 'Path to BLAS includes', None),
248    PathOption('blas_lib_path', 'Path to BLAS libs', None),    PathOption('blas_lib_path', 'Path to BLAS libs', None),
# Line 245  opts.AddOptions( Line 270  opts.AddOptions(
270    PathOption('papi_path', 'Path to PAPI includes', None),    PathOption('papi_path', 'Path to PAPI includes', None),
271    PathOption('papi_lib_path', 'Path to PAPI libs', None),    PathOption('papi_lib_path', 'Path to PAPI libs', None),
272    ('papi_libs', 'PAPI libraries to link with', None),    ('papi_libs', 'PAPI libraries to link with', None),
273      ('papi_instrument_solver', 'use PAPI in Solver.c to instrument each iteration of the solver', None),
274  # MPI  # MPI
275    BoolOption('useMPI', 'Compile parallel version using MPI', 'no'),    BoolOption('useMPI', 'Compile parallel version using MPI', useMPI_default),
276      ('MPICH_IGNORE_CXX_SEEK', 'name of macro to ignore MPI settings of C++ SEEK macro (for MPICH)' , 'MPICH_IGNORE_CXX_SEEK'),
277      PathOption('mpi_path', 'Path to MPI includes', mpi_path_default),
278      ('mpi_run', 'mpirun name' , mpi_run_default),
279      PathOption('mpi_lib_path', 'Path to MPI libs (needs to be added to the LD_LIBRARY_PATH)',mpi_lib_path_default),
280      ('mpi_libs', 'MPI libraries to link with (needs to be shared!)', mpi_libs_default)
281  )  )
282  #=================================================================================================  #=================================================================================================
283  #  #
# Line 270  else: Line 301  else:
301        env = Environment(tools = ['default'], options = opts)        env = Environment(tools = ['default'], options = opts)
302  Help(opts.GenerateHelpText(env))  Help(opts.GenerateHelpText(env))
303    
304    if env['bounds_check']:
305       env.Append(CPPDEFINES = [ 'BOUNDS_CHECK' ])
306       env.Append(CXXDEFINES = [ 'BOUNDS_CHECK' ])
307       bounds_check = env['bounds_check']
308    else:
309       bounds_check = 0
310    
311  #=================================================================================================  #=================================================================================================
312  #  #
313  #     Initialise Scons Build Environment  #     Initialise Scons Build Environment
# Line 286  try: Line 324  try:
324     omp_num_threads = os.environ['OMP_NUM_THREADS']     omp_num_threads = os.environ['OMP_NUM_THREADS']
325  except KeyError:  except KeyError:
326     omp_num_threads = 1     omp_num_threads = 1
327    env['ENV']['OMP_NUM_THREADS'] = omp_num_threads
328    
329    try:
330       path = os.environ['PATH']
331       env['ENV']['PATH'] = path
332    except KeyError:
333       omp_num_threads = 1
334    
335  env['ENV']['OMP_NUM_THREADS'] = omp_num_threads  env['ENV']['OMP_NUM_THREADS'] = omp_num_threads
336    
337    
338    # Copy some variables from the system environment to the build environment
339  try:  try:
340     env['ENV']['DISPLAY'] = os.environ['DISPLAY']     env['ENV']['DISPLAY'] = os.environ['DISPLAY']
341     env['ENV']['XAUTHORITY'] = os.environ['XAUTHORITY']     env['ENV']['XAUTHORITY'] = os.environ['XAUTHORITY']
342       home_temp = os.environ['HOME']   # MPICH2's mpd needs $HOME to find $HOME/.mpd.conf
343       env['ENV']['HOME'] = home_temp
344  except KeyError:  except KeyError:
345     pass     pass
346    
# Line 303  except KeyError: Line 352  except KeyError:
352    
353  try:  try:
354     tmp = os.environ['LD_LIBRARY_PATH']     tmp = os.environ['LD_LIBRARY_PATH']
355       print tmp
356     env['ENV']['LD_LIBRARY_PATH'] = tmp     env['ENV']['LD_LIBRARY_PATH'] = tmp
357  except KeyError:  except KeyError:
358     pass     pass
# Line 333  try: Line 383  try:
383     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)
384     if IS_WINDOWS_PLATFORM :     if IS_WINDOWS_PLATFORM :
385        env.PrependENVPath('PATH', libinstall)        env.PrependENVPath('PATH', libinstall)
386          env.PrependENVPath('PATH', env['boost_lib_path'])
387  except KeyError:  except KeyError:
388     libinstall = None     libinstall = None
389  try:  try:
390     pyinstall = env['pyinstall'] # all targets will install into pyinstall/esys but PYTHONPATH points at straight pyinstall so you go import esys.escript etc     pyinstall = env['pyinstall'] # all targets will install into pyinstall/esys but PYTHONPATH points at straight pyinstall so you go import esys.escript etc
391  except KeyError:  except KeyError:
392     pyinstall = None     pyinstall = None
393    
394    try:
395       cc_defines = env['cc_defines']
396       env.Append(CPPDEFINES = cc_defines)
397    except KeyError:
398       pass
399    try:
400       flags = env['ar_flags']
401       env.Append(ARFLAGS = flags)
402    except KeyError:
403       ar_flags = None
404    try:
405       sys_libs = env['sys_libs']
406    except KeyError:
407       sys_libs = []
408    
409    try:
410       tar_flags = env['tar_flags']
411       env.Replace(TARFLAGS = tar_flags)
412    except KeyError:
413       pass
414    
415  try:  try:
416     exinstall = env['exinstall']     exinstall = env['exinstall']
417  except KeyError:  except KeyError:
# Line 355  try: Line 428  try:
428     sys_exinstall = env['sys_exinstall']     sys_exinstall = env['sys_exinstall']
429  except KeyError:  except KeyError:
430     sys_exinstall = None     sys_exinstall = None
431    
432    # ====================== debugging ===================================
433  try:  try:
434     dodebug = env['dodebug']     dodebug = env['dodebug']
435  except KeyError:  except KeyError:
436     dodebug = None     dodebug = None
437    
438    # === switch on omp ===================================================
439  try:  try:
440     useMPI = env['useMPI']    omp_flags = env['omp_flags']
441  except KeyError:  except KeyError:
442     useMPI = None    omp_flags = ''
443    
444  try:  try:
445     cc_defines = env['cc_defines']    omp_flags_debug = env['omp_flags_debug']
    env.Append(CPPDEFINES = cc_defines)  
446  except KeyError:  except KeyError:
447     pass    omp_flags_debug = ''
448    
449    # ========= use mpi? =====================================================
450    try:
451       useMPI = env['useMPI']
452    except KeyError:
453       useMPI = None
454    # ========= set compiler flags ===========================================
455    
456    # Can't use MPI and OpenMP simultaneously at this time
457    if useMPI:
458        omp_flags=''
459        omp_flags_debug=''
460    
461  if dodebug:  if dodebug:
   if useMPI:  
462      try:      try:
463        flags = env['cc_flags_debug_MPI']        flags = env['cc_flags_debug'] + ' ' + omp_flags_debug
       env.Append(CCFLAGS = flags)  
     except KeyError:  
       pass  
   else:  
     try:  
       flags = env['cc_flags_debug']  
464        env.Append(CCFLAGS = flags)        env.Append(CCFLAGS = flags)
465      except KeyError:      except KeyError:
466        pass        pass
467  else:  else:
   if useMPI:  
468     try:     try:
469       flags = env['cc_flags_MPI']        flags = env['cc_flags'] + ' ' + omp_flags
      env.Append(CCFLAGS = flags)  
    except KeyError:  
       pass  
   else:  
    try:  
       flags = env['cc_flags']  
470        env.Append(CCFLAGS = flags)        env.Append(CCFLAGS = flags)
471     except KeyError:     except KeyError:
472        pass        pass
473  if dodebug:  if dodebug:
    if useMPI:  
      try:  
         flags = env['cxx_flags_debug_MPI']  
         env.Append(CXXFLAGS = flags)  
      except KeyError:  
         pass  
    else:  
474       try:       try:
475          flags = env['cxx_flags_debug']          flags = env['cxx_flags_debug']
476          env.Append(CXXFLAGS = flags)          env.Append(CXXFLAGS = flags)
477       except KeyError:       except KeyError:
478          pass          pass
479  else:  else:
    if useMPI:  
      try:  
         flags = env['cxx_flags_MPI']  
         env.Append(CXXFLAGS = flags)  
      except KeyError:  
         pass  
    else:  
480       try:       try:
481          flags = env['cxx_flags']          flags = env['cxx_flags']
482          env.Append(CXXFLAGS = flags)          env.Append(CXXFLAGS = flags)
483       except KeyError:       except KeyError:
484          pass          pass
485  try:  try:
486     flags = env['ar_flags']       if env['CC'] == 'gcc': env.Append(CCFLAGS = "-pedantic-errors -Wno-long-long")
487     env.Append(ARFLAGS = flags)  except:
488  except KeyError:       pass
    ar_flags = None  
 try:  
    sys_libs = env['sys_libs']  
 except KeyError:  
    sys_libs = []  
489    
490  try:  # ============= Remember what options were used in the compile =====================================
491     tar_flags = env['tar_flags']  if not IS_WINDOWS_PLATFORM:
492     env.Replace(TARFLAGS = tar_flags)    env.Execute("/bin/rm -f " + libinstall + "/Compiled.with.*")
493  except KeyError:    if dodebug:       env.Execute("touch " + libinstall + "/Compiled.with.debug")
494     pass    if useMPI:        env.Execute("touch " + libinstall + "/Compiled.with.mpi")
495      if omp_flags != '':   env.Execute("touch " + libinstall + "/Compiled.with.OpenMP")
496      if bounds_check:  env.Execute("touch " + libinstall + "/Compiled.with.bounds_check")
497    
498  try:  # ============= set mkl (but only of no MPI) =====================================
499     includes = env['mkl_path']  if not useMPI:
500     env.Append(CPPPATH = [includes,])     try:
501  except KeyError:        includes = env['mkl_path']
502     pass        env.Append(CPPPATH = [includes,])
503       except KeyError:
504          pass
505    
506  try:     try:
507     lib_path = env['mkl_lib_path']        lib_path = env['mkl_lib_path']
508     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
509  except KeyError:        env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
510     pass     except KeyError:
511          pass
512    
 if useMPI:  
    mkl_libs = []  
 else:  
513     try:     try:
514        mkl_libs = env['mkl_libs']        mkl_libs = env['mkl_libs']
515     except KeyError:     except KeyError:
516        mkl_libs = []        mkl_libs = []
517    else:
518         mkl_libs = []
519    
520  try:  # ============= set scsl (but only of no MPI) =====================================
521     includes = env['scsl_path']  if not useMPI:
522     env.Append(CPPPATH = [includes,])     try:
523  except KeyError:        includes = env['scsl_path']
524     pass        env.Append(CPPPATH = [includes,])
525       except KeyError:
526          pass
527    
528  try:     try:
529     lib_path = env['scsl_lib_path']        lib_path = env['scsl_lib_path']
530     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
531  except KeyError:        env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
532     pass     except KeyError:
533          pass
534      
535       try:
536          scsl_libs = env['scsl_libs']
537       except KeyError:
538          scsl_libs = [ ]
539    
540  if useMPI:  else:
541    try:      scsl_libs =  []
     scsl_libs = env['scsl_libs_MPI']  
   except KeyError:  
     scsl_libs = []  
 else:  
   try:  
     scsl_libs = env['scsl_libs']  
   except KeyError:  
     scsl_libs = []  
542    
543  try:  # ============= set TRILINOS (but only with MPI) =====================================
544     includes = env['umf_path']  if useMPI:
545     env.Append(CPPPATH = [includes,])     try:
546  except KeyError:        includes = env['trilinos_path']
547     pass        env.Append(CPPPATH = [includes,])
548       except KeyError:
549          pass
550    
551  try:     try:
552     lib_path = env['umf_lib_path']        lib_path = env['trilinos_lib_path']
553     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
554  except KeyError:     except KeyError:
555     pass        pass
556    
557  if useMPI:     try:
558      umf_libs = []        trilinos_libs = env['trilinos_libs']
559       except KeyError:
560          trilinos_libs = []
561  else:  else:
562         trilinos_libs = []
563    
564    
565    # ============= set umfpack (but only without MPI) =====================================
566    umf_libs=[ ]
567    if not useMPI:
568       try:
569          includes = env['umf_path']
570          env.Append(CPPPATH = [includes,])
571       except KeyError:
572          pass
573    
574       try:
575          lib_path = env['umf_lib_path']
576          env.Append(LIBPATH = [lib_path,])
577       except KeyError:
578          pass
579    
580     try:     try:
581        umf_libs = env['umf_libs']        umf_libs = env['umf_libs']
582          umf_libs+=umf_libs
583     except KeyError:     except KeyError:
584        umf_libs = []        pass
585    
586  try:     try:
587     includes = env['ufc_path']        includes = env['ufc_path']
588     env.Append(CPPPATH = [includes,])        env.Append(CPPPATH = [includes,])
589  except KeyError:     except KeyError:
590     pass        pass
591    
592  try:     try:
593     includes = env['amd_path']        includes = env['amd_path']
594     env.Append(CPPPATH = [includes,])        env.Append(CPPPATH = [includes,])
595  except KeyError:     except KeyError:
596     pass        pass
597    
598  try:     try:
599     lib_path = env['amd_lib_path']        lib_path = env['amd_lib_path']
600     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
601  except KeyError:     except KeyError:
602     pass        pass
603    
 if useMPI:  
     amd_libs = []  
 else:  
604     try:     try:
605        amd_libs = env['amd_libs']        amd_libs = env['amd_libs']
606          umf_libs+=amd_libs
607     except KeyError:     except KeyError:
608        amd_libs = []        pass
609    
610    # ============= set TRILINOS (but only with MPI) =====================================
611    if useMPI:
612       try:
613          includes = env['trilinos_path']
614          env.Append(CPPPATH = [includes,])
615       except KeyError:
616          pass
617    
618       try:
619          lib_path = env['trilinos_lib_path']
620          env.Append(LIBPATH = [lib_path,])
621       except KeyError:
622          pass
623    
624       try:
625          trilinos_libs = env['trilinos_libs']
626       except KeyError:
627          trilinos_libs = []
628    else:
629         trilinos_libs = []
630    
631    # ============= set blas =====================================
632  try:  try:
633     includes = env['blas_path']     includes = env['blas_path']
634     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 542  except KeyError: Line 644  except KeyError:
644  try:  try:
645     blas_libs = env['blas_libs']     blas_libs = env['blas_libs']
646  except KeyError:  except KeyError:
647     blas_libs = []     blas_libs = [ ]
648    
649    # ========== netcdf ====================================
650  try:  try:
651     useNetCDF = env['useNetCDF']     useNetCDF = env['useNetCDF']
652  except KeyError:  except KeyError:
653     useNetCDF = 'yes'     useNetCDF = 'yes'
654     pass     pass
655        
656  if useNetCDF == 'yes':  if useNetCDF == 'yes':
657     try:     try:
658        netCDF_libs = env['netCDF_libs']        netCDF_libs = env['netCDF_libs']
# Line 567  if useNetCDF == 'yes': Line 670  if useNetCDF == 'yes':
670     try:     try:
671        lib_path = env['netCDF_lib_path']        lib_path = env['netCDF_lib_path']
672        env.Append(LIBPATH = [ lib_path, ])        env.Append(LIBPATH = [ lib_path, ])
673          env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
674        if IS_WINDOWS_PLATFORM :        if IS_WINDOWS_PLATFORM :
675           env.PrependENVPath('PATH', lib_path)           env.PrependENVPath('PATH', lib_path)
676     except KeyError:     except KeyError:
# Line 575  else: Line 679  else:
679     print "Warning: Installation is not configured with netCDF. Some I/O function may not be available."     print "Warning: Installation is not configured with netCDF. Some I/O function may not be available."
680     netCDF_libs=[ ]     netCDF_libs=[ ]
681    
682    # ====================== boost ======================================
683  try:  try:
684     includes = env['boost_path']     includes = env['boost_path']
685     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 583  except KeyError: Line 688  except KeyError:
688  try:  try:
689     lib_path = env['boost_lib_path']     lib_path = env['boost_lib_path']
690     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
691       env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
692     if IS_WINDOWS_PLATFORM :     if IS_WINDOWS_PLATFORM :
693        env.PrependENVPath('PATH', lib_path)        env.PrependENVPath('PATH', lib_path)
694  except KeyError:  except KeyError:
# Line 591  try: Line 697  try:
697     boost_lib = env['boost_lib']     boost_lib = env['boost_lib']
698  except KeyError:  except KeyError:
699     boost_lib = None     boost_lib = None
700    # ====================== python ======================================
701  try:  try:
702     includes = env['python_path']     includes = env['python_path']
703     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 598  except KeyError: Line 705  except KeyError:
705     pass     pass
706  try:  try:
707     lib_path = env['python_lib_path']     lib_path = env['python_lib_path']
708       env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
709     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
710  except KeyError:  except KeyError:
711     pass     pass
# Line 605  try: Line 713  try:
713     python_lib = env['python_lib']     python_lib = env['python_lib']
714  except KeyError:  except KeyError:
715     python_lib = None     python_lib = None
716    # =============== documentation =======================================
717  try:  try:
718     doxygen_path = env['doxygen_path']     doxygen_path = env['doxygen_path']
719  except KeyError:  except KeyError:
# Line 613  try: Line 722  try:
722     epydoc_path = env['epydoc_path']     epydoc_path = env['epydoc_path']
723  except KeyError:  except KeyError:
724     epydoc_path = None     epydoc_path = None
725    # =============== PAPI =======================================
726  try:  try:
727     includes = env['papi_path']     includes = env['papi_path']
728     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 627  try: Line 737  try:
737     papi_libs = env['papi_libs']     papi_libs = env['papi_libs']
738  except KeyError:  except KeyError:
739     papi_libs = None     papi_libs = None
740    # ============= set mpi =====================================
741    if useMPI:
742       env.Append(CPPDEFINES=['PASO_MPI',])
743       try:
744          includes = env['mpi_path']
745          env.Append(CPPPATH = [includes,])
746       except KeyError:
747          pass
748       try:
749          lib_path = env['mpi_lib_path']
750          env.Append(LIBPATH = [lib_path,])
751          env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
752       except KeyError:
753          pass
754       try:
755          mpi_libs = env['mpi_libs']
756       except KeyError:
757          mpi_libs = []
758    
759       try:
760          mpi_run = env['mpi_run']
761       except KeyError:
762          mpi_run = ''
763    
764       try:
765           mpich_ignore_cxx_seek=env['MPICH_IGNORE_CXX_SEEK']
766           env.Append(CPPDEFINES = [ mpich_ignore_cxx_seek ] )
767       except KeyError:
768          pass
769    else:
770      mpi_libs=[]
771      mpi_run = mpi_run_default
772    # =========== zip files ===========================================
773    try:
774       includes = env['papi_path']
775       env.Append(CPPPATH = [includes,])
776    except KeyError:
777       pass
778    try:
779       lib_path = env['papi_lib_path']
780       env.Append(LIBPATH = [lib_path,])
781    except KeyError:
782       pass
783    try:
784       papi_libs = env['papi_libs']
785    except KeyError:
786       papi_libs = None
787    try:
788       papi_instrument_solver = env['papi_instrument_solver']
789    except KeyError:
790       papi_instrument_solver = None
791    
792    
793    # ============= and some helpers =====================================
794    try:
795       doxygen_path = env['doxygen_path']
796    except KeyError:
797       doxygen_path = None
798    try:
799       epydoc_path = env['epydoc_path']
800    except KeyError:
801       epydoc_path = None
802  try:  try:
803     src_zipfile = env.File(env['src_zipfile'])     src_zipfile = env.File(env['src_zipfile'])
804  except KeyError:  except KeyError:
# Line 676  except KeyError: Line 846  except KeyError:
846     api_doxygen = None     api_doxygen = None
847    
848  try:  try:
849     svn_pipe = os.popen("svn info | grep '^Revision'")     svn_pipe = os.popen("svnversion -n .")
850     rev = svn_pipe.readlines()     global_revision = svn_pipe.readlines()
851     svn_pipe.close()     svn_pipe.close()
852     svn_version = re.sub("[^0-9]", "", rev[0])     global_revision = re.sub(":.*", "", global_revision[0])
853       global_revision = re.sub("[^0-9]", "", global_revision)
854  except:  except:
855     svn_version = "0"     global_revision="-1"
856  env.Append(CPPDEFINES = "SVN_VERSION="+svn_version)     print "Warning: unable to recover global revsion number."
857    print "Revision number is %s."%global_revision
858    env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)
859    
860  # Python install - esys __init__.py  # Python install - esys __init__.py
861  init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))  init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))
# Line 714  env.Alias('all_tests', ['run_tests', 'py Line 887  env.Alias('all_tests', ['run_tests', 'py
887    
888    
889  # Allow sconscripts to see the env  # Allow sconscripts to see the env
890  Export(["env", "incinstall", "libinstall", "pyinstall", "exinstall", "dodebug",  Export(["IS_WINDOWS_PLATFORM", "env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "blas_libs", "netCDF_libs", "useNetCDF", "mpi_run",
         "mkl_libs", "scsl_libs", "umf_libs", "amd_libs", "blas_libs",  
         "netCDF_libs",  
891      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",
892          "sys_libs", "test_zipfile", "src_zipfile", "test_tarfile",          "sys_libs", "test_zipfile", "src_zipfile", "test_tarfile", "src_tarfile", "examples_tarfile", "examples_zipfile", "trilinos_libs", "mpi_libs", "papi_instrument_solver",
893          "src_tarfile", "examples_tarfile", "examples_zipfile",          "guide_pdf", "guide_html_index", "api_epydoc", "api_doxygen", "useMPI" ])
         "guide_pdf", "guide_html_index", "api_epydoc", "api_doxygen", "useMPI"  
         ])  
894    
895  # End initialisation section  # End initialisation section
896  # Begin configuration section  # Begin configuration section
897  # adds this file and the scons option directore to the source tar  # adds this file and the scons option directore to the source tar
898  release_srcfiles=[env.File('SConstruct'),]+[ env.File(x) for x in glob.glob('scons/*.py') ]  release_srcfiles=[env.File('SConstruct'),env.Dir('lib'),env.Dir('include'),]+[ env.File(x) for x in glob.glob('scons/*.py') ]
899  release_testfiles=[env.File('README_TESTS'),]  release_testfiles=[env.File('README_TESTS'),]
900  env.Zip(src_zipfile, release_srcfiles)  env.Zip(src_zipfile, release_srcfiles)
901  env.Zip(test_zipfile, release_testfiles)  env.Zip(test_zipfile, release_testfiles)
# Line 751  env.SConscript(dirs = ['modellib/py_src' Line 920  env.SConscript(dirs = ['modellib/py_src'
920  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)
921  env.SConscript(dirs = ['pyvisi/py_src'], build_dir='build/$PLATFORM/pyvisi', duplicate=0)  env.SConscript(dirs = ['pyvisi/py_src'], build_dir='build/$PLATFORM/pyvisi', duplicate=0)
922  env.SConscript(dirs = ['pycad/py_src'], build_dir='build/$PLATFORM/pycad', duplicate=0)  env.SConscript(dirs = ['pycad/py_src'], build_dir='build/$PLATFORM/pycad', duplicate=0)
   
 # added by Ben Cumming  
923  env.SConscript(dirs = ['pythonMPI/src'], build_dir='build/$PLATFORM/pythonMPI', duplicate=0)  env.SConscript(dirs = ['pythonMPI/src'], build_dir='build/$PLATFORM/pythonMPI', duplicate=0)
924  #env.SConscript(dirs = ['../test'], build_dir='../test/build', duplicate=0)  #env.SConscript(dirs = ['../test'], build_dir='../test/build', duplicate=0)
925    

Legend:
Removed from v.1248  
changed lines
  Added in v.1391

  ViewVC Help
Powered by ViewVC 1.1.26