From e3c9fb9feed0040a50540067f727bb2217a13ce7 Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 13 Apr 2020 08:36:14 -0700 Subject: [PATCH] Fix build issues --- onnxruntime/core/providers/cpu/reduction/reduction_ops.cc | 4 +++- winml/test/common/taefTestMacros.h | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/onnxruntime/core/providers/cpu/reduction/reduction_ops.cc b/onnxruntime/core/providers/cpu/reduction/reduction_ops.cc index e85a7ecb25..c05617f808 100644 --- a/onnxruntime/core/providers/cpu/reduction/reduction_ops.cc +++ b/onnxruntime/core/providers/cpu/reduction/reduction_ops.cc @@ -566,7 +566,9 @@ Status ReduceSum::Compute(OpKernelContext* ctx) const { if (no_transpose) { const T* input_data = ctx->Input(0)->template Data(); auto lambda = [input_data, blocks, output_data](ptrdiff_t i) { - output_data[i] = ConstEigenVectorMap(input_data + (i * blocks), blocks).sum(); + + // The ConstEigenMatrixMap type is expanded to work around a MS compiler issue + output_data[i] = Eigen::Map>(input_data + (i * blocks), blocks).sum(); }; concurrency::ThreadPool::TryBatchParallelFor(ctx->GetOperatorThreadPool(), block_size, lambda, 0); } else { diff --git a/winml/test/common/taefTestMacros.h b/winml/test/common/taefTestMacros.h index a4b3b6beab..4b63201c59 100644 --- a/winml/test/common/taefTestMacros.h +++ b/winml/test/common/taefTestMacros.h @@ -1,8 +1,5 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -#define INLINE_TEST_METHOD_MARKUP - #include "WexTestClass.h" using namespace WEX::Logging;