-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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.
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
GH-44915: [C++] Add WithinUlp testing functions #44906
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
4953fc2
GH-XXX: [C++] Add WithinUlp testing functions
pitrou a7c3549
Fix erroneous declaration (which apparently didn't cause any problem,…
pitrou 126e765
Add float tests
pitrou 4e84e20
Add assertion functions
pitrou 505c96f
Remove dead code
pitrou 0e396ac
Fix logic when two different exponents are involved
pitrou 0783571
Apply suggestion
pitrou b2cb305
Add explanatory comment for kOneUlp
pitrou d35adc6
Fix comment
pitrou ad2bf4f
Avoid hardcoded literals
pitrou File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
// Licensed to the Apache Software Foundation (ASF) under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The ASF licenses this file | ||
// to you under the Apache License, Version 2.0 (the | ||
// "License"); you may not use this file except in compliance | ||
// with the License. You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
#include "arrow/testing/math.h" | ||
|
||
#include <cmath> | ||
#include <limits> | ||
|
||
#include <gtest/gtest.h> | ||
|
||
#include "arrow/util/logging.h" | ||
|
||
namespace arrow { | ||
namespace { | ||
|
||
template <typename Float> | ||
bool WithinUlpOneWay(Float left, Float right, int n_ulp) { | ||
// The delta between 1.0 and the FP value immediately before it. | ||
// We're using this value because `frexp` returns a mantissa between 0.5 and 1.0. | ||
static const Float kOneUlp = Float(1.0) - std::nextafter(Float(1.0), Float(0.0)); | ||
|
||
DCHECK_GE(n_ulp, 1); | ||
|
||
if (left == 0) { | ||
return left == right; | ||
} | ||
if (left < 0) { | ||
left = -left; | ||
right = -right; | ||
} | ||
|
||
int left_exp; | ||
Float left_mant = std::frexp(left, &left_exp); | ||
Float delta = static_cast<Float>(n_ulp) * kOneUlp; | ||
Float lower_bound = std::ldexp(left_mant - delta, left_exp); | ||
Float upper_bound = std::ldexp(left_mant + delta, left_exp); | ||
return right >= lower_bound && right <= upper_bound; | ||
} | ||
|
||
template <typename Float> | ||
bool WithinUlpGeneric(Float left, Float right, int n_ulp) { | ||
if (!std::isfinite(left) || !std::isfinite(right)) { | ||
return left == right; | ||
} | ||
return (std::abs(left) <= std::abs(right)) ? WithinUlpOneWay(left, right, n_ulp) | ||
: WithinUlpOneWay(right, left, n_ulp); | ||
} | ||
|
||
template <typename Float> | ||
void AssertWithinUlpGeneric(Float left, Float right, int n_ulp) { | ||
if (!WithinUlpGeneric(left, right, n_ulp)) { | ||
FAIL() << left << " and " << right << " are not within " << n_ulp << " ulps"; | ||
} | ||
} | ||
|
||
} // namespace | ||
|
||
bool WithinUlp(float left, float right, int n_ulp) { | ||
return WithinUlpGeneric(left, right, n_ulp); | ||
} | ||
|
||
bool WithinUlp(double left, double right, int n_ulp) { | ||
return WithinUlpGeneric(left, right, n_ulp); | ||
} | ||
|
||
void AssertWithinUlp(float left, float right, int n_ulps) { | ||
AssertWithinUlpGeneric(left, right, n_ulps); | ||
} | ||
|
||
void AssertWithinUlp(double left, double right, int n_ulps) { | ||
AssertWithinUlpGeneric(left, right, n_ulps); | ||
} | ||
|
||
} // namespace arrow |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
// Licensed to the Apache Software Foundation (ASF) under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The ASF licenses this file | ||
// to you under the Apache License, Version 2.0 (the | ||
// "License"); you may not use this file except in compliance | ||
// with the License. You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
#pragma once | ||
|
||
#include "arrow/testing/visibility.h" | ||
|
||
namespace arrow { | ||
|
||
ARROW_TESTING_EXPORT | ||
bool WithinUlp(float left, float right, int n_ulp); | ||
ARROW_TESTING_EXPORT | ||
bool WithinUlp(double left, double right, int n_ulp); | ||
|
||
ARROW_TESTING_EXPORT | ||
void AssertWithinUlp(float left, float right, int n_ulps); | ||
ARROW_TESTING_EXPORT | ||
void AssertWithinUlp(double left, double right, int n_ulps); | ||
|
||
} // namespace arrow |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why argument name in within is
n_ulp
, but in assertWithin isn_ulps
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm... no reason I'm afraid. We can open a minor PR to fix that.