Skip to content

Commit bf2f329

Browse files
pranavvm26pranavvm26
authored
Merge branch 'aws:master' into master
2 parents c235f9a + 2f8ed41 commit bf2f329

File tree

8 files changed

+109
-12
lines changed

8 files changed

+109
-12
lines changed

‎doc/overview.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,6 +2565,9 @@ set default values for. For the full schema, see `sagemaker.config.config_schema
25652565
      KmsKeyId: 'kmskeyid10'
25662566
    TransformResources:
25672567
      VolumeKmsKeyId: 'volumekmskeyid4'
2568+
Tags:
2569+
    - Key: 'tag_key'
2570+
      Value: 'tag_value
25682571
  CompilationJob:
25692572
  # https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_CreateCompilationJob.html
25702573
    OutputConfig:

‎src/sagemaker/image_uri_config/spark.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"ap-southeast-2": "440695851116",
2121
"ap-southeast-3": "800295151634",
2222
"ap-southeast-4": "819679513684",
23+
"ap-southeast-5": "841784149062",
2324
"ca-central-1": "446299261295",
2425
"ca-west-1": "000907499111",
2526
"cn-north-1": "671472414489",
@@ -61,6 +62,7 @@
6162
"ap-southeast-2": "440695851116",
6263
"ap-southeast-3": "800295151634",
6364
"ap-southeast-4": "819679513684",
65+
"ap-southeast-5": "841784149062",
6466
"ca-central-1": "446299261295",
6567
"ca-west-1": "000907499111",
6668
"cn-north-1": "671472414489",
@@ -102,6 +104,7 @@
102104
"ap-southeast-2": "440695851116",
103105
"ap-southeast-3": "800295151634",
104106
"ap-southeast-4": "819679513684",
107+
"ap-southeast-5": "841784149062",
105108
"ca-central-1": "446299261295",
106109
"ca-west-1": "000907499111",
107110
"cn-north-1": "671472414489",
@@ -143,6 +146,7 @@
143146
"ap-southeast-2": "440695851116",
144147
"ap-southeast-3": "800295151634",
145148
"ap-southeast-4": "819679513684",
149+
"ap-southeast-5": "841784149062",
146150
"ca-central-1": "446299261295",
147151
"ca-west-1": "000907499111",
148152
"cn-north-1": "671472414489",
@@ -184,6 +188,7 @@
184188
"ap-southeast-2": "440695851116",
185189
"ap-southeast-3": "800295151634",
186190
"ap-southeast-4": "819679513684",
191+
"ap-southeast-5": "841784149062",
187192
"ca-central-1": "446299261295",
188193
"ca-west-1": "000907499111",
189194
"cn-north-1": "671472414489",

‎src/sagemaker/image_uri_config/tensorflow.json

Lines changed: 85 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,8 @@
332332
"2.12": "2.12.1",
333333
"2.13": "2.13.0",
334334
"2.14": "2.14.1",
335-
"2.16": "2.16.1"
335+
"2.16": "2.16.1",
336+
"2.18": "2.18.0"
336337
},
337338
"versions": {
338339
"1.4.1": {
@@ -2267,6 +2268,45 @@
22672268
"us-west-2": "763104351884"
22682269
},
22692270
"repository": "tensorflow-inference"
2271+
},
2272+
"2.18.0": {
2273+
"registries": {
2274+
"af-south-1": "626614931356",
2275+
"ap-east-1": "871362719292",
2276+
"ap-northeast-1": "763104351884",
2277+
"ap-northeast-2": "763104351884",
2278+
"ap-northeast-3": "364406365360",
2279+
"ap-south-1": "763104351884",
2280+
"ap-south-2": "772153158452",
2281+
"ap-southeast-1": "763104351884",
2282+
"ap-southeast-2": "763104351884",
2283+
"ap-southeast-3": "907027046896",
2284+
"ap-southeast-4": "457447274322",
2285+
"ap-southeast-5": "550225433462",
2286+
"ca-central-1": "763104351884",
2287+
"ca-west-1": "204538143572",
2288+
"cn-north-1": "727897471807",
2289+
"cn-northwest-1": "727897471807",
2290+
"eu-central-1": "763104351884",
2291+
"eu-central-2": "380420809688",
2292+
"eu-north-1": "763104351884",
2293+
"eu-south-1": "692866216735",
2294+
"eu-south-2": "503227376785",
2295+
"eu-west-1": "763104351884",
2296+
"eu-west-2": "763104351884",
2297+
"eu-west-3": "763104351884",
2298+
"il-central-1": "780543022126",
2299+
"me-central-1": "914824155844",
2300+
"me-south-1": "217643126080",
2301+
"sa-east-1": "763104351884",
2302+
"us-east-1": "763104351884",
2303+
"us-east-2": "763104351884",
2304+
"us-gov-east-1": "446045086412",
2305+
"us-gov-west-1": "442386744353",
2306+
"us-west-1": "763104351884",
2307+
"us-west-2": "763104351884"
2308+
},
2309+
"repository": "tensorflow-inference"
22702310
}
22712311
}
22722312
},
@@ -2550,7 +2590,8 @@
25502590
"2.12": "2.12.0",
25512591
"2.13": "2.13.0",
25522592
"2.14": "2.14.1",
2553-
"2.16": "2.16.2"
2593+
"2.16": "2.16.2",
2594+
"2.18": "2.18.0"
25542595
},
25552596
"versions": {
25562597
"1.4.1": {
@@ -4570,6 +4611,48 @@
45704611
"us-west-2": "763104351884"
45714612
},
45724613
"repository": "tensorflow-training"
4614+
},
4615+
"2.18.0": {
4616+
"py_versions": [
4617+
"py310"
4618+
],
4619+
"registries": {
4620+
"af-south-1": "626614931356",
4621+
"ap-east-1": "871362719292",
4622+
"ap-northeast-1": "763104351884",
4623+
"ap-northeast-2": "763104351884",
4624+
"ap-northeast-3": "364406365360",
4625+
"ap-south-1": "763104351884",
4626+
"ap-south-2": "772153158452",
4627+
"ap-southeast-1": "763104351884",
4628+
"ap-southeast-2": "763104351884",
4629+
"ap-southeast-3": "907027046896",
4630+
"ap-southeast-4": "457447274322",
4631+
"ap-southeast-5": "550225433462",
4632+
"ca-central-1": "763104351884",
4633+
"ca-west-1": "204538143572",
4634+
"cn-north-1": "727897471807",
4635+
"cn-northwest-1": "727897471807",
4636+
"eu-central-1": "763104351884",
4637+
"eu-central-2": "380420809688",
4638+
"eu-north-1": "763104351884",
4639+
"eu-south-1": "692866216735",
4640+
"eu-south-2": "503227376785",
4641+
"eu-west-1": "763104351884",
4642+
"eu-west-2": "763104351884",
4643+
"eu-west-3": "763104351884",
4644+
"il-central-1": "780543022126",
4645+
"me-central-1": "914824155844",
4646+
"me-south-1": "217643126080",
4647+
"sa-east-1": "763104351884",
4648+
"us-east-1": "763104351884",
4649+
"us-east-2": "763104351884",
4650+
"us-gov-east-1": "446045086412",
4651+
"us-gov-west-1": "442386744353",
4652+
"us-west-1": "763104351884",
4653+
"us-west-2": "763104351884"
4654+
},
4655+
"repository": "tensorflow-training"
45734656
}
45744657
}
45754658
}

‎src/sagemaker/local/image.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,12 @@ def write_processing_config_files(
476476
"""
477477
config_path = os.path.join(self.container_root, host, "config")
478478

479-
resource_config = {"current_host": host, "hosts": self.hosts}
479+
resource_config = {
480+
"current_host": host,
481+
"hosts": self.hosts,
482+
"network_interface_name": "eth0",
483+
"current_instance_type": self.instance_type,
484+
}
480485
_write_json_file(os.path.join(config_path, "resourceconfig.json"), resource_config)
481486

482487
processing_job_config = {
@@ -522,7 +527,12 @@ def write_config_files(self, host, hyperparameters, input_data_config):
522527
"""
523528
config_path = os.path.join(self.container_root, host, "input", "config")
524529

525-
resource_config = {"current_host": host, "hosts": self.hosts}
530+
resource_config = {
531+
"current_host": host,
532+
"hosts": self.hosts,
533+
"network_interface_name": "eth0",
534+
"current_instance_type": self.instance_type,
535+
}
526536

527537
json_input_data_config = {}
528538
for c in input_data_config:

‎tests/integ/sagemaker/workflow/test_model_create_and_registration.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import pytest
2727

2828
from packaging.version import Version
29-
from packaging.specifiers import SpecifierSet
3029

3130
from sagemaker.model_card.model_card import ModelCard, ModelOverview, ModelPackageModelCard
3231
from sagemaker.model_card.schema_constraints import ModelCardStatusEnum
@@ -1422,7 +1421,7 @@ def test_model_registration_with_tensorflow_model_with_pipeline_model(
14221421
pipeline_name,
14231422
region_name,
14241423
):
1425-
if Version(tf_full_version) in SpecifierSet("==2.16.*"):
1424+
if Version(tf_full_version) >= Version("2.16"):
14261425
pytest.skip(
14271426
"This test is failing in TensorFlow 2.16 beacuse of an upstream bug: "
14281427
"https://github.com/tensorflow/io/issues/2039"

‎tests/integ/sagemaker/workflow/test_model_steps.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import pytest
1919

2020
from packaging.version import Version
21-
from packaging.specifiers import SpecifierSet
2221

2322
from tests.integ.sagemaker.workflow.helpers import wait_pipeline_execution
2423
from sagemaker.workflow.fail_step import FailStep
@@ -592,7 +591,7 @@ def test_model_registration_with_drift_check_baselines_and_model_metrics(
592591
def test_model_registration_with_tensorflow_model_with_pipeline_model(
593592
pipeline_session, role, tf_full_version, tf_full_py_version, pipeline_name
594593
):
595-
if Version(tf_full_version) in SpecifierSet("==2.16.*"):
594+
if Version(tf_full_version) >= Version("2.16"):
596595
pytest.skip(
597596
"This test is failing in TensorFlow 2.16 beacuse of an upstream bug: "
598597
"https://github.com/tensorflow/io/issues/2039"

‎tests/integ/sagemaker/workflow/test_training_steps.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import pytest
2020

2121
from packaging.version import Version
22-
from packaging.specifiers import SpecifierSet
2322

2423
from tests.integ.sagemaker.workflow.helpers import wait_pipeline_execution
2524
from sagemaker import TrainingInput, get_execution_role, utils, image_uris
@@ -238,7 +237,7 @@ def test_training_step_with_output_path_as_join(
238237
def test_tensorflow_training_step_with_parameterized_code_input(
239238
pipeline_session, role, tf_full_version, tf_full_py_version, pipeline_name
240239
):
241-
if Version(tf_full_version) in SpecifierSet("==2.16.*"):
240+
if Version(tf_full_version) >= Version("2.16"):
242241
pytest.skip(
243242
"This test is failing in TensorFlow 2.16 beacuse of an upstream bug: "
244243
"https://github.com/tensorflow/io/issues/2039"

‎tests/integ/test_transformer.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import pytest
2020

2121
from packaging.version import Version
22-
from packaging.specifiers import SpecifierSet
2322

2423
from sagemaker import KMeans, s3, get_execution_role
2524
from sagemaker.mxnet import MXNet
@@ -556,7 +555,7 @@ def test_transform_mxnet_logs(
556555
def test_transform_tf_kms_network_isolation(
557556
sagemaker_session, cpu_instance_type, tmpdir, tf_full_version, tf_full_py_version
558557
):
559-
if Version(tf_full_version) in SpecifierSet("==2.16.*"):
558+
if Version(tf_full_version) >= Version("2.16"):
560559
pytest.skip(
561560
"This test is failing in TensorFlow 2.16 beacuse of an upstream bug: "
562561
"https://github.com/tensorflow/io/issues/2039"

0 commit comments

Comments
 (0)