Skip to content

Commit 1af437e

Browse files
Add arm64 builds to the libcuvs_c rocky8 matrix (rapidsai#1570)
Extend the `rocky8-clib-standalone-build` to include arm64 builds Authors: - Robert Maynard (https://github.com/robertmaynard) Approvers: - James Lamb (https://github.com/jameslamb) - Kyle Edwards (https://github.com/KyleFromNVIDIA) URL: rapidsai#1570
1 parent 91c51b1 commit 1af437e

File tree

3 files changed

+25
-33
lines changed

3 files changed

+25
-33
lines changed

.github/workflows/pr.yaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,18 @@ jobs:
184184
cuda_version:
185185
- &latest_cuda12 '12.9.1'
186186
- &latest_cuda13 '13.0.2'
187+
arch:
188+
- amd64
189+
- arm64
187190
with:
188191
build_type: pull-request
189-
arch: "amd64"
192+
arch: "${{matrix.arch}}"
190193
date: ${{ inputs.date }}_c
191194
container_image: "rapidsai/ci-wheel:26.02-cuda${{ matrix.cuda_version }}-rockylinux8-py3.10"
192195
node_type: "cpu16"
193196
# requires_license_builder: false
194197
script: "ci/build_standalone_c.sh --build-tests"
195-
artifact-name: "libcuvs_c_${{ matrix.cuda_version }}.tar.gz"
198+
artifact-name: "libcuvs_c_${{ matrix.cuda_version }}_${{ matrix.arch }}.tar.gz"
196199
file_to_upload: "libcuvs_c.tar.gz"
197200
sha: ${{ inputs.sha }}
198201
rocky8-clib-tests:
@@ -206,13 +209,16 @@ jobs:
206209
cuda_version:
207210
- *latest_cuda12
208211
- *latest_cuda13
212+
arch:
213+
- amd64
214+
- arm64
209215
with:
210216
build_type: pull-request
211217
node_type: "gpu-l4-latest-1"
212-
arch: "amd64"
218+
arch: "${{matrix.arch}}"
213219
date: ${{ inputs.date }}_c
214220
container_image: "rapidsai/ci-wheel:26.02-cuda${{ matrix.cuda_version }}-rockylinux8-py3.10"
215-
script: "ci/test_standalone_c.sh"
221+
script: "ci/test_standalone_c.sh libcuvs_c_${{ matrix.cuda_version }}_${{ matrix.arch }}.tar.gz"
216222
sha: ${{ inputs.sha }}
217223
conda-java-build-and-tests:
218224
needs: [conda-cpp-build, changed-files]

ci/build_standalone_c.sh

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
set -euo pipefail
66

77
TOOLSET_VERSION=14
8-
CMAKE_VERSION=3.31.8
9-
CMAKE_ARCH=x86_64
108

119
BUILD_C_LIB_TESTS="OFF"
1210
if [[ "${1:-}" == "--build-tests" ]]; then
@@ -18,20 +16,12 @@ dnf install -y \
1816
tar \
1917
make
2018

21-
# Fetch and install CMake.
22-
if [ ! -e "/usr/local/bin/cmake" ]; then
23-
pushd /usr/local
24-
wget --quiet https://github.com/Kitware/CMake/releases/download/v"${CMAKE_VERSION}"/cmake-"${CMAKE_VERSION}"-linux-"${CMAKE_ARCH}".tar.gz
25-
tar zxf cmake-"${CMAKE_VERSION}"-linux-"${CMAKE_ARCH}".tar.gz
26-
rm cmake-"${CMAKE_VERSION}"-linux-"${CMAKE_ARCH}".tar.gz
27-
ln -s /usr/local/cmake-"${CMAKE_VERSION}"-linux-"${CMAKE_ARCH}"/bin/cmake /usr/local/bin/cmake
28-
popd
29-
fi
30-
3119
source rapids-configure-sccache
32-
3320
source rapids-date-string
3421

22+
rapids-pip-retry install cmake
23+
pyenv rehash
24+
3525
rapids-print-env
3626

3727
rapids-logger "Begin cpp build"

ci/test_standalone_c.sh

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,27 @@
44

55
set -euo pipefail
66

7-
CMAKE_VERSION=4.1.2
8-
CMAKE_ARCH=x86_64
9-
10-
# Fetch and install CMake.
11-
if [ ! -e "/usr/local/bin/cmake" ]; then
12-
pushd /usr/local
13-
wget --quiet https://github.com/Kitware/CMake/releases/download/v"${CMAKE_VERSION}"/cmake-"${CMAKE_VERSION}"-linux-"${CMAKE_ARCH}".tar.gz
14-
tar zxf cmake-"${CMAKE_VERSION}"-linux-"${CMAKE_ARCH}".tar.gz
15-
rm cmake-"${CMAKE_VERSION}"-linux-"${CMAKE_ARCH}".tar.gz
16-
ln -s /usr/local/cmake-"${CMAKE_VERSION}"-linux-"${CMAKE_ARCH}"/bin/cmake /usr/local/bin/cmake
17-
popd
18-
fi
7+
rapids-pip-retry install cmake
8+
pyenv rehash
9+
10+
INSTALL_PREFIX="${PWD}/libcuvs_c_install"
11+
mkdir -p "${INSTALL_PREFIX}"
1912

2013
# Download the standalone C library artifact
21-
payload_name="libcuvs_c_${RAPIDS_CUDA_VERSION}.tar.gz"
14+
if [ -z "$1" ]; then
15+
echo "Error: name of the standalone C library artifact is missing"
16+
exit 1
17+
fi
18+
19+
payload_name="$1"
2220
pkg_name="libcuvs_c.tar.gz"
2321
rapids-logger "Download ${payload_name} artifacts from previous jobs"
2422
DOWNLOAD_LOCATION=$(rapids-download-from-github "${payload_name}")
2523

2624
# Extract the artifact to a staging directory
27-
INSTALL_PREFIX="${PWD}/libcuvs_c_install"
28-
mkdir -p "${INSTALL_PREFIX}"
29-
ls -l "${DOWNLOAD_LOCATION}"
3025
tar -xf "${DOWNLOAD_LOCATION}/${pkg_name}" -C "${INSTALL_PREFIX}"
3126

27+
3228
rapids-logger "Run C API tests"
3329
ls -l "${INSTALL_PREFIX}"
3430
cd "$INSTALL_PREFIX"/bin/gtests/libcuvs

0 commit comments

Comments
 (0)