Skip to content

Commit 2189cb1

Browse files
committed
fix workflow
1 parent aee4a4f commit 2189cb1

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

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

+16-5
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,16 @@ jobs:
6262
TEST_CUDA_MAJOR="$(cut -d '.' -f 1 <<< ${{ inputs.cuda-version }})"
6363
if [[ $BUILD_CUDA_MAJOR != $TEST_CUDA_MAJOR ]]; then
6464
SKIP_CUDA_BINDINGS_TEST=1
65+
SKIP_CUDA_CORE_CYTHON_TEST=0
6566
else
6667
SKIP_CUDA_BINDINGS_TEST=0
68+
BUILD_CUDA_MINOR="$(cut -d '.' -f 2 <<< ${{ inputs.build-ctk-ver }})"
69+
TEST_CUDA_MINOR="$(cut -d '.' -f 2 <<< ${{ inputs.cuda-version }})"
70+
if [[ $BUILD_CUDA_MINOR != $TEST_CUDA_MINOR ]]; then
71+
SKIP_CUDA_CORE_CYTHON_TEST=1
72+
else
73+
SKIP_CUDA_CORE_CYTHON_TEST=0
74+
fi
6775
fi
6876
6977
# make outputs from the previous job as env vars
@@ -77,6 +85,7 @@ jobs:
7785
echo "CUDA_BINDINGS_ARTIFACT_NAME=${CUDA_BINDINGS_ARTIFACT_BASENAME}-${{ github.sha }}" >> $GITHUB_ENV
7886
echo "CUDA_BINDINGS_ARTIFACTS_DIR=$(realpath "$REPO_DIR/cuda_bindings/dist")" >> $GITHUB_ENV
7987
echo "SKIP_CUDA_BINDINGS_TEST=${SKIP_CUDA_BINDINGS_TEST}" >> $GITHUB_ENV
88+
echo "SKIP_CUDA_CORE_CYTHON_TEST=${SKIP_CUDA_CORE_CYTHON_TEST}" >> $GITHUB_ENV
8089
8190
- name: Install dependencies
8291
uses: ./.github/actions/install_unix_deps
@@ -197,8 +206,8 @@ jobs:
197206
exit 1
198207
fi
199208
pytest -rxXs tests/cython
200-
popd
201209
fi
210+
popd
202211
203212
- name: Run cuda.core tests
204213
run: |
@@ -221,20 +230,22 @@ jobs:
221230
pushd ./cuda_core
222231
pip install -r "tests/requirements-cu${TEST_CUDA_MAJOR}.txt"
223232
pytest -rxXs tests/
224-
popd
225233
226234
# It is a bit convoluted to run the Cython tests against CTK wheels,
227-
# so let's just skip them.
228-
if [[ "${{ inputs.local-ctk }}" == 1 ]]; then
235+
# so let's just skip them. Also, currently our CI always installs the
236+
# latest bindings (from either major version). This is not compatible
237+
# with the test requirements.
238+
if [[ "${{ inputs.local-ctk }}" == 1 && "${SKIP_CUDA_CORE_CYTHON_TEST}" == 0 ]]; then
239+
pip install cython
229240
if [[ "${{ inputs.host-platform }}" == linux* ]]; then
230241
bash tests/cython/build_tests.sh
231242
elif [[ "${{ inputs.host-platform }}" == win* ]]; then
232243
# TODO: enable this once win-64 runners are up
233244
exit 1
234245
fi
235246
pytest -rxXs tests/cython
236-
popd
237247
fi
248+
popd
238249
239250
- name: Ensure cuda-python installable
240251
run: |

0 commit comments

Comments
 (0)