From 19fbfbbef7ff76db6bc672e63aad659cb0a5ec06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 11 Aug 2026 15:42:04 +0200 Subject: [PATCH 1/3] skip CUDA installation for all RISC-V builds --- bot/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bot/build.sh b/bot/build.sh index 7b414d18..adaa7ddc 100755 --- a/bot/build.sh +++ b/bot/build.sh @@ -246,9 +246,9 @@ COMMON_ARGS+=("--pass-through" "--contain") # make sure to use the same parent dir for storing tarballs of tmp PREVIOUS_TMP_DIR=${PWD}/previous_tmp -# Skip CUDA installation for riscv.eessi.io -if [[ "${REPOSITORY_NAME}" == "riscv.eessi.io" ]]; then - echo "bot/build.sh: disabling CUDA installation for RISC-V repository (${REPOSITORY_NAME})" +# Skip CUDA installation for RISC-V builds +if [[ "${REPOSITORY_NAME}" == "riscv.eessi.io" || "${EESSI_SOFTWARE_SUBDIR_OVERRIDE}" =~ ^riscv64/.* ]]; then + echo "bot/build.sh: disabling CUDA installation for RISC-V builds" INSTALL_SCRIPT_ARGS+=("--skip-cuda-install") fi From dc00dedba671d32b2902d8c806bc15715c85fc1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 11 Aug 2026 15:42:20 +0200 Subject: [PATCH 2/3] fatal error for non-supported architectures --- scripts/gpu_support/nvidia/install_cuda_and_libraries.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/gpu_support/nvidia/install_cuda_and_libraries.sh b/scripts/gpu_support/nvidia/install_cuda_and_libraries.sh index 34027bf2..89b108f9 100755 --- a/scripts/gpu_support/nvidia/install_cuda_and_libraries.sh +++ b/scripts/gpu_support/nvidia/install_cuda_and_libraries.sh @@ -77,6 +77,13 @@ done # Make sure EESSI is initialised check_eessi_initialised +# Check if this script is run on a supported architecture, +# CUDA on RISC-V is not supported yet. +[[ -z "${EESSI_CPU_FAMILY}" ]] && export EESSI_CPU_FAMILY=$(uname -m) +if [[ "${EESSI_CPU_FAMILY}" != "x86_64" && "${EESSI_CPU_FAMILY}" != "aarch64" ]]; then + fatal_error "Unsupported CPU family: $EESSI_CPU_FAMILY" +fi + # we need a directory we can use for temporary storage if [[ -z "${TEMP_DIR}" ]]; then tmpdir=$(mktemp -d) From 243cf8aa541e35fa70e46eec177d0e02d7c5b31c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 11 Aug 2026 15:45:36 +0200 Subject: [PATCH 3/3] Update scripts/gpu_support/nvidia/install_cuda_and_libraries.sh Co-authored-by: Caspar van Leeuwen <33718780+casparvl@users.noreply.github.com> --- scripts/gpu_support/nvidia/install_cuda_and_libraries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gpu_support/nvidia/install_cuda_and_libraries.sh b/scripts/gpu_support/nvidia/install_cuda_and_libraries.sh index 89b108f9..3ac19226 100755 --- a/scripts/gpu_support/nvidia/install_cuda_and_libraries.sh +++ b/scripts/gpu_support/nvidia/install_cuda_and_libraries.sh @@ -81,7 +81,7 @@ check_eessi_initialised # CUDA on RISC-V is not supported yet. [[ -z "${EESSI_CPU_FAMILY}" ]] && export EESSI_CPU_FAMILY=$(uname -m) if [[ "${EESSI_CPU_FAMILY}" != "x86_64" && "${EESSI_CPU_FAMILY}" != "aarch64" ]]; then - fatal_error "Unsupported CPU family: $EESSI_CPU_FAMILY" + fatal_error "CUDA does not support CPU family: $EESSI_CPU_FAMILY" fi # we need a directory we can use for temporary storage