saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-19 19:00:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change order of some checks to workaround a linker issue when /LTCG:incremental is set. (#4713)

Browse source
This commit is contained in:
Scott McKay 2020-08-10 17:54:11 +10:00 committed by GitHub
parent 24d4f76436
commit 2e3ccc7518
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
onnxruntime/test/providers/provider_test_utils.cc
View file

@ -91,11 +91,12 @@ void Check<double>(const OpTester::Data& expected_data,
#endif
for (int i = 0; i < size; ++i) {
if (std::isinf(expected[i])) { // Test infinity for equality
EXPECT_EQ(expected[i], output[i]) << "i:" << i;
} else if (std::isnan(expected[i])) {
EXPECT_TRUE(std::isnan(output[i])) << "Expected output " << i
<< " to be NaN";
// NOTE: Check isnan first to work around MSVC linker bug when /LTCG:incremental is specified.
// If the isinf check is first the isnan check and branch gets omitted
if (std::isnan(expected[i])) {
EXPECT_TRUE(std::isnan(output[i])) << "Expected NaN. i:" << i << ", provider_type: " << provider_type;
} else if (std::isinf(expected[i])) { // Test infinity for equality
EXPECT_EQ(expected[i], output[i]) << "Expected infinity. i:" << i << ", provider_type: " << provider_type;
} else {
if (!has_abs_err && !has_rel_err) {
// the default for existing tests
@ -142,11 +143,12 @@ void InternalNumericalCheck(const OpTester::Data& expected_data,
#endif
for (int i = 0; i < size; ++i) {
if (std::isinf(expected[i])) { // Test infinity for equality
EXPECT_EQ(expected[i], output[i]) << "i:" << i;
} else if (std::isnan(expected[i])) {
EXPECT_TRUE(std::isnan(output[i])) << "Expected output " << i
<< " to be NaN";
// NOTE: Check isnan first to work around MSVC linker bug when /LTCG:incremental is specified.
// If the isinf check is first the isnan check and branch gets omitted
if (std::isnan(expected[i])) {
EXPECT_TRUE(std::isnan(output[i])) << "Expected NaN. i:" << i << ", provider_type: " << provider_type;
} else if (std::isinf(expected[i])) { // Test infinity for equality
EXPECT_EQ(expected[i], output[i]) << "Expected infinity. i:" << i << ", provider_type: " << provider_type;
} else {
if (!has_abs_err && !has_rel_err) {
// the default for existing tests