/[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 2358 by gross, Wed Apr 1 22:25:24 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 296  if env['usepedantic']: env.Append(CCFLAG Line 297  if env['usepedantic']: env.Append(CCFLAG
297    
298  # MS Windows  # MS Windows
299  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
300    env.PrependENVPath('PATH',    [env['boost_lib_path']])    env.AppendENVPath('PATH', [env['boost_lib_path']])
301    env.PrependENVPath('PATH',    [env['libinstall']])    env.AppendENVPath('PATH', [env['libinstall']])
302    if not env['share_esysUtils'] :    if not env['share_esysUtils'] :
303      env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])      env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])
304    if not env['share_paso'] :    if not env['share_paso'] :
305      env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])      env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])
306    
307    if env['usenetcdf']:    if env['usenetcdf']:
308      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])      env.AppendENVPath('PATH',   [env['netCDF_lib_path']])
309    
310  env.Append(ARFLAGS = env['ar_flags'])  env.Append(ARFLAGS = env['ar_flags'])
311    
# Line 466  if env['usemkl']: Line 467  if env['usemkl']:
467    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
468    
469  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
470  if env['usemkl'] and not conf.CheckFunc('pardiso_'): env['usemkl'] = 0  if env['usemkl'] and not conf.CheckFunc('pardiso'): env['usemkl'] = 0
471    
472  # Add MKL to environment env if it was found  # Add MKL to environment env if it was found
473  if env['usemkl']:  if env['usemkl']:
# Line 542  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 563  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 638  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)"
# Line 746  if env['useopenmp']: Line 749  if env['useopenmp']:
749  else:  else:
750      out+="n"      out+="n"
751  buildvars.write(out+"\n")  buildvars.write(out+"\n")
752    buildvars.write("mpi_flavour="+env['mpi_flavour']+'\n')
753    
754  buildvars.close()  buildvars.close()
755    
# Line 807  env.Alias('build_full',['install_all','b Line 811  env.Alias('build_full',['install_all','b
811    
812  ############ Targets to build the documentation ################  ############ Targets to build the documentation ################
813    
814  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'])
815    
816  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:
817     try:     try:

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

  ViewVC Help
Powered by ViewVC 1.1.26