From 814d60a8b157b91b5939215a4a186b9310713eb4 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Wed, 31 May 2023 17:53:10 +0100 Subject: [PATCH 1/2] Enable OpenJ9 CUDA support if the SDK is installed on aarch64 Signed-off-by: Stewart X Addison --- .../platform-specific-configurations/linux.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build-farm/platform-specific-configurations/linux.sh b/build-farm/platform-specific-configurations/linux.sh index 8589589eb..cba5a22f4 100755 --- a/build-farm/platform-specific-configurations/linux.sh +++ b/build-farm/platform-specific-configurations/linux.sh @@ -218,15 +218,15 @@ if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ] then # OpenJ9 fetches the latest OpenSSL in their get_source.sh export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched" - - if [ "${ARCHITECTURE}" == "ppc64le" ] || [ "${ARCHITECTURE}" == "x64" ] + if [ "${ARCHITECTURE}" == "aarch64" ]; then + echo PROBABLE JETSON NANO DEVELOPMENT ENVIRONMENT - Enabling CUDA ... + CUDA_HOME=/usr/local/cuda-10.2 + else + CUDA_HOME=/usr/local/cuda-9.0 + fi + if [ -f $CUDA_HOME/include/cuda.h ] then - CUDA_VERSION=9.0 - CUDA_HOME=/usr/local/cuda-$CUDA_VERSION - if [ -f $CUDA_HOME/include/cuda.h ] - then - export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --enable-cuda --with-cuda=$CUDA_HOME" - fi + export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --enable-cuda --with-cuda=$CUDA_HOME" fi fi From 53862d0707046b4b5199b97c391f76f1f6ac7502 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Fri, 17 Nov 2023 13:01:35 +0000 Subject: [PATCH 2/2] Fixup to comment Signed-off-by: Stewart X Addison --- build-farm/platform-specific-configurations/linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-farm/platform-specific-configurations/linux.sh b/build-farm/platform-specific-configurations/linux.sh index cba5a22f4..0518757e0 100755 --- a/build-farm/platform-specific-configurations/linux.sh +++ b/build-farm/platform-specific-configurations/linux.sh @@ -219,7 +219,7 @@ then # OpenJ9 fetches the latest OpenSSL in their get_source.sh export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched" if [ "${ARCHITECTURE}" == "aarch64" ]; then - echo PROBABLE JETSON NANO DEVELOPMENT ENVIRONMENT - Enabling CUDA ... + # Potentially a JetSon Nano dev environment so look here CUDA_HOME=/usr/local/cuda-10.2 else CUDA_HOME=/usr/local/cuda-9.0