Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move SLURM to separate module #528

Merged
merged 3 commits into from
Dec 20, 2024
Merged

Move SLURM to separate module #528

merged 3 commits into from
Dec 20, 2024

Conversation

jan-janssen
Copy link
Member

@jan-janssen jan-janssen commented Dec 20, 2024

Summary by CodeRabbit

  • New Features

    • Introduced a new SrunSpawner class for managing SLURM job submissions with enhanced command generation capabilities.
  • Bug Fixes

    • Improved error handling for unsupported execution backends.
  • Documentation

    • Updated import paths and public entity declarations to reflect the restructuring of spawner classes.
  • Tests

    • Modified test cases to accommodate the new SrunSpawner class and its parameters.

Copy link
Contributor

coderabbitai bot commented Dec 20, 2024

Walkthrough

This pull request focuses on restructuring the SLURM spawner implementation by moving the SrunSpawner class from the standalone module to the interactive module. The changes involve relocating the SLURM-specific spawner implementation, updating import statements, and modifying the create_executor function to consistently handle the SLURM backend. The modifications aim to improve the organization of spawner classes and clarify the backend selection process.

Changes

File Change Summary
executorlib/interactive/executor.py Updated import and backend handling for SrunSpawner
executorlib/interactive/slurm.py New file introducing SrunSpawner with SLURM job submission logic
executorlib/standalone/__init__.py Removed SrunSpawner from public exports
executorlib/standalone/interactive/spawner.py Removed entire SrunSpawner class and related methods
tests/test_shared_backend.py Updated import for SrunSpawner and adjusted test cases

Sequence Diagram

sequenceDiagram
    participant Executor as create_executor()
    participant Spawner as SrunSpawner
    participant Backend as SLURM Backend

    Executor->>Spawner: Initialize with parameters
    Spawner->>Backend: Generate SLURM command
    Backend-->>Spawner: Return command list
    Spawner-->>Executor: Return configured spawner
Loading

Possibly related PRs

Poem

🐰 A spawner's journey, from standalone to new,
SLURM's command dancing, a computational brew
Modules reshuffled with algorithmic grace
Code moves like a rabbit, finding its place
Efficiency hopping, with elegance true! 🚀

Tip

CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command @coderabbitai generate docstrings to have CodeRabbit automatically generate docstrings for your pull request. We would love to hear your feedback on Discord.


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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 3

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 44214f7 and b4a8a37.

📒 Files selected for processing (5)
  • executorlib/interactive/executor.py (2 hunks)
  • executorlib/interactive/slurm.py (1 hunks)
  • executorlib/standalone/__init__.py (1 hunks)
  • executorlib/standalone/interactive/spawner.py (0 hunks)
  • tests/test_shared_backend.py (1 hunks)
💤 Files with no reviewable changes (1)
  • executorlib/standalone/interactive/spawner.py
🧰 Additional context used
🪛 Ruff (0.8.2)
executorlib/interactive/slurm.py

16-16: Do not use mutable data structures for argument defaults

Replace with None; initialize within function

(B006)


67-67: Do not use mutable data structures for argument defaults

Replace with None; initialize within function

(B006)

🔇 Additional comments (4)
executorlib/interactive/slurm.py (1)

1-94: Overall module structure and functionality look good.
The code successfully introduces the separate SLURM module and the SrunSpawner class with a clear interface. Aside from the mutable default arguments and the typo in the SLURM argument, everything else looks well-documented and consistent with the objective of moving SLURM functionality into its own module.

🧰 Tools
🪛 Ruff (0.8.2)

16-16: Do not use mutable data structures for argument defaults

Replace with None; initialize within function

(B006)


67-67: Do not use mutable data structures for argument defaults

Replace with None; initialize within function

(B006)

executorlib/standalone/__init__.py (1)

9-9: Removal of SrunSpawner from standalone exports is appropriate.
No issues found. This change aligns with moving SLURM logic to its dedicated module.

tests/test_shared_backend.py (1)

6-7: Updated import for SrunSpawner looks good.
All tests exercise the new SLURM spawner’s functionality properly, which is important for ensuring feature parity after the relocation.

executorlib/interactive/executor.py (1)

Line range hint 10-21: Integration with the new SrunSpawner is coherent.
The changes correctly reflect the separate SLURM module. The code structure for choosing spawners based on the backend remains clear and maintainable.

if cwd is not None:
command_prepend_lst += ["-D", cwd]
if threads_per_core > 1:
command_prepend_lst += ["--cpus-per-task" + str(threads_per_core)]
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Potential typo: missing equals sign in '--cpus-per-task'.
SLURM typically expects an equals sign for this argument to parse the integer value properly.

Proposed fix:

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

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

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

threads_per_core: int = 1,
gpus_per_core: int = 0,
openmpi_oversubscribe: bool = False,
slurm_cmd_args: list[str] = [],
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Avoid using mutable default arguments.
Using mutable lists as default argument values can lead to unexpected behavior when multiple instances share the same list reference.

You can fix this by setting the default to None and initializing it in the method body:

-        slurm_cmd_args: list[str] = [],
+        slurm_cmd_args: Optional[list[str]] = None,

And inside the constructor:

 if slurm_cmd_args is None:
     slurm_cmd_args = []

Committable suggestion skipped: line range outside the PR's diff.

🧰 Tools
🪛 Ruff (0.8.2)

16-16: Do not use mutable data structures for argument defaults

Replace with None; initialize within function

(B006)

threads_per_core: int = 1,
gpus_per_core: int = 0,
openmpi_oversubscribe: bool = False,
slurm_cmd_args: list[str] = [],
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Same mutable default argument concern.
This function parameter also defines a mutable list as the default value, raising the same risk of shared state across multiple calls.

Use the same approach as above to ensure each invocation gets its own list instance:

-    slurm_cmd_args: list[str] = [],
+    slurm_cmd_args: Optional[list[str]] = None,

and initialize within the function body:

 if slurm_cmd_args is None:
     slurm_cmd_args = []

Committable suggestion skipped: line range outside the PR's diff.

🧰 Tools
🪛 Ruff (0.8.2)

67-67: Do not use mutable data structures for argument defaults

Replace with None; initialize within function

(B006)

@jan-janssen jan-janssen merged commit f1649fa into main Dec 20, 2024
27 checks passed
@jan-janssen jan-janssen deleted the slurm branch December 20, 2024 04:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant