From 8961b1c898ff1fc833092ecdf4caa12b5738159d Mon Sep 17 00:00:00 2001 From: Cho Date: Mon, 20 Feb 2023 12:28:42 -0500 Subject: [PATCH] Build Fixes --- docker/1.0-1/base/Dockerfile.cpu | 2 +- docker/1.0-1/base/Dockerfile_arm.cpu | 2 +- docker/1.0-1/final/Dockerfile_arm.cpu | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/1.0-1/base/Dockerfile.cpu b/docker/1.0-1/base/Dockerfile.cpu index ce04dd1f..fab320f7 100644 --- a/docker/1.0-1/base/Dockerfile.cpu +++ b/docker/1.0-1/base/Dockerfile.cpu @@ -99,7 +99,7 @@ RUN echo "conda ${CONDA_PKG_VERSION}" >> /miniconda3/conda-meta/pinned && \ python3 setup.py bdist_wheel && \ python3 -m pip install --upgrade pip && \ python3 -m pip install dist/*.whl && \ - cp -r /tmp/mlio/build/third-party/lib/intel64/gcc4.7/* /usr/local/lib/ && \ + cp -r /tmp/mlio/build/third-party/lib/libtbb* /usr/local/lib/ && \ ldconfig && \ rm -rf /tmp/mlio diff --git a/docker/1.0-1/base/Dockerfile_arm.cpu b/docker/1.0-1/base/Dockerfile_arm.cpu index b6fea28d..18bdfde6 100644 --- a/docker/1.0-1/base/Dockerfile_arm.cpu +++ b/docker/1.0-1/base/Dockerfile_arm.cpu @@ -8,7 +8,7 @@ ARG CONDA_PY_VERSION=38 ARG CONDA_PKG_VERSION=4.10.1 ARG PYTHON_VERSION=3.8.13 ARG PYARROW_VERSION=10.0.1 -ARG MLIO_VERSION=0.8.0 +ARG MLIO_VERSION=v0.8.0 # Install python and other scikit-learn runtime dependencies # Dependency list from http://scikit-learn.org/stable/developers/advanced_installation.html#installing-build-dependencies diff --git a/docker/1.0-1/final/Dockerfile_arm.cpu b/docker/1.0-1/final/Dockerfile_arm.cpu index 31020efa..75b07d51 100644 --- a/docker/1.0-1/final/Dockerfile_arm.cpu +++ b/docker/1.0-1/final/Dockerfile_arm.cpu @@ -8,9 +8,9 @@ RUN python -m pip install -r /requirements.txt && \ rm /requirements.txt COPY dist/sagemaker_sklearn_container-2.0-py3-none-any.whl /sagemaker_sklearn_container-2.0-py3-none-any.whl -# # https://github.com/googleapis/google-cloud-python/issues/6647 -RUN rm -rf /miniconda3/lib/python3.7/site-packages/numpy-1.19.4.dist-info && \ - pip install --no-cache /sagemaker_sklearn_container-2.0-py3-none-any.whl && \ +RUN rm /miniconda3/lib/python3.8/site-packages/**/REQUESTED && \ + rm /miniconda3/lib/python3.8/site-packages/**/direct_url.json +RUN pip install --no-cache /sagemaker_sklearn_container-2.0-py3-none-any.whl && \ rm /sagemaker_sklearn_container-2.0-py3-none-any.whl ENV SAGEMAKER_TRAINING_MODULE sagemaker_sklearn_container.training:main