perf-libs now drives setting CUDA_HOME

ci/test-stable-perf.sh

@@ -14,11 +14,10 @@ if ! ci/version-check.sh stable; then
 fi
 export RUST_BACKTRACE=1
 export RUSTFLAGS="-D warnings"
-export CUDA_HOME=/usr/local/cuda
 
 ./fetch-perf-libs.sh
-export LD_LIBRARY_PATH=$PWD/target/perf-libs:$CUDA_HOME/lib64:$LD_LIBRARY_PATH
+# shellcheck source=/dev/null
-export PATH=$PATH:$CUDA_HOME/bin
+source ./target/perf-libs/env.sh
 
 _() {
   echo "--- $*"

fetch-perf-libs.sh

@@ -19,7 +19,13 @@ mkdir -p target/perf-libs
     curl https://solana-perf.s3.amazonaws.com/v0.10.5/x86_64-unknown-linux-gnu/solana-perf.tgz | tar zxvf -
   )
 
-  : "${CUDA_HOME:=/usr/local/cuda}"
+  if [[ -z "$CUDA_HOME" ]]; then
+    if [[ -r "$CUDA_HOME"/solana-perf-CUDA_HOME.txt ]]; then
+      CUDA_HOME=$(cat "$CUDA_HOME"/solana-perf-CUDA_HOME.txt)
+    else
+      CUDA_HOME=/usr/local/cuda
+    fi
+  fi
 
   if [[ -r "$CUDA_HOME"/version.txt && -r cuda-version.txt ]]; then
     if ! diff "$CUDA_HOME"/version.txt cuda-version.txt > /dev/null; then
@@ -36,7 +42,17 @@ mkdir -p target/perf-libs
     echo ==============================================
   fi
 
+  cat > env.sh <<EOF
+export CUDA_HOME=$CUDA_HOME
+export LD_LIBRARY_PATH="$PWD:$CUDA_HOME/lib64:$LD_LIBRARY_PATH"
+export PATH="$PATH:$CUDA_HOME/bin"
+echo CUDA_HOME="$CUDA_HOME"
+echo LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
+EOF
+
   echo "Downloaded solana-perf version: $(cat solana-perf-HEAD.txt)"
+  echo
+  echo "source ./target/perf-libs/env.sh to setup compatible build environment"
 )
 
 exit 0

net/remote/remote-node.sh

@@ -84,11 +84,9 @@ local|tar)
   export RUST_LOG
   export SOLANA_DEFAULT_METRICS_RATE=1
 
-  : "${CUDA_HOME:=/usr/local/cuda}"
-
   ./fetch-perf-libs.sh
-  export LD_LIBRARY_PATH="$PWD/target/perf-libs:$CUDA_HOME/lib64:$LD_LIBRARY_PATH"
+  # shellcheck source=/dev/null
-  echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+  source ./target/perf-libs/env.sh
 
   scripts/oom-monitor.sh  > oom-monitor.log 2>&1 &
   scripts/net-stats.sh  > net-stats.log 2>&1 &