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

Moving data sorting from plotting to data input #261

Merged
merged 12 commits into from
Nov 5, 2019

Conversation

wathen
Copy link
Collaborator

@wathen wathen commented Sep 30, 2019

Description of Work

Fixes part of #242

Moves data sorting out of fitbenchmarking/fitting/plotting to fitbenchmarking/parsing so that the data is sorted once.

Testing Instructions

  1. Check example results from master

Copy link
Member

@tyronerees tyronerees left a comment

Choose a reason for hiding this comment

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

Checked on simple_tests and CUTEst (all minimizers) and Neutron (scipy and mantid), and no changes in the accuracy.

The times are around 50% quicker with sorted data, suggesting that the fitting routines sort the data first.

example_scripts/example_runScripts.py Outdated Show resolved Hide resolved
fitbenchmarking/parsing/parse.py Outdated Show resolved Hide resolved
@Anders-Markvardsen Anders-Markvardsen added the block This must wait for an open issue to be fixed label Oct 11, 2019
@tyronerees tyronerees removed the block This must wait for an open issue to be fixed label Oct 30, 2019
@tyronerees
Copy link
Member

For some reason this change slowed things down quite a bit on my system. I didn’t have time to investigate, and won’t be able to follow until I’m back in a week. I’ll pass over reviewing duty to @AndrewLister-STFC so this doesn’t get held up

Copy link
Contributor

@AndrewLister-STFC AndrewLister-STFC left a comment

Choose a reason for hiding this comment

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

I think indexing data_e might be dangerous as it could be None?

I'm going to check the timings that @tyronerees mentioned now.

fitbenchmarking/fitbenchmark_one_problem.py Outdated Show resolved Hide resolved
@AndrewLister-STFC
Copy link
Contributor

For some reason this change slowed things down quite a bit on my system. I didn’t have time to investigate, and won’t be able to follow until I’m back in a week. I’ll pass over reviewing duty to @AndrewLister-STFC so this doesn’t get held up

I had a look on mine, and found that the branch gives timings which are similar but slower.
As an example, I ran scipy against SasModelling/1D, simple_tests, and Muon. On the branch I get ~1min 10s and on master it's ~1min 3s

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants