Skip to content

Commit 0ab3af9

Browse files
metrizableDan Choi
authored andcommitted
feature: add mxnet 1.8 to image uris (#540)
1 parent 7283ec0 commit 0ab3af9

File tree

3 files changed

+77
-4
lines changed

3 files changed

+77
-4
lines changed

src/sagemaker/image_uri_config/mxnet.json

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"1.2": "1.2.1",
99
"1.3": "1.3.0",
1010
"1.4": "1.4.1",
11-
"1.6": "1.6.0"
11+
"1.6": "1.6.0",
12+
"1.7": "1.7.0",
13+
"1.8": "1.8.0"
1214
},
1315
"versions": {
1416
"0.12.1": {
@@ -310,6 +312,36 @@
310312
},
311313
"repository": "mxnet-training",
312314
"py_versions": ["py3"]
315+
},
316+
"1.8.0": {
317+
"registries": {
318+
"af-south-1": "626614931356",
319+
"ap-east-1": "871362719292",
320+
"ap-northeast-1": "763104351884",
321+
"ap-northeast-2": "763104351884",
322+
"ap-south-1": "763104351884",
323+
"ap-southeast-1": "763104351884",
324+
"ap-southeast-2": "763104351884",
325+
"ca-central-1": "763104351884",
326+
"cn-north-1": "727897471807",
327+
"cn-northwest-1": "727897471807",
328+
"eu-central-1": "763104351884",
329+
"eu-north-1": "763104351884",
330+
"eu-west-1": "763104351884",
331+
"eu-west-2": "763104351884",
332+
"eu-west-3": "763104351884",
333+
"eu-south-1": "692866216735",
334+
"me-south-1": "217643126080",
335+
"sa-east-1": "763104351884",
336+
"us-east-1": "763104351884",
337+
"us-east-2": "763104351884",
338+
"us-gov-west-1": "442386744353",
339+
"us-iso-east-1": "886529160074",
340+
"us-west-1": "763104351884",
341+
"us-west-2": "763104351884"
342+
},
343+
"repository": "mxnet-training",
344+
"py_versions": ["py37"]
313345
}
314346
}
315347
},
@@ -624,6 +656,36 @@
624656
},
625657
"repository": "mxnet-inference",
626658
"py_versions": ["py3"]
659+
},
660+
"1.8.0": {
661+
"registries": {
662+
"af-south-1": "626614931356",
663+
"ap-east-1": "871362719292",
664+
"ap-northeast-1": "763104351884",
665+
"ap-northeast-2": "763104351884",
666+
"ap-south-1": "763104351884",
667+
"ap-southeast-1": "763104351884",
668+
"ap-southeast-2": "763104351884",
669+
"ca-central-1": "763104351884",
670+
"cn-north-1": "727897471807",
671+
"cn-northwest-1": "727897471807",
672+
"eu-central-1": "763104351884",
673+
"eu-north-1": "763104351884",
674+
"eu-west-1": "763104351884",
675+
"eu-west-2": "763104351884",
676+
"eu-west-3": "763104351884",
677+
"eu-south-1": "692866216735",
678+
"me-south-1": "217643126080",
679+
"sa-east-1": "763104351884",
680+
"us-east-1": "763104351884",
681+
"us-east-2": "763104351884",
682+
"us-gov-west-1": "442386744353",
683+
"us-iso-east-1": "886529160074",
684+
"us-west-1": "763104351884",
685+
"us-west-2": "763104351884"
686+
},
687+
"repository": "mxnet-inference",
688+
"py_versions": ["py37"]
627689
}
628690
}
629691
},

tests/conftest.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ def chainer_py_version(request):
140140
def mxnet_inference_py_version(mxnet_inference_version, request):
141141
if Version(mxnet_inference_version) < Version("1.7.0"):
142142
return request.param
143+
elif Version(mxnet_inference_version) == Version("1.8.0"):
144+
return "py37"
143145
else:
144146
return "py3"
145147

@@ -148,6 +150,8 @@ def mxnet_inference_py_version(mxnet_inference_version, request):
148150
def mxnet_training_py_version(mxnet_training_version, request):
149151
if Version(mxnet_training_version) < Version("1.7.0"):
150152
return request.param
153+
elif Version(mxnet_training_version) == Version("1.8.0"):
154+
return "py37"
151155
else:
152156
return "py3"
153157

tests/unit/test_mxnet.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -664,9 +664,16 @@ def test_model_prepare_container_def_no_instance_type_or_image(
664664

665665

666666
def test_attach(sagemaker_session, mxnet_training_version, mxnet_training_py_version):
667-
training_image = "1.dkr.ecr.us-west-2.amazonaws.com/sagemaker-mxnet-{0}-cpu:{1}-cpu-{0}".format(
668-
mxnet_training_py_version, mxnet_training_version
669-
)
667+
if mxnet_training_py_version == "py37":
668+
training_image = "1.dkr.ecr.us-west-2.amazonaws.com/mxnet-training:{1}-cpu-{0}".format(
669+
mxnet_training_py_version, mxnet_training_version
670+
)
671+
else:
672+
training_image = (
673+
"1.dkr.ecr.us-west-2.amazonaws.com/sagemaker-mxnet-{0}-cpu:{1}-cpu-{0}".format(
674+
mxnet_training_py_version, mxnet_training_version
675+
)
676+
)
670677
returned_job_description = {
671678
"AlgorithmSpecification": {"TrainingInputMode": "File", "TrainingImage": training_image},
672679
"HyperParameters": {

0 commit comments

Comments
 (0)