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

Diff of /branches/numpy/SConstruct

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

revision 2356 by gross, Wed Apr 1 04:46:22 2009 UTC revision 2358 by gross, Wed Apr 1 22:25:24 2009 UTC
# Line 467  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 565  conf = Configure(clone_env(env_mpi)) Line 565  conf = Configure(clone_env(env_mpi))
565  if env_mpi['usempi']:  if env_mpi['usempi']:
566    VALID_MPIs=[ "MPT", "OPENMPI", "MPICH", "OPENMPI", "INTELMPI" ]    VALID_MPIs=[ "MPT", "OPENMPI", "MPICH", "OPENMPI", "INTELMPI" ]
567    if not env_mpi['mpi_flavour'] in VALID_MPIs:    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)        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']])

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

  ViewVC Help
Powered by ViewVC 1.1.26