Skip to content

Commit f589987

Browse files
leofangleofang
committed
ensure cython tests are only run when testing against build CTK
1 parent 08c5579 commit f589987

File tree

2 files changed

+33
-29
lines changed

2 files changed

+33
-29
lines changed

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

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ jobs:
149149
uses: ./.github/actions/install_unix_deps
150150
continue-on-error: false
151151
with:
152-
# gcc for Cython tests, jq/wget for artifact fetching
153-
dependencies: "build-essential jq wget"
154-
dependent_exes: "gcc jq wget"
152+
# for artifact fetching
153+
dependencies: "jq wget"
154+
dependent_exes: "jq wget"
155155

156156
- name: Set environment variables
157157
run: |
@@ -167,15 +167,15 @@ jobs:
167167
TEST_CUDA_MAJOR="$(cut -d '.' -f 1 <<< ${{ matrix.CUDA_VER }})"
168168
if [[ $BUILD_CUDA_MAJOR != $TEST_CUDA_MAJOR ]]; then
169169
SKIP_CUDA_BINDINGS_TEST=1
170-
SKIP_CUDA_CORE_CYTHON_TEST=0
170+
SKIP_CYTHON_TEST=1
171171
else
172172
SKIP_CUDA_BINDINGS_TEST=0
173173
BUILD_CUDA_MINOR="$(cut -d '.' -f 2 <<< ${{ inputs.build-ctk-ver }})"
174174
TEST_CUDA_MINOR="$(cut -d '.' -f 2 <<< ${{ matrix.CUDA_VER }})"
175175
if [[ $BUILD_CUDA_MINOR != $TEST_CUDA_MINOR ]]; then
176-
SKIP_CUDA_CORE_CYTHON_TEST=1
176+
SKIP_CYTHON_TEST=1
177177
else
178-
SKIP_CUDA_CORE_CYTHON_TEST=0
178+
SKIP_CYTHON_TEST=0
179179
fi
180180
fi
181181
@@ -204,7 +204,7 @@ jobs:
204204
echo "CUDA_BINDINGS_CYTHON_TESTS_DIR=$(realpath "$REPO_DIR/cuda_bindings/tests/cython")" >> $GITHUB_ENV
205205
206206
echo "SKIP_CUDA_BINDINGS_TEST=${SKIP_CUDA_BINDINGS_TEST}" >> $GITHUB_ENV
207-
echo "SKIP_CUDA_CORE_CYTHON_TEST=${SKIP_CUDA_CORE_CYTHON_TEST}" >> $GITHUB_ENV
207+
echo "SKIP_CYTHON_TEST=${SKIP_CYTHON_TEST}" >> $GITHUB_ENV
208208
209209
- name: Download cuda-python build artifacts
210210
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0'}}
@@ -265,14 +265,14 @@ jobs:
265265
ls -lahR $CUDA_BINDINGS_ARTIFACTS_DIR
266266
267267
- name: Download cuda.bindings Cython tests
268-
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0' }}
268+
if: ${{ env.SKIP_CYTHON_TEST == '0' }}
269269
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
270270
with:
271271
name: ${{ env.CUDA_BINDINGS_ARTIFACT_NAME }}-tests
272272
path: ${{ env.CUDA_BINDINGS_CYTHON_TESTS_DIR }}
273273

274274
- name: Display structure of downloaded cuda.bindings Cython tests
275-
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0' }}
275+
if: ${{ env.SKIP_CYTHON_TEST == '0' }}
276276
run: |
277277
pwd
278278
ls -lahR $CUDA_BINDINGS_CYTHON_TESTS_DIR
@@ -289,14 +289,14 @@ jobs:
289289
ls -lahR $CUDA_CORE_ARTIFACTS_DIR
290290
291291
- name: Download cuda.core Cython tests
292-
if: ${{ env.SKIP_CUDA_CORE_CYTHON_TEST == '0' }}
292+
if: ${{ env.SKIP_CYTHON_TEST == '0' }}
293293
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
294294
with:
295295
name: ${{ env.CUDA_CORE_ARTIFACT_NAME }}-tests
296296
path: ${{ env.CUDA_CORE_CYTHON_TESTS_DIR }}
297297

298298
- name: Display structure of downloaded cuda.core Cython tests
299-
if: ${{ env.SKIP_CUDA_CORE_CYTHON_TEST == '0' }}
299+
if: ${{ env.SKIP_CYTHON_TEST == '0' }}
300300
run: |
301301
pwd
302302
ls -lahR $CUDA_CORE_CYTHON_TESTS_DIR
@@ -355,7 +355,9 @@ jobs:
355355
356356
pushd ./cuda_bindings
357357
${SANITIZER_CMD} pytest -rxXs -v tests/
358-
${SANITIZER_CMD} pytest -rxXs -v tests/cython
358+
if [[ "${SKIP_CYTHON_TEST}" == 0 ]]; then
359+
${SANITIZER_CMD} pytest -rxXs -v tests/cython
360+
fi
359361
popd
360362
361363
- name: Run cuda.core tests
@@ -381,7 +383,7 @@ jobs:
381383
382384
# Currently our CI always installs the latest bindings (from either major version).
383385
# This is not compatible with the test requirements.
384-
if [[ "${SKIP_CUDA_CORE_CYTHON_TEST}" == 0 ]]; then
386+
if [[ "${SKIP_CYTHON_TEST}" == 0 ]]; then
385387
${SANITIZER_CMD} pytest -rxXs -v tests/cython
386388
fi
387389
popd

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@ jobs:
105105
$TEST_CUDA_MAJOR = '${{ matrix.CUDA_VER }}' -split '\.' | Select-Object -First 1
106106
if ($BUILD_CUDA_MAJOR -ne $TEST_CUDA_MAJOR) {
107107
$SKIP_CUDA_BINDINGS_TEST = 1
108-
$SKIP_CUDA_CORE_CYTHON_TEST = 0
108+
$SKIP_CYTHON_TEST = 1
109109
} else {
110110
$SKIP_CUDA_BINDINGS_TEST = 0
111111
$BUILD_CUDA_MINOR = '${{ inputs.build-ctk-ver }}' -split '\.' | Select-Object -Skip 1 -First 1
112112
$TEST_CUDA_MINOR = '${{ matrix.CUDA_VER }}' -split '\.' | Select-Object -Skip 1 -First 1
113113
if ($BUILD_CUDA_MINOR -ne $TEST_CUDA_MINOR) {
114-
$SKIP_CUDA_CORE_CYTHON_TEST = 1
114+
$SKIP_CYTHON_TEST = 1
115115
} else {
116-
$SKIP_CUDA_CORE_CYTHON_TEST = 0
116+
$SKIP_CYTHON_TEST = 0
117117
}
118118
}
119119
@@ -130,7 +130,7 @@ jobs:
130130
"CUDA_BINDINGS_ARTIFACTS_DIR=$($ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath("$REPO_DIR\cuda_bindings\dist"))" >> $env:GITHUB_ENV
131131
"CUDA_BINDINGS_CYTHON_TESTS_DIR=$($ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath("$REPO_DIR\cuda_bindings\tests\cython"))" >> $env:GITHUB_ENV
132132
"SKIP_CUDA_BINDINGS_TEST=${SKIP_CUDA_BINDINGS_TEST}" >> $env:GITHUB_ENV
133-
"SKIP_CUDA_CORE_CYTHON_TEST=${SKIP_CUDA_CORE_CYTHON_TEST}" >> $env:GITHUB_ENV
133+
"SKIP_CYTHON_TEST=${SKIP_CYTHON_TEST}" >> $env:GITHUB_ENV
134134
135135
- name: Download cuda-python build artifacts
136136
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0'}}
@@ -146,13 +146,6 @@ jobs:
146146
name: ${{ env.CUDA_BINDINGS_ARTIFACT_NAME }}
147147
path: ${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}
148148

149-
- name: Download cuda.bindings Cython tests
150-
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0' }}
151-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
152-
with:
153-
name: ${{ env.CUDA_BINDINGS_ARTIFACT_NAME }}-tests
154-
path: ${{ env.CUDA_BINDINGS_CYTHON_TESTS_DIR }}
155-
156149
- name: Install gh cli
157150
# the GPU runner image does not have gh pre-installed...
158151
env:
@@ -233,8 +226,15 @@ jobs:
233226
Get-Location
234227
Get-ChildItem -Recurse -Force $env:CUDA_BINDINGS_ARTIFACTS_DIR | Select-Object Mode, LastWriteTime, Length, FullName
235228
229+
- name: Download cuda.bindings Cython tests
230+
if: ${{ env.SKIP_CYTHON_TEST == '0' }}
231+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
232+
with:
233+
name: ${{ env.CUDA_BINDINGS_ARTIFACT_NAME }}-tests
234+
path: ${{ env.CUDA_BINDINGS_CYTHON_TESTS_DIR }}
235+
236236
- name: Display structure of downloaded cuda.bindings Cython tests
237-
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0' }}
237+
if: ${{ env.SKIP_CYTHON_TEST == '0' }}
238238
run: |
239239
Get-Location
240240
Get-ChildItem -Recurse -Force $env:CUDA_BINDINGS_CYTHON_TESTS_DIR | Select-Object Mode, LastWriteTime, Length, FullName
@@ -251,14 +251,14 @@ jobs:
251251
Get-ChildItem -Recurse -Force $env:CUDA_CORE_ARTIFACTS_DIR | Select-Object Mode, LastWriteTime, Length, FullName
252252
253253
- name: Download cuda.core Cython tests
254-
if: ${{ env.SKIP_CUDA_CORE_CYTHON_TEST == '0' }}
254+
if: ${{ env.SKIP_CYTHON_TEST == '0' }}
255255
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
256256
with:
257257
name: ${{ env.CUDA_CORE_ARTIFACT_NAME }}-tests
258258
path: ${{ env.CUDA_CORE_CYTHON_TESTS_DIR }}
259259

260260
- name: Display structure of downloaded cuda.core Cython tests
261-
if: ${{ env.SKIP_CUDA_CORE_CYTHON_TEST == '0' }}
261+
if: ${{ env.SKIP_CYTHON_TEST == '0' }}
262262
run: |
263263
Get-Location
264264
Get-ChildItem -Recurse -Force $env:CUDA_CORE_CYTHON_TESTS_DIR | Select-Object Mode, LastWriteTime, Length, FullName
@@ -291,7 +291,9 @@ jobs:
291291
292292
Push-Location ./cuda_bindings
293293
pytest -rxXs -v tests/
294-
pytest -rxXs -v tests/cython
294+
if ($env:SKIP_CYTHON_TEST -eq '0') {
295+
pytest -rxXs -v tests/cython
296+
}
295297
Pop-Location
296298
297299
- name: Run cuda.core tests
@@ -314,7 +316,7 @@ jobs:
314316
315317
Push-Location ./cuda_core
316318
pytest -rxXs -v tests/
317-
if ($env:SKIP_CUDA_CORE_CYTHON_TEST -eq '0') {
319+
if ($env:SKIP_CYTHON_TEST -eq '0') {
318320
pytest -rxXs -v tests/cython
319321
}
320322
Pop-Location

0 commit comments

Comments
 (0)