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

Diff of /branches/diaplayground/SConstruct

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

revision 5084 by caltinay, Sun Jun 29 23:29:51 2014 UTC revision 5085 by caltinay, Mon Jun 30 01:20:41 2014 UTC
# Line 188  if len(vars.UnknownVariables())>0: Line 188  if len(vars.UnknownVariables())>0:
188      Exit(1)      Exit(1)
189    
190  if env['cuda']:  if env['cuda']:
191        if env['nvcc'] != 'default':
192            env['NVCC'] = env['nvcc']
193      env.Tool('nvcc')      env.Tool('nvcc')
194    
195  # create dictionary which will be populated with info for buildvars file  # create dictionary which will be populated with info for buildvars file
# Line 218  env.Append(LIBPATH = [env['libinstall']] Line 220  env.Append(LIBPATH = [env['libinstall']]
220    
221  if env['cxx'] != 'default': env['CXX']=env['cxx']  if env['cxx'] != 'default': env['CXX']=env['cxx']
222    
 if env['nvcc'] != 'default':  
     env['NVCC'] = env['nvcc']  
 else:  
     env['NVCC'] = 'nvcc'  
   
223  # version >=9 of intel C++ compiler requires use of icpc to link in C++  # version >=9 of intel C++ compiler requires use of icpc to link in C++
224  # runtimes (icc does not)  # runtimes (icc does not)
225  if not IS_WINDOWS and os.uname()[4]=='ia64' and env['CXX']=='icpc':  if not IS_WINDOWS and os.uname()[4]=='ia64' and env['CXX']=='icpc':
# Line 452  env=checkPython(env) Line 449  env=checkPython(env)
449  ######## boost & boost-python (required)  ######## boost & boost-python (required)
450  env=checkBoost(env)  env=checkBoost(env)
451    
452    ######## NVCC version (optional)
453    if env['cuda']:
454        env=checkCudaVersion(env)
455    
456  ######## numpy (required) and numpy headers (optional)  ######## numpy (required) and numpy headers (optional)
457  env=checkNumpy(env)  env=checkNumpy(env)
458    
# Line 657  def print_summary(): Line 658  def print_summary():
658          print("          LAPACK:  YES (flavour: %s)"%env['lapack'])          print("          LAPACK:  YES (flavour: %s)"%env['lapack'])
659      else:      else:
660          print("          LAPACK:  DISABLED")          print("          LAPACK:  DISABLED")
661        if env['cuda']:
662            print("            CUDA:  YES (nvcc: %s)"%env['nvcc_version'])
663        else:
664            print("            CUDA:  DISABLED")
665      d_list=[]      d_list=[]
666      e_list=[]      e_list=[]
667      for i in 'debug','openmp','boomeramg','gdal','mkl','netcdf','papi','parmetis','pyproj','scipy','silo','sympy','umfpack','visit','vsl_random':      for i in 'debug','openmp','boomeramg','gdal','mkl','netcdf','papi','parmetis','pyproj','scipy','silo','sympy','umfpack','visit','vsl_random':

Legend:
Removed from v.5084  
changed lines
  Added in v.5085

  ViewVC Help
Powered by ViewVC 1.1.26