/[escript]/branches/csiropost2.0/SConstruct
ViewVC logotype

Diff of /branches/csiropost2.0/SConstruct

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

revision 2338 by jfenwick, Fri Mar 27 05:01:49 2009 UTC revision 2364 by gross, Fri Apr 3 08:06:30 2009 UTC
# Line 243  if env['omp_optim'] == "" and env['omp_d Line 243  if env['omp_optim'] == "" and env['omp_d
243  try: env['ENV']['OMP_NUM_THREADS'] = os.environ['OMP_NUM_THREADS']  try: env['ENV']['OMP_NUM_THREADS'] = os.environ['OMP_NUM_THREADS']
244  except KeyError: env['ENV']['OMP_NUM_THREADS'] = 1  except KeyError: env['ENV']['OMP_NUM_THREADS'] = 1
245    
246    try: env['ENV']['ESCRIPT_NUM_THREADS'] = os.environ['ESCRIPT_NUM_THREADS']
247    except KeyError: pass
248    
249    try: env['ENV']['ESCRIPT_NUM_PROCS'] = os.environ['ESCRIPT_NUM_PROCS']
250    except KeyError: pass
251    
252    try: env['ENV']['ESCRIPT_NUM_NODES'] = os.environ['ESCRIPT_NUM_NODES']
253    except KeyError: pass
254    
255    try: env['ENV']['ESCRIPT_HOSTFILE'] = os.environ['ESCRIPT_HOSTFILE']
256    except KeyError: pass
257    
258  try: env['ENV']['PATH'] = os.environ['PATH']  try: env['ENV']['PATH'] = os.environ['PATH']
259  except KeyError: pass  except KeyError: pass
260    
# Line 467  if env['usemkl']: Line 479  if env['usemkl']:
479    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
480    
481  if env['usemkl'] and not conf.CheckCHeader('mkl_solver.h'): env['usemkl'] = 0  if env['usemkl'] and not conf.CheckCHeader('mkl_solver.h'): env['usemkl'] = 0
482  if env['usemkl'] and not conf.CheckFunc('pardiso_'): env['usemkl'] = 0  if env['usemkl'] and not conf.CheckFunc('pardiso'): env['usemkl'] = 0
483    
484  # Add MKL to environment env if it was found  # Add MKL to environment env if it was found
485  if env['usemkl']:  if env['usemkl']:
# Line 543  else: Line 555  else:
555  env.Append(CCFLAGS      = env['cc_flags'])  env.Append(CCFLAGS      = env['cc_flags'])
556  env.Append(LIBS         = [env['omp_libs']])  env.Append(LIBS         = [env['omp_libs']])
557    
   
558  ############ Add some custom builders ##########################  ############ Add some custom builders ##########################
559    
560  py_builder = Builder(action = scons_extensions.build_py, suffix = '.pyc', src_suffix = '.py', single_source=True)  py_builder = Builder(action = scons_extensions.build_py, suffix = '.pyc', src_suffix = '.py', single_source=True)
# Line 556  runPyUnitTest_builder = Builder(action = Line 567  runPyUnitTest_builder = Builder(action =
567  env.Append(BUILDERS = {'RunPyUnitTest' : runPyUnitTest_builder});  env.Append(BUILDERS = {'RunPyUnitTest' : runPyUnitTest_builder});
568    
569  ############ MPI (optional) ####################################  ############ MPI (optional) ####################################
570    if not env['usempi']: env['mpi_flavour']='none'
571    
572  # Create a modified environment for MPI programs (identical to env if usempi=no)  # Create a modified environment for MPI programs (identical to env if usempi=no)
573  env_mpi = clone_env(env)  env_mpi = clone_env(env)
# Line 564  env_mpi = clone_env(env) Line 576  env_mpi = clone_env(env)
576  conf = Configure(clone_env(env_mpi))  conf = Configure(clone_env(env_mpi))
577    
578  if env_mpi['usempi']:  if env_mpi['usempi']:
579      VALID_MPIs=[ "MPT", "MPICH", "OPENMPI", "INTELMPI" ]
580      if not env_mpi['mpi_flavour'] in VALID_MPIs:
581          raise ValueError,"MPI is enabled but mpi_flavour = %s is not a valid key from %s."%( env_mpi['mpi_flavour'],VALID_MPIs)
582    conf.env.AppendUnique(CPPPATH = [env_mpi['mpi_path']])    conf.env.AppendUnique(CPPPATH = [env_mpi['mpi_path']])
583    conf.env.AppendUnique(LIBPATH = [env_mpi['mpi_lib_path']])    conf.env.AppendUnique(LIBPATH = [env_mpi['mpi_lib_path']])
584    conf.env.AppendUnique(LIBS    = [env_mpi['mpi_libs']])    conf.env.AppendUnique(LIBS    = [env_mpi['mpi_libs']])
# Line 584  else: Line 599  else:
599    
600  env['usempi'] = env_mpi['usempi']  env['usempi'] = env_mpi['usempi']
601    
602    
603  ############ ParMETIS (optional) ###############################  ############ ParMETIS (optional) ###############################
604    
605  # Start a new configure environment that reflects what we've already found  # Start a new configure environment that reflects what we've already found
# Line 639  if env['usesilo']: print " Using Silo" Line 655  if env['usesilo']: print " Using Silo"
655  else: print "   Not using Silo"  else: print "   Not using Silo"
656  if env['useopenmp']: print "    Using OpenMP"  if env['useopenmp']: print "    Using OpenMP"
657  else: print "   Not using OpenMP"  else: print "   Not using OpenMP"
658  if env['usempi']: print "   Using MPI"  if env['usempi']: print "   Using MPI (flavour = %s)"%env['mpi_flavour']
659  else: print "   Not using MPI"  else: print "   Not using MPI"
660  if env['useparmetis']: print "  Using ParMETIS"  if env['useparmetis']: print "  Using ParMETIS"
661  else: print "   Not using ParMETIS (requires MPI)"  else: print "   Not using ParMETIS (requires MPI)"

Legend:
Removed from v.2338  
changed lines
  Added in v.2364

  ViewVC Help
Powered by ViewVC 1.1.26