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.

Sign up for GitHub

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

Jump to bottom

Fix uv runtime environment hook if sys.argv is changed by user script #50597

Merged
merged 1 commit into from
Feb 14, 2025
Merged

Fix uv runtime environment hook if sys.argv is changed by user script #50597

merged 1 commit into from
Feb 14, 2025

Conversation

pcmoritz
Copy link
Contributor

@pcmoritz pcmoritz commented Feb 14, 2025 •
edited
Loading

Why are these changes needed?

This fixes an issue @erictang000 was running into while using the uv runtime env hook for https://github.com/hiyouga/LLaMA-Factory. LLaMA Factory modifies sys.argv before calling ray.init (and therefore the hook), which broke the original logic. We instead use the value from /proc/{pid}/cmdline and add a test that we can tolerate changes of sys.argv.

Related issue number

Checks

  • I've signed off every commit(by using the -s flag, i.e., git commit -s) in this PR.
  • I've run scripts/format.sh to lint the changes in this PR.
  • I've included any doc changes needed for https://docs.ray.io/en/master/.
    • I've added any new APIs to the API Reference. For example, if I added a
      method in Tune, I've added it in doc/source/tune/api/ under the
      corresponding .rst file.
  • I've made sure the tests are passing. Note that there might be a few flaky tests, see the recent failures at https://flakey-tests.ray.io/
  • Testing Strategy
    • Unit tests
    • Release tests
    • This PR is not tested :(

@pcmoritz pcmoritz changed the title Fix uv runtime environment hook Fix uv runtime environment hook if sys.argv is changed by user script Feb 14, 2025
@pcmoritz pcmoritz requested a review from edoakes February 14, 2025 09:05
@pcmoritz pcmoritz added the go add ONLY when ready to merge, run all tests label Feb 14, 2025
@pcmoritz pcmoritz merged commit 6880654 into master Feb 14, 2025
5 checks passed
@pcmoritz pcmoritz deleted the fix-uv-runtime-env-hook branch February 14, 2025 20:50
400Ping pushed a commit to 400Ping/ray that referenced this pull request Feb 20, 2025
@pcmoritz @400Ping
Fix uv runtime environment hook if sys.argv is changed by user script (…
53f42ab 
…ray-project#50597)

<!-- Thank you for your contribution! Please review
https://github.com/ray-project/ray/blob/master/CONTRIBUTING.rst before
opening a pull request. -->

<!-- Please add a reviewer to the assignee section when you create a PR.
If you don't have the access to it, we will shortly find a reviewer and
assign them to your PR. -->

## Why are these changes needed?

This fixes an issue @erictang000 was running into while using the uv
runtime env hook for https://github.com/hiyouga/LLaMA-Factory. LLaMA
Factory modifies sys.argv before calling ray.init (and therefore the
hook), which broke the original logic. We instead use the value from
`/proc/{pid}/cmdline` and add a test that we can tolerate changes of
sys.argv.

## Related issue number

<!-- For example: "Closes ray-project#1234" -->

## Checks

- [ ] I've signed off every commit(by using the -s flag, i.e., `git
commit -s`) in this PR.
- [ ] I've run `scripts/format.sh` to lint the changes in this PR.
- [ ] I've included any doc changes needed for
https://docs.ray.io/en/master/.
- [ ] I've added any new APIs to the API Reference. For example, if I
added a
method in Tune, I've added it in `doc/source/tune/api/` under the
           corresponding `.rst` file.
- [ ] I've made sure the tests are passing. Note that there might be a
few flaky tests, see the recent failures at https://flakey-tests.ray.io/
- Testing Strategy
   - [ ] Unit tests
   - [ ] Release tests
   - [ ] This PR is not tested :(

Signed-off-by: 400Ping <43886578+400Ping@users.noreply.github.com>
israbbani pushed a commit that referenced this pull request Feb 25, 2025
@pcmoritz @israbbani
Fix uv runtime environment hook if sys.argv is changed by user script (…
c7c719e 
…#50597)

<!-- Thank you for your contribution! Please review
https://github.com/ray-project/ray/blob/master/CONTRIBUTING.rst before
opening a pull request. -->

<!-- Please add a reviewer to the assignee section when you create a PR.
If you don't have the access to it, we will shortly find a reviewer and
assign them to your PR. -->

## Why are these changes needed?

This fixes an issue @erictang000 was running into while using the uv
runtime env hook for https://github.com/hiyouga/LLaMA-Factory. LLaMA
Factory modifies sys.argv before calling ray.init (and therefore the
hook), which broke the original logic. We instead use the value from
`/proc/{pid}/cmdline` and add a test that we can tolerate changes of
sys.argv.

## Related issue number

<!-- For example: "Closes #1234" -->

## Checks

- [ ] I've signed off every commit(by using the -s flag, i.e., `git
commit -s`) in this PR.
- [ ] I've run `scripts/format.sh` to lint the changes in this PR.
- [ ] I've included any doc changes needed for
https://docs.ray.io/en/master/.
- [ ] I've added any new APIs to the API Reference. For example, if I
added a
method in Tune, I've added it in `doc/source/tune/api/` under the
           corresponding `.rst` file.
- [ ] I've made sure the tests are passing. Note that there might be a
few flaky tests, see the recent failures at https://flakey-tests.ray.io/
- Testing Strategy
   - [ ] Unit tests
   - [ ] Release tests
   - [ ] This PR is not tested :(
xsuler pushed a commit to antgroup/ant-ray that referenced this pull request Mar 4, 2025
@pcmoritz @xsuler
Fix uv runtime environment hook if sys.argv is changed by user script (…
e4eb1a4 
…ray-project#50597)

<!-- Thank you for your contribution! Please review
https://github.com/ray-project/ray/blob/master/CONTRIBUTING.rst before
opening a pull request. -->

<!-- Please add a reviewer to the assignee section when you create a PR.
If you don't have the access to it, we will shortly find a reviewer and
assign them to your PR. -->

## Why are these changes needed?

This fixes an issue @erictang000 was running into while using the uv
runtime env hook for https://github.com/hiyouga/LLaMA-Factory. LLaMA
Factory modifies sys.argv before calling ray.init (and therefore the
hook), which broke the original logic. We instead use the value from
`/proc/{pid}/cmdline` and add a test that we can tolerate changes of
sys.argv.

## Related issue number

<!-- For example: "Closes ray-project#1234" -->

## Checks

- [ ] I've signed off every commit(by using the -s flag, i.e., `git
commit -s`) in this PR.
- [ ] I've run `scripts/format.sh` to lint the changes in this PR.
- [ ] I've included any doc changes needed for
https://docs.ray.io/en/master/.
- [ ] I've added any new APIs to the API Reference. For example, if I
added a
method in Tune, I've added it in `doc/source/tune/api/` under the
           corresponding `.rst` file.
- [ ] I've made sure the tests are passing. Note that there might be a
few flaky tests, see the recent failures at https://flakey-tests.ray.io/
- Testing Strategy
   - [ ] Unit tests
   - [ ] Release tests
   - [ ] This PR is not tested :(
xsuler pushed a commit to antgroup/ant-ray that referenced this pull request Mar 4, 2025
@pcmoritz @xsuler
Fix uv runtime environment hook if sys.argv is changed by user script (…
054c89a 
…ray-project#50597)

<!-- Thank you for your contribution! Please review
https://github.com/ray-project/ray/blob/master/CONTRIBUTING.rst before
opening a pull request. -->

<!-- Please add a reviewer to the assignee section when you create a PR.
If you don't have the access to it, we will shortly find a reviewer and
assign them to your PR. -->

## Why are these changes needed?

This fixes an issue @erictang000 was running into while using the uv
runtime env hook for https://github.com/hiyouga/LLaMA-Factory. LLaMA
Factory modifies sys.argv before calling ray.init (and therefore the
hook), which broke the original logic. We instead use the value from
`/proc/{pid}/cmdline` and add a test that we can tolerate changes of
sys.argv.

## Related issue number

<!-- For example: "Closes ray-project#1234" -->

## Checks

- [ ] I've signed off every commit(by using the -s flag, i.e., `git
commit -s`) in this PR.
- [ ] I've run `scripts/format.sh` to lint the changes in this PR.
- [ ] I've included any doc changes needed for
https://docs.ray.io/en/master/.
- [ ] I've added any new APIs to the API Reference. For example, if I
added a
method in Tune, I've added it in `doc/source/tune/api/` under the
           corresponding `.rst` file.
- [ ] I've made sure the tests are passing. Note that there might be a
few flaky tests, see the recent failures at https://flakey-tests.ray.io/
- Testing Strategy
   - [ ] Unit tests
   - [ ] Release tests
   - [ ] This PR is not tested :(
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edoakes edoakes edoakes approved these changes

Assignees
No one assigned
Labels
go add ONLY when ready to merge, run all tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pcmoritz @edoakes