/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2358 by gross, Wed Apr 1 22:25:24 2009 UTC revision 2366 by gross, Mon Apr 6 03:10:55 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 555  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 563  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", "OPENMPI", "MPICH", "OPENMPI", "INTELMPI" ]    VALID_MPIs=[ "MPT", "MPICH", "MPICH2", "OPENMPI", "INTELMPI" ]
580    if not env_mpi['mpi_flavour'] in VALID_MPIs:    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)        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']])
# Line 586  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
Legend:
Removed from v.2358  
changed lines
  Added in v.2366
  ViewVC Help
Powered by ViewVC 1.1.26