From b7b8b5b2ce80edb33990c7ae0fedac6ae3c623f4 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Tue, 7 Nov 2023 01:19:51 +0800 Subject: [PATCH] Fix Eigen-3.4.0 URL and hash (#18290) ### Description Add CI changes for #18287 Install onnx explicitly to pass windows GPU+dml stage. ### Motivation and Context 'eigen-3.4' was refering to a branch, not to a tag. There is now an Eigen 3.4.1 on that branch, and thus the hash has changed. See https://github.com/microsoft/onnxruntime/issues/18286#issuecomment-1793683416 --- cmake/deps.txt | 2 +- tools/ci_build/build.py | 5 +++++ .../github/azure-pipelines/templates/download-deps.yml | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cmake/deps.txt b/cmake/deps.txt index 575df832ac..4aab8c974d 100644 --- a/cmake/deps.txt +++ b/cmake/deps.txt @@ -16,7 +16,7 @@ abseil_cpp;https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.0.zip cxxopts;https://github.com/jarro2783/cxxopts/archive/3c73d91c0b04e2b59462f0a741be8c07024c1bc0.zip;6c6ca7f8480b26c8d00476e0e24b7184717fe4f0 date;https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.1.zip;2dac0c81dc54ebdd8f8d073a75c053b04b56e159 dlpack;https://github.com/dmlc/dlpack/archive/refs/tags/v0.6.zip;4d565dd2e5b31321e5549591d78aa7f377173445 -eigen;https://gitlab.com/libeigen/eigen/-/archive/3.4/eigen-3.4.zip;ee201b07085203ea7bd8eb97cbcb31b07cfa3efb +eigen;https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.zip;ef24286b7ece8737c99fa831b02941843546c081 flatbuffers;https://github.com/google/flatbuffers/archive/refs/tags/v1.12.0.zip;ba0a75fd12dbef8f6557a74e611b7a3d0c5fe7bf fp16;https://github.com/Maratyszcza/FP16/archive/0a92994d729ff76a58f692d3028ca1b64b145d91.zip;b985f6985a05a1c03ff1bb71190f66d8f98a1494 fxdiv;https://github.com/Maratyszcza/FXdiv/archive/63058eff77e11aa15bf531df5dd34395ec3017c8.zip;a5658f4036402dbca7cebee32be57fb8149811e1 diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py index 25d69ef3a1..a38087aa03 100644 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py @@ -1839,6 +1839,11 @@ def run_onnxruntime_tests(args, source_dir, ctest_path, build_dir, configs): # For CUDA or DML enabled builds test IOBinding feature if args.use_cuda or args.use_dml: log.info("Testing IOBinding feature") + if args.use_dml: + run_subprocess( + [sys.executable, "-m", "pip", "uninstall", "--yes", "onnx"], cwd=cwd, dll_path=dll_path + ) + run_subprocess([sys.executable, "-m", "pip", "install", "-q", "onnx"], cwd=cwd, dll_path=dll_path) run_subprocess([sys.executable, "onnxruntime_test_python_iobinding.py"], cwd=cwd, dll_path=dll_path) if args.use_cuda: diff --git a/tools/ci_build/github/azure-pipelines/templates/download-deps.yml b/tools/ci_build/github/azure-pipelines/templates/download-deps.yml index dc41a2d398..bb9f1fd277 100644 --- a/tools/ci_build/github/azure-pipelines/templates/download-deps.yml +++ b/tools/ci_build/github/azure-pipelines/templates/download-deps.yml @@ -11,7 +11,7 @@ steps: packageType: upack feed: '/7424c8e4-5c62-490e-95c4-79446f31017c' definition: '517c4f6f-5437-4392-a70d-4f15ec5be2f0' - version: 1.0.107 + version: 1.0.110 downloadPath: $(Build.BinariesDirectory)/deps # The private ADO project @@ -22,7 +22,7 @@ steps: packageType: upack feed: '/4c7631f5-24c0-4307-8822-1aa8f180c325' definition: 'fd9dd5ad-b73e-4678-890e-edcf680dbc1a' - version: 1.0.107 + version: 1.0.110 downloadPath: $(Build.BinariesDirectory)/deps # You can add more ADO accounts at here.