From 64a5cbf29516bcb9b3da3b49e352029615536a70 Mon Sep 17 00:00:00 2001 From: Tobias Domhan Date: Fri, 27 Jul 2018 09:34:28 +0200 Subject: [PATCH] Ensure recent numpy version to avoid MKL conflicts. (#494) * Making sure to use numpy>=1.14 to avoid MKL conflicts. * changelog * Update CHANGELOG.md * Update __init__.py * Update CHANGELOG.md * Update __init__.py --- CHANGELOG.md | 7 ++++--- requirements/requirements.gpu-cu75.txt | 2 +- requirements/requirements.gpu-cu80.txt | 2 +- requirements/requirements.gpu-cu90.txt | 2 +- requirements/requirements.gpu-cu91.txt | 2 +- requirements/requirements.txt | 2 +- sockeye/__init__.py | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8176c913..ef9f68507 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,13 +10,14 @@ Note that Sockeye has checks in place to not translate with an old model that wa Each version section may have have subsections for: _Added_, _Changed_, _Removed_, _Deprecated_, and _Fixed_. +## [1.18.41] +### Changed +- Require numpy 1.14 or later to avoid MKL conflicts between numpy as mxnet-mkl. + ## [1.18.40] ### Fixed - Fixed bad check for existence of negative constraints. - Resolved conflict for phrases that are both positive and negative constraints. - -## [1.18.40] -### Fixed - Fixed softmax temperature at inference time. ## [1.18.39] diff --git a/requirements/requirements.gpu-cu75.txt b/requirements/requirements.gpu-cu75.txt index 17ad1693a..9eba7b488 100644 --- a/requirements/requirements.gpu-cu75.txt +++ b/requirements/requirements.gpu-cu75.txt @@ -1,4 +1,4 @@ pyyaml==3.12 mxnet-cu75mkl==1.2.1 -numpy>=1.12 +numpy>=1.14 typing diff --git a/requirements/requirements.gpu-cu80.txt b/requirements/requirements.gpu-cu80.txt index 4277517b5..db17c2d46 100644 --- a/requirements/requirements.gpu-cu80.txt +++ b/requirements/requirements.gpu-cu80.txt @@ -1,4 +1,4 @@ pyyaml==3.12 mxnet-cu80mkl==1.2.1 -numpy>=1.12 +numpy>=1.14 typing diff --git a/requirements/requirements.gpu-cu90.txt b/requirements/requirements.gpu-cu90.txt index 8eec7113e..45e7cdc48 100644 --- a/requirements/requirements.gpu-cu90.txt +++ b/requirements/requirements.gpu-cu90.txt @@ -1,4 +1,4 @@ pyyaml==3.12 mxnet-cu90mkl==1.2.1 -numpy>=1.12 +numpy>=1.14 typing diff --git a/requirements/requirements.gpu-cu91.txt b/requirements/requirements.gpu-cu91.txt index 9eb53f212..58100e8fe 100644 --- a/requirements/requirements.gpu-cu91.txt +++ b/requirements/requirements.gpu-cu91.txt @@ -1,4 +1,4 @@ pyyaml==3.12 mxnet-cu91mkl==1.2.1 -numpy>=1.12 +numpy>=1.14 typing diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 747b1ca8a..808141c42 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,4 +1,4 @@ pyyaml==3.12 mxnet-mkl==1.2.1 -numpy>=1.12 +numpy>=1.14 typing diff --git a/sockeye/__init__.py b/sockeye/__init__.py index 78580ef5a..4cd48211a 100644 --- a/sockeye/__init__.py +++ b/sockeye/__init__.py @@ -11,4 +11,4 @@ # express or implied. See the License for the specific language governing # permissions and limitations under the License. -__version__ = '1.18.40' +__version__ = '1.18.41'