Merge branch 'aws:master' into master

Author: varunmoris

huggingface/pytorch/inference/buildspec.yml

@@ -35,7 +35,7 @@ images:
     python_version: &DOCKER_PYTHON_VERSION py3
     tag_python_version: &TAG_PYTHON_VERSION py311
     os_version: &OS_VERSION ubuntu22.04
-    transformers_version: &TRANSFORMERS_VERSION 4.46.1
+    transformers_version: &TRANSFORMERS_VERSION 4.48.0
     tag: !join [ *VERSION, '-', 'transformers', *TRANSFORMERS_VERSION, '-', *DEVICE_TYPE, '-', *TAG_PYTHON_VERSION, '-', *OS_VERSION ]
     docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /Dockerfile., *DEVICE_TYPE ]
     context:
@@ -48,8 +48,8 @@ images:
     python_version: &DOCKER_PYTHON_VERSION py3
     tag_python_version: &TAG_PYTHON_VERSION py311
     cuda_version: &CUDA_VERSION cu121
-    os_version: &OS_VERSION ubuntu20.04
-    transformers_version: &TRANSFORMERS_VERSION 4.46.1
+    os_version: &OS_VERSION ubuntu22.04
+    transformers_version: &TRANSFORMERS_VERSION 4.48.0
     tag: !join [ *VERSION, '-', 'transformers', *TRANSFORMERS_VERSION, '-', *DEVICE_TYPE, '-', *TAG_PYTHON_VERSION, '-',
                  *CUDA_VERSION, '-', *OS_VERSION ]
     docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /,

huggingface/pytorch/inference/docker/2.3/py3/Dockerfile.cpu

@@ -1,13 +1,13 @@
 FROM ubuntu:22.04 AS base_image
 
 LABEL maintainer="Amazon AI"
-LABEL dlc_major_version="1"
+LABEL dlc_major_version="2"
 LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true
 LABEL com.amazonaws.sagemaker.capabilities.multi-models=true
 
 ARG PYTHON=python3
 ARG PYTHON_VERSION=3.11.9
-ARG MINIFORGE3_VERSION=23.11.0-0
+ARG MINIFORGE3_VERSION=24.11.0-0
 ARG OPEN_MPI_VERSION=4.1.5
 ARG MMS_VERSION=1.1.11
 

huggingface/pytorch/inference/docker/2.3/py3/cu121/Dockerfile.gpu

@@ -1,15 +1,15 @@
-FROM nvidia/cuda:12.1.1-base-ubuntu20.04 AS base_image
+FROM nvidia/cuda:12.1.1-base-ubuntu22.04 AS base_image
 
 LABEL maintainer="Amazon AI"
-LABEL dlc_major_version="1"
+LABEL dlc_major_version="2"
 LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true
 LABEL com.amazonaws.sagemaker.capabilities.multi-models=true
 LABEL com.amazonaws.sagemaker.inference.cuda.verified_versions=12.2
 
 ARG MMS_VERSION=1.1.11
 ARG PYTHON=python3
 ARG PYTHON_VERSION=3.11.9
-ARG MINIFORGE3_VERSION=23.11.0-0
+ARG MINIFORGE3_VERSION=24.11.0-0
 ARG OPEN_MPI_VERSION=4.1.5
 
 # Nvidia software versions
@@ -85,7 +85,6 @@ RUN apt-get update \
     libnuma1 \
     libnuma-dev \
     libsm6 \
-    libssl1.1 \
     libssl-dev \
     libxext6 \
     libxrender-dev \

release_images_inference.yml

@@ -149,11 +149,11 @@ release_images:
     framework: "huggingface_pytorch"
     version: "2.3.0"
     arch_type: "x86"
-    hf_transformers: "4.46.1"
+    hf_transformers: "4.48.0"
     inference:
       device_types: ["gpu" ]
       python_versions: [ "py311" ]
-      os_version: "ubuntu20.04"
+      os_version: "ubuntu22.04"
       cuda_version: "cu121"
       example: False
       disable_sm_tag: True
@@ -162,7 +162,7 @@ release_images:
     framework: "huggingface_pytorch"
     version: "2.3.0"
     arch_type: "x86"
-    hf_transformers: "4.46.1"
+    hf_transformers: "4.48.0"
     inference:
       device_types: [ "cpu" ]
       python_versions: [ "py311" ]

src/patch_helper.py

@@ -305,9 +305,6 @@ def initiate_multithreaded_autopatch_prep(PRE_PUSH_STAGE_IMAGES, make_dummy_boto
         f"""pip install -r {os.path.join(os.sep, get_cloned_folder_path(), "test", "requirements.txt")}""",
         hide=False,
     )
-    # temporary workaround for breaking boto3 version
-    run("pip uninstall -y boto3 botocore s3transfer")
-    run("pip install boto3==1.35.75")  # minimum required version for sagemaker dependency currently
 
     folder_path_outside_clone = os.path.join(os.sep, *get_cloned_folder_path().split(os.sep)[:-1])
     download_path = os.path.join(os.sep, folder_path_outside_clone, "patch-dlc")

src/requirements.txt

@@ -1,12 +1,12 @@
+awscli==1.37.6
+boto3==1.36.6
+fabric
+invoke
 wheel==0.44.0
 docker==4.2.0
-fabric==2.5.0
-#unpin when fabric releases v3.1 Related Issue https://github.com/fabric/fabric/issues/2263
-invoke<2.1.0
 pyfiglet==0.8.post1
 reprint==0.5.2
 ruamel.yaml==0.18.10
-boto3>=1.33
 black==23.3.0
 junit-xml==1.9
 toml==0.10.2

tensorflow/inference/buildspec-2-18-ec2.yml

@@ -5,7 +5,7 @@ framework: &FRAMEWORK tensorflow
 version: &VERSION 2.18.0
 short_version: &SHORT_VERSION 2.18
 arch_type: x86
-# autopatch_build: "True"
+autopatch_build: "True"
 
 repository_info:
   inference_repository: &INFERENCE_REPOSITORY

tensorflow/inference/buildspec-2-18-sm.yml

@@ -5,7 +5,7 @@ framework: &FRAMEWORK tensorflow
 version: &VERSION 2.18.0
 short_version: &SHORT_VERSION 2.18
 arch_type: x86
-# autopatch_build: "True"
+autopatch_build: "True"
 
 repository_info:
   inference_repository: &INFERENCE_REPOSITORY

tensorflow/inference/docker/2.18/py3/Dockerfile.ec2.cpu.core_packages.json

@@ -0,0 +1,18 @@
+{
+    "protobuf":{
+        "version_specifier": ">=3.20.3,<5.0.0dev,!=4.21.5,!=4.21.4,!=4.21.3,!=4.21.2,!=4.21.1,!=4.21.0"
+    },
+    "cython":{
+        "version_specifier": "<3.0"
+    },
+    "awscli":{
+        "version_specifier": "<2"
+    },
+    "tensorflow-serving-api":{
+        "version_specifier": "==2.18.0",
+        "skip":"True"
+    },
+    "urllib3": {
+        "version_specifier": ">=2.0.7"
+    }
+}

tensorflow/inference/docker/2.18/py3/Dockerfile.sagemaker.cpu.core_packages.json

@@ -0,0 +1,24 @@
+{
+    "protobuf":{
+        "version_specifier": ">=3.20.3,<5.0.0dev,!=4.21.5,!=4.21.4,!=4.21.3,!=4.21.2,!=4.21.1,!=4.21.0"
+    },
+    "cython":{
+        "version_specifier": "<3.0"
+    },
+    "awscli":{
+        "version_specifier": "<2"
+    },
+    "tensorflow-serving-api":{
+        "version_specifier": "==2.18.0",
+        "skip":"True"
+    },
+    "falcon":{
+        "version_specifier": "==3.1.0"
+    },
+    "gunicorn":{
+        "version_specifier": ">=22.0.0"
+    },
+    "urllib3": {
+        "version_specifier": ">=2.0.7"
+    }
+}