/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 3359 by jfenwick, Wed Nov 17 23:32:36 2010 UTC revision 3506 by jfenwick, Wed May 11 01:59:45 2011 UTC
# Line 103  vars.AddVariables( Line 103  vars.AddVariables(
103    ('visit_prefix', 'Prefix/Paths to VisIt installation', default_prefix),    ('visit_prefix', 'Prefix/Paths to VisIt installation', default_prefix),
104    ('visit_libs', 'VisIt libraries to link with', ['simV2']),    ('visit_libs', 'VisIt libraries to link with', ['simV2']),
105    BoolVariable('pyvisi', 'Enable pyvisi (deprecated, requires VTK module)', False),    BoolVariable('pyvisi', 'Enable pyvisi (deprecated, requires VTK module)', False),
106      BoolVariable('vsl_random', 'Use VSL from intel for random data', False),
107  # Advanced settings  # Advanced settings
108    #dudley_assemble_flags = -funroll-loops      to actually do something    #dudley_assemble_flags = -funroll-loops      to actually do something
109    ('dudley_assemble_flags', 'compiler flags for some dudley optimisations', ''),    ('dudley_assemble_flags', 'compiler flags for some dudley optimisations', ''),
# Line 312  for key in 'OMP_NUM_THREADS', 'ESCRIPT_N Line 313  for key in 'OMP_NUM_THREADS', 'ESCRIPT_N
313          env['ENV'][key] = 1          env['ENV'][key] = 1
314    
315  env_export=env['env_export']  env_export=env['env_export']
316  env_export.extend(['ESCRIPT_NUM_THREADS','ESCRIPT_HOSTFILE','DISPLAY','XAUTHORITY','PATH','HOME'])  env_export.extend(['ESCRIPT_NUM_THREADS','ESCRIPT_HOSTFILE','DISPLAY','XAUTHORITY','PATH','HOME','TMPDIR','TEMP','TMP'])
317    
318  for key in set(env_export):  for key in set(env_export):
319      try:      try:
# Line 381  if conf.CheckFunc('gethostname'): Line 382  if conf.CheckFunc('gethostname'):
382  python_inc_path=sysconfig.get_python_inc()  python_inc_path=sysconfig.get_python_inc()
383  if IS_WINDOWS:  if IS_WINDOWS:
384      python_lib_path=os.path.join(sysconfig.get_config_var('prefix'), 'libs')      python_lib_path=os.path.join(sysconfig.get_config_var('prefix'), 'libs')
385    elif env['PLATFORM']=='darwin':
386        python_lib_path=sysconfig.get_config_var('LIBPL')
387  else:  else:
388      python_lib_path=sysconfig.get_config_var('LIBDIR')      python_lib_path=sysconfig.get_config_var('LIBDIR')
389  #python_libs=[sysconfig.get_config_var('LDLIBRARY')] # only on linux  #python_libs=[sysconfig.get_config_var('LDLIBRARY')] # only on linux
# Line 524  if env['silo']: Line 527  if env['silo']:
527      # weipa library and tools.      # weipa library and tools.
528      #env.AppendUnique(LIBS = [env['silo_libs']])      #env.AppendUnique(LIBS = [env['silo_libs']])
529    
530    ######## VSL random numbers (optional)
531    if env['vsl_random']:
532        env.Append(CPPDEFINES = ['MKLRANDOM'])
533    
534  ######## VisIt (optional)  ######## VisIt (optional)
535    
536  visit_inc_path=''  visit_inc_path=''
# Line 565  if env['parmetis']: Line 572  if env['parmetis']:
572      env.PrependENVPath(LD_LIBRARY_PATH_KEY, parmetis_lib_path)      env.PrependENVPath(LD_LIBRARY_PATH_KEY, parmetis_lib_path)
573      env.Append(CPPDEFINES = ['USE_PARMETIS'])      env.Append(CPPDEFINES = ['USE_PARMETIS'])
574    
575    ######## gmsh (optional, for tests)
576    
577    try:
578        import subprocess
579        p=subprocess.Popen(['gmsh', '-version'], stderr=subprocess.PIPE)
580        p.poll()
581        env['gmsh']=True
582    except OSError:
583        env['gmsh']=False
584    
585  ######################## Summarize our environment ###########################  ######################## Summarize our environment ###########################
586    
587  # keep some of our install paths first in the list for the unit tests  # keep some of our install paths first in the list for the unit tests
# Line 603  else: Line 620  else:
620      print("          LAPACK:  DISABLED")      print("          LAPACK:  DISABLED")
621  d_list=[]  d_list=[]
622  e_list=[]  e_list=[]
623  for i in 'debug','openmp','netcdf','parmetis','papi','mkl','umfpack','silo','visit','pyvisi':  for i in 'debug','openmp','netcdf','parmetis','papi','mkl','umfpack','silo','visit':
624      if env[i]: e_list.append(i)      if env[i]: e_list.append(i)
625      else: d_list.append(i)      else: d_list.append(i)
626  for i in e_list:  for i in e_list:
627      print("%16s:  YES"%i)      print("%16s:  YES"%i)
628  for i in d_list:  for i in d_list:
629      print("%16s:  DISABLED"%i)      print("%16s:  DISABLED"%i)
630    if env['gmsh']:
631        print("            gmsh:  FOUND")
632    else:
633        print("            gmsh:  NOT FOUND")
634    print("      vsl_random:  %s"%env['vsl_random'])
635        
636  if ((fatalwarning != '') and (env['werror'])):  if ((fatalwarning != '') and (env['werror'])):
637      print("  Treating warnings as errors")      print("  Treating warnings as errors")
638  else:  else:
# Line 689  buildvars.write("mpi_inc_path=%s\n"%mpi_ Line 712  buildvars.write("mpi_inc_path=%s\n"%mpi_
712  buildvars.write("mpi_lib_path=%s\n"%mpi_lib_path)  buildvars.write("mpi_lib_path=%s\n"%mpi_lib_path)
713  buildvars.write("lapack=%s\n"%env['lapack'])  buildvars.write("lapack=%s\n"%env['lapack'])
714  buildvars.write("pyvisi=%d\n"%env['pyvisi'])  buildvars.write("pyvisi=%d\n"%env['pyvisi'])
715    buildvars.write("vsl_random=%d"%int(env['vsl_random']))
716  for i in 'netcdf','parmetis','papi','mkl','umfpack','silo','visit':  for i in 'netcdf','parmetis','papi','mkl','umfpack','silo','visit':
717      buildvars.write("%s=%d\n"%(i, int(env[i])))      buildvars.write("%s=%d\n"%(i, int(env[i])))
718      if env[i]:      if env[i]:

Legend:
Removed from v.3359  
changed lines
  Added in v.3506

  ViewVC Help
Powered by ViewVC 1.1.26