/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

temp/SConstruct revision 1387 by trankine, Fri Jan 11 07:45:26 2008 UTC trunk/SConstruct revision 1459 by ksteube, Thu Mar 27 01:49:10 2008 UTC
# Line 238  opts.AddOptions( Line 238  opts.AddOptions(
238    PathOption('amd_path', 'Path to AMD includes', amd_path_default),    PathOption('amd_path', 'Path to AMD includes', amd_path_default),
239    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),
240    ('amd_libs', 'AMD libraries to link with', amd_libs_default),    ('amd_libs', 'AMD libraries to link with', amd_libs_default),
241    # ParMETIS
242      ('parmetis_path', 'Path to ParMETIS includes', ''),
243      ('parmetis_lib_path', 'Path to ParMETIS library', ''),
244      ('parmetis_lib', 'ParMETIS library to link with', []),
245  # TRILINOS  # TRILINOS
246    PathOption('trilinos_path', 'Path to TRILINOS includes', None),    PathOption('trilinos_path', 'Path to TRILINOS includes', None),
247    PathOption('trilinos_lib_path', 'Path to TRILINOS libs', None),    PathOption('trilinos_lib_path', 'Path to TRILINOS libs', None),
# Line 291  opts.AddOptions( Line 295  opts.AddOptions(
295    
296  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
297        env = Environment(tools = ['default', 'msvc'], options = opts)        env = Environment(tools = ['default', 'msvc'], options = opts)
298          #env = Environment(tools = ['default', 'intelc'], options = opts)
299  else:  else:
300     if os.uname()[4]=='ia64':     if os.uname()[4]=='ia64':
301        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
# Line 452  except KeyError: Line 457  except KeyError:
457     useMPI = None     useMPI = None
458  # ========= set compiler flags ===========================================  # ========= set compiler flags ===========================================
459    
 # Can't use MPI and OpenMP simultaneously at this time  
 if useMPI:  
     omp_flags=''  
     omp_flags_debug=''  
   
460  if dodebug:  if dodebug:
461      try:      try:
462        flags = env['cc_flags_debug'] + ' ' + omp_flags_debug        flags = env['cc_flags_debug'] + ' ' + omp_flags_debug
# Line 721  try: Line 721  try:
721     epydoc_path = env['epydoc_path']     epydoc_path = env['epydoc_path']
722  except KeyError:  except KeyError:
723     epydoc_path = None     epydoc_path = None
724    # =============== ParMETIS =======================================
725    try:
726       parmetis_path = env['parmetis_path']
727       parmetis_lib_path = env['parmetis_lib_path']
728       parmetis_lib = env['parmetis_lib']
729    except KeyError:
730       parmetis_path = ''
731       parmetis_lib_path = ''
732       parmetis_lib = ''
733    
734    if useMPI and os.path.isdir(parmetis_lib_path):
735       env.Append(CPPDEFINES = [ 'PARMETIS' ])
736       env.Append(CXXDEFINES = [ 'PARMETIS' ])
737       env.Append(CPPPATH = [parmetis_path])
738       env.Append(LIBPATH = [parmetis_lib_path])
739       env.Append(LIBS = parmetis_lib)
740  # =============== PAPI =======================================  # =============== PAPI =======================================
741  try:  try:
742     includes = env['papi_path']     includes = env['papi_path']
# Line 851  try: Line 867  try:
867     global_revision = re.sub(":.*", "", global_revision[0])     global_revision = re.sub(":.*", "", global_revision[0])
868     global_revision = re.sub("[^0-9]", "", global_revision)     global_revision = re.sub("[^0-9]", "", global_revision)
869  except:  except:
870     global_revision = "0"     global_revision="-1"
871       print "Warning: unable to recover global revsion number."
872    if global_revision == "": global_revision="0"
873    print "Revision number is %s."%global_revision
874  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)
875    
876  # Python install - esys __init__.py  # Python install - esys __init__.py

Legend:
Removed from v.1387  
changed lines
  Added in v.1459

  ViewVC Help
Powered by ViewVC 1.1.26