/[escript]/trunk/SConstruct
ViewVC logotype

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

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

  ViewVC Help
Powered by ViewVC 1.1.26