From a880f58c9aa4bb85bf940f73de63e9bfd303e358 Mon Sep 17 00:00:00 2001 From: Gokul A <166456257+nargokul@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:22:37 -0800 Subject: [PATCH 1/4] Cloudpickle Revert --- pyproject.toml | 2 +- requirements/extras/test_requirements.txt | 2 +- src/sagemaker/serve/utils/conda_in_process.yml | 2 +- src/sagemaker/serve/utils/in_process_requirements.txt | 2 +- tests/data/serve_resources/mlflow/pytorch/requirements.txt | 2 +- tests/data/serve_resources/mlflow/tensorflow/requirements.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9ad30d20a1..12f068c230 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ classifiers = [ dependencies = [ "attrs>=23.1.0,<24", "boto3>=1.35.75,<2.0", - "cloudpickle>=2.2.1", + "cloudpickle==2.2.1", "docker", "fastapi", "google-pasta", diff --git a/requirements/extras/test_requirements.txt b/requirements/extras/test_requirements.txt index 9664a63e1d..fe31300c22 100644 --- a/requirements/extras/test_requirements.txt +++ b/requirements/extras/test_requirements.txt @@ -24,7 +24,7 @@ Jinja2==3.1.4 pyvis==0.2.1 pandas==1.4.4 scikit-learn==1.3.0 -cloudpickle>=2.2.1 +cloudpickle==2.2.1 jsonpickle<4.0.0 PyYAML==6.0 # TODO find workaround diff --git a/src/sagemaker/serve/utils/conda_in_process.yml b/src/sagemaker/serve/utils/conda_in_process.yml index 7336130118..61badaa52f 100644 --- a/src/sagemaker/serve/utils/conda_in_process.yml +++ b/src/sagemaker/serve/utils/conda_in_process.yml @@ -39,7 +39,7 @@ dependencies: - certifi==2022.12.7 - charset-normalizer>=3.1.0 - click>=8.1.3 - - cloudpickle>=2.2.1 + - cloudpickle==2.2.1 - colorama>=0.4.4 - contextlib2>=21.6.0 - decorator>=5.1.1 diff --git a/src/sagemaker/serve/utils/in_process_requirements.txt b/src/sagemaker/serve/utils/in_process_requirements.txt index 5a620937eb..e356e1720d 100644 --- a/src/sagemaker/serve/utils/in_process_requirements.txt +++ b/src/sagemaker/serve/utils/in_process_requirements.txt @@ -7,7 +7,7 @@ cachetools>=5.3.0 certifi==2024.7.4 charset-normalizer>=3.1.0 click>=8.1.3 -cloudpickle>=2.2.1 +cloudpickle==2.2.1 colorama>=0.4.4 contextlib2>=21.6.0 decorator>=5.1.1 diff --git a/tests/data/serve_resources/mlflow/pytorch/requirements.txt b/tests/data/serve_resources/mlflow/pytorch/requirements.txt index 12bae64c99..0446ed5053 100644 --- a/tests/data/serve_resources/mlflow/pytorch/requirements.txt +++ b/tests/data/serve_resources/mlflow/pytorch/requirements.txt @@ -1,7 +1,7 @@ mlflow==2.13.2 astunparse==1.6.3 cffi==1.16.0 -cloudpickle>=2.2.1 +cloudpickle==2.2.1 defusedxml==0.7.1 dill==0.3.8 gmpy2==2.1.2 diff --git a/tests/data/serve_resources/mlflow/tensorflow/requirements.txt b/tests/data/serve_resources/mlflow/tensorflow/requirements.txt index cd1cbee65b..ff99d3b92e 100644 --- a/tests/data/serve_resources/mlflow/tensorflow/requirements.txt +++ b/tests/data/serve_resources/mlflow/tensorflow/requirements.txt @@ -1,4 +1,4 @@ mlflow==2.13.2 -cloudpickle>=2.2.1 +cloudpickle==2.2.1 numpy==1.26.4 tensorflow==2.16.1 From 7fdc99170f73b0055f761232d0799f9018786cc9 Mon Sep 17 00:00:00 2001 From: Gokul A <166456257+nargokul@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:14:32 -0800 Subject: [PATCH 2/4] NUmpy FIxes --- src/sagemaker/serve/utils/conda_in_process.yml | 2 +- tests/data/serve_resources/mlflow/pytorch/requirements.txt | 2 +- tests/data/serve_resources/mlflow/tensorflow/conda.yaml | 2 +- tests/data/serve_resources/mlflow/tensorflow/requirements.txt | 2 +- tests/data/serve_resources/mlflow/xgboost/conda.yaml | 2 +- tests/data/serve_resources/mlflow/xgboost/requirements.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sagemaker/serve/utils/conda_in_process.yml b/src/sagemaker/serve/utils/conda_in_process.yml index 61badaa52f..60926200d5 100644 --- a/src/sagemaker/serve/utils/conda_in_process.yml +++ b/src/sagemaker/serve/utils/conda_in_process.yml @@ -12,7 +12,7 @@ dependencies: - boto3>=1.34.142,<2.0 - cloudpickle==2.2.1 - google-pasta - - numpy>=1.9.0,<2.0 + - numpy>=1.9.0,<3.0 - protobuf>=3.12,<5.0 - smdebug_rulesconfig==1.0.1 - importlib-metadata>=1.4.0,<7.0 diff --git a/tests/data/serve_resources/mlflow/pytorch/requirements.txt b/tests/data/serve_resources/mlflow/pytorch/requirements.txt index 0446ed5053..c83689ba05 100644 --- a/tests/data/serve_resources/mlflow/pytorch/requirements.txt +++ b/tests/data/serve_resources/mlflow/pytorch/requirements.txt @@ -5,7 +5,7 @@ cloudpickle==2.2.1 defusedxml==0.7.1 dill==0.3.8 gmpy2==2.1.2 -numpy==1.24.4 +numpy>=1.24.4 opt-einsum==3.3.0 packaging==21.3 pandas==2.2.1 diff --git a/tests/data/serve_resources/mlflow/tensorflow/conda.yaml b/tests/data/serve_resources/mlflow/tensorflow/conda.yaml index 90d8c300a0..2e674e916c 100644 --- a/tests/data/serve_resources/mlflow/tensorflow/conda.yaml +++ b/tests/data/serve_resources/mlflow/tensorflow/conda.yaml @@ -6,6 +6,6 @@ dependencies: - pip: - mlflow==2.11.1 - cloudpickle==2.2.1 - - numpy==1.26.4 + - numpy>=1.26.4 - tensorflow==2.16.1 name: mlflow-env diff --git a/tests/data/serve_resources/mlflow/tensorflow/requirements.txt b/tests/data/serve_resources/mlflow/tensorflow/requirements.txt index ff99d3b92e..badfe9789e 100644 --- a/tests/data/serve_resources/mlflow/tensorflow/requirements.txt +++ b/tests/data/serve_resources/mlflow/tensorflow/requirements.txt @@ -1,4 +1,4 @@ mlflow==2.13.2 cloudpickle==2.2.1 -numpy==1.26.4 +numpy>=1.26.4 tensorflow==2.16.1 diff --git a/tests/data/serve_resources/mlflow/xgboost/conda.yaml b/tests/data/serve_resources/mlflow/xgboost/conda.yaml index 44ca3c4c2e..40fd969813 100644 --- a/tests/data/serve_resources/mlflow/xgboost/conda.yaml +++ b/tests/data/serve_resources/mlflow/xgboost/conda.yaml @@ -6,7 +6,7 @@ dependencies: - pip: - mlflow==2.11.1 - lz4==4.3.2 - - numpy==1.26.4 + - numpy>=1.26.4 - pandas==2.2.1 - psutil==5.9.8 - scikit-learn==1.3.2 diff --git a/tests/data/serve_resources/mlflow/xgboost/requirements.txt b/tests/data/serve_resources/mlflow/xgboost/requirements.txt index 1130dcaec5..4f6e3c3487 100644 --- a/tests/data/serve_resources/mlflow/xgboost/requirements.txt +++ b/tests/data/serve_resources/mlflow/xgboost/requirements.txt @@ -1,6 +1,6 @@ mlflow==2.13.2 lz4==4.3.2 -numpy==1.24.4 +numpy>=1.24.4 pandas==2.0.3 psutil==5.9.8 scikit-learn==1.3.2 From 4093d76ddbeda0676d3b7450108a6fcb49a71fe3 Mon Sep 17 00:00:00 2001 From: Gokul A <166456257+nargokul@users.noreply.github.com> Date: Wed, 11 Dec 2024 14:47:54 -0800 Subject: [PATCH 3/4] Revert "NUmpy FIxes" This reverts commit 7fdc99170f73b0055f761232d0799f9018786cc9. --- src/sagemaker/serve/utils/conda_in_process.yml | 2 +- tests/data/serve_resources/mlflow/pytorch/requirements.txt | 2 +- tests/data/serve_resources/mlflow/tensorflow/conda.yaml | 2 +- tests/data/serve_resources/mlflow/tensorflow/requirements.txt | 2 +- tests/data/serve_resources/mlflow/xgboost/conda.yaml | 2 +- tests/data/serve_resources/mlflow/xgboost/requirements.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sagemaker/serve/utils/conda_in_process.yml b/src/sagemaker/serve/utils/conda_in_process.yml index 60926200d5..61badaa52f 100644 --- a/src/sagemaker/serve/utils/conda_in_process.yml +++ b/src/sagemaker/serve/utils/conda_in_process.yml @@ -12,7 +12,7 @@ dependencies: - boto3>=1.34.142,<2.0 - cloudpickle==2.2.1 - google-pasta - - numpy>=1.9.0,<3.0 + - numpy>=1.9.0,<2.0 - protobuf>=3.12,<5.0 - smdebug_rulesconfig==1.0.1 - importlib-metadata>=1.4.0,<7.0 diff --git a/tests/data/serve_resources/mlflow/pytorch/requirements.txt b/tests/data/serve_resources/mlflow/pytorch/requirements.txt index c83689ba05..0446ed5053 100644 --- a/tests/data/serve_resources/mlflow/pytorch/requirements.txt +++ b/tests/data/serve_resources/mlflow/pytorch/requirements.txt @@ -5,7 +5,7 @@ cloudpickle==2.2.1 defusedxml==0.7.1 dill==0.3.8 gmpy2==2.1.2 -numpy>=1.24.4 +numpy==1.24.4 opt-einsum==3.3.0 packaging==21.3 pandas==2.2.1 diff --git a/tests/data/serve_resources/mlflow/tensorflow/conda.yaml b/tests/data/serve_resources/mlflow/tensorflow/conda.yaml index 2e674e916c..90d8c300a0 100644 --- a/tests/data/serve_resources/mlflow/tensorflow/conda.yaml +++ b/tests/data/serve_resources/mlflow/tensorflow/conda.yaml @@ -6,6 +6,6 @@ dependencies: - pip: - mlflow==2.11.1 - cloudpickle==2.2.1 - - numpy>=1.26.4 + - numpy==1.26.4 - tensorflow==2.16.1 name: mlflow-env diff --git a/tests/data/serve_resources/mlflow/tensorflow/requirements.txt b/tests/data/serve_resources/mlflow/tensorflow/requirements.txt index badfe9789e..ff99d3b92e 100644 --- a/tests/data/serve_resources/mlflow/tensorflow/requirements.txt +++ b/tests/data/serve_resources/mlflow/tensorflow/requirements.txt @@ -1,4 +1,4 @@ mlflow==2.13.2 cloudpickle==2.2.1 -numpy>=1.26.4 +numpy==1.26.4 tensorflow==2.16.1 diff --git a/tests/data/serve_resources/mlflow/xgboost/conda.yaml b/tests/data/serve_resources/mlflow/xgboost/conda.yaml index 40fd969813..44ca3c4c2e 100644 --- a/tests/data/serve_resources/mlflow/xgboost/conda.yaml +++ b/tests/data/serve_resources/mlflow/xgboost/conda.yaml @@ -6,7 +6,7 @@ dependencies: - pip: - mlflow==2.11.1 - lz4==4.3.2 - - numpy>=1.26.4 + - numpy==1.26.4 - pandas==2.2.1 - psutil==5.9.8 - scikit-learn==1.3.2 diff --git a/tests/data/serve_resources/mlflow/xgboost/requirements.txt b/tests/data/serve_resources/mlflow/xgboost/requirements.txt index 4f6e3c3487..1130dcaec5 100644 --- a/tests/data/serve_resources/mlflow/xgboost/requirements.txt +++ b/tests/data/serve_resources/mlflow/xgboost/requirements.txt @@ -1,6 +1,6 @@ mlflow==2.13.2 lz4==4.3.2 -numpy>=1.24.4 +numpy==1.24.4 pandas==2.0.3 psutil==5.9.8 scikit-learn==1.3.2 From 3359f1d5092c86fabcc64701bc781d54fa66c72d Mon Sep 17 00:00:00 2001 From: Gokul A <166456257+nargokul@users.noreply.github.com> Date: Wed, 11 Dec 2024 14:48:09 -0800 Subject: [PATCH 4/4] NUmpy FIxes --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 12f068c230..242b66f73e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,7 @@ dependencies = [ "google-pasta", "importlib-metadata>=1.4.0,<7.0", "jsonschema", - "numpy>=1.9.0,<3.0", + "numpy>=1.9.0,<2.0", "omegaconf>=2.2,<2.3", "packaging>=20.0", "pandas",