Skip to content

Commit c08b460

Browse files
committed
name cleanup + add H100 runner + install curl
1 parent 61813fa commit c08b460

File tree

3 files changed

+33
-26
lines changed

3 files changed

+33
-26
lines changed

.github/actions/fetch_ctk/action.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ runs:
1919
echo "CTK_CACHE_KEY=mini-ctk-${{ inputs.cuda-version }}-${{ inputs.host-platform }}" >> $GITHUB_ENV
2020
echo "CTK_CACHE_FILENAME=mini-ctk-${{ inputs.cuda-version }}-${{ inputs.host-platform }}.tar.gz" >> $GITHUB_ENV
2121
22+
- name: Install mini CTK action dependencies
23+
if: ${{ runner.environment == 'self-hosted' }}
24+
shell: bash --noprofile --norc -xeuo pipefail {0}
25+
run: |
26+
apt update
27+
apt install -y zstd curl
28+
2229
- name: Download CTK cache
2330
id: ctk-get-cache
2431
uses: actions/cache/restore@v4
@@ -32,22 +39,22 @@ runs:
3239
if: ${{ steps.ctk-get-cache.outputs.cache-hit != 'true' }}
3340
shell: bash --noprofile --norc -xeuo pipefail {0}
3441
run: |
35-
CUDA_PATH="$(pwd)/cuda_toolkit"
42+
CUDA_PATH="./cuda_toolkit"
3643
mkdir $CUDA_PATH
3744
3845
# The binary archives (redist) are guaranteed to be updated as part of the release posting.
3946
CTK_BASE_URL="https://developer.download.nvidia.com/compute/cuda/redist/"
4047
CTK_JSON_URL="$CTK_BASE_URL/redistrib_${{ inputs.cuda-version }}.json"
4148
if [[ "${{ inputs.host-platform }}" == linux* ]]; then
42-
if [[ "${{ inputs.host-platform }}" == "linux-x64" ]]; then
49+
if [[ "${{ inputs.host-platform }}" == "linux-64" ]]; then
4350
CTK_SUBDIR="linux-x86_64"
4451
elif [[ "${{ inputs.host-platform }}" == "linux-aarch64" ]]; then
4552
CTK_SUBDIR="linux-sbsa"
4653
fi
4754
function extract() {
4855
tar -xvf $1 -C $CUDA_PATH --strip-components=1
4956
}
50-
elif [[ "${{ inputs.host-platform }}" == "win-x64" ]]; then
57+
elif [[ "${{ inputs.host-platform }}" == "win-64" ]]; then
5158
CTK_SUBDIR="windows-x86_64"
5259
function extract() {
5360
_TEMP_DIR_=$(mktemp -d)
@@ -102,12 +109,13 @@ runs:
102109
shell: bash --noprofile --norc -xeuo pipefail {0}
103110
run: |
104111
ls -l
105-
CUDA_PATH="$(pwd)/cuda_toolkit"
112+
CUDA_PATH="./cuda_toolkit"
106113
tar -xzvf $CTK_CACHE_FILENAME
107114
ls -l $CUDA_PATH
108115
if [ ! -d "$CUDA_PATH/include" ]; then
109116
exit 1
110117
fi
118+
CUDA_PATH=$(realpath ${CUDA_PATH})
111119
112120
echo "CUDA_PATH=${CUDA_PATH}" >> $GITHUB_ENV
113121
echo "${CUDA_PATH}/bin" >> $GITHUB_PATH

.github/workflows/ci-gh.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "CI"
1+
name: CI
22

33
concurrency:
44
group: ${{ startsWith(github.ref_name, 'main') && format('unique-{0}', github.run_id) || format('ci-build-and-test-on-{0}-from-{1}', github.event_name, github.ref_name) }}
@@ -12,7 +12,6 @@ on:
1212

1313
jobs:
1414
ci:
15-
name: "CI"
1615
uses:
1716
./.github/workflows/gh-build-and-test.yml
1817
secrets: inherit

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ jobs:
55
strategy:
66
fail-fast: false
77
matrix:
8-
# TODO: align host-platform names with conda convention
98
host-platform:
10-
- linux-x64
9+
- linux-64
1110
- linux-aarch64
12-
- win-x64
11+
- win-64
1312
python-version:
1413
- "3.13"
1514
- "3.12"
@@ -19,15 +18,15 @@ jobs:
1918
cuda-version:
2019
# Note: this is for build-time only.
2120
- "12.6.2"
22-
name: Build (${{ matrix.host-platform }}, Python "${{ matrix.python-version }}")
21+
name: Build (${{ matrix.host-platform }}, Python ${{ matrix.python-version }}, CUDA ${{ matrix.cuda-version }})
2322
if: ${{ github.repository_owner == 'nvidia' }}
2423
permissions:
2524
id-token: write # This is required for configure-aws-credentials
2625
contents: read # This is required for actions/checkout
27-
runs-on: ${{ (matrix.host-platform == 'linux-x64' && 'linux-amd64-cpu8') ||
26+
runs-on: ${{ (matrix.host-platform == 'linux-64' && 'linux-amd64-cpu8') ||
2827
(matrix.host-platform == 'linux-aarch64' && 'linux-arm64-cpu8') ||
29-
(matrix.host-platform == 'win-x64' && 'windows-2019') }}
30-
# (matrix.host-platform == 'win-x64' && 'windows-amd64-cpu8') }}
28+
(matrix.host-platform == 'win-64' && 'windows-2019') }}
29+
# (matrix.host-platform == 'win-64' && 'windows-amd64-cpu8') }}
3130
outputs:
3231
BUILD_CTK_VER: ${{ steps.pass_env.outputs.CUDA_VERSION }}
3332
steps:
@@ -166,13 +165,13 @@ jobs:
166165
test:
167166
strategy:
168167
fail-fast: false
168+
# TODO: add driver version here
169169
matrix:
170-
# TODO: align host-platform names with conda convention
171170
host-platform:
172-
- linux-x64
171+
- linux-64
173172
- linux-aarch64
174173
# TODO: enable testing once win-64 GPU runners are up
175-
# - win-x64
174+
# - win-64
176175
python-version:
177176
- "3.13"
178177
- "3.12"
@@ -184,13 +183,21 @@ jobs:
184183
- "12.6.2"
185184
- "12.0.1"
186185
- "11.8.0"
187-
name: Test (${{ matrix.host-platform }}, CUDA ${{ matrix.cuda-version }}, Python "${{ matrix.python-version }}")
186+
runner:
187+
- default
188+
include:
189+
- host-platform: linux-64
190+
python-version: "3.12"
191+
cuda-version: "12.6.2"
192+
runner: H100
193+
name: Test (${{ matrix.host-platform }}, Python ${{ matrix.python-version }}, CUDA ${{ matrix.cuda-version }}, Runner ${{ matrix.runner }})
188194
if: ${{ (github.repository_owner == 'nvidia') }}
189195
permissions:
190196
id-token: write # This is required for configure-aws-credentials
191197
contents: read # This is required for actions/checkout
192-
runs-on: ${{ (matrix.host-platform == 'linux-x64' && 'linux-amd64-gpu-v100-latest-1') ||
193-
(matrix.host-platform == 'linux-aarch64' && 'linux-arm64-gpu-a100-latest-1') }}
198+
runs-on: ${{ (matrix.runner == 'default' && matrix.host-platform == 'linux-64' && 'linux-amd64-gpu-v100-latest-1') ||
199+
(matrix.runner == 'default' && matrix.host-platform == 'linux-aarch64' && 'linux-arm64-gpu-a100-latest-1') ||
200+
(matrix.runner == 'H100' && 'linux-amd64-gpu-h100-latest-1-testing') }}
194201
# Our self-hosted runners require a container
195202
# TODO: use a different (nvidia?) container
196203
container:
@@ -256,13 +263,6 @@ jobs:
256263
with:
257264
python-version: ${{ matrix.python-version }}
258265

259-
# The cache action needs this
260-
- name: Install zstd
261-
shell: bash --noprofile --norc -xeuo pipefail {0}
262-
run: |
263-
apt update
264-
apt install zstd
265-
266266
- name: Set up mini CTK
267267
uses: ./.github/actions/fetch_ctk
268268
continue-on-error: false

0 commit comments

Comments
 (0)