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

3109: Bumps FitProblem fix #3110

Merged
merged 3 commits into from
Oct 25, 2024
Merged

3109: Bumps FitProblem fix #3110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f14b597
Iterating through bumps MultiFitProblem.models now returns the Fitnes…
krzywon Sep 10, 2024
824d782
Remove all calls to setup.py to help future-proof the build process
krzywon Sep 11, 2024
f95ee9a
Move example data from base sasdata package instead of built package
krzywon Sep 11, 2024
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
10 changes: 1 addition & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,27 +119,21 @@ jobs:
cd ../sasdata
rm -rf build
rm -rf dist
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.

Using this build:

https://github.com/SasView/sasview/actions/runs/10814069439

python -m pip install --no-deps .

- name: Build and install sasmodels
run: |
cd ../sasmodels
rm -rf build
rm -rf dist
python setup.py clean
python setup.py build
python -m pip install --no-deps .

- name: Build and install bumps
run: |
cd ../bumps
rm -rf build
rm -rf dist
python setup.py clean
python setup.py build
python -m pip install --no-deps .

### Document the build environment
Expand All @@ -156,8 +150,6 @@ jobs:
githash=$( git rev-parse HEAD )
sed -i.bak s/GIT_COMMIT/$githash/g src/sas/sasview/__init__.py
# BUILD SASVIEW
python setup.py clean
python setup.py build
python -m pip install --no-deps .

### Run tests (if enabled)
Expand Down
3 changes: 1 addition & 2 deletions src/sas/sascalc/fit/BumpsFitting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,7 @@ def fit(self, msg_q=None,
# Check if uncertainty is missing for any parameter
uncertainty_warning = False

for fitting_module in problem.models:
fitness = fitting_module.fitness
for fitness in problem.models:
pars = fitness.fitted_pars + fitness.computed_pars
par_names = fitness.fitted_par_names + fitness.computed_par_names

Expand Down
Loading