Skip to content

Commit d37eeba

Browse files
committed
ci: fixup group usage
1 parent 03d6330 commit d37eeba

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

.github/workflows/build-wheel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ jobs:
246246
247247
- name: Build cuda.bindings Cython tests
248248
run: |
249-
pip install $(ls ${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}/*.whl)[test]
249+
pip install ${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}/*.whl --group ./cuda_bindings/pyproject.toml:test
250250
pushd ${{ env.CUDA_BINDINGS_CYTHON_TESTS_DIR }}
251251
bash build_tests.sh
252252
popd
@@ -260,7 +260,7 @@ jobs:
260260

261261
- name: Build cuda.core Cython tests
262262
run: |
263-
pip install $(ls ${{ env.CUDA_CORE_ARTIFACTS_DIR }}/*.whl)[test]
263+
pip install ${{ env.CUDA_CORE_ARTIFACTS_DIR }}/*.whl --group ./cuda_core/pyproject.toml:test
264264
pushd ${{ env.CUDA_CORE_CYTHON_TESTS_DIR }}
265265
bash build_tests.sh
266266
popd

.github/workflows/test-wheel-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ jobs:
283283
run: |
284284
set -euo pipefail
285285
pushd cuda_pathfinder
286-
pip install --only-binary=:all: -v ".[test_nvidia_wheels_cu${TEST_CUDA_MAJOR},test_nvidia_wheels_host]"
286+
pip install --only-binary=:all: -v . --group "test_nvidia_wheels_cu${TEST_CUDA_MAJOR}" --group test_nvidia_wheels_host
287287
pip list
288288
popd
289289

.github/workflows/test-wheel-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ jobs:
256256
shell: bash --noprofile --norc -xeuo pipefail {0}
257257
run: |
258258
pushd cuda_pathfinder
259-
pip install --only-binary=:all: -v ".[test_nvidia_wheels_cu${TEST_CUDA_MAJOR},test_nvidia_wheels_host]"
259+
pip install --only-binary=:all: -v . --group "test_nvidia_wheels_cu${TEST_CUDA_MAJOR}" --group test_nvidia_wheels_host
260260
pip list
261261
popd
262262

ci/tools/run-tests

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pushd ./cuda_pathfinder
2626
echo "Installing pathfinder wheel"
2727
pwd
2828
ls
29-
pip install ./*.whl --group test
29+
pip install ./*.whl --group ./pyproject.toml:test
3030
popd
3131

3232
if [[ "${test_module}" == "pathfinder" ]]; then
@@ -41,15 +41,16 @@ if [[ "${test_module}" == "pathfinder" ]]; then
4141
echo "Number of \"INFO test_\" lines: $line_count"
4242
popd
4343
elif [[ "${test_module}" == "bindings" ]]; then
44+
bindings_dir="${PWD}/cuda_bindings"
4445
pushd "${CUDA_BINDINGS_ARTIFACTS_DIR}"
4546
echo "Installing bindings wheel"
4647
pwd
4748
ls
4849
if [[ "${LOCAL_CTK}" == 1 ]]; then
4950
ls "${CUDA_PATH}"
50-
pip install ./*.whl --group test
51+
pip install ./*.whl --group "${bindings_dir}/pyproject.toml:test"
5152
else
52-
pip install $(ls ./*.whl)[all] --group test
53+
pip install $(ls ./*.whl)[all] --group "${bindings_dir}/pyproject.toml:test"
5354
fi
5455
popd
5556
pushd ./cuda_bindings
@@ -76,6 +77,7 @@ elif [[ "${test_module}" == "core" ]]; then
7677
popd
7778
fi
7879
TEST_CUDA_MAJOR="$(cut -d '.' -f 1 <<< ${CUDA_VER})"
80+
core_dir="${PWD}/cuda_core"
7981
pushd "${CUDA_CORE_ARTIFACTS_DIR}"
8082
echo "Installing core wheel"
8183
pwd
@@ -89,9 +91,9 @@ elif [[ "${test_module}" == "core" ]]; then
8991
if [[ "${LOCAL_CTK}" == 1 ]]; then
9092
# We already installed cuda-bindings, and all CTK components exist locally,
9193
# so just install the test dependencies.
92-
pip install ./*.whl --group "test-cu${TEST_CUDA_MAJOR}${FREE_THREADING}"
94+
pip install ./*.whl --group "${core_dir}/pyproject.toml:test-cu${TEST_CUDA_MAJOR}${FREE_THREADING}"
9395
else
94-
pip install $(ls ./*.whl)["cu${TEST_CUDA_MAJOR}"] --group "test-cu${TEST_CUDA_MAJOR}${FREE_THREADING}"
96+
pip install $(ls ./*.whl)["cu${TEST_CUDA_MAJOR}"] --group "${core_dir}/pyproject.toml:test-cu${TEST_CUDA_MAJOR}${FREE_THREADING}"
9597
fi
9698
popd
9799
pushd ./cuda_core

0 commit comments

Comments
 (0)