From 1a73d618297c080cafff0a67b85c7829a8e629ad Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Thu, 11 May 2023 11:56:59 -0700 Subject: [PATCH] Update eigen to 3.4 and remove the eigen from git submodule (#15875) ### Description Update eigen to 3.4 and remove the eigen from git submodule ### Motivation and Context We need to have eigen 3.4 for c++20 --- .gitmodules | 3 --- cmake/deps.txt | 1 + cmake/external/eigen | 1 - cmake/external/eigen.cmake | 4 ++-- .../github/azure-pipelines/templates/download-deps.yml | 4 ++-- 5 files changed, 5 insertions(+), 8 deletions(-) delete mode 160000 cmake/external/eigen diff --git a/.gitmodules b/.gitmodules index 19f55e6c7b..1baeb73541 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "cmake/external/onnx"] path = cmake/external/onnx url = https://github.com/onnx/onnx.git -[submodule "cmake/external/eigen"] - path = cmake/external/eigen - url = https://gitlab.com/libeigen/eigen.git [submodule "cmake/external/libprotobuf-mutator"] path = cmake/external/libprotobuf-mutator url = https://github.com/google/libprotobuf-mutator.git diff --git a/cmake/deps.txt b/cmake/deps.txt index d6da73ce1c..58a7f41631 100644 --- a/cmake/deps.txt +++ b/cmake/deps.txt @@ -49,3 +49,4 @@ pthread;https://sourceforge.net/projects/pthreads4w/files/pthreads4w-code-v3.0.0 triton;https://github.com/triton-inference-server/server/archive/refs/tags/v2.28.0.zip;4b305570aa1e889946e20e36050b6770e4108fee # above are deps introduced by triton client, might remove after 1.14 release extensions;https://github.com/microsoft/onnxruntime-extensions/archive/94142d8391c9791ec71c38336436319a2d4ac7a0.zip;4365ac5140338b4cb75a39944a4be276e3829b3c +eigen;https://gitlab.com/libeigen/eigen/-/archive/3.4/eigen-3.4.zip;ee201b07085203ea7bd8eb97cbcb31b07cfa3efb \ No newline at end of file diff --git a/cmake/external/eigen b/cmake/external/eigen deleted file mode 160000 index d10b27fe37..0000000000 --- a/cmake/external/eigen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d10b27fe37736d2944630ecd7557cefa95cf87c9 diff --git a/cmake/external/eigen.cmake b/cmake/external/eigen.cmake index 266dd534af..a8b80fb4c3 100644 --- a/cmake/external/eigen.cmake +++ b/cmake/external/eigen.cmake @@ -7,13 +7,13 @@ else () if (onnxruntime_USE_ACL) FetchContent_Declare( eigen - URL https://gitlab.com/libeigen/eigen/-/archive/d10b27fe37736d2944630ecd7557cefa95cf87c9/eigen-d10b27fe37736d2944630ecd7557cefa95cf87c9.zip + URL https://gitlab.com/libeigen/eigen/-/archive/3.4/eigen-3.4.zip PATCH_COMMAND ${Patch_EXECUTABLE} --ignore-space-change --ignore-whitespace < ${PROJECT_SOURCE_DIR}/patches/eigen/Fix_Eigen_Build_Break.patch ) else() FetchContent_Declare( eigen - URL https://gitlab.com/libeigen/eigen/-/archive/d10b27fe37736d2944630ecd7557cefa95cf87c9/eigen-d10b27fe37736d2944630ecd7557cefa95cf87c9.zip + URL https://gitlab.com/libeigen/eigen/-/archive/3.4/eigen-3.4.zip ) endif() FetchContent_Populate(eigen) 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 8b0cbdf89b..c65fc73422 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.56 + version: 1.0.59 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.56 + version: 1.0.59 downloadPath: $(Build.BinariesDirectory)/deps # You can add more ADO accounts at here.