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

Diff of /branches/py3_attempt2/SConstruct

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

revision 2363 by gross, Fri Apr 3 03:56:19 2009 UTC revision 2364 by gross, Fri Apr 3 08:06:30 2009 UTC
# Line 567  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 575  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", "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 598  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.2363  
changed lines
  Added in v.2364

  ViewVC Help
Powered by ViewVC 1.1.26