feat: add SM XgBoost 1.7-1-1(#454)

Xinyun-123 · web-flow · commit ec28c4b97b18 · 2025-09-19T13:13:52.000-04:00
* feat: update python version to 3.10

* feat: update python version to 3.10
diff --git a/docker/1.7-1-1/base/Dockerfile.cpu b/docker/1.7-1-1/base/Dockerfile.cpu
@@ -26,10 +26,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 FROM nvidia/cuda:${CUDA_VERSION}-base-ubuntu${UBUNTU_VERSION}@sha256:${IMAGE_DIGEST}
 
 ARG MINICONDA_VERSION=24.7.1
-ARG CONDA_CHECKSUM=2006a61abc8b4fd04de5eb92620e1f72bada713cc84b5b4899463095e1210556
-ARG CONDA_PY_VERSION=39
+ARG CONDA_CHECKSUM=684cda724bc37e3bbbb342e440fc4cac515c92e91a489eb4359feca35382894b
+ARG CONDA_PY_VERSION=310
 ARG CONDA_PKG_VERSION=24.7.1
-ARG PYTHON_VERSION=3.9
+ARG PYTHON_VERSION=3.10
 ARG PYARROW_VERSION=14.0.1
 ARG MLIO_VERSION=0.9.0
 ARG XGBOOST_VERSION=1.7.4
diff --git a/docker/1.7-1-1/final/Dockerfile.cpu b/docker/1.7-1-1/final/Dockerfile.cpu
@@ -1,5 +1,5 @@
-ARG SAGEMAKER_XGBOOST_VERSION=1.7-1
-ARG PYTHON_VERSION=3.9
+ARG SAGEMAKER_XGBOOST_VERSION=1.7-1-1
+ARG PYTHON_VERSION=3.10
 
 FROM xgboost-container-base:${SAGEMAKER_XGBOOST_VERSION}-cpu-py3
 
@@ -11,6 +11,14 @@ ARG SAGEMAKER_XGBOOST_VERSION
 COPY requirements.txt /requirements.txt
 RUN python3 -m pip install -r /requirements.txt && rm /requirements.txt
 
+# Fix Python 3.10 compatibility for sagemaker-containers
+RUN python3 -c "import sys; sys.path.insert(0, '/miniconda3/lib/python3.10/site-packages'); \
+    import sagemaker_containers._mapping as m; \
+    import collections.abc; \
+    setattr(collections, 'Mapping', collections.abc.Mapping); \
+    exec(open('/miniconda3/lib/python3.10/site-packages/sagemaker_containers/_mapping.py').read().replace('collections.Mapping', 'collections.abc.Mapping'))" || \
+    sed -i 's/collections\.Mapping/collections.abc.Mapping/g' /miniconda3/lib/python3.10/site-packages/sagemaker_containers/_mapping.py
+
 # Install smdebug from source
 RUN python3 -m pip install git+https://github.com/awslabs/sagemaker-debugger.git@1.0.29
 
@@ -20,7 +28,8 @@ RUN python3 -m pip install git+https://github.com/awslabs/sagemaker-debugger.git
 ###########################
 COPY dist/sagemaker_xgboost_container-2.0-py2.py3-none-any.whl /sagemaker_xgboost_container-1.0-py2.py3-none-any.whl
 RUN rm -rf /miniconda3/lib/python${PYTHON_VERSION}/site-packages/numpy-1.21.2.dist-info && \
-    python3 -m pip install --no-cache /sagemaker_xgboost_container-1.0-py2.py3-none-any.whl && \
+    python3 -m pip install --force-reinstall PyYAML==6.0.1 && \
+    python3 -m pip install --no-cache --no-deps /sagemaker_xgboost_container-1.0-py2.py3-none-any.whl && \
     python3 -m pip uninstall -y typing && \
     rm /sagemaker_xgboost_container-1.0-py2.py3-none-any.whl
 
diff --git a/docker/1.7-1-1/resources/mms/ExecutionParameters.java b/docker/1.7-1-1/resources/mms/ExecutionParameters.java
diff --git a/docker/1.7-1-1/resources/mms/config.properties.tmp b/docker/1.7-1-1/resources/mms/config.properties.tmp
diff --git a/docker/1.7-1-1/resources/mms/endpoints-1.0.jar b/docker/1.7-1-1/resources/mms/endpoints-1.0.jar
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 Flask==1.1.1  # sagemaker-containers requires flask 1.1.1
-PyYAML==5.4.1
+PyYAML==6.0.1
 Pillow==9.1.1
 boto3==1.17.52
 botocore==1.20.52
@@ -8,10 +8,10 @@ dask==2022.11.1
 dask-cuda==22.12.0
 gunicorn==23.0.0
 itsdangerous==2.0.1
-matplotlib==3.4.1
+matplotlib==3.6.3
 multi-model-server==1.1.2
 numpy==1.24.1
-pandas==1.2.4
+pandas==1.4.4
 protobuf==3.20.1
 psutil==5.6.7  # sagemaker-containers requires psutil 5.6.7
 pynvml==11.4.1
@@ -20,8 +20,8 @@ retrying==1.3.3
 requests==2.29.0
 sagemaker-containers==2.8.6.post2
 sagemaker-inference==1.5.5
-scikit-learn==0.24.1
-scipy==1.8.0
+scikit-learn==1.0.2
+scipy==1.9.3
 urllib3==1.26.5
 wheel==0.36.2
 jinja2==2.11.3
diff --git a/setup.py b/setup.py
@@ -31,6 +31,7 @@ def read(fname):
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
     install_requires=read("requirements.txt"),
     extras_require={"test": read("test-requirements.txt")},
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -2,7 +2,6 @@ Flask==1.1.1  # sagemaker-containers requires flask 1.1.1
 black
 coverage
 docker==6.1.3 # docker 7.0.0 has a breaking change: https://github.com/docker/docker-py/issues/3194#issuecomment-1848950456
-docker-compose
 flake8
 isort
 mock
diff --git a/test/resources/versions/train.py b/test/resources/versions/train.py
@@ -3,28 +3,28 @@
 import pkg_resources
 
 PYTHON_MAJOR_VERSION = 3
-PYTHON_MINOR_VERSION = 9
+PYTHON_MINOR_VERSION = 10
 REQUIREMENTS = """\
 Flask==1.1.1
 Pillow==9.1.1
-PyYAML==5.4.1
+PyYAML==6.0.1
 boto3==1.17.52
 botocore==1.20.52
 conda==24.7.1
 cryptography==39.0.1
 gunicorn==23.0.0
-matplotlib==3.4.1
+matplotlib==3.6.3
 multi-model-server==1.1.2
 numpy==1.24.1
-pandas==1.2.4
+pandas==1.4.4
 psutil==5.6.7
 pyarrow==14.0.1
 python-dateutil==2.8.1
 retrying==1.3.3
 sagemaker-containers==2.8.6.post2
 sagemaker-inference==1.5.5
-scikit-learn==0.24.1
-scipy==1.8.0
+scikit-learn==1.0.2
+scipy==1.9.3
 smdebug==1.0.29
 urllib3==1.26.5
 wheel==0.36.2
