Fixes for v6.28 #12899
Merged
Fixes for v6.28 #12899
Conversation
This file contains hidden or 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
Subtracting a constant 1e-15 might not result in a representation that is different from the previous value. Instead subtract the relative value 1e-9 * dx, with dx being the equidistant step size between points. This fixes stressRooFit on mac13arm. (cherry picked from commit ac79f37)
The alias was deprecated with numpy-1.20 and now expired in numpy-1.24: https://numpy.org/devdocs/release/1.20.0-notes.html#deprecations https://numpy.org/devdocs/release/1.24.0-notes.html#expired-deprecations This change also works with older versions (tested with numpy-1.19). (cherry picked from commit e0a6f8c)
This is a partial backport of the changes to isSameEntity from commit llvm/llvm-project@2408f97 (which lives in a different file in LLVM 13 and was moved to ASTContext at a later point). The gist of the change is that during template instantiation, the constraint / requires clause also gets instantiated and potentially changed. This means that if a function with constraints is used in one module, but included as-is in another, the two of them could not be merged. This change fixes the following error seen on macOS 13 with C++20: ``` /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__iterator/reverse_iterator.h:141:23: error: 'std::reverse_iterator<std::string *>::operator->' from module 'std.iterator.__iterator.reverse_iterator' is not present in definition of 'std::reverse_iterator<std::string *>' in module 'std.iterator.__iterator.reverse_iterator' constexpr pointer operator->() const ^ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__iterator/reverse_iterator.h:141:23: note: declaration of 'operator->' does not match ``` Note that this particular code was recently reverted in commit llvm/llvm-project@aeee4eb However, as far as I can tell, this relies on the implementation of deferred concept instantiation which solves the problem from a different angle, but cannot be easily backported to our copy of LLVM: llvm/llvm-project@babdef2 (cherry picked from commit 690903b)
... otherwise we get a warning. Those should have been caught by the TestSupport library, but that one doesn't work at the moment (see root-project#12828). (cherry picked from commit 96b9ebe)
Co-authored-by: Javier Lopez-Gomez <javier.lopez.gomez@cern.ch> (cherry picked from commit 251bd40)
The failure happens on ppc64le and aarch64.
This PR changes EXPECT_EQ to EXPECT_DOUBLE_EQ in the affected test.
[ RUN ] SimBinnedConstrainedTest.SubEventSections
/builddir/build/BUILD/root-6.28.00/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx:293: Failure
Expected equality of these values:
whole.Sum()
Which is: -1263.796050661927
N_events_total_parts.Sum()
Which is: -1263.7960506619268
/builddir/build/BUILD/root-6.28.00/roofit/roofitcore/test/TestStatistics/testRooAbsL.cxx:303: Failure
Expected equality of these values:
whole.Sum()
Which is: -1263.796050661927
thrice_N_events_total_parts.Sum()
Which is: -1263.7960506619268
[ FAILED ] SimBinnedConstrainedTest.SubEventSections (199 ms)
(cherry picked from commit b70fcdb)
The pyobj's tp_flags can have a number of other bits set, for example Py_TPFLAGS_HEAPTYPE and Py_TPFLAGS_BASETYPE. Only forward the two bits for Py_TPFLAGS_HAVE_GC and (since Python 3.11) Py_TPFLAGS_MANAGED_DICT. This fixes test failures seen with a Debug build on Fedora 38, but likely affecting all builds against Python 3.11. (cherry picked from commit dedbc75)
…om file This makes the test roottest-root-treeproxy-make pass on macOS 13, where a proxy pulling in "pair<int,int>" was trying to include the (private) header __bit_reference. (cherry picked from commit b1412da)
hahnjo
requested review from
Axel-Naumann,
eguiraud,
guitargeek,
hageboeck,
jblomer,
lmoneta,
pcanal,
vepadulano and
vgvassilev
as code owners
|
Starting build on |
guitargeek
approved these changes
May 30, 2023
Contributor
guitargeek
left a comment
guitargeek
left a comment
There was a problem hiding this comment.
Thank you for the backports!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Backport of
See also root-project/roottest#970