/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2742 by jfenwick, Thu Nov 12 06:03:37 2009 UTC revision 2787 by jfenwick, Fri Nov 27 05:03:09 2009 UTC
# Line 549  if env['usemkl']: Line 549  if env['usemkl']:
549  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
550  if env['usemkl'] and not conf.CheckFunc('pardiso'): env['usemkl'] = 0  if env['usemkl'] and not conf.CheckFunc('pardiso'): env['usemkl'] = 0
551    
552    
553  # Add MKL to environment env if it was found  # Add MKL to environment env if it was found
554  if env['usemkl']:  if env['usemkl']:
555    env = conf.Finish()    env = conf.Finish()
# Line 620  if env['uselapack']: Line 621  if env['uselapack']:
621      env.Append(LIBPATH = '/usr/lib/atlas')      env.Append(LIBPATH = '/usr/lib/atlas')
622      env.Append(LIBS = [env['lapack_libs']])      env.Append(LIBS = [env['lapack_libs']])
623      if env['lapack_type']=='mkl':      if env['lapack_type']=='mkl':
624         env.AppendUnique(CPPDEFINES='MKL_LAPACK')         if not env['usemkl']:
625            env['uselapack']=0
626            print "mkl_lapack requires mkl"
627           else:
628            env.AppendUnique(CPPDEFINES='MKL_LAPACK')
629          
630    
631    
632  ############ Add the compiler flags ############################  ############ Add the compiler flags ############################
633    
# Line 745  if env['useparmetis']: print " Using Par Line 752  if env['useparmetis']: print " Using Par
752  else: print "   Not using ParMETIS (requires MPI)"  else: print "   Not using ParMETIS (requires MPI)"
753  if env['usepapi']: print "  Using PAPI"  if env['usepapi']: print "  Using PAPI"
754  else: print "   Not using PAPI"  else: print "   Not using PAPI"
755    if env['uselapack']: print "    Using Lapack"
756    else: print "   Not using Lapack"
757  if env['usedebug']: print " Compiling for debug"  if env['usedebug']: print " Compiling for debug"
758  else: print "   Not compiling for debug"  else: print "   Not compiling for debug"
759  print " Installing in", prefix  print " Installing in", prefix
# Line 811  env.Alias('remember_options', remember_l Line 820  env.Alias('remember_options', remember_l
820  ############### Record python interpreter version ##############  ############### Record python interpreter version ##############
821    
822  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:
823    
824    versionstring="Python "+str(sys.version_info[0])+"."+str(sys.version_info[1])+"."+str(sys.version_info[2])    versionstring="Python "+str(sys.version_info[0])+"."+str(sys.version_info[1])+"."+str(sys.version_info[2])
825      if sys.version_info[4] >0 : versionstring+="rc%s"%sys.version_info[4]
826    os.system("echo "+versionstring+" > "+os.path.join(env['libinstall'],"pyversion"))    os.system("echo "+versionstring+" > "+os.path.join(env['libinstall'],"pyversion"))
827    
828  ############## Populate the buildvars file #####################  ############## Populate the buildvars file #####################

Legend:
Removed from v.2742  
changed lines
  Added in v.2787

  ViewVC Help
Powered by ViewVC 1.1.26