/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2324 by jfenwick, Thu Mar 19 04:35:30 2009 UTC revision 2363 by gross, Fri Apr 3 03:56:19 2009 UTC
# Line 98  opts.AddOptions( Line 98  opts.AddOptions(
98    ('mpi_run', 'mpirun name' , 'mpiexec -np 1'),    ('mpi_run', 'mpirun name' , 'mpiexec -np 1'),
99    ('mpi_lib_path', 'Path to MPI libs (needs to be added to the LD_LIBRARY_PATH)', usr_lib),    ('mpi_lib_path', 'Path to MPI libs (needs to be added to the LD_LIBRARY_PATH)', usr_lib),
100    ('mpi_libs', 'MPI libraries to link with (needs to be shared!)', ['mpich' , 'pthread', 'rt']),    ('mpi_libs', 'MPI libraries to link with (needs to be shared!)', ['mpich' , 'pthread', 'rt']),
101      ('mpi_flavour','Type of MPI execution environment','none'),
102  # ParMETIS  # ParMETIS
103    BoolOption('useparmetis', 'Compile parallel version using ParMETIS', 'yes'),    BoolOption('useparmetis', 'Compile parallel version using ParMETIS', 'yes'),
104    ('parmetis_path', 'Path to ParMETIS includes', '/usr/include'),    ('parmetis_path', 'Path to ParMETIS includes', '/usr/include'),
# Line 242  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 296  if env['usepedantic']: env.Append(CCFLAG Line 309  if env['usepedantic']: env.Append(CCFLAG
309    
310  # MS Windows  # MS Windows
311  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
312    env.PrependENVPath('PATH',    [env['boost_lib_path']])    env.AppendENVPath('PATH', [env['boost_lib_path']])
313    env.PrependENVPath('PATH',    [env['libinstall']])    env.AppendENVPath('PATH', [env['libinstall']])
314    if not env['share_esysUtils'] :    if not env['share_esysUtils'] :
315      env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])      env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])
316    if not env['share_paso'] :    if not env['share_paso'] :
317      env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])      env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])
318    
319    if env['usenetcdf']:    if env['usenetcdf']:
320      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])      env.AppendENVPath('PATH',   [env['netCDF_lib_path']])
321    
322  env.Append(ARFLAGS = env['ar_flags'])  env.Append(ARFLAGS = env['ar_flags'])
323    
# Line 466  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 542  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 563  env_mpi = clone_env(env) Line 575  env_mpi = clone_env(env)
575  conf = Configure(clone_env(env_mpi))  conf = Configure(clone_env(env_mpi))
576    
577  if env_mpi['usempi']:  if env_mpi['usempi']:
578      VALID_MPIs=[ "MPT", "OPENMPI", "MPICH", "OPENMPI", "INTELMPI" ]
579      if not env_mpi['mpi_flavour'] in VALID_MPIs:
580          raise ValueError,"MPI is enabled but mpi_flavour = %s is not a valid key from %s."%( env_mpi['mpi_flavour'],VALID_MPIs)
581    conf.env.AppendUnique(CPPPATH = [env_mpi['mpi_path']])    conf.env.AppendUnique(CPPPATH = [env_mpi['mpi_path']])
582    conf.env.AppendUnique(LIBPATH = [env_mpi['mpi_lib_path']])    conf.env.AppendUnique(LIBPATH = [env_mpi['mpi_lib_path']])
583    conf.env.AppendUnique(LIBS    = [env_mpi['mpi_libs']])    conf.env.AppendUnique(LIBS    = [env_mpi['mpi_libs']])
# Line 638  if env['usesilo']: print " Using Silo" Line 653  if env['usesilo']: print " Using Silo"
653  else: print "   Not using Silo"  else: print "   Not using Silo"
654  if env['useopenmp']: print "    Using OpenMP"  if env['useopenmp']: print "    Using OpenMP"
655  else: print "   Not using OpenMP"  else: print "   Not using OpenMP"
656  if env['usempi']: print "   Using MPI"  if env['usempi']: print "   Using MPI (flavour = %s)"%env['mpi_flavour']
657  else: print "   Not using MPI"  else: print "   Not using MPI"
658  if env['useparmetis']: print "  Using ParMETIS"  if env['useparmetis']: print "  Using ParMETIS"
659  else: print "   Not using ParMETIS (requires MPI)"  else: print "   Not using ParMETIS (requires MPI)"
# Line 746  if env['useopenmp']: Line 761  if env['useopenmp']:
761  else:  else:
762      out+="n"      out+="n"
763  buildvars.write(out+"\n")  buildvars.write(out+"\n")
764    buildvars.write("mpi_flavour="+env['mpi_flavour']+'\n')
765    
766  buildvars.close()  buildvars.close()
767    
# Line 807  env.Alias('build_full',['install_all','b Line 823  env.Alias('build_full',['install_all','b
823    
824  ############ Targets to build the documentation ################  ############ Targets to build the documentation ################
825    
826  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html'])  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf'])
827    
828  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:
829     try:     try:

Legend:
Removed from v.2324  
changed lines
  Added in v.2363

  ViewVC Help
Powered by ViewVC 1.1.26