/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2729 by jfenwick, Thu Oct 22 01:45:28 2009 UTC revision 2748 by gross, Tue Nov 17 07:32:59 2009 UTC
# Line 161  adder( Line 161  adder(
161    ('blas_path', 'Path to BLAS includes', '/usr/include/suitesparse'),    ('blas_path', 'Path to BLAS includes', '/usr/include/suitesparse'),
162    ('blas_lib_path', 'Path to BLAS libs', usr_lib),    ('blas_lib_path', 'Path to BLAS libs', usr_lib),
163    ('blas_libs', 'BLAS libraries to link with', ['blas']),    ('blas_libs', 'BLAS libraries to link with', ['blas']),
164    #Lapack options
165      BoolVariable('uselapack','switch on/off use of Lapack','no'),
166      ('lapack_path', 'Path to Lapack includes','/usr/include'),
167      ('lapack_lib_path', 'Path to Lapack libs', usr_lib),
168      ('lapack_libs', 'Lapack libraries to link with', []),
169      ('lapack_type', '{clapack,mkl}','clapack'),
170  # An option for specifying the compiler tools set (see windows branch).  # An option for specifying the compiler tools set (see windows branch).
171    ('tools_names', 'allow control over the tools in the env setup', ['intelc']),    ('tools_names', 'allow control over the tools in the env setup', ['intelc']),
172  # finer control over library building, intel aggressive global optimisation  # finer control over library building, intel aggressive global optimisation
# Line 603  if env['usesilo']: Line 609  if env['usesilo']:
609    env.AppendUnique(LIBPATH = [env['silo_lib_path']])    env.AppendUnique(LIBPATH = [env['silo_lib_path']])
610    env.Append(CPPDEFINES = ['HAVE_SILO'])    env.Append(CPPDEFINES = ['HAVE_SILO'])
611    
612    ########### Lapack (optional) ##################################
613    
614    
615    if env['uselapack']:
616        env.AppendUnique(CPPDEFINES='USE_LAPACK')
617        env.AppendUnique(CPPPATH = [env['lapack_path']])
618        env.AppendUnique(LIBPATH =[env['lapack_lib_path']])
619    
620        env.Append(LIBPATH = '/usr/lib/atlas')
621        env.Append(LIBS = [env['lapack_libs']])
622        if env['lapack_type']=='mkl':
623           env.AppendUnique(CPPDEFINES='MKL_LAPACK')
624    
625  ############ Add the compiler flags ############################  ############ Add the compiler flags ############################
626    
627  # Enable debug by choosing either cc_debug or cc_optim  # Enable debug by choosing either cc_debug or cc_optim
# Line 792  env.Alias('remember_options', remember_l Line 811  env.Alias('remember_options', remember_l
811  ############### Record python interpreter version ##############  ############### Record python interpreter version ##############
812    
813  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:
814    
815    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])
816      if sys.version_info[4] >0 : versionstring+="rc%s"%sys.version_info[4]
817    os.system("echo "+versionstring+" > "+os.path.join(env['libinstall'],"pyversion"))    os.system("echo "+versionstring+" > "+os.path.join(env['libinstall'],"pyversion"))
818    
819  ############## Populate the buildvars file #####################  ############## Populate the buildvars file #####################
# Line 829  else: Line 850  else:
850      out+="n"      out+="n"
851  buildvars.write(out+"\n")  buildvars.write(out+"\n")
852  buildvars.write("mpi_flavour="+env['mpi_flavour']+'\n')  buildvars.write("mpi_flavour="+env['mpi_flavour']+'\n')
853    buildvars.write("lapack=")
854    if env['uselapack']:
855       buildvars.write('y')
856    else:
857       buildvars.write('n')
858    buildvars.write('\n')
859  buildvars.close()  buildvars.close()
860    
861    

Legend:
Removed from v.2729  
changed lines
  Added in v.2748

  ViewVC Help
Powered by ViewVC 1.1.26