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

Allow skypilot to configure step or run full pipeline in one VM #2276

Merged
merged 9 commits into from
Jan 15, 2024

Conversation

safoinme
Copy link
Contributor

@safoinme safoinme commented Jan 12, 2024

Describe changes

I implemented/fixed _ to achieve _.

Pre-requisites

Please ensure you have done the following:

  • I have read the CONTRIBUTING.md document.
  • If my change requires a change to docs, I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • I have based my new branch on develop and the open PR is targeting develop. If your branch wasn't based on develop read Contribution guide on rebasing branch to develop.
  • If my changes require changes to the dashboard, these changes are communicated/requested.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Other (add details above)

Summary by CodeRabbit

  • New Features

    • Added an option to configure SkyPilot VM Orchestrator for specific VM types and resources per pipeline step.
    • Introduced ability to disable step-specific resources for pipeline execution in SkyPilot VM Orchestrator.
  • Documentation

    • Updated component guide with new hints and examples for SkyPilot VM Orchestrator configurations.
  • Enhancements

    • Improved SkyPilot VM Orchestrator to allow running all steps in a single VM or separate VMs based on user settings.

Copy link
Contributor

coderabbitai bot commented Jan 12, 2024

Important

Auto Review Skipped

Auto reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository.

To trigger a single review, invoke the @coderabbitai review command.

Walkthrough

The recent updates focus on enhancing the SkyPilot VM Orchestrator within the ZenML framework. The modifications allow for more granular control over resource allocation, enabling users to specify VM types and resources for individual pipeline steps or to run the entire pipeline on a single VM, depending on the new settings introduced.

Changes

File Path Change Summary
docs/book/stacks-and-components/.../skypilot-vm.md
src/zenml/integrations/skypilot/flavors/skypilot_orchestrator_base_vm_config.py
Added hints for VM type configuration per pipeline step, an example for disabling step-specific resources, and notes on individual step resource configuration. Included a new attribute disable_step_based_settings and updated the docstring to describe it.
src/zenml/integrations/skypilot/orchestrators/skypilot_base_vm_orchestrator.py Added an import, a new config property, and updated logic for running pipelines with single or separate VMs.

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>.
    • Generate unit-tests for this file.
  • 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 tests 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 generate interesting stats about this repository from git and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

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 as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • 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/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

@github-actions github-actions bot added internal To filter out internal PRs and issues enhancement New feature or request labels Jan 12, 2024
Copy link
Contributor

@htahir1 htahir1 left a comment

Choose a reason for hiding this comment

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

Left one structural feedbacl

@safoinme
Copy link
Contributor Author

@coderabbitai review

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.

Review Status

Actionable comments generated: 0

Configuration used: .coderabbit.yaml

Commits Files that changed from the base of the PR and between 1fb6966 and 75b2c32.
Files selected for processing (3)
  • docs/book/stacks-and-components/component-guide/orchestrators/skypilot-vm.md (2 hunks)
  • src/zenml/integrations/skypilot/flavors/skypilot_orchestrator_base_vm_config.py (1 hunks)
  • src/zenml/integrations/skypilot/orchestrators/skypilot_base_vm_orchestrator.py (3 hunks)
Files skipped from review due to trivial changes (1)
  • docs/book/stacks-and-components/component-guide/orchestrators/skypilot-vm.md
Additional comments: 3
src/zenml/integrations/skypilot/flavors/skypilot_orchestrator_base_vm_config.py (1)
  • 116-125: The addition of the disable_step_based_settings attribute with a default value of False is consistent with the PR's objective to allow configuration of step or run full pipeline in one VM. The docstring is clear and explains the purpose of the attribute well.
src/zenml/integrations/skypilot/orchestrators/skypilot_base_vm_orchestrator.py (2)
  • 114-121: The new config property provides a typed way to access the orchestrator configuration. This is a good practice as it ensures type safety and clarity in the code.

  • 203-235: The logic to run the entire pipeline in one VM or separate VMs based on the disable_step_based_settings configuration is implemented correctly. However, ensure that the rest of the codebase and any external documentation are updated to reflect this new behavior, as it could potentially affect existing users' workflows.

Verification successful

The search within Python files for the disable_step_based_settings property has yielded results, indicating that this property is indeed present and used within the codebase. Specifically, it is referenced in the skypilot_orchestrator_base_vm_config.py file, where it is defined with a default value of False, and in the skypilot_base_vm_orchestrator.py file, where it is used within a conditional statement.

Additionally, the documentation has been updated to reflect the new behavior, as the search in Markdown files within the docs directory has found references to disable_step_based_settings.

Based on the information gathered, it can be concluded that both the codebase and the documentation have been updated to accommodate the new disable_step_based_settings configuration.

Scripts Executed

The following scripts were executed for the analysis:


Script:

#!/bin/bash
# Verify that the documentation is updated to reflect the new behavior.
rg --type md 'disable_step_based_settings' ./docs
# Verify that the rest of the codebase is aware of the new config property.
ast-grep --lang python --pattern $'SkypilotBaseOrchestratorConfig { $$$ disable_step_based_settings $$$ }'

Length of output: 1253



Script:

#!/bin/bash
# Correcting the ast-grep pattern to search for the 'disable_step_based_settings' attribute within the 'SkypilotBaseOrchestratorConfig' class.
ast-grep --lang python --pattern $'class SkypilotBaseOrchestratorConfig {
  $$$
  disable_step_based_settings
  $$$
}'

Length of output: 464



Script:

#!/bin/bash
# Attempting a broader search for 'disable_step_based_settings' within Python files to verify its usage in the codebase.
rg --type py 'disable_step_based_settings'

Length of output: 617

@safoinme safoinme requested a review from htahir1 January 13, 2024 16:32
Copy link
Contributor

@strickvl strickvl left a comment

Choose a reason for hiding this comment

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

Approved pending that final comment I just made. Otherwise looks good!

@safoinme
Copy link
Contributor Author

@coderabbitai review

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.

Review Status

Actionable comments generated: 0

Configuration used: .coderabbit.yaml

Commits Files that changed from the base of the PR and between 75b2c32 and 446c3e5.
Files selected for processing (1)
  • src/zenml/integrations/skypilot/orchestrators/skypilot_base_vm_orchestrator.py (4 hunks)
Files skipped from review as they are similar to previous changes (1)
  • src/zenml/integrations/skypilot/orchestrators/skypilot_base_vm_orchestrator.py

Copy link
Contributor

@htahir1 htahir1 left a comment

Choose a reason for hiding this comment

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

Nice one!

@safoinme safoinme merged commit 684f84c into develop Jan 15, 2024
35 of 36 checks passed
@safoinme safoinme deleted the feature/skypilot-one-vm-run-orchestrator branch January 15, 2024 14:01
kabinja pushed a commit to kabinja/zenml that referenced this pull request Jan 29, 2024
…l-io#2276)

* Allow skypilot to configure step or run  full pipeline in one VM

* Chnage behaviour of using step based resources

* Update src/zenml/integrations/skypilot/orchestrators/skypilot_base_vm_orchestrator.py

Co-authored-by: Alex Strick van Linschoten <strickvl@users.noreply.github.com>

* Refactor SkypilotBaseOrchestrator to support step-based VM configuration

* Update docs/book/stacks-and-components/component-guide/orchestrators/skypilot-vm.md

Co-authored-by: Hamza Tahir <hamza@zenml.io>

---------

Co-authored-by: Alex Strick van Linschoten <strickvl@users.noreply.github.com>
Co-authored-by: Hamza Tahir <hamza@zenml.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request internal To filter out internal PRs and issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants