Skip to content

Commit 47ad79f

Browse files
committed
Temporarily restore debug changes under .github/workflows, for expanded path_finder test coverage
1 parent ad1e85e commit 47ad79f

File tree

4 files changed

+23
-18
lines changed

4 files changed

+23
-18
lines changed

.github/workflows/build-and-test.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,9 @@ jobs:
2525
matrix:
2626
host-platform:
2727
- linux-64
28-
- linux-aarch64
2928
- win-64
3029
python-version:
31-
- "3.13"
3230
- "3.12"
33-
- "3.11"
34-
- "3.10"
35-
- "3.9"
3631
cuda-version:
3732
# Note: this is for build-time only.
3833
- "12.8.0"
@@ -215,13 +210,8 @@ jobs:
215210
matrix:
216211
host-platform:
217212
- linux-64
218-
- linux-aarch64
219213
python-version:
220-
- "3.13"
221214
- "3.12"
222-
- "3.11"
223-
- "3.10"
224-
- "3.9"
225215
cuda-version:
226216
# Note: this is for test-time only.
227217
- "12.8.0"

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ jobs:
7878
fi
7979
fi
8080
81+
if [[ "${{ inputs.local-ctk }}" != 1 ]]; then
82+
echo "CUDA_BINDINGS_PATH_FINDER_TEST_ALL_LIBNAMES=1" >> $GITHUB_ENV
83+
fi
84+
8185
# make outputs from the previous job as env vars
8286
CUDA_CORE_ARTIFACT_BASENAME="cuda-core-python${PYTHON_VERSION_FORMATTED}-${{ inputs.host-platform }}"
8387
echo "PYTHON_VERSION_FORMATTED=${PYTHON_VERSION_FORMATTED}" >> $GITHUB_ENV
@@ -216,7 +220,7 @@ jobs:
216220
217221
pushd ./cuda_bindings
218222
pip install -r requirements.txt
219-
${SANITIZER_CMD} pytest -rxXs -v tests/
223+
${SANITIZER_CMD} pytest -ra -s -v tests/
220224
221225
# It is a bit convoluted to run the Cython tests against CTK wheels,
222226
# so let's just skip them.
@@ -227,7 +231,7 @@ jobs:
227231
# TODO: enable this once win-64 runners are up
228232
exit 1
229233
fi
230-
${SANITIZER_CMD} pytest -rxXs -v tests/cython
234+
${SANITIZER_CMD} pytest -ra -s -v tests/cython
231235
fi
232236
popd
233237
@@ -251,7 +255,7 @@ jobs:
251255
252256
pushd ./cuda_core
253257
pip install -r "tests/requirements-cu${TEST_CUDA_MAJOR}.txt"
254-
${SANITIZER_CMD} pytest -rxXs -v tests/
258+
${SANITIZER_CMD} pytest -ra -s -v tests/
255259
256260
# It is a bit convoluted to run the Cython tests against CTK wheels,
257261
# so let's just skip them. Also, currently our CI always installs the
@@ -265,7 +269,7 @@ jobs:
265269
# TODO: enable this once win-64 runners are up
266270
exit 1
267271
fi
268-
${SANITIZER_CMD} pytest -rxXs -v tests/cython
272+
${SANITIZER_CMD} pytest -ra -s -v tests/cython
269273
fi
270274
popd
271275

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ jobs:
6565
}
6666
}
6767
68+
"CUDA_BINDINGS_PATH_FINDER_TEST_ALL_LIBNAMES=1" >> $env:GITHUB_ENV
69+
6870
# Make outputs from the previous job as env vars
6971
$CUDA_CORE_ARTIFACT_BASENAME = "cuda-core-python${PYTHON_VERSION_FORMATTED}-${{ inputs.host-platform }}"
7072
"PYTHON_VERSION_FORMATTED=${PYTHON_VERSION_FORMATTED}" >> $env:GITHUB_ENV
@@ -165,8 +167,7 @@ jobs:
165167
uses: Jimver/[email protected]
166168
with:
167169
cuda: ${{ inputs.cuda-version }}
168-
method: 'network'
169-
sub-packages: ${{ env.MINI_CTK_DEPS }}
170+
method: 'local'
170171

171172
- name: Update PATH
172173
if: ${{ inputs.local-ctk == '1' }}
@@ -190,7 +191,7 @@ jobs:
190191
191192
Push-Location ./cuda_bindings
192193
pip install -r requirements.txt
193-
pytest -rxXs -v tests/
194+
pytest -ra -s -v tests/
194195
# skip Cython tests for now (NVIDIA/cuda-python#466)
195196
Pop-Location
196197
@@ -214,7 +215,7 @@ jobs:
214215
215216
Push-Location ./cuda_core
216217
pip install -r "tests/requirements-cu${TEST_CUDA_MAJOR}.txt"
217-
pytest -rxXs -v tests/
218+
pytest -ra -s -v tests/
218219
Pop-Location
219220
220221
- name: Ensure cuda-python installable

cuda_bindings/pyproject.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ all = [
4242
"nvidia-cuda-nvcc-cu12",
4343
"nvidia-cuda-nvrtc-cu12",
4444
"nvidia-nvjitlink-cu12>=12.3",
45+
"nvidia-cuda-runtime-cu12",
46+
"nvidia-cublas-cu12",
47+
"nvidia-cufft-cu12",
48+
"nvidia-curand-cu12",
49+
"nvidia-cusolver-cu12",
50+
"nvidia-cusparse-cu12",
51+
"nvidia-npp-cu12",
52+
"nvidia-nvjpeg-cu12",
53+
"nvidia-nvfatbin-cu12",
54+
"nvidia-cufile-cu12; sys_platform != 'win32'",
4555
]
4656

4757
[project.urls]

0 commit comments

Comments
 (0)