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

multislice rPIE ready for main branch after testing Daniel's reworkng of multiGPU workflow #332

Merged
merged 1 commit into from
Aug 21, 2024

Conversation

a4894z
Copy link
Contributor

@a4894z a4894z commented Aug 21, 2024

Purpose

After extensive testing on various benchmarking datasets (experimental and simulated), I believe multislice rPIE is ready to be merged into the main branch of TIKE.

Approach

The preconditioners are calculated for each slice in the sample, and these are then used in the sample update for each slice in a 3PIE style of update and the probe is updated using only the first slice of the sample and probe...this is a similar scheme that fold_slice uses in their LSTSQ multislice solver.

Pre-Merge Checklists

Submitter

  • Write a helpfully descriptive pull request title.
  • Organize changes into logically grouped commits with descriptive commit messages.
  • Document all new functions.
  • Click 'details' on the readthedocs check to view the updated docs.
  • Write tests for new functions or explain why they are not needed.
  • Address any complaints from pep8speaks.

Reviewer

  • Actually read all of the code.
  • Run the new code yourself; the included tests should make this easy.
  • Write a summary of the changes as you understand them.
  • Thank the submitter.

@pep8speaks
Copy link

Hello @a4894z! Thanks for opening this PR. We checked the lines you've touched for PEP 8 issues, and found:

Line 126:56: E201 whitespace after '['
Line 126:58: E202 whitespace before ']'
Line 127:56: E201 whitespace after '['
Line 127:58: E202 whitespace before ']'

Line 76:1: W293 blank line contains whitespace
Line 97:5: E303 too many blank lines (4)
Line 104:1: W293 blank line contains whitespace
Line 110:9: E303 too many blank lines (2)
Line 125:28: E222 multiple spaces after operator
Line 125:44: E201 whitespace after '('
Line 125:46: E201 whitespace after '('
Line 125:81: E501 line too long (116 > 80 characters)
Line 125:94: E202 whitespace before ')'
Line 125:115: E202 whitespace before ')'
Line 126:27: E201 whitespace after '['
Line 126:34: E202 whitespace before ']'
Line 128:37: E203 whitespace before ':'
Line 131:24: E221 multiple spaces before operator
Line 131:24: E251 unexpected spaces around keyword / parameter equals
Line 131:28: E251 unexpected spaces around keyword / parameter equals
Line 131:33: E201 whitespace after '['
Line 131:41: E202 whitespace before ']'
Line 131:44: W291 trailing whitespace
Line 132:25: E221 multiple spaces before operator
Line 132:25: E251 unexpected spaces around keyword / parameter equals
Line 132:28: E251 unexpected spaces around keyword / parameter equals
Line 133:26: E251 unexpected spaces around keyword / parameter equals
Line 133:28: E251 unexpected spaces around keyword / parameter equals
Line 133:47: E201 whitespace after '['
Line 133:55: E202 whitespace before ']'
Line 135:1: W293 blank line contains whitespace
Line 136:23: E201 whitespace after '('
Line 136:40: E202 whitespace before ')'
Line 136:42: E203 whitespace before ':'
Line 139:31: E201 whitespace after '['
Line 139:43: E202 whitespace before ']'
Line 139:69: E201 whitespace after '('
Line 139:79: E251 unexpected spaces around keyword / parameter equals
Line 139:81: E251 unexpected spaces around keyword / parameter equals
Line 139:81: E501 line too long (99 > 80 characters)
Line 142:1: W293 blank line contains whitespace
Line 143:1: W293 blank line contains whitespace

Line 138:1: W293 blank line contains whitespace
Line 150:81: E501 line too long (128 > 80 characters)
Line 150:94: E201 whitespace after '('
Line 152:52: E201 whitespace after '('
Line 152:62: E251 unexpected spaces around keyword / parameter equals
Line 152:64: E251 unexpected spaces around keyword / parameter equals
Line 152:81: E501 line too long (118 > 80 characters)
Line 155:1: W293 blank line contains whitespace

Line 339:81: E501 line too long (124 > 80 characters)
Line 358:58: W291 trailing whitespace

Line 36:50: W291 trailing whitespace
Line 65:1: W293 blank line contains whitespace
Line 124:16: E201 whitespace after '('
Line 124:70: E202 whitespace before ')'
Line 133:1: W293 blank line contains whitespace
Line 139:39: E201 whitespace after '['
Line 139:46: E202 whitespace before ']'
Line 144:38: E201 whitespace after '['
Line 145:1: W293 blank line contains whitespace
Line 147:9: E303 too many blank lines (2)
Line 156:1: W293 blank line contains whitespace

Line 151:51: W291 trailing whitespace
Line 152:1: W293 blank line contains whitespace
Line 188:47: W291 trailing whitespace
Line 230:31: W291 trailing whitespace
Line 231:51: W291 trailing whitespace
Line 241:1: W293 blank line contains whitespace
Line 247:14: E201 whitespace after '('
Line 247:75: W291 trailing whitespace
Line 248:75: E201 whitespace after '('
Line 248:81: E501 line too long (106 > 80 characters)
Line 253:12: W291 trailing whitespace
Line 264:53: W291 trailing whitespace
Line 267:1: W293 blank line contains whitespace
Line 271:53: W291 trailing whitespace
Line 278:53: W291 trailing whitespace
Line 315:52: E201 whitespace after '['
Line 315:59: E202 whitespace before ']'
Line 318:81: E501 line too long (85 > 80 characters)
Line 319:81: E501 line too long (117 > 80 characters)
Line 322:71: E201 whitespace after '['
Line 322:78: E202 whitespace before ']'
Line 322:81: E501 line too long (116 > 80 characters)
Line 322:85: E201 whitespace after '('
Line 323:1: W293 blank line contains whitespace
Line 329:9: E303 too many blank lines (4)
Line 329:12: W291 trailing whitespace
Line 340:53: W291 trailing whitespace
Line 343:1: W293 blank line contains whitespace
Line 346:53: W291 trailing whitespace
Line 352:53: W291 trailing whitespace
Line 358:53: W291 trailing whitespace
Line 364:53: W291 trailing whitespace
Line 436:42: E201 whitespace after '('
Line 436:46: E202 whitespace before ')'
Line 436:81: E501 line too long (105 > 80 characters)
Line 437:1: W293 blank line contains whitespace
Line 438:44: E201 whitespace after '('
Line 438:50: E202 whitespace before ')'
Line 438:81: E501 line too long (113 > 80 characters)
Line 439:1: W293 blank line contains whitespace
Line 440:50: E201 whitespace after '('
Line 440:52: E201 whitespace after '('
Line 440:79: E202 whitespace before ')'
Line 440:81: E501 line too long (103 > 80 characters)
Line 440:88: E251 unexpected spaces around keyword / parameter equals
Line 440:90: E251 unexpected spaces around keyword / parameter equals
Line 440:102: E202 whitespace before ')'
Line 442:47: E201 whitespace after '('
Line 442:52: E202 whitespace before ')'
Line 442:81: E501 line too long (121 > 80 characters)
Line 444:49: E201 whitespace after '('
Line 444:54: E202 whitespace before ')'
Line 444:81: E501 line too long (127 > 80 characters)
Line 465:9: E265 block comment should start with '# '
Line 467:36: E221 multiple spaces before operator
Line 467:81: E501 line too long (119 > 80 characters)
Line 536:81: E501 line too long (82 > 80 characters)
Line 539:33: E201 whitespace after '('
Line 539:58: E202 whitespace before ')'
Line 539:60: E203 whitespace before ':'
Line 540:13: E115 expected an indented block (comment)
Line 540:13: E265 block comment should start with '# '
Line 540:54: W291 trailing whitespace
Line 542:1: W293 blank line contains whitespace
Line 543:17: E265 block comment should start with '# '
Line 543:17: E303 too many blank lines (2)
Line 543:81: E501 line too long (144 > 80 characters)
Line 544:55: E201 whitespace after '['
Line 544:72: E202 whitespace before ']'
Line 544:81: E501 line too long (169 > 80 characters)
Line 544:110: E201 whitespace after '('
Line 544:168: E202 whitespace before ')'
Line 553:38: E201 whitespace after '['
Line 553:46: E202 whitespace before ']'
Line 555:17: E122 continuation line missing indentation or outdented
Line 555:45: E201 whitespace after '['
Line 555:53: E202 whitespace before ']'
Line 562:36: E201 whitespace after '['
Line 562:44: E202 whitespace before ']'
Line 566:51: E201 whitespace after '['
Line 566:59: E202 whitespace before ']'
Line 575:55: E201 whitespace after '('
Line 575:60: E202 whitespace before ')'
Line 575:62: W291 trailing whitespace

@a4894z a4894z merged commit 0b8fa67 into AdvancedPhotonSource:main Aug 21, 2024
1 of 5 checks passed
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.

2 participants