From c24d7a8a0a95002cfde70db8ffdac1a1d95b3ca7 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Fri, 11 Oct 2019 10:44:19 -0700 Subject: [PATCH] Update eigen to the latest version (#1910) --- cgmanifest.json | 2 +- cmake/external/eigen | 2 +- onnxruntime/core/providers/cpu/tensor/cast_op.cc | 2 +- onnxruntime/core/providers/cpu/tensor/isnan.cc | 2 +- onnxruntime/core/util/math_cpu.cc | 2 +- onnxruntime/test/util/compare_ortvalue.cc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cgmanifest.json b/cgmanifest.json index 1a27c0deda..c1f111e6d2 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -139,7 +139,7 @@ "component": { "type": "git", "git": { - "commitHash": "1456fe2fac0cd074bbbb8630ba003a7c325d015b", + "commitHash": "899973df982f2d389659d9e4266efabb3da1ecc8", "repositoryUrl": "https://github.com/eigenteam/eigen-git-mirror.git" } } diff --git a/cmake/external/eigen b/cmake/external/eigen index 1456fe2fac..899973df98 160000 --- a/cmake/external/eigen +++ b/cmake/external/eigen @@ -1 +1 @@ -Subproject commit 1456fe2fac0cd074bbbb8630ba003a7c325d015b +Subproject commit 899973df982f2d389659d9e4266efabb3da1ecc8 diff --git a/onnxruntime/core/providers/cpu/tensor/cast_op.cc b/onnxruntime/core/providers/cpu/tensor/cast_op.cc index 928db73c47..7d74e1db25 100644 --- a/onnxruntime/core/providers/cpu/tensor/cast_op.cc +++ b/onnxruntime/core/providers/cpu/tensor/cast_op.cc @@ -7,7 +7,7 @@ #include "core/framework/op_kernel.h" #include "core/util/math.h" #include "core/util/math_cpuonly.h" -#include "Eigen/src/Core/arch/GPU/Half.h" +#include "Eigen/src/Core/arch/Default/Half.h" #include "core/common/common.h" #if defined(_M_AMD64) diff --git a/onnxruntime/core/providers/cpu/tensor/isnan.cc b/onnxruntime/core/providers/cpu/tensor/isnan.cc index a092964bf6..19f24df89a 100644 --- a/onnxruntime/core/providers/cpu/tensor/isnan.cc +++ b/onnxruntime/core/providers/cpu/tensor/isnan.cc @@ -5,7 +5,7 @@ #include "core/util/math_cpuonly.h" #include "core/common/common.h" #include "core/framework/tensor.h" -#include "Eigen/src/Core/arch/GPU/Half.h" +#include "Eigen/src/Core/arch/Default/Half.h" namespace onnxruntime { // https://github.com/onnx/onnx/blob/master/docs/Operators.md#IsNaN diff --git a/onnxruntime/core/util/math_cpu.cc b/onnxruntime/core/util/math_cpu.cc index 23d2362998..babdeef527 100644 --- a/onnxruntime/core/util/math_cpu.cc +++ b/onnxruntime/core/util/math_cpu.cc @@ -19,7 +19,7 @@ #include "core/util/math.h" #include "core/util/math_cpuonly.h" #include "core/mlas/inc/mlas.h" -#include "Eigen/src/Core/arch/GPU/Half.h" +#include "Eigen/src/Core/arch/Default/Half.h" using onnxruntime::concurrency::ThreadPool; namespace onnxruntime { diff --git a/onnxruntime/test/util/compare_ortvalue.cc b/onnxruntime/test/util/compare_ortvalue.cc index 52d3f140c1..3c827db0a5 100644 --- a/onnxruntime/test/util/compare_ortvalue.cc +++ b/onnxruntime/test/util/compare_ortvalue.cc @@ -15,7 +15,7 @@ #include "core/framework/tensorprotoutils.h" #include "core/framework/utils.h" #include "Eigen/Core" -#include "Eigen/src/Core/arch/GPU/Half.h" +#include "Eigen/src/Core/arch/Default/Half.h" using namespace onnxruntime;