Merge branch 'master' into master

Author: rvasahu-amazon

src/sagemaker/dataset_definition/inputs.py

@@ -198,7 +198,7 @@ def __init__(
                 the path to a local directory. If not provided, skips data download
                 by SageMaker platform.
             s3_data_type (str, default="S3Prefix"): Valid options are "ManifestFile" or "S3Prefix".
-            s3_input_mode (str, default="File"): Valid options are "Pipe" or "File".
+            s3_input_mode (str, default="File"): Valid options are "Pipe", "File" or "FastFile".
             s3_data_distribution_type (str, default="FullyReplicated"):
                 Valid options are "FullyReplicated" or "ShardedByS3Key".
             s3_compression_type (str, default=None): Valid options are "None" or "Gzip".

src/sagemaker/image_uri_config/huggingface-llm.json

@@ -218,6 +218,48 @@
                 "tag_prefix": "2.0.1-tgi1.1.0",
                 "repository": "huggingface-pytorch-tgi-inference",
                 "container_version": {"gpu": "cu118-ubuntu20.04"}
+            },
+            "1.2.0": {
+                "py_versions": ["py310"],
+                "registries": {
+                    "af-south-1": "626614931356",
+                    "il-central-1": "780543022126",
+                    "ap-east-1": "871362719292",
+                    "ap-northeast-1": "763104351884",
+                    "ap-northeast-2": "763104351884",
+                    "ap-northeast-3": "364406365360",
+                    "ap-south-1": "763104351884",
+                    "ap-south-2": "772153158452",
+                    "ap-southeast-1": "763104351884",
+                    "ap-southeast-2": "763104351884",
+                    "ap-southeast-3": "907027046896",
+                    "ap-southeast-4": "457447274322",
+                    "ca-central-1": "763104351884",
+                    "cn-north-1": "727897471807",
+                    "cn-northwest-1": "727897471807",
+                    "eu-central-1": "763104351884",
+                    "eu-central-2": "380420809688",
+                    "eu-north-1": "763104351884",
+                    "eu-west-1": "763104351884",
+                    "eu-west-2": "763104351884",
+                    "eu-west-3": "763104351884",
+                    "eu-south-1": "692866216735",
+                    "eu-south-2": "503227376785",
+                    "me-south-1": "217643126080",
+                    "me-central-1": "914824155844",
+                    "sa-east-1": "763104351884",
+                    "us-east-1": "763104351884",
+                    "us-east-2": "763104351884",
+                    "us-gov-east-1": "446045086412",
+                    "us-gov-west-1": "442386744353",
+                    "us-iso-east-1": "886529160074",
+                    "us-isob-east-1": "094389454867",
+                    "us-west-1": "763104351884",
+                    "us-west-2": "763104351884"
+                },
+                "tag_prefix": "2.1.1-tgi1.2.0",
+                "repository": "huggingface-pytorch-tgi-inference",
+                "container_version": {"gpu": "cu121-ubuntu20.04"}
             }
         }
     }

src/sagemaker/image_uri_config/sagemaker-geospatial.json

@@ -0,0 +1,13 @@
+{
+    "processing": {
+      "versions": {
+        "1.x": {
+          "registries": {
+            "us-west-2": "081189585635"
+          },
+          "repository": "sagemaker-geospatial-v1-0",
+          "tag_prefix": "latest"
+        } 
+      }
+    }
+}

src/sagemaker/model_monitor/model_monitoring.py

@@ -3933,7 +3933,8 @@ def __init__(
         Args:
             endpoint_name (str): The name of the endpoint.
             destination (str): The destination of the input.
-            s3_input_mode (str): The S3 input mode. Can be one of: "File", "Pipe. Default: "File".
+            s3_input_mode (str): The S3 input mode. Can be one of: "File", "Pipe" or "FastFile".
+                Default: "File".
             s3_data_distribution_type (str): The S3 Data Distribution Type. Can be one of:
                 "FullyReplicated", "ShardedByS3Key"
             start_time_offset (str): Monitoring start time offset, e.g. "-PT1H"
@@ -4043,7 +4044,8 @@ def __init__(
             data_captured_destination_s3_uri (str): Location to the batch transform captured data
                 file which needs to be analysed.
             destination (str): The destination of the input.
-            s3_input_mode (str): The S3 input mode. Can be one of: "File", "Pipe. (default: File)
+            s3_input_mode (str): The S3 input mode. Can be one of: "File", "Pipe" or
+                "FastFile". (default: File)
             s3_data_distribution_type (str): The S3 Data Distribution Type. Can be one of:
                 "FullyReplicated", "ShardedByS3Key" (default: FullyReplicated)
             start_time_offset (str): Monitoring start time offset, e.g. "-PT1H" (default: None)

src/sagemaker/processing.py

@@ -1242,7 +1242,7 @@ def __init__(
             input_name (str or PipelineVariable): The name for the input. If a name
                 is not provided, one will be generated (eg. "input-1").
             s3_data_type (str or PipelineVariable): Valid options are "ManifestFile" or "S3Prefix".
-            s3_input_mode (str or PipelineVariable): Valid options are "Pipe" or "File".
+            s3_input_mode (str or PipelineVariable): Valid options are "Pipe", "File" or "FastFile".
             s3_data_distribution_type (str or PipelineVariable): Valid options are "FullyReplicated"
                 or "ShardedByS3Key".
             s3_compression_type (str or PipelineVariable): Valid options are "None" or "Gzip".

tests/unit/sagemaker/image_uris/expected_uris.py

@@ -59,6 +59,11 @@ def monitor_uri(account, region=REGION):
     return MONITOR_URI_FORMAT.format(account, region, domain)
 
 
+def algo_uri_with_tag(algo, account, region, tag):
+    domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
+    return IMAGE_URI_FORMAT.format(account, region, domain, algo, tag)
+
+
 def graviton_framework_uri(
     repo,
     fw_version,

tests/unit/sagemaker/image_uris/test_huggingface_llm.py

@@ -24,6 +24,7 @@
     "0.9.3": "2.0.1-tgi0.9.3-gpu-py39-cu118-ubuntu20.04",
     "1.0.3": "2.0.1-tgi1.0.3-gpu-py39-cu118-ubuntu20.04",
     "1.1.0": "2.0.1-tgi1.1.0-gpu-py39-cu118-ubuntu20.04",
+    "1.2.0": "2.1.1-tgi1.2.0-gpu-py310-cu121-ubuntu20.04",
 }
 
 

tests/unit/sagemaker/image_uris/test_sagemaker_geospatial.py

@@ -0,0 +1,55 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+from __future__ import absolute_import
+
+import pytest
+from sagemaker import image_uris
+from tests.unit.sagemaker.image_uris import expected_uris
+
+
+def _test_ecr_uri(account, region, version, tag):
+    actual_uri = image_uris.retrieve("sagemaker-geospatial", region=region, version=version)
+    expected_uri = expected_uris.algo_uri_with_tag(
+        "sagemaker-geospatial-v1-0",
+        account,
+        region,
+        tag=tag,
+    )
+    return expected_uri == actual_uri
+
+
+@pytest.mark.parametrize("load_config", ["sagemaker-geospatial.json"], indirect=True)
+@pytest.mark.parametrize("extract_versions_for_image_scope", ["processing"], indirect=True)
+def test_sagemaker_geospatial_ecr_uri(load_config, extract_versions_for_image_scope):
+    VERSIONS = extract_versions_for_image_scope
+    for version in VERSIONS:
+        SAGEMAKER_GEOSPATIAL_ACCOUNTS = load_config["processing"]["versions"][version]["registries"]
+        for region in SAGEMAKER_GEOSPATIAL_ACCOUNTS.keys():
+
+            assert _test_ecr_uri(
+                account=SAGEMAKER_GEOSPATIAL_ACCOUNTS[region],
+                region=region,
+                version=version,
+                tag="latest",
+            )
+
+
+@pytest.mark.parametrize("load_config", ["sagemaker-geospatial.json"], indirect=True)
+def test_sagemaker_geospatial_ecr_uri_no_version(load_config):
+    region = "us-west-2"
+    SAGEMAKER_GEOSPATIAL_ACCOUNTS = load_config["processing"]["versions"]["1.x"]["registries"]
+    actual_uri = image_uris.retrieve("sagemaker-geospatial", region=region)
+    expected_uri = expected_uris.algo_uri_with_tag(
+        "sagemaker-geospatial-v1-0", SAGEMAKER_GEOSPATIAL_ACCOUNTS[region], region, tag="latest"
+    )
+    assert expected_uri == actual_uri