From 832efa6cb7d3026835e133e04b904817e149594d Mon Sep 17 00:00:00 2001 From: Courtney Pacheco <6019922+courtneypacheco@users.noreply.github.com> Date: Thu, 15 May 2025 09:44:57 -0400 Subject: [PATCH] fix: Require medium and large E2E jobs to use constraints-dev.txt to unblock jobs In the core repo, we are using constraints-dev.txt to constrain our dependencies in the CI: https://github.com/instructlab/instructlab/blob/main/.github/workflows/e2e-nvidia-l40s-x4.yml#L175 In this repo, we are pulling the E2E workflow from the core repo without actually passing in `-c constraints-dev.txt` Signed-off-by: Courtney Pacheco <6019922+courtneypacheco@users.noreply.github.com> --- .github/workflows/e2e-nvidia-l4-x1.yml | 9 +++++---- .github/workflows/e2e-nvidia-l40s-x4.yml | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/e2e-nvidia-l4-x1.yml b/.github/workflows/e2e-nvidia-l4-x1.yml index 1d81b1dd..52b0709a 100644 --- a/.github/workflows/e2e-nvidia-l4-x1.yml +++ b/.github/workflows/e2e-nvidia-l4-x1.yml @@ -112,19 +112,20 @@ jobs: working-directory: ./instructlab run: | export CUDA_HOME="/usr/local/cuda" - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$CUDA_HOME/lib64:$CUDA_HOME/extras/CUPTI/lib64" export PATH="$PATH:$CUDA_HOME/bin" python3.11 -m venv --upgrade-deps venv . venv/bin/activate nvidia-smi python3.11 -m pip cache remove llama_cpp_python - CMAKE_ARGS="-DLLAMA_CUDA=on" python3.11 -m pip install -v . + pip_install="python3.11 -m pip install -v -c constraints-dev.txt" + CMAKE_ARGS="-DGGML_CUDA=on" $pip_install . # https://github.com/instructlab/instructlab/issues/1821 # install with Torch and build dependencies installed - python3.11 -m pip install -v packaging wheel setuptools-scm - python3.11 -m pip install -v .[cuda] -r requirements-vllm-cuda.txt + $pip_install packaging wheel setuptools-scm + $pip_install .[cuda] -r requirements-vllm-cuda.txt - name: Update instructlab-eval library working-directory: ./eval diff --git a/.github/workflows/e2e-nvidia-l40s-x4.yml b/.github/workflows/e2e-nvidia-l40s-x4.yml index d802c3d9..8fe0e037 100644 --- a/.github/workflows/e2e-nvidia-l40s-x4.yml +++ b/.github/workflows/e2e-nvidia-l40s-x4.yml @@ -143,19 +143,20 @@ jobs: working-directory: ./instructlab run: | export CUDA_HOME="/usr/local/cuda" - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$CUDA_HOME/lib64:$CUDA_HOME/extras/CUPTI/lib64" export PATH="$PATH:$CUDA_HOME/bin" python3.11 -m venv --upgrade-deps venv . venv/bin/activate nvidia-smi python3.11 -m pip cache remove llama_cpp_python - CMAKE_ARGS="-DLLAMA_CUDA=on" python3.11 -m pip install . + pip_install="python3.11 -m pip install -v -c constraints-dev.txt" + CMAKE_ARGS="-DGGML_CUDA=on" $pip_install . # https://github.com/instructlab/instructlab/issues/1821 # install with Torch and build dependencies installed - python3.11 -m pip install packaging wheel setuptools-scm - python3.11 -m pip install .[cuda] -r requirements-vllm-cuda.txt + $pip_install packaging wheel setuptools-scm + $pip_install .[cuda] -r requirements-vllm-cuda.txt - name: Update instructlab-eval library working-directory: ./eval