diff --git a/build_scripts/chey_intel_mkl_omp.sh b/build_scripts/chey_intel_mkl_omp.sh index c6a766d..ee40614 100644 --- a/build_scripts/chey_intel_mkl_omp.sh +++ b/build_scripts/chey_intel_mkl_omp.sh @@ -11,7 +11,7 @@ f2py *.f90 -m _wrffortran -h wrffortran.pyf --overwrite-signature cd .. python setup.py clean --all -python setup.py config_fc --f90flags="-O3 -xHost -mkl -qopenmp" build_ext --rpath="/glade/u/apps/opt/intel/2017u1/compilers_and_libraries/linux/lib/intel64_lin:/glade/u/apps/opt/intel/2017u1/compilers_and_libraries/linux/mkl/lib/intel64_lin" --library-dirs="/glade/u/apps/opt/intel/2017u1/compilers_and_libraries/linux/lib/intel64_lin:/glade/u/apps/opt/intel/2017u1/compilers_and_libraries/linux/mkl/lib/intel64_lin" --libraries="mkl_intel_ilp64 mkl_intel_thread mkl_core iomp5 pthread m dl" build --compiler=intelem --fcompiler=intelem bdist_wheel +python setup.py config_fc --f90flags="-xHost -mkl -qopenmp" build_ext --rpath="/glade/u/apps/opt/intel/2017u1/compilers_and_libraries/linux/lib/intel64_lin:/glade/u/apps/opt/intel/2017u1/compilers_and_libraries/linux/mkl/lib/intel64_lin" --library-dirs="/glade/u/apps/opt/intel/2017u1/compilers_and_libraries/linux/lib/intel64_lin:/glade/u/apps/opt/intel/2017u1/compilers_and_libraries/linux/mkl/lib/intel64_lin" --libraries="mkl_intel_ilp64 mkl_intel_thread mkl_core iomp5 pthread m dl" build --compiler=intelem --fcompiler=intelem bdist_wheel #pip install . diff --git a/chey_intel.py b/chey_intel.py index 1662af9..8ba16b7 100644 --- a/chey_intel.py +++ b/chey_intel.py @@ -57,8 +57,8 @@ class IntelFCompiler(BaseIntelFCompiler): def get_flags_opt(self): # Scipy test failures with -O2 v = self.get_version() - mpopt = 'qopenmp' - return ['-fp-model strict -O3 -{}'.format(mpopt)] + mpopt = '' + return ['-fp-model strict -O2 -{}'.format(mpopt)] def get_flags_arch(self): return [] @@ -123,8 +123,8 @@ class IntelEM64TFCompiler(IntelFCompiler): def get_flags_opt(self): # Scipy test failures with -O2 v = self.get_version() - mpopt = 'qopenmp' - return ['-fp-model strict -O3 -{}'.format(mpopt)] + mpopt = '' + return ['-fp-model strict -O2 -{}'.format(mpopt)] def get_flags_arch(self): return [''] diff --git a/doc/source/new.rst b/doc/source/new.rst index e2ff9cc..5197ebb 100644 --- a/doc/source/new.rst +++ b/doc/source/new.rst @@ -4,6 +4,16 @@ What's New Releases ------------- +v1.1.1 +^^^^^^^^^^^^^^ + +- Release 1.1.1 +- Added script for building on Cheyenne with maxed out Intel settings, which + also included a patch for numpy.distutils. +- Fixed a few unicode characters hiding in a docstring that were causing + problems on Cheyenne, and also building the docs with Sphinx with Python 2.x. + + v1.1.0 ^^^^^^^^^^^^^^ diff --git a/src/wrf/version.py b/src/wrf/version.py index aebf1b8..c5762ad 100644 --- a/src/wrf/version.py +++ b/src/wrf/version.py @@ -1,2 +1,2 @@ -__version__ = "1.1.0" +__version__ = "1.1.1"