From 416180f9019abee02c06e7ffda74ea8762508dbb Mon Sep 17 00:00:00 2001 From: Felix Hieber Date: Thu, 29 Nov 2018 18:21:04 +0100 Subject: [PATCH] Update to MXNet 1.3.1. Removed Cuda7.5 and Cuda9.1 requirement files. (#589) --- CHANGELOG.md | 4 ++++ docs/setup.md | 6 +++--- requirements/requirements.gpu-cu75.txt | 5 ----- requirements/requirements.gpu-cu80.txt | 2 +- requirements/requirements.gpu-cu90.txt | 2 +- requirements/requirements.gpu-cu91.txt | 5 ----- requirements/requirements.gpu-cu92.txt | 2 +- requirements/requirements.txt | 2 +- sockeye/__init__.py | 2 +- 9 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 requirements/requirements.gpu-cu75.txt delete mode 100644 requirements/requirements.gpu-cu91.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 02acd5196..91828b6dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ 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.61] +### Changed +- Update to MXNet 1.3.1. Removed requirements/requirements.gpu-cu{75,91}.txt as CUDA 7.5 and 9.1 are deprecated. + ## [1.18.60] ### Fixed - Performance optimization to skip the softmax operation for single model greedy decoding is now only applied if no translation scores are required in the output. diff --git a/docs/setup.md b/docs/setup.md index 833f9a480..f8614a78b 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -4,7 +4,7 @@ Sockeye requires: - **Python3** -- [MXNet 1.3.0](https://github.com/apache/incubator-mxnet/tree/1.3.0) +- [MXNet 1.3.1](https://github.com/apache/incubator-mxnet/tree/1.3.1) - numpy ## Installation @@ -28,7 +28,7 @@ wget https://raw.githubusercontent.com/awslabs/sockeye/master/requirements/requi pip install sockeye --no-deps -r requirements.gpu-cu${CUDA_VERSION}.txt rm requirements.gpu-cu${CUDA_VERSION}.txt ``` -where `${CUDA_VERSION}` can be `75` (7.5), `80` (8.0), `90` (9.0), `91` (9.1), or `92` (9.2). +where `${CUDA_VERSION}` can be `80` (8.0), `90` (9.0), or `92` (9.2). ### → via source... @@ -47,7 +47,7 @@ running the following: > pip install -r requirements/requirements.gpu-cu${CUDA_VERSION}.txt > pip install . ``` -where `${CUDA_VERSION}` can be `75` (7.5), `80` (8.0), `90` (9.0), or `91` (9.1), or `92` (9.2). +where `${CUDA_VERSION}` can be `80` (8.0), `90` (9.0), or `92` (9.2). Developers will be better served by pointing `$PYTHONPATH` to the root of the git-cloned source. diff --git a/requirements/requirements.gpu-cu75.txt b/requirements/requirements.gpu-cu75.txt deleted file mode 100644 index 875da0e39..000000000 --- a/requirements/requirements.gpu-cu75.txt +++ /dev/null @@ -1,5 +0,0 @@ -pyyaml==3.12 -mxnet-cu75mkl==1.3.0.post0 -numpy>=1.14 -typing -portalocker diff --git a/requirements/requirements.gpu-cu80.txt b/requirements/requirements.gpu-cu80.txt index f7042a613..9468d6032 100644 --- a/requirements/requirements.gpu-cu80.txt +++ b/requirements/requirements.gpu-cu80.txt @@ -1,5 +1,5 @@ pyyaml==3.12 -mxnet-cu80mkl==1.3.0.post0 +mxnet-cu80mkl==1.3.1 numpy>=1.14 typing portalocker diff --git a/requirements/requirements.gpu-cu90.txt b/requirements/requirements.gpu-cu90.txt index 5b38a40b1..5586ab735 100644 --- a/requirements/requirements.gpu-cu90.txt +++ b/requirements/requirements.gpu-cu90.txt @@ -1,5 +1,5 @@ pyyaml==3.12 -mxnet-cu90mkl==1.3.0.post0 +mxnet-cu90mkl==1.3.1 numpy>=1.14 typing portalocker diff --git a/requirements/requirements.gpu-cu91.txt b/requirements/requirements.gpu-cu91.txt deleted file mode 100644 index fe365bb80..000000000 --- a/requirements/requirements.gpu-cu91.txt +++ /dev/null @@ -1,5 +0,0 @@ -pyyaml==3.12 -mxnet-cu91mkl==1.3.0.post0 -numpy>=1.14 -typing -portalocker diff --git a/requirements/requirements.gpu-cu92.txt b/requirements/requirements.gpu-cu92.txt index 0048e3637..8417569b5 100644 --- a/requirements/requirements.gpu-cu92.txt +++ b/requirements/requirements.gpu-cu92.txt @@ -1,5 +1,5 @@ pyyaml==3.12 -mxnet-cu92mkl==1.3.0.post0 +mxnet-cu92mkl==1.3.1 numpy>=1.14 typing portalocker diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7b77f034a..3a9ac412b 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,5 +1,5 @@ pyyaml==3.12 -mxnet-mkl==1.3.0.post0 +mxnet-mkl==1.3.1 numpy>=1.14 typing portalocker diff --git a/sockeye/__init__.py b/sockeye/__init__.py index 95c8f2be9..892ca7a0a 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.60' +__version__ = '1.18.61'