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

Fix crash of threaded integrator if njobs > 1. #1410

Merged
merged 3 commits into from
Sep 18, 2020

Conversation

jbeilstenedmands
Copy link
Contributor

Don't try to set an attribute of a namedtuple.
Add test to verify basic functioning of threaded integrator.

Don't try to set an attribute of a namedtuple. Add test to verify
basic functioning of threaded integrator.
@codecov
Copy link

codecov bot commented Sep 17, 2020

Codecov Report

Merging #1410 into master will decrease coverage by 0.18%.
The diff coverage is 8.33%.

@@            Coverage Diff             @@
##           master    #1410      +/-   ##
==========================================
- Coverage   64.65%   64.46%   -0.19%     
==========================================
  Files         617      617              
  Lines       69630    69862     +232     
  Branches     9561     9682     +121     
==========================================
+ Hits        45019    45039      +20     
- Misses      22829    23026     +197     
- Partials     1782     1797      +15     

@jbeilstenedmands jbeilstenedmands merged commit 6cbf426 into master Sep 18, 2020
@jbeilstenedmands jbeilstenedmands deleted the fix_threaded_integrator branch September 18, 2020 15:14
Anthchirp added a commit that referenced this pull request Sep 18, 2020
verified that the test fails against the original, unfixed code.
This will not work out-of-the-box, as the indexed.* files need to be
added to dials-data first.

[skip ci]
Anthchirp added a commit that referenced this pull request Sep 21, 2020
verified that the test fails against the original, unfixed code.
This will not work out-of-the-box, as the indexed.* files need to be
added to dials-data first.

Requires dials-data 2.1.22+
ndevenish pushed a commit that referenced this pull request Sep 28, 2020
Don't try to set an attribute of a namedtuple.
Add test to verify basic functioning of threaded integrator.
@ndevenish ndevenish mentioned this pull request Sep 28, 2020
ndevenish added a commit that referenced this pull request Sep 28, 2020
- ``dials.integrate``: fix integrator=3d_threaded crash if njobs > 1 (#1410)
- ``dials.integrate``: Check for and show error message if shoebox data is missing (#1421)
- ``dials.refine``: Avoid crash for experiments with zero reflections if the `auto_reduction.action=remove` option was active (#1417)
- ``dials.merge``: improve help message by adding usage examples (#1413)
- ``dials.refine``: More helpful error message when too few reflections (#1431)
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.

None yet

1 participant