Skip to content

Commit 1b02e55

Browse files
committed
ensure cuda related paths are set correctly on windows
1 parent ffa239e commit 1b02e55

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/actions/fetch_ctk/action.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,14 @@ runs:
146146
- name: Set output environment variables
147147
shell: bash -xeuo pipefail {0}
148148
run: |
149-
CUDA_PATH=$(realpath "./cuda_toolkit")
149+
# mimics actual CTK installation
150+
if [[ "${{ inputs.host-platform }}" == linux* ]]; then
151+
CUDA_PATH=$(realpath "./cuda_toolkit")
152+
echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-}:${CUDA_PATH}/lib:${CUDA_PATH}/nvvm/lib64" >> $GITHUB_ENV
153+
elif [[ "${{ inputs.host-platform }}" == win* ]]; then
154+
CUDA_PATH=$(cygpath -w $(realpath "./cuda_toolkit"))
155+
echo "$(cygpath -w ${CUDA_PATH}/bin)" >> $GITHUB_PATH
156+
echo "$(cygpath -w $CUDA_PATH/nvvm/bin)" >> $GITHUB_PATH
157+
fi
150158
echo "CUDA_PATH=${CUDA_PATH}" >> $GITHUB_ENV
151159
echo "CUDA_HOME=${CUDA_PATH}" >> $GITHUB_ENV
152-
echo "${CUDA_PATH}/bin" >> $GITHUB_PATH
153-
echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-}:${CUDA_PATH}/lib:${CUDA_PATH}/nvvm/lib64" >> $GITHUB_ENV

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
LIBRARY_PATH=/host/${{ env.CUDA_PATH }}/lib
147147
CUDA_BINDINGS_PARALLEL_LEVEL=${{ env.CUDA_BINDINGS_PARALLEL_LEVEL }}
148148
CIBW_ENVIRONMENT_WINDOWS: >
149-
CUDA_HOME="$(cygpath -w ${{ env.CUDA_PATH }})"
149+
CUDA_HOME=${{ env.CUDA_PATH }}
150150
LIB="${CUDA_HOME}\\lib\\x64;${LIB}"
151151
CUDA_BINDINGS_PARALLEL_LEVEL=${{ env.CUDA_BINDINGS_PARALLEL_LEVEL }}
152152
with:

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ jobs:
100100
101101
- name: Install Git for Windows
102102
# the GPU runner image does not have Git Bash pre-installed...
103+
if: ${{ inputs.local-ctk == '1' }}
103104
env:
104105
# doesn't seem there's an easy way to avoid hard-coding it?
105106
GFW_EXE_URL: https://github.com/git-for-windows/git/releases/download/v2.49.0.windows.1/PortableGit-2.49.0-64-bit.7z.exe
@@ -172,13 +173,6 @@ jobs:
172173
host-platform: ${{ inputs.host-platform }}
173174
cuda-version: ${{ inputs.cuda-version }}
174175

175-
- name: Update PATH
176-
if: ${{ inputs.local-ctk == '1' }}
177-
run: |
178-
# mimics actual CTK installation
179-
echo $PATH
180-
echo "$env:CUDA_PATH\nvvm\bin" >> $env:GITHUB_PATH
181-
182176
- name: Run cuda.bindings tests
183177
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0' }}
184178
run: |

0 commit comments

Comments
 (0)