From 71ba100321810fc4d10cfcc2a847405c3f86f52e Mon Sep 17 00:00:00 2001 From: Zhanghao Wu Date: Thu, 23 May 2024 17:12:08 +0000 Subject: [PATCH] address comments --- llm/axolotl/axolotl-docker.yaml | 6 ------ llm/axolotl/axolotl-spot.yaml | 6 ------ sky/skylet/attempt_skylet.py | 5 +++-- sky/skylet/constants.py | 2 -- tests/test_smoke.py | 2 +- 5 files changed, 4 insertions(+), 17 deletions(-) diff --git a/llm/axolotl/axolotl-docker.yaml b/llm/axolotl/axolotl-docker.yaml index 9cec1d1f331..b883ebdde46 100644 --- a/llm/axolotl/axolotl-docker.yaml +++ b/llm/axolotl/axolotl-docker.yaml @@ -27,9 +27,3 @@ run: | envs: HF_TOKEN: # TODO: Fill with your own huggingface token, or use --env to pass. - - - - - - diff --git a/llm/axolotl/axolotl-spot.yaml b/llm/axolotl/axolotl-spot.yaml index 9d34f11193f..8970737483d 100644 --- a/llm/axolotl/axolotl-spot.yaml +++ b/llm/axolotl/axolotl-spot.yaml @@ -29,10 +29,4 @@ run: | envs: HF_TOKEN: # TODO: Fill with your own huggingface token, or use --env to pass. BUCKET: # TODO: Fill with your unique bucket name, or use --env to pass. - - - - - -4 diff --git a/sky/skylet/attempt_skylet.py b/sky/skylet/attempt_skylet.py index be1faa8c3b6..54df4986080 100644 --- a/sky/skylet/attempt_skylet.py +++ b/sky/skylet/attempt_skylet.py @@ -21,8 +21,9 @@ def restart_skylet(): shell=True, check=False) subprocess.run( - # Activate python environment first to make sure skylet can find the - # cloud SDK for autostopping. + # We have made sure that `attempt_skylet.py` is executed with the + # skypilot runtime env activated, so that skylet can access the cloud + # CLI tools. f'nohup {constants.SKY_PYTHON_CMD} -m sky.skylet.skylet' ' >> ~/.sky/skylet.log 2>&1 &', shell=True, diff --git a/sky/skylet/constants.py b/sky/skylet/constants.py index 4372e354e84..0c68fd7f6e6 100644 --- a/sky/skylet/constants.py +++ b/sky/skylet/constants.py @@ -105,8 +105,6 @@ 'bash Miniconda3-Linux-x86_64.sh -b && ' 'eval "$(~/miniconda3/bin/conda shell.bash hook)" && conda init && ' 'conda config --set auto_activate_base true && ' - # Use $(echo ~) instead of ~ to avoid the error "no such file or directory". - # Also, not using $HOME to avoid the error HOME variable not set. f'conda activate base; }}; ' 'grep "# >>> conda initialize >>>" ~/.bashrc || ' '{ conda init && source ~/.bashrc; };' diff --git a/tests/test_smoke.py b/tests/test_smoke.py index e7b6521cdae..1eb1c621976 100644 --- a/tests/test_smoke.py +++ b/tests/test_smoke.py @@ -1025,7 +1025,7 @@ def test_kubernetes_storage_mounts(): [ 'docker:nvidia/cuda:11.8.0-devel-ubuntu18.04', 'docker:ubuntu:18.04', - # Test latest image with python 3.11 installed by default. + # Test image with python 3.11 installed by default. 'docker:continuumio/miniconda3:24.1.2-0', # Test python>=3.12 where SkyPilot should automatically create a separate # conda env for runtime with python 3.10.