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

Don't include script directory in sys.path if it's started via python -m #28140

Merged
merged 2 commits into from Aug 30, 2022

Conversation

jjyao
Copy link
Contributor

@jjyao jjyao commented Aug 27, 2022

Why are these changes needed?

Redo #28043

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 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: Jiajun Yao <jeromeyjj@gmail.com>
# (e.g driver is started via `python -m`,
# see https://peps.python.org/pep-0338/),
# then we shouldn't add it to the workers.
if script_directory in sys.path:
Copy link
Contributor

Choose a reason for hiding this comment

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

If driver's sys.path doesn't include the script directory, do we need to add the current directory into sys.path by run_function_on_all_workers instead of the script directory?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The code below adds the current directory into sys.path.

@jjyao jjyao requested a review from SongGuyang August 29, 2022 16:31
Copy link
Contributor

@SongGuyang SongGuyang left a comment

Choose a reason for hiding this comment

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

Looks good for me after I read the related issue and context!

@jjyao jjyao merged commit 2c6a960 into ray-project:master Aug 30, 2022
@jjyao jjyao deleted the jjyao/tune branch August 30, 2022 15:33
JiahaoYao pushed a commit to JiahaoYao/ray that referenced this pull request Aug 30, 2022
pcmoritz pushed a commit to pcmoritz/ray-1 that referenced this pull request Aug 31, 2022
… -m (ray-project#28140)

Redo ray-project#28043

Signed-off-by: Jiajun Yao <jeromeyjj@gmail.com>
Signed-off-by: Philipp Moritz <pcmoritz@gmail.com>
ArturNiederfahrenhorst pushed a commit to ArturNiederfahrenhorst/ray that referenced this pull request Sep 1, 2022
… -m (ray-project#28140)

Redo ray-project#28043

Signed-off-by: Jiajun Yao <jeromeyjj@gmail.com>
Signed-off-by: Artur Niederfahrenhorst <artur@anyscale.com>
XiaodongLv pushed a commit to XiaodongLv/ray that referenced this pull request Sep 2, 2022
matthewdeng pushed a commit that referenced this pull request Sep 15, 2022
… -m (#28140)

Redo #28043

Signed-off-by: Jiajun Yao <jeromeyjj@gmail.com>
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.

None yet

4 participants