Skip to content

change: add MXNet 1.4.1 support #886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 18, 2019
Merged

change: add MXNet 1.4.1 support #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5c05ec4
update docs
laurenyu Jun 24, 2019
435819d
update pytest fixture
laurenyu Jun 24, 2019
e214ae4
bump LATEST_VERSION
laurenyu Jul 3, 2019
00011ec
Merge branch 'master' into mx-1.4.1
laurenyu Jul 3, 2019
a02e488
Merge branch 'master' into mx-1.4.1
laurenyu Jul 3, 2019
715e202
Merge branch 'master' into mx-1.4.1
laurenyu Jul 18, 2019
7352f5f
Merge branch 'master' into mx-1.4.1
laurenyu Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ MXNet SageMaker Estimators

By using MXNet SageMaker Estimators, you can train and host MXNet models on Amazon SageMaker.

Supported versions of MXNet: ``0.12.1``, ``1.0.0``, ``1.1.0``, ``1.2.1``, ``1.3.0``, ``1.4.0``.
Supported versions of MXNet: ``0.12.1``, ``1.0.0``, ``1.1.0``, ``1.2.1``, ``1.3.0``, ``1.4.0``, ``1.4.1``.

Supported versions of MXNet for Elastic Inference: ``1.3.0``, ``1.4.0``.
Supported versions of MXNet for Elastic Inference: ``1.3.0``, ``1.4.0``, ``1.4.1``.

We recommend that you use the latest supported version, because that's where we focus most of our development efforts.

Expand Down
32 changes: 16 additions & 16 deletions doc/using_mxnet.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Using MXNet with the SageMaker Python SDK

With the SageMaker Python SDK, you can train and host MXNet models on Amazon SageMaker.

Supported versions of MXNet: ``1.4.0``, ``1.3.0``, ``1.2.1``, ``1.1.0``, ``1.0.0``, ``0.12.1``.
Supported versions of MXNet: ``0.12.1``, ``1.0.0``, ``1.1.0``, ``1.2.1``, ``1.3.0``, ``1.4.0``, ``1.4.1``.

Supported versions of MXNet for Elastic Inference: ``1.4.0``, ``1.3.0``.
Supported versions of MXNet for Elastic Inference: ``1.3.0``, ``1.4.0``, ``1.4.1``.

Training with MXNet
-------------------
Expand Down Expand Up @@ -806,23 +806,23 @@ Your MXNet training script will be run on version 1.2.1 by default. (See below f

The Docker images have the following dependencies installed:

+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
| Dependencies | MXNet 0.12.1 | MXNet 1.0.0 | MXNet 1.1.0 | MXNet 1.2.1 | MXNet 1.3.0 | MXNet 1.4.0 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
| Python | 2.7 or 3.5 | 2.7 or 3.5| 2.7 or 3.5| 2.7 or 3.5| 2.7 or 3.5| 2.7 or 3.6|
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
| CUDA (GPU image only) | 9.0 | 9.0 | 9.0 | 9.0 | 9.0 | 9.2 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
| numpy | 1.13.3 | 1.13.3 | 1.13.3 | 1.14.5 | 1.14.6 | 1.16.3 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
| onnx | N/A | N/A | N/A | 1.2.1 | 1.2.1 | 1.4.1 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
| keras-mxnet | N/A | N/A | N/A | N/A | 2.2.2 | 2.2.4.1 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+
| Dependencies | MXNet 0.12.1 | MXNet 1.0.0 | MXNet 1.1.0 | MXNet 1.2.1 | MXNet 1.3.0 | MXNet 1.4.0 | MXNet 1.4.1 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+
| Python | 2.7 or 3.5 | 2.7 or 3.5| 2.7 or 3.5| 2.7 or 3.5| 2.7 or 3.5| 2.7 or 3.6| 2.7 or 3.6|
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+
| CUDA (GPU image only) | 9.0 | 9.0 | 9.0 | 9.0 | 9.0 | 9.2 | 10.0 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+
| numpy | 1.13.3 | 1.13.3 | 1.13.3 | 1.14.5 | 1.14.6 | 1.16.3 | 1.14.5 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+
| onnx | N/A | N/A | N/A | 1.2.1 | 1.2.1 | 1.4.1 | 1.4.1 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+
| keras-mxnet | N/A | N/A | N/A | N/A | 2.2.2 | 2.2.4.1 | 2.2.4.1 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+

The Docker images extend Ubuntu 16.04.

You can select version of MXNet by passing a ``framework_version`` keyword arg to the MXNet Estimator constructor. Currently supported versions are listed in the above table. You can also set ``framework_version`` to only specify major and minor version, e.g ``1.2``, which will cause your training script to be run on the latest supported patch version of that minor version, which in this example would be 1.2.1.
You can select version of MXNet by passing a ``framework_version`` keyword arg to the MXNet Estimator constructor. Currently supported versions are listed in the above table. You can also set ``framework_version`` to only specify major and minor version, e.g ``1.4``, which will cause your training script to be run on the latest supported patch version of that minor version, which in this example would be 1.4.1.
Alternatively, you can build your own image by following the instructions in the SageMaker MXNet containers repository, and passing ``image_name`` to the MXNet Estimator constructor.

You can visit the SageMaker MXNet container repositories here:
Expand Down
32 changes: 16 additions & 16 deletions src/sagemaker/mxnet/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Using MXNet with the SageMaker Python SDK

With the SageMaker Python SDK, you can train and host MXNet models on Amazon SageMaker.

Supported versions of MXNet: ``1.4.0``, ``1.3.0``, ``1.2.1``, ``1.1.0``, ``1.0.0``, ``0.12.1``.
Supported versions of MXNet: ``0.12.1``, ``1.0.0``, ``1.1.0``, ``1.2.1``, ``1.3.0``, ``1.4.0``, ``1.4.1``.

Supported versions of MXNet for Elastic Inference: ``1.4.0``, ``1.3.0``.
Supported versions of MXNet for Elastic Inference: ``1.3.0``, ``1.4.0``, ``1.4.1``.

For information about using MXNet with the SageMaker Python SDK, see https://sagemaker.readthedocs.io/en/stable/using_mxnet.html.

Expand All @@ -21,23 +21,23 @@ Your MXNet training script will be run on version 1.2.1 by default. (See below f

The Docker images have the following dependencies installed:

+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
| Dependencies | MXNet 0.12.1 | MXNet 1.0.0 | MXNet 1.1.0 | MXNet 1.2.1 | MXNet 1.3.0 | MXNet 1.4.0 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
| Python | 2.7 or 3.5 | 2.7 or 3.5| 2.7 or 3.5| 2.7 or 3.5| 2.7 or 3.5| 2.7 or 3.6|
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
| CUDA (GPU image only) | 9.0 | 9.0 | 9.0 | 9.0 | 9.0 | 9.2 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
| numpy | 1.13.3 | 1.13.3 | 1.13.3 | 1.14.5 | 1.14.6 | 1.16.3 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
| onnx | N/A | N/A | N/A | 1.2.1 | 1.2.1 | 1.4.1 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
| keras-mxnet | N/A | N/A | N/A | N/A | 2.2.2 | 2.2.4.1 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+
| Dependencies | MXNet 0.12.1 | MXNet 1.0.0 | MXNet 1.1.0 | MXNet 1.2.1 | MXNet 1.3.0 | MXNet 1.4.0 | MXNet 1.4.1 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+
| Python | 2.7 or 3.5 | 2.7 or 3.5| 2.7 or 3.5| 2.7 or 3.5| 2.7 or 3.5| 2.7 or 3.6| 2.7 or 3.6|
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+
| CUDA (GPU image only) | 9.0 | 9.0 | 9.0 | 9.0 | 9.0 | 9.2 | 10.0 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+
| numpy | 1.13.3 | 1.13.3 | 1.13.3 | 1.14.5 | 1.14.6 | 1.16.3 | 1.14.5 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+
| onnx | N/A | N/A | N/A | 1.2.1 | 1.2.1 | 1.4.1 | 1.4.1 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+
| keras-mxnet | N/A | N/A | N/A | N/A | 2.2.2 | 2.2.4.1 | 2.2.4.1 |
+-------------------------+--------------+-------------+-------------+-------------+-------------+-------------+-------------+

The Docker images extend Ubuntu 16.04.

You can select version of MXNet by passing a ``framework_version`` keyword arg to the MXNet Estimator constructor. Currently supported versions are listed in the above table. You can also set ``framework_version`` to only specify major and minor version, e.g ``1.2``, which will cause your training script to be run on the latest supported patch version of that minor version, which in this example would be 1.2.1.
You can select version of MXNet by passing a ``framework_version`` keyword arg to the MXNet Estimator constructor. Currently supported versions are listed in the above table. You can also set ``framework_version`` to only specify major and minor version, e.g ``1.4``, which will cause your training script to be run on the latest supported patch version of that minor version, which in this example would be 1.4.1.
Alternatively, you can build your own image by following the instructions in the SageMaker MXNet containers repository, and passing ``image_name`` to the MXNet Estimator constructor.

You can visit the SageMaker MXNet container repositories here:
Expand Down
2 changes: 1 addition & 1 deletion src/sagemaker/mxnet/estimator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class MXNet(Framework):
__framework_name__ = "mxnet"
_LOWEST_SCRIPT_MODE_VERSION = ["1", "3"]

LATEST_VERSION = "1.4"
LATEST_VERSION = "1.4.1"
"""The latest version of MXNet included in the SageMaker pre-built Docker images."""

def __init__(
Expand Down
1 change: 1 addition & 0 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ def chainer_version(request):
"1.3.0",
"1.4",
"1.4.0",
"1.4.1",
],
)
def mxnet_version(request):
Expand Down