[perf] use uv for venv creation and pip install #4414

cg505 · 2024-11-25T23:23:02Z

This was previously merged in as #4394, which was reverted in #4401 due to a bug.
This PR:

readds the old uv changes
fixes the bug on Azure (see below)
uses the --seed flag with uv venv to make sure pip is installed in the venv

Azure bug:
uv pip install skypilot[azure] would fail to install azure-cli and complain as follows:

  × No solution found when resolving dependencies:
  ╰─▶ Because there is no version of azure-keyvault-administration==4.4.0b2
      and azure-cli>=2.65.0 depends on azure-keyvault-administration==4.4.0b2,
      we can conclude that azure-cli>=2.65.0 cannot be used.
      And because only the following versions of azure-cli are available:
          azure-cli<=2.65.0
          azure-cli==2.66.0
          azure-cli==2.67.0
      and skypilot[azure]==1.0.0.dev0 depends on azure-cli>=2.65.0, we can
      conclude that skypilot[azure]==1.0.0.dev0 cannot be used.
      And because only skypilot[azure]==1.0.0.dev0 is available and you
      require skypilot[azure], we can conclude that your requirements are
      unsatisfiable.

      hint: azure-keyvault-administration was requested with a pre-release
      marker (e.g., azure-keyvault-administration==4.4.0b2), but pre-releases
      weren't enabled (try: `--prerelease=allow`)

This is because azure-cli directly depends on a pre-release version of azure-keyvault-administration (and several other packages). Normal pip handles this by allowing the pre-release version since it's specified as an explicit version requirement, however uv by default does not consider pre-releases at all. See https://docs.astral.sh/uv/pip/compatibility/#pre-release-compatibility.
We don't want to use uv pip install --prerelease=allow skypilot[azure] because this will allow pre-release versions to satisfy any dependency, not just these explicitly specified ones. I tested this and the resolved version was different for a few packages. This seems like an unacceptable difference, especially since we will be unnecessarily relying on pre-release packages.
Once azure-cli is installed, uv pip install skypilot[azure] will work just fine, since it doesn't need to worry about resolving azure-cli's dependencies. So, we just need to find a way to install azure-cli. pip install azure-cli works, but it's VERY slow (takes >60s on my machine). uv pip install --prerelease=allow azure-cli is much faster, so I went with this.
Technically, uv pip install --prerelease=allow azure-cli uses different resolution than pip install azure-cli, for the same reason described above for installing skypilot[azure]. However, I tested this, and in practice only one package has a different version. (azure-mgmt-search 9.1.0 -> 9.2.0b2)

Tested (run the relevant ones):

Code formatting: bash format.sh
Any manual or new tests for this PR (please specify below)
All smoke tests: pytest tests/test_smoke.py
Relevant individual smoke tests: pytest tests/test_smoke.py::test_fill_in_the_name
Backward compatibility tests: conda deactivate; bash -i tests/backward_compatibility_tests.sh
- k8s
- aws
- azure
  - technically I can't get this to pass - everything passes except step 7 which fails because it takes 50 minutes to schedule the job lol

skypilot-org#4401)" This reverts commit 0b20d56.

cg505 · 2024-11-25T23:59:06Z

@romilbhardwaj Rather than conditionally using pip/uv based on what's installed, I just changed the RAY_INSTALLATION_COMMANDS to also install uv if it's missing. I think this is better because we need different behavior between pip and uv, so trying to make things compatible with both is going to get increasingly difficult. As a brief example, pip uninstall needs the -y flag to work non-interactively, but this flag does not exist in uv pip uninstall.

Michaelvll

Thanks @cg505! It looks mostly good to me. We should run the backward compatibility tests to make sure it works, especially on AWS, GCP, Azure and Kubernetes

Michaelvll · 2024-11-26T00:51:03Z

sky/skylet/constants.py

+    'if [ "{cloud}" = "azure" ]; then '
+    f'{SKY_UV_PIP_CMD} install --prerelease=allow "azure-cli>=2.65.0"; fi;'


We should search for all occurence of azure-cli across the project and pip installs. Are we planning to install the dependencies with uv for controller dependencies as well?

skypilot/sky/utils/controller_utils.py

Line 232 in 1b3c277

'pip install "azure-cli>=2.31.0" azure-core '

Oh wow, I didn't know about this code. We should definitely fix this up. To be clear, everything should work as-is but ideally we would move this all to uv as well.

There are no other relevant mentions of azure-cli in the repo.

Michaelvll

Thanks @cg505!

Michaelvll · 2024-11-27T00:52:35Z

sky/skylet/constants.py

@@ -39,6 +39,7 @@
                           'which python3')
 # Python executable, e.g., /opt/conda/bin/python3
 SKY_PYTHON_CMD = f'$({SKY_GET_PYTHON_PATH_CMD})'
+# Prefer SKY_UV_PIP_CMD, which is faster. TODO(cooper): remove all usages.


Mention the reason in the comment for why we keep this for future reference.

Michaelvll · 2024-11-27T17:44:28Z

sky/setup_files/setup.py

+sys.path.append(SETUP_FILE_DIR)
+import dependencies


dependencies seems not included in this PR?

Michaelvll · 2024-11-27T17:47:02Z

sky/utils/controller_utils.py

@@ -25,6 +25,7 @@
 from sky.jobs import utils as managed_job_utils


This is awesome!

cg505 · 2024-11-27T19:11:05Z

Ran backwards compatibility tests as shown in PR description.

Michaelvll

Thanks for adding this @cg505! We may want to run some tests in a clean env: tests for normal launches and jobs/serve with new controller set up by this PR.

Michaelvll · 2024-11-27T19:26:57Z

sky/setup_files/setup.py

+# setuptools does not include the script dir on the search path, so manually add
+# it so that we can import the dependencies file.
+sys.path.append(SETUP_FILE_DIR)
+import dependencies  # pylint: disable=wrong-import-position


Is this a common practice?

Would it cause any issue with our wheel building during sky launch? Would be great if we can test it in a clean env, e.g. start a new container for running some tests.

I tested the wheel build command manually as well as sky launch to make sure this would work. I looked for information on whether this is common practice but couldn't find any useful info.

I found this: pypa/setuptools#3134
Obviously it's not ideal to hack sys.path. We could use importlib as suggested there. What do you think?

python build systems are so complicated...

Updated this to use runpy.run_path, which seems a lot cleaner.

Michaelvll · 2024-11-27T19:29:09Z

sky/utils/controller_utils.py

+                    f'uv -V > /dev/null 2>&1 ||'
+                    'curl -LsSf https://astral.sh/uv/install.sh 2>/dev/null |'
+                    'UV_INSTALL_DIR="$HOME/.local/bin" sh >/dev/null 2>&1')


Just curious, should we just use uv setup in our provision setup, i.e. use {constants.UV_PIP_CMD} directly?

Also, we use {{ sky_activate_python_env }} in jobs controller yml to make sure pip install goes to the separate env we created. Will the new changes cause any issue?

We probably could use SKY_UV_PIP_CMD - I didn't because the existing code wasn't using SKY_PIP_CMD.
Activating the python env normally should work correctly with uv.

Updated to use the commands from skylet.constants.

Michaelvll

Thanks @cg505! It looks mostly good to me with a small comment below

sky/utils/controller_utils.py

Michaelvll

Thanks @cg505! LGTM.

Can we have a quick number for the performance improvement in the PR description, for future reference?

sky/utils/controller_utils.py

Co-authored-by: Zhanghao Wu <[email protected]>

cg505 added 3 commits November 25, 2024 15:00

Revert "remove uv from runtime setup due to azure installation issue (

9ccb69e

skypilot-org#4401)" This reverts commit 0b20d56.

on azure, use --prerelease=allow to install azure-cli

a31e4c1

use uv venv --seed

7574b94

cg505 requested review from romilbhardwaj and Michaelvll November 25, 2024 23:23

fix backwards compatibility

11040e3

Michaelvll reviewed Nov 26, 2024

View reviewed changes

cg505 added 2 commits November 26, 2024 11:54

really fix backwards compatibility

c8c910c

use uv to set up controller dependencies

64a0981

Michaelvll reviewed Nov 27, 2024

View reviewed changes

cg505 added 4 commits November 27, 2024 09:56

fix python 3.8

46b7e15

lint

b06b77c

add missing file

62a780a

update comment

2a1b494

cg505 requested a review from Michaelvll November 27, 2024 19:11

Michaelvll reviewed Nov 27, 2024

View reviewed changes

cg505 added 2 commits November 27, 2024 11:39

split out azure-cli dep

9ef8d22

fix lint for dependencies

1c0ee29

Michaelvll mentioned this pull request Dec 2, 2024

[Tests] Move tests to uv to speed up the dependency installation by >10x #4424

Merged

5 tasks

Michaelvll reviewed Dec 2, 2024

View reviewed changes

sky/utils/controller_utils.py Show resolved Hide resolved

cg505 added 3 commits December 3, 2024 11:32

use runpy.run_path rather than modifying sys.path

a392afd

fix cloud dependency installation commands

4fda5fe

lint

9e188a6

cg505 requested a review from Michaelvll December 3, 2024 20:05

Michaelvll approved these changes Dec 3, 2024

View reviewed changes

sky/utils/controller_utils.py Outdated Show resolved Hide resolved

Update sky/utils/controller_utils.py

478c56e

Co-authored-by: Zhanghao Wu <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[perf] use uv for venv creation and pip install #4414

[perf] use uv for venv creation and pip install #4414

cg505 commented Nov 25, 2024 •

edited

Loading

cg505 commented Nov 25, 2024

Michaelvll left a comment

Michaelvll Nov 26, 2024

cg505 Nov 26, 2024

Michaelvll left a comment

Michaelvll Nov 27, 2024

Michaelvll Nov 27, 2024

Michaelvll Nov 27, 2024

cg505 commented Nov 27, 2024

Michaelvll left a comment

Michaelvll Nov 27, 2024

cg505 Nov 27, 2024

cg505 Nov 27, 2024

cg505 Nov 27, 2024

cg505 Dec 3, 2024

Michaelvll Nov 27, 2024

Michaelvll Nov 27, 2024

cg505 Nov 27, 2024

cg505 Dec 3, 2024

Michaelvll left a comment

Michaelvll left a comment •

edited

Loading

		'if [ "{cloud}" = "azure" ]; then '
		f'{SKY_UV_PIP_CMD} install --prerelease=allow "azure-cli>=2.65.0"; fi;'

		@@ -25,6 +25,7 @@
		from sky.jobs import utils as managed_job_utils

[perf] use uv for venv creation and pip install #4414

Are you sure you want to change the base?

[perf] use uv for venv creation and pip install #4414

Conversation

cg505 commented Nov 25, 2024 • edited Loading

cg505 commented Nov 25, 2024

Michaelvll left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Michaelvll left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cg505 commented Nov 27, 2024

Michaelvll left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Michaelvll left a comment

Choose a reason for hiding this comment

Michaelvll left a comment • edited Loading

Choose a reason for hiding this comment

cg505 commented Nov 25, 2024 •

edited

Loading

Michaelvll left a comment •

edited

Loading