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

Diff of /branches/escript3047_with_pastix2995/SConstruct

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

revision 1247 by ksteube, Tue Aug 14 01:29:20 2007 UTC revision 1348 by ksteube, Mon Nov 19 00:21:36 2007 UTC
# Line 49  dir_packages = os.path.join(source_root, Line 49  dir_packages = os.path.join(source_root,
49  dir_examples = os.path.join(source_root,"examples")  dir_examples = os.path.join(source_root,"examples")
50  dir_libraries = os.path.join(source_root,"lib")  dir_libraries = os.path.join(source_root,"lib")
51    
52    print "Source root is : ",source_root
53  print " Default packages local installation:    ", dir_packages  print " Default packages local installation:    ", dir_packages
54  print " Default library local installation  ", dir_libraries  print " Default library local installation  ", dir_libraries
55  print " Default example local  installation:    ", dir_examples  print " Default example local  installation:    ", dir_examples
# Line 75  if not os.path.isfile(options_file) : Line 76  if not os.path.isfile(options_file) :
76    
77  if not options_file :  if not options_file :
78     import socket     import socket
79     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+="_"  
80     tmp = os.path.join("scons",hostname+"_options.py")     tmp = os.path.join("scons",hostname+"_options.py")
81    
82     if os.path.isfile(tmp) :     if os.path.isfile(tmp) :
# Line 141  python_lib_default="python%s.%s"%(sys.ve Line 136  python_lib_default="python%s.%s"%(sys.ve
136  boost_path_default=os.path.join(tools_prefix,'include')  boost_path_default=os.path.join(tools_prefix,'include')
137  boost_lib_path_default=os.path.join(tools_prefix,'lib')  boost_lib_path_default=os.path.join(tools_prefix,'lib')
138  boost_lib_default=['boost_python']  boost_lib_default=['boost_python']
139    
140  #==========================================================================  #==========================================================================
141  #  #
142  #    check if netCDF is installed on the system:  #    check if netCDF is installed on the system:
143  #  #
144  netCDF_path_default=os.path.join(tools_prefix,'include','netcdf-3')  netCDF_path_default=os.path.join(tools_prefix,'include','netcdf-3')
145  netCDF_lib_path_default=os.path.join(tools_prefix,'lib','netcdf-3')  netCDF_lib_path_default=os.path.join(tools_prefix,'lib')
146    
147  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):
148       useNetCDF_default='yes'       useNetCDF_default='yes'
# Line 159  else: Line 155  else:
155    
156  #==========================================================================  #==========================================================================
157  #  #
158    #  MPI:
159    #
160    if IS_WINDOWS_PLATFORM:
161       useMPI_default='no'
162       mpi_path_default=None
163       mpi_lib_path_default=None
164       mpi_libs_default=[]
165       mpi_run_default=None
166    else:
167       useMPI_default='no'
168       mpi_root='/usr/local'
169       mpi_path_default=os.path.join(mpi_root,'include')
170       mpi_lib_path_default=os.path.join(mpi_root,'lib')
171       mpi_libs_default=[ 'mpich' , 'pthread', 'rt' ]
172       mpi_run_default='mpiexec -np 1'
173    #
174    #==========================================================================
175    #
176  #    compile:  #    compile:
177  #  #
178  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'
179  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'
180  cxx_flags_default='--no-warn -ansi'  cxx_flags_default='--no-warn -ansi'
181  cxx_flags_debug_default='--no-warn -ansi -DDOASSERT'  cxx_flags_debug_default='--no-warn -ansi -DDOASSERT'
182    
183  #==============================================================================================      #==============================================================================================    
184  # Default options and options help text  # Default options and options help text
185  # 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 206  opts.AddOptions(
206    ('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"),
207  # Compilation options  # Compilation options
208    BoolOption('dodebug', 'Do you want a debug build?', 'no'),    BoolOption('dodebug', 'Do you want a debug build?', 'no'),
209      BoolOption('bounds_check', 'Do you want extra array bounds checking?', 'no'),
210    ('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),
211    ('cc_defines','C/C++ defines to use', None),    ('cc_defines','C/C++ defines to use', None),
212    ('cc_flags','C compiler flags to use (Release build)', cc_flags_default),    ('cc_flags','C compiler flags to use (Release build)', cc_flags_default),
213    ('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),
214    ('cxx_flags', 'C++ compiler flags to use (Release build)', cxx_flags_default),    ('cxx_flags', 'C++ compiler flags to use (Release build)', cxx_flags_default),
215    ('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),
216      ('omp_flags', 'OpenMP compiler flags to use (Release build)', ''),
217      ('omp_flags_debug', 'OpenMP compiler flags to use (Debug build)', ''),
218    ('ar_flags', 'Static library archiver flags to use', None),    ('ar_flags', 'Static library archiver flags to use', None),
219    ('sys_libs', 'System libraries to link with', None),    ('sys_libs', 'System libraries to link with', None),
220    ('tar_flags','flags for zip files','-c -z'),    ('tar_flags','flags for zip files','-c -z'),
# Line 218  opts.AddOptions( Line 236  opts.AddOptions(
236    PathOption('amd_path', 'Path to AMD includes', amd_path_default),    PathOption('amd_path', 'Path to AMD includes', amd_path_default),
237    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),
238    ('amd_libs', 'AMD libraries to link with', amd_libs_default),    ('amd_libs', 'AMD libraries to link with', amd_libs_default),
239    # TRILINOS
240      PathOption('trilinos_path', 'Path to TRILINOS includes', None),
241      PathOption('trilinos_lib_path', 'Path to TRILINOS libs', None),
242      ('trilinos_libs', 'TRILINOS libraries to link with', None),
243  # BLAS  # BLAS
244    PathOption('blas_path', 'Path to BLAS includes', None),    PathOption('blas_path', 'Path to BLAS includes', None),
245    PathOption('blas_lib_path', 'Path to BLAS libs', None),    PathOption('blas_lib_path', 'Path to BLAS libs', None),
# Line 245  opts.AddOptions( Line 267  opts.AddOptions(
267    PathOption('papi_path', 'Path to PAPI includes', None),    PathOption('papi_path', 'Path to PAPI includes', None),
268    PathOption('papi_lib_path', 'Path to PAPI libs', None),    PathOption('papi_lib_path', 'Path to PAPI libs', None),
269    ('papi_libs', 'PAPI libraries to link with', None),    ('papi_libs', 'PAPI libraries to link with', None),
270      ('papi_instrument_solver', 'use PAPI in Solver.c to instrument each iteration of the solver', None),
271  # MPI  # MPI
272    BoolOption('useMPI', 'Compile parallel version using MPI', 'no'),    BoolOption('useMPI', 'Compile parallel version using MPI', useMPI_default),
273      ('MPICH_IGNORE_CXX_SEEK', 'name of macro to ignore MPI settings of C++ SEEK macro (for MPICH)' , 'MPICH_IGNORE_CXX_SEEK'),
274      PathOption('mpi_path', 'Path to MPI includes', mpi_path_default),
275      ('mpi_run', 'mpirun name' , mpi_run_default),
276      PathOption('mpi_lib_path', 'Path to MPI libs (needs to be added to the LD_LIBRARY_PATH)',mpi_lib_path_default),
277      ('mpi_libs', 'MPI libraries to link with (needs to be shared!)', mpi_libs_default)
278  )  )
279  #=================================================================================================  #=================================================================================================
280  #  #
# Line 270  else: Line 298  else:
298        env = Environment(tools = ['default'], options = opts)        env = Environment(tools = ['default'], options = opts)
299  Help(opts.GenerateHelpText(env))  Help(opts.GenerateHelpText(env))
300    
301    if env['bounds_check']:
302       env.Append(CPPDEFINES = [ 'BOUNDS_CHECK' ])
303       env.Append(CXXDEFINES = [ 'BOUNDS_CHECK' ])
304       bounds_check = env['bounds_check']
305    else:
306       bounds_check = 0
307    
308  #=================================================================================================  #=================================================================================================
309  #  #
310  #     Initialise Scons Build Environment  #     Initialise Scons Build Environment
# Line 286  try: Line 321  try:
321     omp_num_threads = os.environ['OMP_NUM_THREADS']     omp_num_threads = os.environ['OMP_NUM_THREADS']
322  except KeyError:  except KeyError:
323     omp_num_threads = 1     omp_num_threads = 1
324    env['ENV']['OMP_NUM_THREADS'] = omp_num_threads
325    
326    try:
327       path = os.environ['PATH']
328       env['ENV']['PATH'] = path
329    except KeyError:
330       omp_num_threads = 1
331    
332  env['ENV']['OMP_NUM_THREADS'] = omp_num_threads  env['ENV']['OMP_NUM_THREADS'] = omp_num_threads
333    
334    
335    # Copy some variables from the system environment to the build environment
336  try:  try:
337     env['ENV']['DISPLAY'] = os.environ['DISPLAY']     env['ENV']['DISPLAY'] = os.environ['DISPLAY']
338     env['ENV']['XAUTHORITY'] = os.environ['XAUTHORITY']     env['ENV']['XAUTHORITY'] = os.environ['XAUTHORITY']
339       home_temp = os.environ['HOME']   # MPICH2's mpd needs $HOME to find $HOME/.mpd.conf
340       env['ENV']['HOME'] = home_temp
341  except KeyError:  except KeyError:
342     pass     pass
343    
# Line 331  try: Line 377  try:
377     libinstall = env['libinstall']     libinstall = env['libinstall']
378     env.Append(LIBPATH = [libinstall,]) # Adds -L for building of libescript.so libfinley.so escriptcpp.so finleycpp.so     env.Append(LIBPATH = [libinstall,]) # Adds -L for building of libescript.so libfinley.so escriptcpp.so finleycpp.so
379     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)
380     if env['PLATFORM'] == "win32":     if IS_WINDOWS_PLATFORM :
381        env.PrependENVPath('PATH', libinstall)        env.PrependENVPath('PATH', libinstall)
382        env.PrependENVPath('PATH', env['boost_lib_path'])        env.PrependENVPath('PATH', env['boost_lib_path'])
383  except KeyError:  except KeyError:
# Line 340  try: Line 386  try:
386     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
387  except KeyError:  except KeyError:
388     pyinstall = None     pyinstall = None
389    
390    try:
391       cc_defines = env['cc_defines']
392       env.Append(CPPDEFINES = cc_defines)
393    except KeyError:
394       pass
395    try:
396       flags = env['ar_flags']
397       env.Append(ARFLAGS = flags)
398    except KeyError:
399       ar_flags = None
400    try:
401       sys_libs = env['sys_libs']
402    except KeyError:
403       sys_libs = []
404    
405    try:
406       tar_flags = env['tar_flags']
407       env.Replace(TARFLAGS = tar_flags)
408    except KeyError:
409       pass
410    
411  try:  try:
412     exinstall = env['exinstall']     exinstall = env['exinstall']
413  except KeyError:  except KeyError:
# Line 356  try: Line 424  try:
424     sys_exinstall = env['sys_exinstall']     sys_exinstall = env['sys_exinstall']
425  except KeyError:  except KeyError:
426     sys_exinstall = None     sys_exinstall = None
427    
428    # ====================== debugging ===================================
429  try:  try:
430     dodebug = env['dodebug']     dodebug = env['dodebug']
431  except KeyError:  except KeyError:
432     dodebug = None     dodebug = None
433    
434    # === switch on omp ===================================================
435  try:  try:
436     useMPI = env['useMPI']    omp_flags = env['omp_flags']
437  except KeyError:  except KeyError:
438     useMPI = None    omp_flags = ''
439    
440  try:  try:
441     cc_defines = env['cc_defines']    omp_flags_debug = env['omp_flags_debug']
    env.Append(CPPDEFINES = cc_defines)  
442  except KeyError:  except KeyError:
443     pass    omp_flags_debug = ''
444    
445    # ========= use mpi? =====================================================
446    try:
447       useMPI = env['useMPI']
448    except KeyError:
449       useMPI = None
450    # ========= set compiler flags ===========================================
451    
452    # Can't use MPI and OpenMP simultaneously at this time
453    if useMPI:
454        omp_flags=''
455        omp_flags_debug=''
456    
457  if dodebug:  if dodebug:
   if useMPI:  
458      try:      try:
459        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']  
460        env.Append(CCFLAGS = flags)        env.Append(CCFLAGS = flags)
461      except KeyError:      except KeyError:
462        pass        pass
463  else:  else:
   if useMPI:  
464     try:     try:
465       flags = env['cc_flags_MPI']        flags = env['cc_flags'] + ' ' + omp_flags
      env.Append(CCFLAGS = flags)  
    except KeyError:  
       pass  
   else:  
    try:  
       flags = env['cc_flags']  
466        env.Append(CCFLAGS = flags)        env.Append(CCFLAGS = flags)
467     except KeyError:     except KeyError:
468        pass        pass
469  if dodebug:  if dodebug:
    if useMPI:  
      try:  
         flags = env['cxx_flags_debug_MPI']  
         env.Append(CXXFLAGS = flags)  
      except KeyError:  
         pass  
    else:  
470       try:       try:
471          flags = env['cxx_flags_debug']          flags = env['cxx_flags_debug']
472          env.Append(CXXFLAGS = flags)          env.Append(CXXFLAGS = flags)
473       except KeyError:       except KeyError:
474          pass          pass
475  else:  else:
    if useMPI:  
      try:  
         flags = env['cxx_flags_MPI']  
         env.Append(CXXFLAGS = flags)  
      except KeyError:  
         pass  
    else:  
476       try:       try:
477          flags = env['cxx_flags']          flags = env['cxx_flags']
478          env.Append(CXXFLAGS = flags)          env.Append(CXXFLAGS = flags)
479       except KeyError:       except KeyError:
480          pass          pass
481  try:  try:
482     flags = env['ar_flags']       if env['CC'] == 'gcc': env.Append(CCFLAGS = "-pedantic-errors -Wno-long-long")
483     env.Append(ARFLAGS = flags)  except:
484  except KeyError:       pass
    ar_flags = None  
 try:  
    sys_libs = env['sys_libs']  
 except KeyError:  
    sys_libs = []  
485    
486  try:  # ============= Remember what options were used in the compile =====================================
487     tar_flags = env['tar_flags']  env.Execute("/bin/rm -f " + libinstall + "/Compiled.with.*")
    env.Replace(TARFLAGS = tar_flags)  
 except KeyError:  
    pass  
488    
489  try:  if not useMPI:      env.Execute("/bin/rm -f " + libinstall + "/pythonMPI")
    includes = env['mkl_path']  
    env.Append(CPPPATH = [includes,])  
 except KeyError:  
    pass  
490    
491  try:  if dodebug:     env.Execute("touch " + libinstall + "/Compiled.with.debug")
492     lib_path = env['mkl_lib_path']  if useMPI:      env.Execute("touch " + libinstall + "/Compiled.with.mpi")
493     env.Append(LIBPATH = [lib_path,])  if omp_flags != '': env.Execute("touch " + libinstall + "/Compiled.with.OpenMP")
494  except KeyError:  if bounds_check:    env.Execute("touch " + libinstall + "/Compiled.with.bounds_check")
495     pass  
496    # ============= set mkl (but only of no MPI) =====================================
497    if not useMPI:
498       try:
499          includes = env['mkl_path']
500          env.Append(CPPPATH = [includes,])
501       except KeyError:
502          pass
503    
504       try:
505          lib_path = env['mkl_lib_path']
506          env.Append(LIBPATH = [lib_path,])
507       except KeyError:
508          pass
509    
 if useMPI:  
    mkl_libs = []  
 else:  
510     try:     try:
511        mkl_libs = env['mkl_libs']        mkl_libs = env['mkl_libs']
512     except KeyError:     except KeyError:
513        mkl_libs = []        mkl_libs = []
514    else:
515         mkl_libs = []
516    
517  try:  # ============= set scsl (but only of no MPI) =====================================
518     includes = env['scsl_path']  if not useMPI:
519     env.Append(CPPPATH = [includes,])     try:
520  except KeyError:        includes = env['scsl_path']
521     pass        env.Append(CPPPATH = [includes,])
522       except KeyError:
523          pass
524    
525  try:     try:
526     lib_path = env['scsl_lib_path']        lib_path = env['scsl_lib_path']
527     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
528  except KeyError:     except KeyError:
529     pass        pass
530      
531       try:
532          scsl_libs = env['scsl_libs']
533       except KeyError:
534          scsl_libs = [ ]
535    
536  if useMPI:  else:
537    try:      scsl_libs =  []
     scsl_libs = env['scsl_libs_MPI']  
   except KeyError:  
     scsl_libs = []  
 else:  
   try:  
     scsl_libs = env['scsl_libs']  
   except KeyError:  
     scsl_libs = []  
538    
539  try:  # ============= set TRILINOS (but only with MPI) =====================================
540     includes = env['umf_path']  if useMPI:
541     env.Append(CPPPATH = [includes,])     try:
542  except KeyError:        includes = env['trilinos_path']
543     pass        env.Append(CPPPATH = [includes,])
544       except KeyError:
545          pass
546    
547  try:     try:
548     lib_path = env['umf_lib_path']        lib_path = env['trilinos_lib_path']
549     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
550  except KeyError:     except KeyError:
551     pass        pass
552    
553  if useMPI:     try:
554      umf_libs = []        trilinos_libs = env['trilinos_libs']
555       except KeyError:
556          trilinos_libs = []
557  else:  else:
558         trilinos_libs = []
559    
560    
561    # ============= set umfpack (but only without MPI) =====================================
562    umf_libs=[ ]
563    if not useMPI:
564       try:
565          includes = env['umf_path']
566          env.Append(CPPPATH = [includes,])
567       except KeyError:
568          pass
569    
570       try:
571          lib_path = env['umf_lib_path']
572          env.Append(LIBPATH = [lib_path,])
573       except KeyError:
574          pass
575    
576     try:     try:
577        umf_libs = env['umf_libs']        umf_libs = env['umf_libs']
578          umf_libs+=umf_libs
579     except KeyError:     except KeyError:
580        umf_libs = []        pass
581    
582  try:     try:
583     includes = env['ufc_path']        includes = env['ufc_path']
584     env.Append(CPPPATH = [includes,])        env.Append(CPPPATH = [includes,])
585  except KeyError:     except KeyError:
586     pass        pass
587    
588  try:     try:
589     includes = env['amd_path']        includes = env['amd_path']
590     env.Append(CPPPATH = [includes,])        env.Append(CPPPATH = [includes,])
591  except KeyError:     except KeyError:
592     pass        pass
593    
594  try:     try:
595     lib_path = env['amd_lib_path']        lib_path = env['amd_lib_path']
596     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
597  except KeyError:     except KeyError:
598     pass        pass
599    
 if useMPI:  
     amd_libs = []  
 else:  
600     try:     try:
601        amd_libs = env['amd_libs']        amd_libs = env['amd_libs']
602          umf_libs+=amd_libs
603     except KeyError:     except KeyError:
604        amd_libs = []        pass
605    
606    # ============= set TRILINOS (but only with MPI) =====================================
607    if useMPI:
608       try:
609          includes = env['trilinos_path']
610          env.Append(CPPPATH = [includes,])
611       except KeyError:
612          pass
613    
614       try:
615          lib_path = env['trilinos_lib_path']
616          env.Append(LIBPATH = [lib_path,])
617       except KeyError:
618          pass
619    
620       try:
621          trilinos_libs = env['trilinos_libs']
622       except KeyError:
623          trilinos_libs = []
624    else:
625         trilinos_libs = []
626    
627    # ============= set blas =====================================
628  try:  try:
629     includes = env['blas_path']     includes = env['blas_path']
630     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 543  except KeyError: Line 640  except KeyError:
640  try:  try:
641     blas_libs = env['blas_libs']     blas_libs = env['blas_libs']
642  except KeyError:  except KeyError:
643     blas_libs = []     blas_libs = [ ]
644    
645    # ========== netcdf ====================================
646  try:  try:
647     useNetCDF = env['useNetCDF']     useNetCDF = env['useNetCDF']
648  except KeyError:  except KeyError:
649     useNetCDF = 'yes'     useNetCDF = 'yes'
650     pass     pass
651        
652  if useNetCDF == 'yes':  if useNetCDF == 'yes':
653     try:     try:
654        netCDF_libs = env['netCDF_libs']        netCDF_libs = env['netCDF_libs']
# Line 567  if useNetCDF == 'yes': Line 665  if useNetCDF == 'yes':
665    
666     try:     try:
667        lib_path = env['netCDF_lib_path']        lib_path = env['netCDF_lib_path']
       if IS_WINDOWS_PLATFORM: env['ENV']['PATH']+=";"+lib_path  
668        env.Append(LIBPATH = [ lib_path, ])        env.Append(LIBPATH = [ lib_path, ])
669          if IS_WINDOWS_PLATFORM :
670             env.PrependENVPath('PATH', lib_path)
671     except KeyError:     except KeyError:
672        pass        pass
673  else:  else:
674     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."
675     netCDF_libs=[ ]     netCDF_libs=[ ]
676    
677    # ====================== boost ======================================
678  try:  try:
679     includes = env['boost_path']     includes = env['boost_path']
680     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 583  except KeyError: Line 683  except KeyError:
683  try:  try:
684     lib_path = env['boost_lib_path']     lib_path = env['boost_lib_path']
685     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
686       if IS_WINDOWS_PLATFORM :
687          env.PrependENVPath('PATH', lib_path)
688  except KeyError:  except KeyError:
689     pass     pass
690  try:  try:
691     boost_lib = env['boost_lib']     boost_lib = env['boost_lib']
692  except KeyError:  except KeyError:
693     boost_lib = None     boost_lib = None
694    # ====================== python ======================================
695  try:  try:
696     includes = env['python_path']     includes = env['python_path']
697     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 603  try: Line 706  try:
706     python_lib = env['python_lib']     python_lib = env['python_lib']
707  except KeyError:  except KeyError:
708     python_lib = None     python_lib = None
709    # =============== documentation =======================================
710  try:  try:
711     doxygen_path = env['doxygen_path']     doxygen_path = env['doxygen_path']
712  except KeyError:  except KeyError:
# Line 611  try: Line 715  try:
715     epydoc_path = env['epydoc_path']     epydoc_path = env['epydoc_path']
716  except KeyError:  except KeyError:
717     epydoc_path = None     epydoc_path = None
718    # =============== PAPI =======================================
719  try:  try:
720     includes = env['papi_path']     includes = env['papi_path']
721     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 625  try: Line 730  try:
730     papi_libs = env['papi_libs']     papi_libs = env['papi_libs']
731  except KeyError:  except KeyError:
732     papi_libs = None     papi_libs = None
733    # ============= set mpi =====================================
734    if useMPI:
735       env.Append(CPPDEFINES=['PASO_MPI',])
736       try:
737          includes = env['mpi_path']
738          env.Append(CPPPATH = [includes,])
739       except KeyError:
740          pass
741       try:
742          lib_path = env['mpi_lib_path']
743          env.Append(LIBPATH = [lib_path,])
744          env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
745       except KeyError:
746          pass
747       try:
748          mpi_libs = env['mpi_libs']
749       except KeyError:
750          mpi_libs = []
751    
752       try:
753          mpi_run = env['mpi_run']
754       except KeyError:
755          mpi_run = ''
756    
757       try:
758           mpich_ignore_cxx_seek=env['MPICH_IGNORE_CXX_SEEK']
759           env.Append(CPPDEFINES = [ mpich_ignore_cxx_seek ] )
760       except KeyError:
761          pass
762    else:
763      mpi_libs=[]
764      mpi_run = mpi_run_default
765    # =========== zip files ===========================================
766    try:
767       includes = env['papi_path']
768       env.Append(CPPPATH = [includes,])
769    except KeyError:
770       pass
771    try:
772       lib_path = env['papi_lib_path']
773       env.Append(LIBPATH = [lib_path,])
774    except KeyError:
775       pass
776    try:
777       papi_libs = env['papi_libs']
778    except KeyError:
779       papi_libs = None
780    try:
781       papi_instrument_solver = env['papi_instrument_solver']
782    except KeyError:
783       papi_instrument_solver = None
784    
785    
786    # ============= and some helpers =====================================
787    try:
788       doxygen_path = env['doxygen_path']
789    except KeyError:
790       doxygen_path = None
791    try:
792       epydoc_path = env['epydoc_path']
793    except KeyError:
794       epydoc_path = None
795  try:  try:
796     src_zipfile = env.File(env['src_zipfile'])     src_zipfile = env.File(env['src_zipfile'])
797  except KeyError:  except KeyError:
# Line 674  except KeyError: Line 839  except KeyError:
839     api_doxygen = None     api_doxygen = None
840    
841  try:  try:
842     svn_pipe = os.popen("svn info | grep '^Revision'")     svn_pipe = os.popen("svnversion -n .")
843     rev = svn_pipe.readlines()     global_revision = svn_pipe.readlines()
844     svn_pipe.close()     svn_pipe.close()
845     svn_version = re.sub("[^0-9]", "", rev[0])     global_revision = re.sub(":.*", "", global_revision[0])
846       global_revision = re.sub("[^0-9]", "", global_revision)
847  except:  except:
848     svn_version = "0"     global_revision = "0"
849  env.Append(CPPDEFINES = "SVN_VERSION="+svn_version)  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)
850    
851  # Python install - esys __init__.py  # Python install - esys __init__.py
852  init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))  init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))
# Line 712  env.Alias('all_tests', ['run_tests', 'py Line 878  env.Alias('all_tests', ['run_tests', 'py
878    
879    
880  # Allow sconscripts to see the env  # Allow sconscripts to see the env
881  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",  
882      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",
883          "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",
884          "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"  
         ])  
885    
886  # End initialisation section  # End initialisation section
887  # Begin configuration section  # Begin configuration section
888  # adds this file and the scons option directore to the source tar  # adds this file and the scons option directore to the source tar
889  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') ]
890  release_testfiles=[env.File('README_TESTS'),]  release_testfiles=[env.File('README_TESTS'),]
891  env.Zip(src_zipfile, release_srcfiles)  env.Zip(src_zipfile, release_srcfiles)
892  env.Zip(test_zipfile, release_testfiles)  env.Zip(test_zipfile, release_testfiles)
# Line 749  env.SConscript(dirs = ['modellib/py_src' Line 911  env.SConscript(dirs = ['modellib/py_src'
911  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)
912  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)
913  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  
914  env.SConscript(dirs = ['pythonMPI/src'], build_dir='build/$PLATFORM/pythonMPI', duplicate=0)  env.SConscript(dirs = ['pythonMPI/src'], build_dir='build/$PLATFORM/pythonMPI', duplicate=0)
915  #env.SConscript(dirs = ['../test'], build_dir='../test/build', duplicate=0)  #env.SConscript(dirs = ['../test'], build_dir='../test/build', duplicate=0)
916    

Legend:
Removed from v.1247  
changed lines
  Added in v.1348

  ViewVC Help
Powered by ViewVC 1.1.26