Remove link between muon and curvefitting libs #39656
Merged
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
thomashampson
added
the
Patch Candidate
MialLewis
force-pushed
the
remove_link_between_muon_and_curvefitting_libs
branch
from
33b17d7 to
011ac0b
Compare
This reverts commit daa6ad6.
|
On Windows (and maybe ARM) a |
This is what I'm working with at the moment: https://godbolt.org/z/hf7GhGs77 Results are inconsistent when using double/long double. |
| private: | ||
| MatrixWorkspace_sptr m_loadedData; | ||
| IAlgorithm_sptr phaseQuad; | ||
| IAlgorithm_sptr m_phaseQuad; |
MialLewis
commented
Jul 17, 2025
| const double X = n0[h] * asym * cos(phi); | ||
| const double Y = n0[h] * asym * sin(phi); | ||
| n0Vectors[h] = CurveFitting::EigenVector({X, Y}); | ||
| Eigen::Vector<eigenDataType, 2> n0vec; |
There was a problem hiding this comment.
This is unused, will push after review.
sf1919
approved these changes
Jul 17, 2025
There was a problem hiding this comment.
I have done a functional test on Windows and on Linux (Ubuntu 20.04) and the two Muon GUIs open without any problem.
The code looks sensible.
I am assuming this does not need a release note @thomashampson ?
github-project-automation
bot
moved this from In Progress
to Done
in ISIS core workstream v6.14.0
|
release notes will be added separately |
peterfpeterson
pushed a commit
to peterfpeterson/mantid
that referenced
this pull request
Jul 17, 2025
This PR removes the use of `Mantid::CurveFitting::EigenMatrix` from the `Muon` library to avoid the linking of two plugin libraries. We use `PartialPivLU` decomposition in calculating the inverse, replicating what the `Mantid::CurveFitting::EigenMatrix` is doing under the hood. `long double` is used on arm mac, as it brings precision of eigen matrix multiplication inline (lowers it) with the other operating systems. I'm not sure why, you would expect a greater degree of precision. Here is a compiler explorer used to interrogate the differences when different types are used with eigen across our compilers: https://godbolt.org/z/51W6KPecb This illustrates the issue, but doesn't show the same impact on arm64 of switching to `long double`.
peterfpeterson
added a commit
that referenced
this pull request
Jul 17, 2025
This is a version of #39656 into `ornl-next` Co-authored-by: MialLewis <95620982+MialLewis@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of work
Summary of work
This PR removes the use of
Mantid::CurveFitting::EigenMatrixfrom theMuonlibrary to avoid the linking of two plugin libraries.We use
PartialPivLUdecomposition in calculating the inverse, replicating what theMantid::CurveFitting::EigenMatrixis doing under the hood.long doubleis used on arm mac, as it brings precision of eigen matrix multiplication inline (lowers it) with the other operating systems. I'm not sure why, you would expect a greater degree of precision.Here is a compiler explorer used to interrogate the differences when different types are used with eigen across our compilers: https://godbolt.org/z/51W6KPecb
This illustrates the issue, but doesn't show the same impact on arm64 of switching to
long double.Testing change on arm: https://builds.mantidproject.org/job/build_packages_from_branch/1200/
Fixes #39644
Reviewer
Please comment on the points listed below (full description).
Your comments will be used as part of the gatekeeper process, so please comment clearly on what you have checked during your review. If changes are made to the PR during the review process then your final comment will be the most important for gatekeepers. In this comment you should make it clear why any earlier review is still valid, or confirm that all requested changes have been addressed.
Code Review
Functional Tests
Does everything look good? Mark the review as Approve. A member of
@mantidproject/gatekeeperswill take care of it.Gatekeeper
If you need to request changes to a PR then please add a comment and set the review status to "Request changes". This will stop the PR from showing up in the list for other gatekeepers.