Skip to content

Commit 5b38607

Browse files
committed
CI: Move compute-sanitzer setup into own step after CTK setup
Because the sanitizer commands depend on the version of the sanitizer we need to be able to run the sanitzer to set the sanitizer cmd. Thus, we need to setup the sanitzer after it is installed.
1 parent 724cf3e commit 5b38607

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

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

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,6 @@ jobs:
7474
fi
7575
fi
7676
77-
if [[ "${{ inputs.python-version }}" == "3.12" && "${{ inputs.local-ctk }}" == 1 ]]; then
78-
# Use single quotes to delay expansion of $CUDA_HOME until after mini-CTK step is complete
79-
COMPUTE_SANITIZER='${CUDA_HOME}/bin/compute-sanitizer'
80-
COMPUTE_SANITIZER_VERSION=$(${COMPUTE_SANITIZER} --version | grep -Eo "[0-9]{4}\.[0-9]\.[0-9]" | sed -e 's/\.//g')
81-
SANITIZER_CMD="${COMPUTE_SANITIZER} --target-processes=all --launch-timeout=0 --tool=memcheck --error-exitcode=1"
82-
if [[ "$COMPUTE_SANITIZER_VERSION" -ge 202111 ]]; then
83-
SANITIZER_CMD="${SANITIZER_CMD} --padding=32"
84-
fi
85-
else
86-
COMPUTE_SANITIZER_VERSION="None"
87-
SANITIZER_CMD=""
88-
fi
89-
9077
# make outputs from the previous job as env vars
9178
CUDA_CORE_ARTIFACT_BASENAME="cuda-core-python${PYTHON_VERSION_FORMATTED}-${{ inputs.host-platform }}"
9279
echo "PYTHON_VERSION_FORMATTED=${PYTHON_VERSION_FORMATTED}" >> $GITHUB_ENV
@@ -99,8 +86,6 @@ jobs:
9986
echo "CUDA_BINDINGS_ARTIFACTS_DIR=$(realpath "$REPO_DIR/cuda_bindings/dist")" >> $GITHUB_ENV
10087
echo "SKIP_CUDA_BINDINGS_TEST=${SKIP_CUDA_BINDINGS_TEST}" >> $GITHUB_ENV
10188
echo "SKIP_CUDA_CORE_CYTHON_TEST=${SKIP_CUDA_CORE_CYTHON_TEST}" >> $GITHUB_ENV
102-
echo "COMPUTE_SANITIZER_VERSION=${COMPUTE_SANITIZER_VERSION}" >> $GITHUB_ENV
103-
echo "SANITIZER_CMD=${SANITIZER_CMD}" >> $GITHUB_ENV
10489
10590
- name: Install dependencies
10691
uses: ./.github/actions/install_unix_deps
@@ -195,6 +180,22 @@ jobs:
195180
host-platform: ${{ inputs.host-platform }}
196181
cuda-version: ${{ inputs.cuda-version }}
197182

183+
- name: Set up compute-saniziter
184+
run: |
185+
if [[ "${{ inputs.python-version }}" == "3.12" && "${{ inputs.local-ctk }}" == 1 ]]; then
186+
COMPUTE_SANITIZER="${CUDA_HOME}/bin/compute-sanitizer"
187+
COMPUTE_SANITIZER_VERSION=$(${COMPUTE_SANITIZER} --version | grep -Eo "[0-9]{4}\.[0-9]\.[0-9]" | sed -e 's/\.//g')
188+
SANITIZER_CMD="${COMPUTE_SANITIZER} --target-processes=all --launch-timeout=0 --tool=memcheck --error-exitcode=1"
189+
if [[ "$COMPUTE_SANITIZER_VERSION" -ge 202111 ]]; then
190+
SANITIZER_CMD="${SANITIZER_CMD} --padding=32"
191+
fi
192+
else
193+
COMPUTE_SANITIZER_VERSION="None"
194+
SANITIZER_CMD=""
195+
fi
196+
echo "COMPUTE_SANITIZER_VERSION=${COMPUTE_SANITIZER_VERSION}" >> $GITHUB_ENV
197+
echo "SANITIZER_CMD=${SANITIZER_CMD}" >> $GITHUB_ENV
198+
198199
- name: Run cuda.bindings tests
199200
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0' }}
200201
run: |

0 commit comments

Comments
 (0)