/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 6701 by jfenwick, Tue Jun 12 00:56:30 2018 UTC revision 6702 by gross, Tue Jun 26 20:48:32 2018 UTC
# Line 21  from distutils import sysconfig Line 21  from distutils import sysconfig
21  from dependencies import *  from dependencies import *
22  from site_init import *  from site_init import *
23    
24    print(sys.version)
25    
26  # Version number to check for in options file. Increment when new features are  # Version number to check for in options file. Increment when new features are
27  # added or existing options changed.  # added or existing options changed.
28  REQUIRED_OPTS_VERSION=203  REQUIRED_OPTS_VERSION=203
# Line 196  elif pos1 < mypos <= pos2: Line 198  elif pos1 < mypos <= pos2:
198          env['netcdf_libs']=['netcdf_c++', 'netcdf']          env['netcdf_libs']=['netcdf_c++', 'netcdf']
199  else:   # netcdf4  else:   # netcdf4
200      env['netcdf']=4      env['netcdf']=4
201        print "SADASDSAD"
202      if env['netcdf_libs']=='DEFAULT':      if env['netcdf_libs']=='DEFAULT':
203          env['netcdf_libs']=['netcdf_c++4']          env['netcdf_libs']=['netcdf_c++4']
204    
# Line 278  if cc_name == 'icpc': Line 281  if cc_name == 'icpc':
281      # #1875: offsetof applied to non-POD types is nonstandard (in boost)      # #1875: offsetof applied to non-POD types is nonstandard (in boost)
282      # removed -std=c99 because icpc doesn't like it and we aren't using c anymore      # removed -std=c99 because icpc doesn't like it and we aren't using c anymore
283      cc_flags    = "-std=c++11 -fPIC -w2 -wd1875 -wd1478 -Wno-unknown-pragmas"      cc_flags    = "-std=c++11 -fPIC -w2 -wd1875 -wd1478 -Wno-unknown-pragmas"
284      cc_optim    = "-O3 -ftz -fno-alias -inline-level=2 -ipo -xHost"      cc_optim    = "-Ofast -ftz -fno-alias -xCORE-AVX2"
285        #cc_optim    = "-Ofast -ftz -fno-alias -inline-level=2 -ipo -xCORE-AVX2"
286        #cc_optim    = "-O2 -ftz -fno-alias -inline-level=2"
287        #cc_optim    = "-O0 -ftz -fno-alias"
288        #cc_optim    = "-O3 -ftz -fno-alias -inline-level=2 -ipo -xHost"
289      cc_debug    = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK -DSLOWSHARECHECK"      cc_debug    = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK -DSLOWSHARECHECK"
290      omp_flags   = "-qopenmp"      omp_flags   = "-qopenmp"
291      omp_ldflags = "-qopenmp" # removing -openmp-report (which is deprecated) because the replacement outputs to a file      omp_ldflags = "-qopenmp" # removing -openmp-report (which is deprecated) because the replacement outputs to a file

Legend:
Removed from v.6701  
changed lines
  Added in v.6702

  ViewVC Help
Powered by ViewVC 1.1.26