Support threads on local backend - #504

Merged
jan-janssen merged 4 commits into
mainfrom
threads
Nov 19, 2024
Merged

Support threads on local backend#504
jan-janssen merged 4 commits into
mainfrom
threads

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 19, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

Release Notes

  • New Features

    • Enhanced resource allocation logic for task execution, now accounting for total slots required based on cores and threads.
    • Added support for specifying the number of threads per core in the spawner classes, improving command generation for SLURM.
  • Bug Fixes

    • Simplified validation process by removing checks for threads per core, improving user experience with local backend configurations.
  • Tests

    • Removed outdated tests related to thread checks and refined error handling in MPI backend tests, streamlining the testing suite to focus on current functionalities.

@coderabbitai

coderabbitaiBot commented Nov 19, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The pull request introduces significant changes across multiple files, primarily focusing on simplifying resource validation related to thread management in the executor framework. The check_threads_per_core function has been removed, along with its associated logic, leading to the elimination of checks for the threads_per_core parameter when using the "local" backend. Additionally, updates were made to resource allocation logic in the shared.py file to better reflect the actual resource needs of tasks. Corresponding tests for the removed functionality were also deleted.

Changes

FileChange Summary
executorlib/interactive/executor.pyRemoved check_threads_per_core function call and logic from create_executor.
executorlib/interactive/shared.pyIntroduced slots_required for resource allocation in _submit_function_to_separate_process. Updated _wait_for_free_slots to use slots_required.
executorlib/standalone/inputcheck.pyRemoved check_threads_per_core function.
tests/test_shared_input_check.pyRemoved test_check_threads_per_core method from TestInputCheck class.
tests/test_executor_backend_mpi.pyUpdated tests to remove assertions related to threads_per_core and added timing assertions for caching behavior.
tests/test_executor_backend_mpi_noblock.pyRemoved test case checking for TypeError related to threads_per_core in test_errors method.
executorlib/standalone/interactive/spawner.pyAdded threads_per_core parameter to SubprocessSpawner and SrunSpawner constructors, updated command generation logic.

Possibly related PRs

🐰 In the meadow where bunnies play,
We’ve tidied up the threads today!
No more checks for cores to fret,
Just hop along, no need to sweat!
With slots in mind, we’ll work just right,
Simplified paths, oh what a sight! 🌼


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
executorlib/interactive/shared.py (1)

552-552: LGTM! Consider documenting the slots calculation.

The use of slots_required in _wait_for_free_slots correctly accounts for both cores and threads when checking resource availability.

Consider adding a docstring update to clarify that cores_requested now represents total slots (cores * threads):

def _wait_for_free_slots(
active_task_dict: dict,
cores_requested: int,
max_cores: Optional[int] = None,
max_workers: Optional[int] = None,
) -> dict:
"""
Wait for available computing resources to become available.
Args:
- cores_requested (int): Number of cores required for executing the next task+ cores_requested (int): Total number of slots (cores * threads_per_core) required for executing the next task
"""
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 1565d4c and 78246d5.

📒 Files selected for processing (4)
  • executorlib/interactive/executor.py (0 hunks)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/inputcheck.py (0 hunks)
  • tests/test_shared_input_check.py (0 hunks)
💤 Files with no reviewable changes (3)
  • executorlib/interactive/executor.py
  • executorlib/standalone/inputcheck.py
  • tests/test_shared_input_check.py
🔇 Additional comments (2)
executorlib/interactive/shared.py (2)

556-556: LGTM! Verify resource tracking behavior.

The active task dictionary now correctly tracks total resource usage by storing slots_required instead of just cores.

Let's verify that the active task dictionary is properly cleaned up:

✅ Verification successful

The search results show that active_task_dict is properly managed throughout its lifecycle:

  1. Initialization as empty dict
  2. Updated through _submit_function_to_separate_process
  3. Cleaned up in _wait_for_free_slots by filtering out completed tasks
  4. Final assignment of slots_required for resource tracking

LGTM! Resource tracking cleanup is properly implemented

The active task dictionary has consistent cleanup through dictionary comprehensions that filter out completed tasks (k.done()). This ensures proper resource tracking and cleanup when tasks complete, preventing resource leaks. The update with slots_required fits well within this pattern.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for all places where active_task_dict is modified to ensure consistent cleanup
rg "active_task_dict.*=|active_task_dict\[.*\].*=" -A 2 -B 2

Length of output: 2707


549-549: LGTM! Verify thread count calculation across the codebase.

The calculation of total slots as cores * threads_per_core is correct. The default value of 1 for threads_per_core maintains backward compatibility.

Let's verify that this is the only place where thread calculations are performed:

✅ Verification successful

Thread calculation is consistently implemented across the codebase

The thread count calculation in shared.py aligns with its usage in the Flux backend implementation. The threads_per_core parameter is correctly:

  • Used as a multiplier for cores in resource calculation (shared.py)
  • Passed as cores_per_task and cores_per_slot in Flux job specifications (flux.py)
  • Documented in examples with appropriate defaults and recommendations
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other thread-related calculations that might need similar updates
rg -l "threads_per_core"| xargs rg "cores.*threads|threads.*cores"

Length of output: 771


Script:

#!/bin/bash# Let's check the implementation in flux.py to understand how threads_per_core is used
rg -A 5 -B 5 "_threads_per_core" executorlib/interactive/flux.py

Length of output: 1294

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (2)
executorlib/standalone/interactive/spawner.py (2)

Line range hint 246-247: Fix the SLURM command generation bug.

There's a critical bug in the SLURM command generation where the --cpus-per-task option is malformed:

  1. The equals sign is missing
  2. There's no space between the option and value

Apply this fix:

- command_prepend_lst += ["--cpus-per-task" + str(threads_per_core)]+ command_prepend_lst += ["--cpus-per-task=" + str(threads_per_core)]

This ensures the SLURM command is properly formatted as --cpus-per-task=N.


Line range hint 1-262: Consider adding integration tests for thread support.

While the thread management implementation looks good overall, consider:

  1. Adding integration tests to verify thread allocation works correctly across different backends (subprocess, MPI, SLURM)
  2. Documenting any limitations or requirements for thread support in the class docstrings

Would you like me to help create integration test cases for thread management?

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 6456b64 and 7a1d302.

📒 Files selected for processing (2)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/interactive/spawner.py (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • executorlib/interactive/shared.py
🔇 Additional comments (2)
executorlib/standalone/interactive/spawner.py (2)

175-175: LGTM: Proper inheritance implementation.

The threads_per_core parameter is correctly passed to the parent class, maintaining the inheritance chain.


60-60: Consider documenting parameter validation and usage.

The threads_per_core parameter is added but:

  1. The docstring could specify any validation rules (e.g., must be positive).
  2. The _threads_per_core instance variable isn't used in the generate_command method of this class.

Let's verify if there are any validation rules for this parameter:

Also applies to: 68-68, 77-77

@jan-janssen
jan-janssen merged commit d11a2d3 into mainNov 19, 2024
@jan-janssen
jan-janssen deleted the threads branch November 19, 2024 15:23
Sign up for freeto 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.

1 participant

@jan-janssen
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Support threads on local backend - #504

Merged
jan-janssen merged 4 commits into
mainfrom
threads
Nov 19, 2024
Merged

Support threads on local backend#504
jan-janssen merged 4 commits into
mainfrom
threads

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 19, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

Release Notes

  • New Features

    • Enhanced resource allocation logic for task execution, now accounting for total slots required based on cores and threads.
    • Added support for specifying the number of threads per core in the spawner classes, improving command generation for SLURM.
  • Bug Fixes

    • Simplified validation process by removing checks for threads per core, improving user experience with local backend configurations.
  • Tests

    • Removed outdated tests related to thread checks and refined error handling in MPI backend tests, streamlining the testing suite to focus on current functionalities.

@coderabbitai

coderabbitaiBot commented Nov 19, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The pull request introduces significant changes across multiple files, primarily focusing on simplifying resource validation related to thread management in the executor framework. The check_threads_per_core function has been removed, along with its associated logic, leading to the elimination of checks for the threads_per_core parameter when using the "local" backend. Additionally, updates were made to resource allocation logic in the shared.py file to better reflect the actual resource needs of tasks. Corresponding tests for the removed functionality were also deleted.

Changes

FileChange Summary
executorlib/interactive/executor.pyRemoved check_threads_per_core function call and logic from create_executor.
executorlib/interactive/shared.pyIntroduced slots_required for resource allocation in _submit_function_to_separate_process. Updated _wait_for_free_slots to use slots_required.
executorlib/standalone/inputcheck.pyRemoved check_threads_per_core function.
tests/test_shared_input_check.pyRemoved test_check_threads_per_core method from TestInputCheck class.
tests/test_executor_backend_mpi.pyUpdated tests to remove assertions related to threads_per_core and added timing assertions for caching behavior.
tests/test_executor_backend_mpi_noblock.pyRemoved test case checking for TypeError related to threads_per_core in test_errors method.
executorlib/standalone/interactive/spawner.pyAdded threads_per_core parameter to SubprocessSpawner and SrunSpawner constructors, updated command generation logic.

Possibly related PRs

🐰 In the meadow where bunnies play,
We’ve tidied up the threads today!
No more checks for cores to fret,
Just hop along, no need to sweat!
With slots in mind, we’ll work just right,
Simplified paths, oh what a sight! 🌼


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
executorlib/interactive/shared.py (1)

552-552: LGTM! Consider documenting the slots calculation.

The use of slots_required in _wait_for_free_slots correctly accounts for both cores and threads when checking resource availability.

Consider adding a docstring update to clarify that cores_requested now represents total slots (cores * threads):

def _wait_for_free_slots(
active_task_dict: dict,
cores_requested: int,
max_cores: Optional[int] = None,
max_workers: Optional[int] = None,
) -> dict:
"""
Wait for available computing resources to become available.
Args:
- cores_requested (int): Number of cores required for executing the next task+ cores_requested (int): Total number of slots (cores * threads_per_core) required for executing the next task
"""
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 1565d4c and 78246d5.

📒 Files selected for processing (4)
  • executorlib/interactive/executor.py (0 hunks)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/inputcheck.py (0 hunks)
  • tests/test_shared_input_check.py (0 hunks)
💤 Files with no reviewable changes (3)
  • executorlib/interactive/executor.py
  • executorlib/standalone/inputcheck.py
  • tests/test_shared_input_check.py
🔇 Additional comments (2)
executorlib/interactive/shared.py (2)

556-556: LGTM! Verify resource tracking behavior.

The active task dictionary now correctly tracks total resource usage by storing slots_required instead of just cores.

Let's verify that the active task dictionary is properly cleaned up:

✅ Verification successful

The search results show that active_task_dict is properly managed throughout its lifecycle:

  1. Initialization as empty dict
  2. Updated through _submit_function_to_separate_process
  3. Cleaned up in _wait_for_free_slots by filtering out completed tasks
  4. Final assignment of slots_required for resource tracking

LGTM! Resource tracking cleanup is properly implemented

The active task dictionary has consistent cleanup through dictionary comprehensions that filter out completed tasks (k.done()). This ensures proper resource tracking and cleanup when tasks complete, preventing resource leaks. The update with slots_required fits well within this pattern.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for all places where active_task_dict is modified to ensure consistent cleanup
rg "active_task_dict.*=|active_task_dict\[.*\].*=" -A 2 -B 2

Length of output: 2707


549-549: LGTM! Verify thread count calculation across the codebase.

The calculation of total slots as cores * threads_per_core is correct. The default value of 1 for threads_per_core maintains backward compatibility.

Let's verify that this is the only place where thread calculations are performed:

✅ Verification successful

Thread calculation is consistently implemented across the codebase

The thread count calculation in shared.py aligns with its usage in the Flux backend implementation. The threads_per_core parameter is correctly:

  • Used as a multiplier for cores in resource calculation (shared.py)
  • Passed as cores_per_task and cores_per_slot in Flux job specifications (flux.py)
  • Documented in examples with appropriate defaults and recommendations
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other thread-related calculations that might need similar updates
rg -l "threads_per_core"| xargs rg "cores.*threads|threads.*cores"

Length of output: 771


Script:

#!/bin/bash# Let's check the implementation in flux.py to understand how threads_per_core is used
rg -A 5 -B 5 "_threads_per_core" executorlib/interactive/flux.py

Length of output: 1294

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (2)
executorlib/standalone/interactive/spawner.py (2)

Line range hint 246-247: Fix the SLURM command generation bug.

There's a critical bug in the SLURM command generation where the --cpus-per-task option is malformed:

  1. The equals sign is missing
  2. There's no space between the option and value

Apply this fix:

- command_prepend_lst += ["--cpus-per-task" + str(threads_per_core)]+ command_prepend_lst += ["--cpus-per-task=" + str(threads_per_core)]

This ensures the SLURM command is properly formatted as --cpus-per-task=N.


Line range hint 1-262: Consider adding integration tests for thread support.

While the thread management implementation looks good overall, consider:

  1. Adding integration tests to verify thread allocation works correctly across different backends (subprocess, MPI, SLURM)
  2. Documenting any limitations or requirements for thread support in the class docstrings

Would you like me to help create integration test cases for thread management?

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 6456b64 and 7a1d302.

📒 Files selected for processing (2)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/interactive/spawner.py (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • executorlib/interactive/shared.py
🔇 Additional comments (2)
executorlib/standalone/interactive/spawner.py (2)

175-175: LGTM: Proper inheritance implementation.

The threads_per_core parameter is correctly passed to the parent class, maintaining the inheritance chain.


60-60: Consider documenting parameter validation and usage.

The threads_per_core parameter is added but:

  1. The docstring could specify any validation rules (e.g., must be positive).
  2. The _threads_per_core instance variable isn't used in the generate_command method of this class.

Let's verify if there are any validation rules for this parameter:

Also applies to: 68-68, 77-77

@jan-janssen
jan-janssen merged commit d11a2d3 into mainNov 19, 2024
@jan-janssen
jan-janssen deleted the threads branch November 19, 2024 15:23
Sign up for freeto 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.

1 participant

@jan-janssen
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Support threads on local backend - #504

Merged
jan-janssen merged 4 commits into
mainfrom
threads
Nov 19, 2024
Merged

Support threads on local backend#504
jan-janssen merged 4 commits into
mainfrom
threads

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 19, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

Release Notes

  • New Features

    • Enhanced resource allocation logic for task execution, now accounting for total slots required based on cores and threads.
    • Added support for specifying the number of threads per core in the spawner classes, improving command generation for SLURM.
  • Bug Fixes

    • Simplified validation process by removing checks for threads per core, improving user experience with local backend configurations.
  • Tests

    • Removed outdated tests related to thread checks and refined error handling in MPI backend tests, streamlining the testing suite to focus on current functionalities.

@coderabbitai

coderabbitaiBot commented Nov 19, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The pull request introduces significant changes across multiple files, primarily focusing on simplifying resource validation related to thread management in the executor framework. The check_threads_per_core function has been removed, along with its associated logic, leading to the elimination of checks for the threads_per_core parameter when using the "local" backend. Additionally, updates were made to resource allocation logic in the shared.py file to better reflect the actual resource needs of tasks. Corresponding tests for the removed functionality were also deleted.

Changes

FileChange Summary
executorlib/interactive/executor.pyRemoved check_threads_per_core function call and logic from create_executor.
executorlib/interactive/shared.pyIntroduced slots_required for resource allocation in _submit_function_to_separate_process. Updated _wait_for_free_slots to use slots_required.
executorlib/standalone/inputcheck.pyRemoved check_threads_per_core function.
tests/test_shared_input_check.pyRemoved test_check_threads_per_core method from TestInputCheck class.
tests/test_executor_backend_mpi.pyUpdated tests to remove assertions related to threads_per_core and added timing assertions for caching behavior.
tests/test_executor_backend_mpi_noblock.pyRemoved test case checking for TypeError related to threads_per_core in test_errors method.
executorlib/standalone/interactive/spawner.pyAdded threads_per_core parameter to SubprocessSpawner and SrunSpawner constructors, updated command generation logic.

Possibly related PRs

🐰 In the meadow where bunnies play,
We’ve tidied up the threads today!
No more checks for cores to fret,
Just hop along, no need to sweat!
With slots in mind, we’ll work just right,
Simplified paths, oh what a sight! 🌼


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
executorlib/interactive/shared.py (1)

552-552: LGTM! Consider documenting the slots calculation.

The use of slots_required in _wait_for_free_slots correctly accounts for both cores and threads when checking resource availability.

Consider adding a docstring update to clarify that cores_requested now represents total slots (cores * threads):

def _wait_for_free_slots(
active_task_dict: dict,
cores_requested: int,
max_cores: Optional[int] = None,
max_workers: Optional[int] = None,
) -> dict:
"""
Wait for available computing resources to become available.
Args:
- cores_requested (int): Number of cores required for executing the next task+ cores_requested (int): Total number of slots (cores * threads_per_core) required for executing the next task
"""
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 1565d4c and 78246d5.

📒 Files selected for processing (4)
  • executorlib/interactive/executor.py (0 hunks)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/inputcheck.py (0 hunks)
  • tests/test_shared_input_check.py (0 hunks)
💤 Files with no reviewable changes (3)
  • executorlib/interactive/executor.py
  • executorlib/standalone/inputcheck.py
  • tests/test_shared_input_check.py
🔇 Additional comments (2)
executorlib/interactive/shared.py (2)

556-556: LGTM! Verify resource tracking behavior.

The active task dictionary now correctly tracks total resource usage by storing slots_required instead of just cores.

Let's verify that the active task dictionary is properly cleaned up:

✅ Verification successful

The search results show that active_task_dict is properly managed throughout its lifecycle:

  1. Initialization as empty dict
  2. Updated through _submit_function_to_separate_process
  3. Cleaned up in _wait_for_free_slots by filtering out completed tasks
  4. Final assignment of slots_required for resource tracking

LGTM! Resource tracking cleanup is properly implemented

The active task dictionary has consistent cleanup through dictionary comprehensions that filter out completed tasks (k.done()). This ensures proper resource tracking and cleanup when tasks complete, preventing resource leaks. The update with slots_required fits well within this pattern.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for all places where active_task_dict is modified to ensure consistent cleanup
rg "active_task_dict.*=|active_task_dict\[.*\].*=" -A 2 -B 2

Length of output: 2707


549-549: LGTM! Verify thread count calculation across the codebase.

The calculation of total slots as cores * threads_per_core is correct. The default value of 1 for threads_per_core maintains backward compatibility.

Let's verify that this is the only place where thread calculations are performed:

✅ Verification successful

Thread calculation is consistently implemented across the codebase

The thread count calculation in shared.py aligns with its usage in the Flux backend implementation. The threads_per_core parameter is correctly:

  • Used as a multiplier for cores in resource calculation (shared.py)
  • Passed as cores_per_task and cores_per_slot in Flux job specifications (flux.py)
  • Documented in examples with appropriate defaults and recommendations
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other thread-related calculations that might need similar updates
rg -l "threads_per_core"| xargs rg "cores.*threads|threads.*cores"

Length of output: 771


Script:

#!/bin/bash# Let's check the implementation in flux.py to understand how threads_per_core is used
rg -A 5 -B 5 "_threads_per_core" executorlib/interactive/flux.py

Length of output: 1294

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (2)
executorlib/standalone/interactive/spawner.py (2)

Line range hint 246-247: Fix the SLURM command generation bug.

There's a critical bug in the SLURM command generation where the --cpus-per-task option is malformed:

  1. The equals sign is missing
  2. There's no space between the option and value

Apply this fix:

- command_prepend_lst += ["--cpus-per-task" + str(threads_per_core)]+ command_prepend_lst += ["--cpus-per-task=" + str(threads_per_core)]

This ensures the SLURM command is properly formatted as --cpus-per-task=N.


Line range hint 1-262: Consider adding integration tests for thread support.

While the thread management implementation looks good overall, consider:

  1. Adding integration tests to verify thread allocation works correctly across different backends (subprocess, MPI, SLURM)
  2. Documenting any limitations or requirements for thread support in the class docstrings

Would you like me to help create integration test cases for thread management?

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 6456b64 and 7a1d302.

📒 Files selected for processing (2)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/interactive/spawner.py (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • executorlib/interactive/shared.py
🔇 Additional comments (2)
executorlib/standalone/interactive/spawner.py (2)

175-175: LGTM: Proper inheritance implementation.

The threads_per_core parameter is correctly passed to the parent class, maintaining the inheritance chain.


60-60: Consider documenting parameter validation and usage.

The threads_per_core parameter is added but:

  1. The docstring could specify any validation rules (e.g., must be positive).
  2. The _threads_per_core instance variable isn't used in the generate_command method of this class.

Let's verify if there are any validation rules for this parameter:

Also applies to: 68-68, 77-77

@jan-janssen
jan-janssen merged commit d11a2d3 into mainNov 19, 2024
@jan-janssen
jan-janssen deleted the threads branch November 19, 2024 15:23
Sign up for freeto 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.

1 participant

@jan-janssen
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Support threads on local backend - #504

Merged
jan-janssen merged 4 commits into
mainfrom
threads
Nov 19, 2024
Merged

Support threads on local backend#504
jan-janssen merged 4 commits into
mainfrom
threads

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 19, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

Release Notes

  • New Features

    • Enhanced resource allocation logic for task execution, now accounting for total slots required based on cores and threads.
    • Added support for specifying the number of threads per core in the spawner classes, improving command generation for SLURM.
  • Bug Fixes

    • Simplified validation process by removing checks for threads per core, improving user experience with local backend configurations.
  • Tests

    • Removed outdated tests related to thread checks and refined error handling in MPI backend tests, streamlining the testing suite to focus on current functionalities.

@coderabbitai

coderabbitaiBot commented Nov 19, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The pull request introduces significant changes across multiple files, primarily focusing on simplifying resource validation related to thread management in the executor framework. The check_threads_per_core function has been removed, along with its associated logic, leading to the elimination of checks for the threads_per_core parameter when using the "local" backend. Additionally, updates were made to resource allocation logic in the shared.py file to better reflect the actual resource needs of tasks. Corresponding tests for the removed functionality were also deleted.

Changes

FileChange Summary
executorlib/interactive/executor.pyRemoved check_threads_per_core function call and logic from create_executor.
executorlib/interactive/shared.pyIntroduced slots_required for resource allocation in _submit_function_to_separate_process. Updated _wait_for_free_slots to use slots_required.
executorlib/standalone/inputcheck.pyRemoved check_threads_per_core function.
tests/test_shared_input_check.pyRemoved test_check_threads_per_core method from TestInputCheck class.
tests/test_executor_backend_mpi.pyUpdated tests to remove assertions related to threads_per_core and added timing assertions for caching behavior.
tests/test_executor_backend_mpi_noblock.pyRemoved test case checking for TypeError related to threads_per_core in test_errors method.
executorlib/standalone/interactive/spawner.pyAdded threads_per_core parameter to SubprocessSpawner and SrunSpawner constructors, updated command generation logic.

Possibly related PRs

🐰 In the meadow where bunnies play,
We’ve tidied up the threads today!
No more checks for cores to fret,
Just hop along, no need to sweat!
With slots in mind, we’ll work just right,
Simplified paths, oh what a sight! 🌼


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
executorlib/interactive/shared.py (1)

552-552: LGTM! Consider documenting the slots calculation.

The use of slots_required in _wait_for_free_slots correctly accounts for both cores and threads when checking resource availability.

Consider adding a docstring update to clarify that cores_requested now represents total slots (cores * threads):

def _wait_for_free_slots(
active_task_dict: dict,
cores_requested: int,
max_cores: Optional[int] = None,
max_workers: Optional[int] = None,
) -> dict:
"""
Wait for available computing resources to become available.
Args:
- cores_requested (int): Number of cores required for executing the next task+ cores_requested (int): Total number of slots (cores * threads_per_core) required for executing the next task
"""
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 1565d4c and 78246d5.

📒 Files selected for processing (4)
  • executorlib/interactive/executor.py (0 hunks)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/inputcheck.py (0 hunks)
  • tests/test_shared_input_check.py (0 hunks)
💤 Files with no reviewable changes (3)
  • executorlib/interactive/executor.py
  • executorlib/standalone/inputcheck.py
  • tests/test_shared_input_check.py
🔇 Additional comments (2)
executorlib/interactive/shared.py (2)

556-556: LGTM! Verify resource tracking behavior.

The active task dictionary now correctly tracks total resource usage by storing slots_required instead of just cores.

Let's verify that the active task dictionary is properly cleaned up:

✅ Verification successful

The search results show that active_task_dict is properly managed throughout its lifecycle:

  1. Initialization as empty dict
  2. Updated through _submit_function_to_separate_process
  3. Cleaned up in _wait_for_free_slots by filtering out completed tasks
  4. Final assignment of slots_required for resource tracking

LGTM! Resource tracking cleanup is properly implemented

The active task dictionary has consistent cleanup through dictionary comprehensions that filter out completed tasks (k.done()). This ensures proper resource tracking and cleanup when tasks complete, preventing resource leaks. The update with slots_required fits well within this pattern.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for all places where active_task_dict is modified to ensure consistent cleanup
rg "active_task_dict.*=|active_task_dict\[.*\].*=" -A 2 -B 2

Length of output: 2707


549-549: LGTM! Verify thread count calculation across the codebase.

The calculation of total slots as cores * threads_per_core is correct. The default value of 1 for threads_per_core maintains backward compatibility.

Let's verify that this is the only place where thread calculations are performed:

✅ Verification successful

Thread calculation is consistently implemented across the codebase

The thread count calculation in shared.py aligns with its usage in the Flux backend implementation. The threads_per_core parameter is correctly:

  • Used as a multiplier for cores in resource calculation (shared.py)
  • Passed as cores_per_task and cores_per_slot in Flux job specifications (flux.py)
  • Documented in examples with appropriate defaults and recommendations
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other thread-related calculations that might need similar updates
rg -l "threads_per_core"| xargs rg "cores.*threads|threads.*cores"

Length of output: 771


Script:

#!/bin/bash# Let's check the implementation in flux.py to understand how threads_per_core is used
rg -A 5 -B 5 "_threads_per_core" executorlib/interactive/flux.py

Length of output: 1294

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (2)
executorlib/standalone/interactive/spawner.py (2)

Line range hint 246-247: Fix the SLURM command generation bug.

There's a critical bug in the SLURM command generation where the --cpus-per-task option is malformed:

  1. The equals sign is missing
  2. There's no space between the option and value

Apply this fix:

- command_prepend_lst += ["--cpus-per-task" + str(threads_per_core)]+ command_prepend_lst += ["--cpus-per-task=" + str(threads_per_core)]

This ensures the SLURM command is properly formatted as --cpus-per-task=N.


Line range hint 1-262: Consider adding integration tests for thread support.

While the thread management implementation looks good overall, consider:

  1. Adding integration tests to verify thread allocation works correctly across different backends (subprocess, MPI, SLURM)
  2. Documenting any limitations or requirements for thread support in the class docstrings

Would you like me to help create integration test cases for thread management?

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 6456b64 and 7a1d302.

📒 Files selected for processing (2)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/interactive/spawner.py (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • executorlib/interactive/shared.py
🔇 Additional comments (2)
executorlib/standalone/interactive/spawner.py (2)

175-175: LGTM: Proper inheritance implementation.

The threads_per_core parameter is correctly passed to the parent class, maintaining the inheritance chain.


60-60: Consider documenting parameter validation and usage.

The threads_per_core parameter is added but:

  1. The docstring could specify any validation rules (e.g., must be positive).
  2. The _threads_per_core instance variable isn't used in the generate_command method of this class.

Let's verify if there are any validation rules for this parameter:

Also applies to: 68-68, 77-77

@jan-janssen
jan-janssen merged commit d11a2d3 into mainNov 19, 2024
@jan-janssen
jan-janssen deleted the threads branch November 19, 2024 15:23
Sign up for freeto 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.

1 participant

@jan-janssen
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Support threads on local backend - #504

Merged
jan-janssen merged 4 commits into
mainfrom
threads
Nov 19, 2024
Merged

Support threads on local backend#504
jan-janssen merged 4 commits into
mainfrom
threads

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 19, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

Release Notes

  • New Features

    • Enhanced resource allocation logic for task execution, now accounting for total slots required based on cores and threads.
    • Added support for specifying the number of threads per core in the spawner classes, improving command generation for SLURM.
  • Bug Fixes

    • Simplified validation process by removing checks for threads per core, improving user experience with local backend configurations.
  • Tests

    • Removed outdated tests related to thread checks and refined error handling in MPI backend tests, streamlining the testing suite to focus on current functionalities.

@coderabbitai

coderabbitaiBot commented Nov 19, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The pull request introduces significant changes across multiple files, primarily focusing on simplifying resource validation related to thread management in the executor framework. The check_threads_per_core function has been removed, along with its associated logic, leading to the elimination of checks for the threads_per_core parameter when using the "local" backend. Additionally, updates were made to resource allocation logic in the shared.py file to better reflect the actual resource needs of tasks. Corresponding tests for the removed functionality were also deleted.

Changes

FileChange Summary
executorlib/interactive/executor.pyRemoved check_threads_per_core function call and logic from create_executor.
executorlib/interactive/shared.pyIntroduced slots_required for resource allocation in _submit_function_to_separate_process. Updated _wait_for_free_slots to use slots_required.
executorlib/standalone/inputcheck.pyRemoved check_threads_per_core function.
tests/test_shared_input_check.pyRemoved test_check_threads_per_core method from TestInputCheck class.
tests/test_executor_backend_mpi.pyUpdated tests to remove assertions related to threads_per_core and added timing assertions for caching behavior.
tests/test_executor_backend_mpi_noblock.pyRemoved test case checking for TypeError related to threads_per_core in test_errors method.
executorlib/standalone/interactive/spawner.pyAdded threads_per_core parameter to SubprocessSpawner and SrunSpawner constructors, updated command generation logic.

Possibly related PRs

🐰 In the meadow where bunnies play,
We’ve tidied up the threads today!
No more checks for cores to fret,
Just hop along, no need to sweat!
With slots in mind, we’ll work just right,
Simplified paths, oh what a sight! 🌼


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
executorlib/interactive/shared.py (1)

552-552: LGTM! Consider documenting the slots calculation.

The use of slots_required in _wait_for_free_slots correctly accounts for both cores and threads when checking resource availability.

Consider adding a docstring update to clarify that cores_requested now represents total slots (cores * threads):

def _wait_for_free_slots(
active_task_dict: dict,
cores_requested: int,
max_cores: Optional[int] = None,
max_workers: Optional[int] = None,
) -> dict:
"""
Wait for available computing resources to become available.
Args:
- cores_requested (int): Number of cores required for executing the next task+ cores_requested (int): Total number of slots (cores * threads_per_core) required for executing the next task
"""
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 1565d4c and 78246d5.

📒 Files selected for processing (4)
  • executorlib/interactive/executor.py (0 hunks)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/inputcheck.py (0 hunks)
  • tests/test_shared_input_check.py (0 hunks)
💤 Files with no reviewable changes (3)
  • executorlib/interactive/executor.py
  • executorlib/standalone/inputcheck.py
  • tests/test_shared_input_check.py
🔇 Additional comments (2)
executorlib/interactive/shared.py (2)

556-556: LGTM! Verify resource tracking behavior.

The active task dictionary now correctly tracks total resource usage by storing slots_required instead of just cores.

Let's verify that the active task dictionary is properly cleaned up:

✅ Verification successful

The search results show that active_task_dict is properly managed throughout its lifecycle:

  1. Initialization as empty dict
  2. Updated through _submit_function_to_separate_process
  3. Cleaned up in _wait_for_free_slots by filtering out completed tasks
  4. Final assignment of slots_required for resource tracking

LGTM! Resource tracking cleanup is properly implemented

The active task dictionary has consistent cleanup through dictionary comprehensions that filter out completed tasks (k.done()). This ensures proper resource tracking and cleanup when tasks complete, preventing resource leaks. The update with slots_required fits well within this pattern.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for all places where active_task_dict is modified to ensure consistent cleanup
rg "active_task_dict.*=|active_task_dict\[.*\].*=" -A 2 -B 2

Length of output: 2707


549-549: LGTM! Verify thread count calculation across the codebase.

The calculation of total slots as cores * threads_per_core is correct. The default value of 1 for threads_per_core maintains backward compatibility.

Let's verify that this is the only place where thread calculations are performed:

✅ Verification successful

Thread calculation is consistently implemented across the codebase

The thread count calculation in shared.py aligns with its usage in the Flux backend implementation. The threads_per_core parameter is correctly:

  • Used as a multiplier for cores in resource calculation (shared.py)
  • Passed as cores_per_task and cores_per_slot in Flux job specifications (flux.py)
  • Documented in examples with appropriate defaults and recommendations
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other thread-related calculations that might need similar updates
rg -l "threads_per_core"| xargs rg "cores.*threads|threads.*cores"

Length of output: 771


Script:

#!/bin/bash# Let's check the implementation in flux.py to understand how threads_per_core is used
rg -A 5 -B 5 "_threads_per_core" executorlib/interactive/flux.py

Length of output: 1294

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (2)
executorlib/standalone/interactive/spawner.py (2)

Line range hint 246-247: Fix the SLURM command generation bug.

There's a critical bug in the SLURM command generation where the --cpus-per-task option is malformed:

  1. The equals sign is missing
  2. There's no space between the option and value

Apply this fix:

- command_prepend_lst += ["--cpus-per-task" + str(threads_per_core)]+ command_prepend_lst += ["--cpus-per-task=" + str(threads_per_core)]

This ensures the SLURM command is properly formatted as --cpus-per-task=N.


Line range hint 1-262: Consider adding integration tests for thread support.

While the thread management implementation looks good overall, consider:

  1. Adding integration tests to verify thread allocation works correctly across different backends (subprocess, MPI, SLURM)
  2. Documenting any limitations or requirements for thread support in the class docstrings

Would you like me to help create integration test cases for thread management?

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 6456b64 and 7a1d302.

📒 Files selected for processing (2)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/interactive/spawner.py (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • executorlib/interactive/shared.py
🔇 Additional comments (2)
executorlib/standalone/interactive/spawner.py (2)

175-175: LGTM: Proper inheritance implementation.

The threads_per_core parameter is correctly passed to the parent class, maintaining the inheritance chain.


60-60: Consider documenting parameter validation and usage.

The threads_per_core parameter is added but:

  1. The docstring could specify any validation rules (e.g., must be positive).
  2. The _threads_per_core instance variable isn't used in the generate_command method of this class.

Let's verify if there are any validation rules for this parameter:

Also applies to: 68-68, 77-77

@jan-janssen
jan-janssen merged commit d11a2d3 into mainNov 19, 2024
@jan-janssen
jan-janssen deleted the threads branch November 19, 2024 15:23
Sign up for freeto 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.

1 participant

@jan-janssen
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Support threads on local backend - #504

Merged
jan-janssen merged 4 commits into
mainfrom
threads
Nov 19, 2024
Merged

Support threads on local backend#504
jan-janssen merged 4 commits into
mainfrom
threads

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 19, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

Release Notes

  • New Features

    • Enhanced resource allocation logic for task execution, now accounting for total slots required based on cores and threads.
    • Added support for specifying the number of threads per core in the spawner classes, improving command generation for SLURM.
  • Bug Fixes

    • Simplified validation process by removing checks for threads per core, improving user experience with local backend configurations.
  • Tests

    • Removed outdated tests related to thread checks and refined error handling in MPI backend tests, streamlining the testing suite to focus on current functionalities.

@coderabbitai

coderabbitaiBot commented Nov 19, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The pull request introduces significant changes across multiple files, primarily focusing on simplifying resource validation related to thread management in the executor framework. The check_threads_per_core function has been removed, along with its associated logic, leading to the elimination of checks for the threads_per_core parameter when using the "local" backend. Additionally, updates were made to resource allocation logic in the shared.py file to better reflect the actual resource needs of tasks. Corresponding tests for the removed functionality were also deleted.

Changes

FileChange Summary
executorlib/interactive/executor.pyRemoved check_threads_per_core function call and logic from create_executor.
executorlib/interactive/shared.pyIntroduced slots_required for resource allocation in _submit_function_to_separate_process. Updated _wait_for_free_slots to use slots_required.
executorlib/standalone/inputcheck.pyRemoved check_threads_per_core function.
tests/test_shared_input_check.pyRemoved test_check_threads_per_core method from TestInputCheck class.
tests/test_executor_backend_mpi.pyUpdated tests to remove assertions related to threads_per_core and added timing assertions for caching behavior.
tests/test_executor_backend_mpi_noblock.pyRemoved test case checking for TypeError related to threads_per_core in test_errors method.
executorlib/standalone/interactive/spawner.pyAdded threads_per_core parameter to SubprocessSpawner and SrunSpawner constructors, updated command generation logic.

Possibly related PRs

🐰 In the meadow where bunnies play,
We’ve tidied up the threads today!
No more checks for cores to fret,
Just hop along, no need to sweat!
With slots in mind, we’ll work just right,
Simplified paths, oh what a sight! 🌼


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
executorlib/interactive/shared.py (1)

552-552: LGTM! Consider documenting the slots calculation.

The use of slots_required in _wait_for_free_slots correctly accounts for both cores and threads when checking resource availability.

Consider adding a docstring update to clarify that cores_requested now represents total slots (cores * threads):

def _wait_for_free_slots(
active_task_dict: dict,
cores_requested: int,
max_cores: Optional[int] = None,
max_workers: Optional[int] = None,
) -> dict:
"""
Wait for available computing resources to become available.
Args:
- cores_requested (int): Number of cores required for executing the next task+ cores_requested (int): Total number of slots (cores * threads_per_core) required for executing the next task
"""
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 1565d4c and 78246d5.

📒 Files selected for processing (4)
  • executorlib/interactive/executor.py (0 hunks)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/inputcheck.py (0 hunks)
  • tests/test_shared_input_check.py (0 hunks)
💤 Files with no reviewable changes (3)
  • executorlib/interactive/executor.py
  • executorlib/standalone/inputcheck.py
  • tests/test_shared_input_check.py
🔇 Additional comments (2)
executorlib/interactive/shared.py (2)

556-556: LGTM! Verify resource tracking behavior.

The active task dictionary now correctly tracks total resource usage by storing slots_required instead of just cores.

Let's verify that the active task dictionary is properly cleaned up:

✅ Verification successful

The search results show that active_task_dict is properly managed throughout its lifecycle:

  1. Initialization as empty dict
  2. Updated through _submit_function_to_separate_process
  3. Cleaned up in _wait_for_free_slots by filtering out completed tasks
  4. Final assignment of slots_required for resource tracking

LGTM! Resource tracking cleanup is properly implemented

The active task dictionary has consistent cleanup through dictionary comprehensions that filter out completed tasks (k.done()). This ensures proper resource tracking and cleanup when tasks complete, preventing resource leaks. The update with slots_required fits well within this pattern.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for all places where active_task_dict is modified to ensure consistent cleanup
rg "active_task_dict.*=|active_task_dict\[.*\].*=" -A 2 -B 2

Length of output: 2707


549-549: LGTM! Verify thread count calculation across the codebase.

The calculation of total slots as cores * threads_per_core is correct. The default value of 1 for threads_per_core maintains backward compatibility.

Let's verify that this is the only place where thread calculations are performed:

✅ Verification successful

Thread calculation is consistently implemented across the codebase

The thread count calculation in shared.py aligns with its usage in the Flux backend implementation. The threads_per_core parameter is correctly:

  • Used as a multiplier for cores in resource calculation (shared.py)
  • Passed as cores_per_task and cores_per_slot in Flux job specifications (flux.py)
  • Documented in examples with appropriate defaults and recommendations
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other thread-related calculations that might need similar updates
rg -l "threads_per_core"| xargs rg "cores.*threads|threads.*cores"

Length of output: 771


Script:

#!/bin/bash# Let's check the implementation in flux.py to understand how threads_per_core is used
rg -A 5 -B 5 "_threads_per_core" executorlib/interactive/flux.py

Length of output: 1294

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (2)
executorlib/standalone/interactive/spawner.py (2)

Line range hint 246-247: Fix the SLURM command generation bug.

There's a critical bug in the SLURM command generation where the --cpus-per-task option is malformed:

  1. The equals sign is missing
  2. There's no space between the option and value

Apply this fix:

- command_prepend_lst += ["--cpus-per-task" + str(threads_per_core)]+ command_prepend_lst += ["--cpus-per-task=" + str(threads_per_core)]

This ensures the SLURM command is properly formatted as --cpus-per-task=N.


Line range hint 1-262: Consider adding integration tests for thread support.

While the thread management implementation looks good overall, consider:

  1. Adding integration tests to verify thread allocation works correctly across different backends (subprocess, MPI, SLURM)
  2. Documenting any limitations or requirements for thread support in the class docstrings

Would you like me to help create integration test cases for thread management?

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 6456b64 and 7a1d302.

📒 Files selected for processing (2)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/interactive/spawner.py (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • executorlib/interactive/shared.py
🔇 Additional comments (2)
executorlib/standalone/interactive/spawner.py (2)

175-175: LGTM: Proper inheritance implementation.

The threads_per_core parameter is correctly passed to the parent class, maintaining the inheritance chain.


60-60: Consider documenting parameter validation and usage.

The threads_per_core parameter is added but:

  1. The docstring could specify any validation rules (e.g., must be positive).
  2. The _threads_per_core instance variable isn't used in the generate_command method of this class.

Let's verify if there are any validation rules for this parameter:

Also applies to: 68-68, 77-77

@jan-janssen
jan-janssen merged commit d11a2d3 into mainNov 19, 2024
@jan-janssen
jan-janssen deleted the threads branch November 19, 2024 15:23
Sign up for freeto 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.

1 participant

@jan-janssen
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Support threads on local backend - #504

Merged
jan-janssen merged 4 commits into
mainfrom
threads
Nov 19, 2024
Merged

Support threads on local backend#504
jan-janssen merged 4 commits into
mainfrom
threads

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 19, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

Release Notes

  • New Features

    • Enhanced resource allocation logic for task execution, now accounting for total slots required based on cores and threads.
    • Added support for specifying the number of threads per core in the spawner classes, improving command generation for SLURM.
  • Bug Fixes

    • Simplified validation process by removing checks for threads per core, improving user experience with local backend configurations.
  • Tests

    • Removed outdated tests related to thread checks and refined error handling in MPI backend tests, streamlining the testing suite to focus on current functionalities.

@coderabbitai

coderabbitaiBot commented Nov 19, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The pull request introduces significant changes across multiple files, primarily focusing on simplifying resource validation related to thread management in the executor framework. The check_threads_per_core function has been removed, along with its associated logic, leading to the elimination of checks for the threads_per_core parameter when using the "local" backend. Additionally, updates were made to resource allocation logic in the shared.py file to better reflect the actual resource needs of tasks. Corresponding tests for the removed functionality were also deleted.

Changes

FileChange Summary
executorlib/interactive/executor.pyRemoved check_threads_per_core function call and logic from create_executor.
executorlib/interactive/shared.pyIntroduced slots_required for resource allocation in _submit_function_to_separate_process. Updated _wait_for_free_slots to use slots_required.
executorlib/standalone/inputcheck.pyRemoved check_threads_per_core function.
tests/test_shared_input_check.pyRemoved test_check_threads_per_core method from TestInputCheck class.
tests/test_executor_backend_mpi.pyUpdated tests to remove assertions related to threads_per_core and added timing assertions for caching behavior.
tests/test_executor_backend_mpi_noblock.pyRemoved test case checking for TypeError related to threads_per_core in test_errors method.
executorlib/standalone/interactive/spawner.pyAdded threads_per_core parameter to SubprocessSpawner and SrunSpawner constructors, updated command generation logic.

Possibly related PRs

🐰 In the meadow where bunnies play,
We’ve tidied up the threads today!
No more checks for cores to fret,
Just hop along, no need to sweat!
With slots in mind, we’ll work just right,
Simplified paths, oh what a sight! 🌼


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
executorlib/interactive/shared.py (1)

552-552: LGTM! Consider documenting the slots calculation.

The use of slots_required in _wait_for_free_slots correctly accounts for both cores and threads when checking resource availability.

Consider adding a docstring update to clarify that cores_requested now represents total slots (cores * threads):

def _wait_for_free_slots(
active_task_dict: dict,
cores_requested: int,
max_cores: Optional[int] = None,
max_workers: Optional[int] = None,
) -> dict:
"""
Wait for available computing resources to become available.
Args:
- cores_requested (int): Number of cores required for executing the next task+ cores_requested (int): Total number of slots (cores * threads_per_core) required for executing the next task
"""
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 1565d4c and 78246d5.

📒 Files selected for processing (4)
  • executorlib/interactive/executor.py (0 hunks)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/inputcheck.py (0 hunks)
  • tests/test_shared_input_check.py (0 hunks)
💤 Files with no reviewable changes (3)
  • executorlib/interactive/executor.py
  • executorlib/standalone/inputcheck.py
  • tests/test_shared_input_check.py
🔇 Additional comments (2)
executorlib/interactive/shared.py (2)

556-556: LGTM! Verify resource tracking behavior.

The active task dictionary now correctly tracks total resource usage by storing slots_required instead of just cores.

Let's verify that the active task dictionary is properly cleaned up:

✅ Verification successful

The search results show that active_task_dict is properly managed throughout its lifecycle:

  1. Initialization as empty dict
  2. Updated through _submit_function_to_separate_process
  3. Cleaned up in _wait_for_free_slots by filtering out completed tasks
  4. Final assignment of slots_required for resource tracking

LGTM! Resource tracking cleanup is properly implemented

The active task dictionary has consistent cleanup through dictionary comprehensions that filter out completed tasks (k.done()). This ensures proper resource tracking and cleanup when tasks complete, preventing resource leaks. The update with slots_required fits well within this pattern.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for all places where active_task_dict is modified to ensure consistent cleanup
rg "active_task_dict.*=|active_task_dict\[.*\].*=" -A 2 -B 2

Length of output: 2707


549-549: LGTM! Verify thread count calculation across the codebase.

The calculation of total slots as cores * threads_per_core is correct. The default value of 1 for threads_per_core maintains backward compatibility.

Let's verify that this is the only place where thread calculations are performed:

✅ Verification successful

Thread calculation is consistently implemented across the codebase

The thread count calculation in shared.py aligns with its usage in the Flux backend implementation. The threads_per_core parameter is correctly:

  • Used as a multiplier for cores in resource calculation (shared.py)
  • Passed as cores_per_task and cores_per_slot in Flux job specifications (flux.py)
  • Documented in examples with appropriate defaults and recommendations
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other thread-related calculations that might need similar updates
rg -l "threads_per_core"| xargs rg "cores.*threads|threads.*cores"

Length of output: 771


Script:

#!/bin/bash# Let's check the implementation in flux.py to understand how threads_per_core is used
rg -A 5 -B 5 "_threads_per_core" executorlib/interactive/flux.py

Length of output: 1294

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (2)
executorlib/standalone/interactive/spawner.py (2)

Line range hint 246-247: Fix the SLURM command generation bug.

There's a critical bug in the SLURM command generation where the --cpus-per-task option is malformed:

  1. The equals sign is missing
  2. There's no space between the option and value

Apply this fix:

- command_prepend_lst += ["--cpus-per-task" + str(threads_per_core)]+ command_prepend_lst += ["--cpus-per-task=" + str(threads_per_core)]

This ensures the SLURM command is properly formatted as --cpus-per-task=N.


Line range hint 1-262: Consider adding integration tests for thread support.

While the thread management implementation looks good overall, consider:

  1. Adding integration tests to verify thread allocation works correctly across different backends (subprocess, MPI, SLURM)
  2. Documenting any limitations or requirements for thread support in the class docstrings

Would you like me to help create integration test cases for thread management?

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 6456b64 and 7a1d302.

📒 Files selected for processing (2)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/interactive/spawner.py (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • executorlib/interactive/shared.py
🔇 Additional comments (2)
executorlib/standalone/interactive/spawner.py (2)

175-175: LGTM: Proper inheritance implementation.

The threads_per_core parameter is correctly passed to the parent class, maintaining the inheritance chain.


60-60: Consider documenting parameter validation and usage.

The threads_per_core parameter is added but:

  1. The docstring could specify any validation rules (e.g., must be positive).
  2. The _threads_per_core instance variable isn't used in the generate_command method of this class.

Let's verify if there are any validation rules for this parameter:

Also applies to: 68-68, 77-77

@jan-janssen
jan-janssen merged commit d11a2d3 into mainNov 19, 2024
@jan-janssen
jan-janssen deleted the threads branch November 19, 2024 15:23
Sign up for freeto 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.

1 participant

@jan-janssen
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Support threads on local backend - #504

Merged
jan-janssen merged 4 commits into
mainfrom
threads
Nov 19, 2024
Merged

Support threads on local backend#504
jan-janssen merged 4 commits into
mainfrom
threads

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 19, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

Release Notes

  • New Features

    • Enhanced resource allocation logic for task execution, now accounting for total slots required based on cores and threads.
    • Added support for specifying the number of threads per core in the spawner classes, improving command generation for SLURM.
  • Bug Fixes

    • Simplified validation process by removing checks for threads per core, improving user experience with local backend configurations.
  • Tests

    • Removed outdated tests related to thread checks and refined error handling in MPI backend tests, streamlining the testing suite to focus on current functionalities.

@coderabbitai

coderabbitaiBot commented Nov 19, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The pull request introduces significant changes across multiple files, primarily focusing on simplifying resource validation related to thread management in the executor framework. The check_threads_per_core function has been removed, along with its associated logic, leading to the elimination of checks for the threads_per_core parameter when using the "local" backend. Additionally, updates were made to resource allocation logic in the shared.py file to better reflect the actual resource needs of tasks. Corresponding tests for the removed functionality were also deleted.

Changes

FileChange Summary
executorlib/interactive/executor.pyRemoved check_threads_per_core function call and logic from create_executor.
executorlib/interactive/shared.pyIntroduced slots_required for resource allocation in _submit_function_to_separate_process. Updated _wait_for_free_slots to use slots_required.
executorlib/standalone/inputcheck.pyRemoved check_threads_per_core function.
tests/test_shared_input_check.pyRemoved test_check_threads_per_core method from TestInputCheck class.
tests/test_executor_backend_mpi.pyUpdated tests to remove assertions related to threads_per_core and added timing assertions for caching behavior.
tests/test_executor_backend_mpi_noblock.pyRemoved test case checking for TypeError related to threads_per_core in test_errors method.
executorlib/standalone/interactive/spawner.pyAdded threads_per_core parameter to SubprocessSpawner and SrunSpawner constructors, updated command generation logic.

Possibly related PRs

🐰 In the meadow where bunnies play,
We’ve tidied up the threads today!
No more checks for cores to fret,
Just hop along, no need to sweat!
With slots in mind, we’ll work just right,
Simplified paths, oh what a sight! 🌼


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
executorlib/interactive/shared.py (1)

552-552: LGTM! Consider documenting the slots calculation.

The use of slots_required in _wait_for_free_slots correctly accounts for both cores and threads when checking resource availability.

Consider adding a docstring update to clarify that cores_requested now represents total slots (cores * threads):

def _wait_for_free_slots(
active_task_dict: dict,
cores_requested: int,
max_cores: Optional[int] = None,
max_workers: Optional[int] = None,
) -> dict:
"""
Wait for available computing resources to become available.
Args:
- cores_requested (int): Number of cores required for executing the next task+ cores_requested (int): Total number of slots (cores * threads_per_core) required for executing the next task
"""
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 1565d4c and 78246d5.

📒 Files selected for processing (4)
  • executorlib/interactive/executor.py (0 hunks)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/inputcheck.py (0 hunks)
  • tests/test_shared_input_check.py (0 hunks)
💤 Files with no reviewable changes (3)
  • executorlib/interactive/executor.py
  • executorlib/standalone/inputcheck.py
  • tests/test_shared_input_check.py
🔇 Additional comments (2)
executorlib/interactive/shared.py (2)

556-556: LGTM! Verify resource tracking behavior.

The active task dictionary now correctly tracks total resource usage by storing slots_required instead of just cores.

Let's verify that the active task dictionary is properly cleaned up:

✅ Verification successful

The search results show that active_task_dict is properly managed throughout its lifecycle:

  1. Initialization as empty dict
  2. Updated through _submit_function_to_separate_process
  3. Cleaned up in _wait_for_free_slots by filtering out completed tasks
  4. Final assignment of slots_required for resource tracking

LGTM! Resource tracking cleanup is properly implemented

The active task dictionary has consistent cleanup through dictionary comprehensions that filter out completed tasks (k.done()). This ensures proper resource tracking and cleanup when tasks complete, preventing resource leaks. The update with slots_required fits well within this pattern.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for all places where active_task_dict is modified to ensure consistent cleanup
rg "active_task_dict.*=|active_task_dict\[.*\].*=" -A 2 -B 2

Length of output: 2707


549-549: LGTM! Verify thread count calculation across the codebase.

The calculation of total slots as cores * threads_per_core is correct. The default value of 1 for threads_per_core maintains backward compatibility.

Let's verify that this is the only place where thread calculations are performed:

✅ Verification successful

Thread calculation is consistently implemented across the codebase

The thread count calculation in shared.py aligns with its usage in the Flux backend implementation. The threads_per_core parameter is correctly:

  • Used as a multiplier for cores in resource calculation (shared.py)
  • Passed as cores_per_task and cores_per_slot in Flux job specifications (flux.py)
  • Documented in examples with appropriate defaults and recommendations
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other thread-related calculations that might need similar updates
rg -l "threads_per_core"| xargs rg "cores.*threads|threads.*cores"

Length of output: 771


Script:

#!/bin/bash# Let's check the implementation in flux.py to understand how threads_per_core is used
rg -A 5 -B 5 "_threads_per_core" executorlib/interactive/flux.py

Length of output: 1294

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (2)
executorlib/standalone/interactive/spawner.py (2)

Line range hint 246-247: Fix the SLURM command generation bug.

There's a critical bug in the SLURM command generation where the --cpus-per-task option is malformed:

  1. The equals sign is missing
  2. There's no space between the option and value

Apply this fix:

- command_prepend_lst += ["--cpus-per-task" + str(threads_per_core)]+ command_prepend_lst += ["--cpus-per-task=" + str(threads_per_core)]

This ensures the SLURM command is properly formatted as --cpus-per-task=N.


Line range hint 1-262: Consider adding integration tests for thread support.

While the thread management implementation looks good overall, consider:

  1. Adding integration tests to verify thread allocation works correctly across different backends (subprocess, MPI, SLURM)
  2. Documenting any limitations or requirements for thread support in the class docstrings

Would you like me to help create integration test cases for thread management?

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 6456b64 and 7a1d302.

📒 Files selected for processing (2)
  • executorlib/interactive/shared.py (1 hunks)
  • executorlib/standalone/interactive/spawner.py (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • executorlib/interactive/shared.py
🔇 Additional comments (2)
executorlib/standalone/interactive/spawner.py (2)

175-175: LGTM: Proper inheritance implementation.

The threads_per_core parameter is correctly passed to the parent class, maintaining the inheritance chain.


60-60: Consider documenting parameter validation and usage.

The threads_per_core parameter is added but:

  1. The docstring could specify any validation rules (e.g., must be positive).
  2. The _threads_per_core instance variable isn't used in the generate_command method of this class.

Let's verify if there are any validation rules for this parameter:

Also applies to: 68-68, 77-77

@jan-janssen
jan-janssen merged commit d11a2d3 into mainNov 19, 2024
@jan-janssen
jan-janssen deleted the threads branch November 19, 2024 15:23
Sign up for freeto 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.

1 participant

@jan-janssen