From 4bfff45859cdc09efc9920ea316f9e9fce76a72e Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Mon, 23 Aug 2021 18:06:23 -0700 Subject: [PATCH] Downgrade Eigen (#8817) --- cgmanifests/submodules/cgmanifest.json | 4 ++-- cmake/external/eigen | 2 +- include/onnxruntime/core/common/eigen_common_wrapper.h | 1 + .../onnxruntime/core/platform/EigenNonBlockingThreadPool.h | 1 + onnxruntime/core/util/math_cpu.cc | 1 + onnxruntime/core/util/math_cpuonly.h | 1 + onnxruntime/test/onnx/microbenchmark/eigen.cc | 1 + onnxruntime/test/perftest/performance_runner.cc | 1 + onnxruntime/test/util/compare_ortvalue.cc | 1 + .../training_ops/cpu/activation/activations_grad.cc | 5 +++++ 10 files changed, 15 insertions(+), 3 deletions(-) diff --git a/cgmanifests/submodules/cgmanifest.json b/cgmanifests/submodules/cgmanifest.json index 97bc013580..c710217e2e 100644 --- a/cgmanifests/submodules/cgmanifest.json +++ b/cgmanifests/submodules/cgmanifest.json @@ -194,7 +194,7 @@ "component": { "type": "git", "git": { - "commitHash": "1f4c0311cda3403999b702c996898af5707973a9", + "commitHash": "d10b27fe37736d2944630ecd7557cefa95cf87c9", "repositoryUrl": "https://gitlab.com/libeigen/eigen.git" }, "comments": "git submodule at cmake/external/eigen" @@ -454,7 +454,7 @@ "component": { "type": "git", "git": { - "commitHash": "eab844a87298d500f1924f8a7cadb4cbee426093", + "commitHash": "a1241a967ec7920310a696a6c22ae2426752e135", "repositoryUrl": "https://github.com/microsoft/onnxruntime-tvm.git" }, "comments": "git submodule at cmake/external/tvm" diff --git a/cmake/external/eigen b/cmake/external/eigen index 1f4c0311cd..d10b27fe37 160000 --- a/cmake/external/eigen +++ b/cmake/external/eigen @@ -1 +1 @@ -Subproject commit 1f4c0311cda3403999b702c996898af5707973a9 +Subproject commit d10b27fe37736d2944630ecd7557cefa95cf87c9 diff --git a/include/onnxruntime/core/common/eigen_common_wrapper.h b/include/onnxruntime/core/common/eigen_common_wrapper.h index ecd0ad267a..fa51a009a6 100644 --- a/include/onnxruntime/core/common/eigen_common_wrapper.h +++ b/include/onnxruntime/core/common/eigen_common_wrapper.h @@ -14,6 +14,7 @@ #pragma GCC diagnostic ignored "-Wignored-attributes" #endif #pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-result" #ifdef HAS_DEPRECATED_COPY #pragma GCC diagnostic ignored "-Wdeprecated-copy" #endif diff --git a/include/onnxruntime/core/platform/EigenNonBlockingThreadPool.h b/include/onnxruntime/core/platform/EigenNonBlockingThreadPool.h index b1d946116a..4dbfdeaf0e 100644 --- a/include/onnxruntime/core/platform/EigenNonBlockingThreadPool.h +++ b/include/onnxruntime/core/platform/EigenNonBlockingThreadPool.h @@ -19,6 +19,7 @@ #if defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-result" #elif defined(_MSC_VER) #pragma warning(push) #pragma warning(disable : 4127) diff --git a/onnxruntime/core/util/math_cpu.cc b/onnxruntime/core/util/math_cpu.cc index 4bfdbaff32..1af59a01dc 100644 --- a/onnxruntime/core/util/math_cpu.cc +++ b/onnxruntime/core/util/math_cpu.cc @@ -22,6 +22,7 @@ #if defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-result" #endif #include "Eigen/src/Core/arch/Default/Half.h" #if defined(__GNUC__) diff --git a/onnxruntime/core/util/math_cpuonly.h b/onnxruntime/core/util/math_cpuonly.h index 05b8688a23..ced9eb404e 100644 --- a/onnxruntime/core/util/math_cpuonly.h +++ b/onnxruntime/core/util/math_cpuonly.h @@ -27,6 +27,7 @@ #pragma GCC diagnostic ignored "-Wignored-attributes" #endif #pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-result" #if __GNUC__ >= 7 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wint-in-bool-context" diff --git a/onnxruntime/test/onnx/microbenchmark/eigen.cc b/onnxruntime/test/onnx/microbenchmark/eigen.cc index 2e3e40762d..6d6d4fd079 100644 --- a/onnxruntime/test/onnx/microbenchmark/eigen.cc +++ b/onnxruntime/test/onnx/microbenchmark/eigen.cc @@ -4,6 +4,7 @@ #pragma GCC diagnostic ignored "-Wignored-attributes" #endif #pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-result" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif diff --git a/onnxruntime/test/perftest/performance_runner.cc b/onnxruntime/test/perftest/performance_runner.cc index 4a15e983f0..4476a26ab3 100644 --- a/onnxruntime/test/perftest/performance_runner.cc +++ b/onnxruntime/test/perftest/performance_runner.cc @@ -23,6 +23,7 @@ using onnxruntime::Status; #if defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-result" #endif #include #if defined(__GNUC__) diff --git a/onnxruntime/test/util/compare_ortvalue.cc b/onnxruntime/test/util/compare_ortvalue.cc index 5599994113..67e20821f0 100644 --- a/onnxruntime/test/util/compare_ortvalue.cc +++ b/onnxruntime/test/util/compare_ortvalue.cc @@ -9,6 +9,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wignored-qualifiers" #pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-result" #endif #include #include diff --git a/orttraining/orttraining/training_ops/cpu/activation/activations_grad.cc b/orttraining/orttraining/training_ops/cpu/activation/activations_grad.cc index baef2df258..08522fb6a8 100644 --- a/orttraining/orttraining/training_ops/cpu/activation/activations_grad.cc +++ b/orttraining/orttraining/training_ops/cpu/activation/activations_grad.cc @@ -8,10 +8,15 @@ #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable : 4127) +#else +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-result" #endif #include "unsupported/Eigen/SpecialFunctions" #if defined(_MSC_VER) #pragma warning(pop) +#else +#pragma GCC diagnostic pop #endif #include "core/util/math_cpuonly.h"