Skip to content

CL Reorg Recovery#1341

Merged
j-c-c merged 1 commit intodevelopfrom
cl_reorg_recovery
Dec 12, 2025
Merged

CL Reorg Recovery#1341
j-c-c merged 1 commit intodevelopfrom
cl_reorg_recovery

Conversation

@j-c-c
Copy link
Collaborator

@j-c-c j-c-c commented Nov 20, 2025

Recovering the previously reviewed changes from #1322 that I mistakenly rebased over with the wrong version of code prior to merging into develop.

Setting this as a draft while I carefully review that it includes all of the correct changes.

@j-c-c j-c-c self-assigned this Nov 20, 2025
@j-c-c j-c-c added the cleanup label Nov 20, 2025
@codecov
Copy link

codecov bot commented Nov 20, 2025

Codecov Report

❌ Patch coverage is 99.13043% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 90.69%. Comparing base (8ccdbc3) to head (d90bc13).
⚠️ Report is 1 commits behind head on develop.

Files with missing lines Patch % Lines
src/aspire/abinitio/sync_voting.py 96.51% 3 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1341      +/-   ##
===========================================
+ Coverage    90.66%   90.69%   +0.03%     
===========================================
  Files          134      135       +1     
  Lines        14455    14503      +48     
===========================================
+ Hits         13105    13154      +49     
+ Misses        1350     1349       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@j-c-c
Copy link
Collaborator Author

j-c-c commented Nov 21, 2025

@garrettwrong Ok, thankfully I was able to recover this branch. The changes in response to your initial review of the original PR #1322 start at commit 4257cbf labeled "docstring" in the commit history above.

These are all changes we discussed in the review comments in #1322 which you have resolved (presumably after looking at the changes). At any rate, this is ready for you to take another look. Let me know if you have any questions that will save you time on the review.

commonline_utils.py and sync_voting.py have a messy looking diff, but ultimately it is only functions being moved and/or removing self references. No functional changes were made here.

@j-c-c j-c-c requested a review from garrettwrong November 21, 2025 16:52
@garrettwrong
Copy link
Collaborator

Glad you were able to find the work. Please reset/squash these down so there is less risk of corrupting the repo history or bringing in regressions. We'll need to re-review them like a new PR because of the history mix up, but it should be pretty smooth. Thanks

@j-c-c j-c-c force-pushed the cl_reorg_recovery branch 3 times, most recently from f752a79 to 44d405e Compare December 2, 2025 16:47
@garrettwrong
Copy link
Collaborator

Hey, just double checking, this is ready to review? I can get started with it while my other task is running in bg... Thanks

@j-c-c
Copy link
Collaborator Author

j-c-c commented Dec 2, 2025

Hey, just double checking, this is ready to review? I can get started with it while my other task is running in bg... Thanks

Yep this is ready. Just finished looking it over and updating the branch. Thanks!

Copy link
Collaborator

@garrettwrong garrettwrong left a comment

Choose a reason for hiding this comment

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

Compared with the class document I had from a long time ago. Everything looks in place for this stage of the reorg.

I have 3 suggestions about the same sort of code. Its not new code, just migrated. Maybe it can be improved (maybe not). Make a followup issue to review those in the future after the reorg stuff. Low priority, just something I might have missed before. Thanks


Rj_tilde = Ri_tildes[j]
# Generate shifted versions of images.
pf_i_shifted = np.array([pf_i * shift_phase for shift_phase in shift_phases])
Copy link
Collaborator

Choose a reason for hiding this comment

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

can we just multiply these arrays....

]
)
# Compute all possible rotations between the i'th and j'th images.
Us = np.array(
Copy link
Collaborator

Choose a reason for hiding this comment

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

Similarly here, seems like a broadcast would work? This might be a rare case where einsum could be useful.

c2s = _cl_angles_to_ind(c2s, n_theta)

# Perform correlation, corrs is shape n_shifts x len(theta_ijs).
corrs = np.array(
Copy link
Collaborator

Choose a reason for hiding this comment

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

This would probably be clearer without the nested list comprehension. And you might not need to reshape it ....

@j-c-c
Copy link
Collaborator Author

j-c-c commented Dec 3, 2025

@garrettwrong Great, thanks for the review!

Make a followup issue to review those in the future after the reorg stuff. Low priority, just something I might have missed before. Thanks

I created issue #1345 and will follow up after the reorg work. Thanks

@j-c-c j-c-c marked this pull request as ready for review December 3, 2025 16:28
@j-c-c j-c-c requested a review from janden as a code owner December 3, 2025 16:28
@j-c-c j-c-c force-pushed the cl_reorg_recovery branch from 44d405e to d90bc13 Compare December 11, 2025 15:38
@j-c-c j-c-c merged commit 12d94e8 into develop Dec 12, 2025
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants