/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/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 2356 by gross, Wed Apr 1 04:46:22 2009 UTC
# Line 543  else: Line 543  else:
543  env.Append(CCFLAGS      = env['cc_flags'])  env.Append(CCFLAGS      = env['cc_flags'])
544  env.Append(LIBS         = [env['omp_libs']])  env.Append(LIBS         = [env['omp_libs']])
545    
   
546  ############ Add some custom builders ##########################  ############ Add some custom builders ##########################
547    
548  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 564  env_mpi = clone_env(env) Line 563  env_mpi = clone_env(env)
563  conf = Configure(clone_env(env_mpi))  conf = Configure(clone_env(env_mpi))
564    
565  if env_mpi['usempi']:  if env_mpi['usempi']:
566      VALID_MPIs=[ "MPT", "OPENMPI", "MPICH", "OPENMPI", "INTELMPI" ]
567      if not env_mpi['mpi_flavour'] in VALID_MPIs:
568          raise ValueError,"MPI is enabled but mpi_flavour = %s is not a valid key from %s."( env_mpi['mpi_flavour'],VALID_MPIs)
569    conf.env.AppendUnique(CPPPATH = [env_mpi['mpi_path']])    conf.env.AppendUnique(CPPPATH = [env_mpi['mpi_path']])
570    conf.env.AppendUnique(LIBPATH = [env_mpi['mpi_lib_path']])    conf.env.AppendUnique(LIBPATH = [env_mpi['mpi_lib_path']])
571    conf.env.AppendUnique(LIBS    = [env_mpi['mpi_libs']])    conf.env.AppendUnique(LIBS    = [env_mpi['mpi_libs']])
# Line 639  if env['usesilo']: print " Using Silo" Line 641  if env['usesilo']: print " Using Silo"
641  else: print "   Not using Silo"  else: print "   Not using Silo"
642  if env['useopenmp']: print "    Using OpenMP"  if env['useopenmp']: print "    Using OpenMP"
643  else: print "   Not using OpenMP"  else: print "   Not using OpenMP"
644  if env['usempi']: print "   Using MPI"  if env['usempi']: print "   Using MPI (flavour = %s)"%env['mpi_flavour']
645  else: print "   Not using MPI"  else: print "   Not using MPI"
646  if env['useparmetis']: print "  Using ParMETIS"  if env['useparmetis']: print "  Using ParMETIS"
647  else: print "   Not using ParMETIS (requires MPI)"  else: print "   Not using ParMETIS (requires MPI)"
Legend:
Removed from v.2338  
changed lines
  Added in v.2356
  ViewVC Help
Powered by ViewVC 1.1.26