aports/testing/onnxruntime/numpy-2.patch
leso-kn a2d8c5e29f testing/onnxruntime: fix build
* explicitly build against numpy v1
2024-10-16 00:09:45 +00:00

93 lines
3.9 KiB
Diff

diff --git a/cmake/onnxruntime_python.cmake b/cmake/onnxruntime_python.cmake
index 270139c..54e8047 100644
--- a/cmake/onnxruntime_python.cmake
+++ b/cmake/onnxruntime_python.cmake
@@ -569,6 +569,9 @@ add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy
${REPO_ROOT}/requirements.txt
$<TARGET_FILE_DIR:${build_output_target}>
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${REPO_ROOT}/requirements.txt
+ $<TARGET_FILE_DIR:${build_output_target}>
COMMAND ${CMAKE_COMMAND} -E copy
${REPO_ROOT}/ThirdPartyNotices.txt
$<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/
diff --git a/onnxruntime/python/tools/transformers/models/llama/requirements.txt b/onnxruntime/python/tools/transformers/models/llama/requirements.txt
index 3880251..ce9fb7b 100644
--- a/onnxruntime/python/tools/transformers/models/llama/requirements.txt
+++ b/onnxruntime/python/tools/transformers/models/llama/requirements.txt
@@ -1,7 +1,7 @@
optimum>=1.14.1
transformers>=4.33.2,<= 4.37.2
+numpy>=1.21.6,<2.0
torch>=2.2.0
onnx==1.16.1
datasets>=2.8.0
protobuf==3.20.2
-psutil
diff --git a/onnxruntime/python/tools/transformers/models/phi2/requirements.txt b/onnxruntime/python/tools/transformers/models/phi2/requirements.txt
index c82022e..346f386 100644
--- a/onnxruntime/python/tools/transformers/models/phi2/requirements.txt
+++ b/onnxruntime/python/tools/transformers/models/phi2/requirements.txt
@@ -1,3 +1,4 @@
+numpy>=1.21.6,<2.0
onnx==1.16.1
transformers>=4.36.2
onnxscript>=0.1.0.dev20240126
diff --git a/onnxruntime/test/python/requirements.txt b/onnxruntime/test/python/requirements.txt
index 741c411..fa5d3f7 100644
--- a/onnxruntime/test/python/requirements.txt
+++ b/onnxruntime/test/python/requirements.txt
@@ -1,2 +1,3 @@
+numpy>=1.21.6,<2.0
onnx==1.16.1
pytest
diff --git a/requirements.txt b/requirements.txt
index 2fd9362..ccf0a10 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
coloredlogs
flatbuffers
-numpy >= 1.21.6
+numpy>=1.21.6,<2.0
packaging
protobuf
sympy
diff --git a/tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-prebuild-steps.yml b/tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-prebuild-steps.yml
index ef48244..8c2aaaa 100644
--- a/tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-prebuild-steps.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-prebuild-steps.yml
@@ -74,7 +74,7 @@ steps:
workingFolder: '$(Build.BinariesDirectory)'
- script: |
- python -m pip install --upgrade "setuptools>=68.2.2" wheel numpy flatbuffers
+ python -m pip install --upgrade "setuptools>=68.2.2" wheel "numpy>=1.21.6,<2.0" flatbuffers
workingDirectory: '$(Build.BinariesDirectory)'
displayName: 'Install python modules'
diff --git a/tools/ci_build/github/linux/docker/migraphx-ci-pipeline-env.Dockerfile b/tools/ci_build/github/linux/docker/migraphx-ci-pipeline-env.Dockerfile
index 98ea5e1..da467a1 100644
--- a/tools/ci_build/github/linux/docker/migraphx-ci-pipeline-env.Dockerfile
+++ b/tools/ci_build/github/linux/docker/migraphx-ci-pipeline-env.Dockerfile
@@ -80,4 +80,4 @@ RUN ln -sf /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ${CONDA_ENVIRONMENT_PATH}/bi
# Install migraphx
RUN apt update && apt install -y migraphx
-RUN pip install numpy packaging ml_dtypes==0.3.0
+RUN pip install "numpy>=1.21.6,<2.0" packaging ml_dtypes==0.3.0
diff --git a/tools/ci_build/github/linux/test_custom_ops_pytorch_export.sh b/tools/ci_build/github/linux/test_custom_ops_pytorch_export.sh
index 9cd1222..5efeecd 100755
--- a/tools/ci_build/github/linux/test_custom_ops_pytorch_export.sh
+++ b/tools/ci_build/github/linux/test_custom_ops_pytorch_export.sh
@@ -2,7 +2,7 @@
pip3 install --user --upgrade pip
-pip3 install --user numpy torch pytest
+pip3 install --user "numpy>=1.21.6,<2.0" torch pytest
pip3 install --user /build/Release/dist/*.whl
export PYTHONPATH=/onnxruntime_src/tools:/usr/local/lib/python3.8/site-packages:$PYTHONPATH