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

Diff of /branches/amg_from_3530/SConstruct

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

revision 1324 by ksteube, Sun Sep 30 23:35:17 2007 UTC revision 1348 by ksteube, Mon Nov 19 00:21:36 2007 UTC
# Line 301  Help(opts.GenerateHelpText(env)) Line 301  Help(opts.GenerateHelpText(env))
301  if env['bounds_check']:  if env['bounds_check']:
302     env.Append(CPPDEFINES = [ 'BOUNDS_CHECK' ])     env.Append(CPPDEFINES = [ 'BOUNDS_CHECK' ])
303     env.Append(CXXDEFINES = [ 'BOUNDS_CHECK' ])     env.Append(CXXDEFINES = [ 'BOUNDS_CHECK' ])
304       bounds_check = env['bounds_check']
305    else:
306       bounds_check = 0
307    
308  #=================================================================================================  #=================================================================================================
309  #  #
# Line 446  except KeyError: Line 449  except KeyError:
449     useMPI = None     useMPI = None
450  # ========= set compiler flags ===========================================  # ========= 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:
458      try:      try:
459        flags = env['cc_flags_debug'] + ' ' + omp_flags_debug        flags = env['cc_flags_debug'] + ' ' + omp_flags_debug
# Line 475  try: Line 483  try:
483  except:  except:
484       pass       pass
485    
486    # ============= Remember what options were used in the compile =====================================
487    env.Execute("/bin/rm -f " + libinstall + "/Compiled.with.*")
488    
489    if not useMPI:      env.Execute("/bin/rm -f " + libinstall + "/pythonMPI")
490    
491    if dodebug:     env.Execute("touch " + libinstall + "/Compiled.with.debug")
492    if useMPI:      env.Execute("touch " + libinstall + "/Compiled.with.mpi")
493    if omp_flags != '': env.Execute("touch " + libinstall + "/Compiled.with.OpenMP")
494    if bounds_check:    env.Execute("touch " + libinstall + "/Compiled.with.bounds_check")
495    
496  # ============= set mkl (but only of no MPI) =====================================  # ============= set mkl (but only of no MPI) =====================================
497  if not useMPI:  if not useMPI:
498     try:     try:
# Line 624  try: Line 642  try:
642  except KeyError:  except KeyError:
643     blas_libs = [ ]     blas_libs = [ ]
644    
645  # ========== netcdf (currently not supported with mpi) ====================================  # ========== netcdf ====================================
646  if useMPI:  try:
647     useNetCDF = 'no'     useNetCDF = env['useNetCDF']
648  else:  except KeyError:
649     try:     useNetCDF = 'yes'
650        useNetCDF = env['useNetCDF']     pass
    except KeyError:  
       useNetCDF = 'yes'  
       pass  
651            
652  if useNetCDF == 'yes':  if useNetCDF == 'yes':
653     try:     try:
# Line 871  Export(["IS_WINDOWS_PLATFORM", "env", "i Line 886  Export(["IS_WINDOWS_PLATFORM", "env", "i
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)

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

  ViewVC Help
Powered by ViewVC 1.1.26