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

Remove n_procs for nodes that do not use multiple cores #1256

Merged
merged 14 commits into from
Sep 12, 2024

Conversation

tsalo
Copy link
Member

@tsalo tsalo commented Sep 11, 2024

Closes none, but addresses an issue identified by @mattcieslak.

Changes proposed in this pull request

  • For any single-threaded nodes in any workflow, drop n_procs=omp_nthreads.
  • Also drop omp_nthreads=* from any nodes using that. Pretty sure it doesn't do anything.
  • Create a WBCommand base interface that sets OMP_NUM_THREADS.
  • Use the MultiProc plugin for integration tests, which speeds things up by a fair amount.

@tsalo tsalo added the refactor Changes to the codebase that don't impact workflow inputs or outputs. label Sep 11, 2024
xcp_d/workflows/anatomical/surface.py Show resolved Hide resolved
xcp_d/workflows/anatomical/volume.py Show resolved Hide resolved
xcp_d/workflows/anatomical/volume.py Show resolved Hide resolved
xcp_d/workflows/bold/metrics.py Show resolved Hide resolved
Copy link

codecov bot commented Sep 11, 2024

Codecov Report

Attention: Patch coverage is 93.33333% with 4 lines in your changes missing coverage. Please review.

Project coverage is 78.26%. Comparing base (3ba1a93) to head (1f30de7).

Files with missing lines Patch % Lines
xcp_d/interfaces/workbench.py 92.72% 3 Missing and 1 partial ⚠️

❗ There is a different number of reports uploaded between BASE (3ba1a93) and HEAD (1f30de7). Click for more details.

HEAD has 1 upload less than BASE
Flag BASE (3ba1a93) HEAD (1f30de7)
2 1
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1256      +/-   ##
==========================================
- Coverage   84.10%   78.26%   -5.84%     
==========================================
  Files          59       59              
  Lines        7197     7219      +22     
  Branches     1065     1066       +1     
==========================================
- Hits         6053     5650     -403     
- Misses        880     1296     +416     
- Partials      264      273       +9     

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

@tsalo
Copy link
Member Author

tsalo commented Sep 12, 2024

The integration tests don't seem to contribute to coverage now that we're using the MultiProc plugin, but I think the speed-up is worth the drop in coverage, so I'm going to merge this.

@tsalo tsalo added the testing Improving testing in the project. label Sep 12, 2024
@tsalo tsalo merged commit 1ddf601 into PennLINC:main Sep 12, 2024
20 of 21 checks passed
@tsalo tsalo deleted the clean-processes branch September 12, 2024 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
refactor Changes to the codebase that don't impact workflow inputs or outputs. testing Improving testing in the project.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants