Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Workaround for MSVC linker bug #4713

Merged
merged 3 commits into from
Aug 10, 2020
Merged

Workaround for MSVC linker bug #4713

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8979e05
Change order of some checks to workaround a linker issue when /LTCG:i…
skottmckay Aug 4, 2020
6e4799d
Merge remote-tracking branch 'origin/master' into skottmckay/Workarou…
skottmckay Aug 4, 2020
25e94ee
Merge remote-tracking branch 'origin/master' into skottmckay/Workarou…
skottmckay Aug 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions onnxruntime/test/providers/provider_test_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down