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.

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

3109: Bumps FitProblem fix #3110

Merged
merged 3 commits into from
Oct 25, 2024
Merged

3109: Bumps FitProblem fix #3110

merged 3 commits into from
Oct 25, 2024

Conversation

krzywon
Copy link
Contributor

@krzywon krzywon commented Sep 10, 2024

Description

This uses the new interface for bumps where every fit problem is multi-fit. Iterating through the models now directly returns the fitness object instead of the individual fit problem. This change brings SasView in line with this new behavior.

This only fixes the majority of the issues related to this major change. Fits will continue to fail, but this PR allows the app to build and launch. See the issue for more info.

Refs #3109

Review Checklist:

Licencing (untick if necessary)

  • The introduced changes comply with SasView license (BSD 3-Clause)

…s object. Update to match the new functionality
@krzywon krzywon marked this pull request as ready for review September 12, 2024 14:17
Copy link
Member

@rozyczko rozyczko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code looks good but I still get this message when trying to fit.

File "sas\qtgui\Perspectives\Fitting\FittingWidget.py", line 2115, in fitComplete
AttributeError: 'str' object has no attribute 'fitness'

python setup.py clean
python setup.py build
mv build/lib/sasdata/example_data/* ../sasview/src/sas/example_data/
mv sasdata/example_data/* ../sasview/src/sas/example_data/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to actually remove example_data from the sasdata source directory during the build step?
Should you not just cp -r the thing?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krzywon
Copy link
Contributor Author

krzywon commented Sep 13, 2024

@rozyczko - The fitting error is expected. This work, as noted in the pull request, only gets SasView to build and launch with the latest version of bumps. There is an outstanding issue how fitting packages parameters and what bumps expects.

@rozyczko
Copy link
Member

Alternatively, we can use the last release of bumps?
git clone --depth=1 --branch v0.9.3 https://github.com/bumps/bumps.git ../bumps

Copy link
Member

@rozyczko rozyczko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this does look good as the first step in solving the interoperability issue.

@wpotrzebowski
Copy link
Contributor

I am getting the same error #3109, while testing #3100. Should we also make the same fix 6.0.0?

@krzywon
Copy link
Contributor Author

krzywon commented Sep 20, 2024

I am getting the same error #3109, while testing #3100. Should we also make the same fix 6.0.0?

If you are running from source, the local repo takes precedence over any installed version. If you have pulled from bumps master recently, this is likely why you are seeing this. 6.0.0 builds should be using bumps v0.9.2.

@krzywon krzywon mentioned this pull request Oct 9, 2024
7 tasks
@wpotrzebowski wpotrzebowski mentioned this pull request Oct 14, 2024
7 tasks
@krzywon krzywon merged commit 1b49bbd into main Oct 25, 2024
14 checks passed
@krzywon krzywon deleted the 3109-bumps-fit-problem branch October 25, 2024 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants