From a537154c287e6bdc0e18d9952f5fea42cc918253 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 7 Nov 2018 10:56:40 -0800
Subject: [PATCH] Remove all cuda dependencies from release tarball beyond
 solana-fullnode-cuda

---
 ci/publish-solana-tar.sh  | 34 +++++++++++++++++++---------------
 multinode-demo/common.sh  |  2 --
 net/remote/remote-node.sh |  9 +++++++++
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/ci/publish-solana-tar.sh b/ci/publish-solana-tar.sh
index f1b98ce6b5..75f7c93561 100755
--- a/ci/publish-solana-tar.sh
+++ b/ci/publish-solana-tar.sh
@@ -5,6 +5,7 @@ cd "$(dirname "$0")/.."
 DRYRUN=
 if [[ -z $BUILDKITE_BRANCH ]]; then
   DRYRUN="echo"
+  CHANNEL=unknown
 fi
 
 eval "$(ci/channel-info.sh)"
@@ -32,36 +33,39 @@ fi
 
 
 echo --- Creating tarball
-if [[ -z $DRYRUN ]]; then
 (
   set -x
   rm -rf solana-release/
   mkdir solana-release/
   (
-    echo "$CHANNEL_OR_TAG "
+    echo "$CHANNEL_OR_TAG"
     git rev-parse HEAD
   ) > solana-release/version.txt
 
-  ./fetch-perf-libs.sh
-  cargo install --features=cuda --root solana-release
+  cargo install --root solana-release
   ./scripts/install-native-programs.sh solana-release
+  ./fetch-perf-libs.sh
+  cargo install --features=cuda --root solana-release-cuda
+  cp solana-release-cuda/bin/solana-fullnode solana-release/bin/solana-fullnode-cuda
 
   tar jvcf solana-release.tar.bz2 solana-release/
 )
-fi
-
 
 echo --- AWS S3 Store
+if [[ -z $DRYRUN ]]; then
+  (
+    set -x
+    if [[ ! -r s3cmd-2.0.1/s3cmd ]]; then
+      rm -rf s3cmd-2.0.1.tar.gz s3cmd-2.0.1
+      $DRYRUN wget https://github.com/s3tools/s3cmd/releases/download/v2.0.1/s3cmd-2.0.1.tar.gz
+      $DRYRUN tar zxf s3cmd-2.0.1.tar.gz
+    fi
 
-set -x
-if [[ ! -r s3cmd-2.0.1/s3cmd ]]; then
-  rm -rf s3cmd-2.0.1.tar.gz s3cmd-2.0.1
-  $DRYRUN wget https://github.com/s3tools/s3cmd/releases/download/v2.0.1/s3cmd-2.0.1.tar.gz
-  $DRYRUN tar zxf s3cmd-2.0.1.tar.gz
+    $DRYRUN python ./s3cmd-2.0.1/s3cmd --acl-public put solana-release.tar.bz2 \
+      s3://solana-release/"$CHANNEL_OR_TAG"/solana-release.tar.bz2
+  )
+else
+  echo Skipped due to DRYRUN
 fi
-
-$DRYRUN python ./s3cmd-2.0.1/s3cmd --acl-public put solana-release.tar.bz2 \
-  s3://solana-release/"$CHANNEL_OR_TAG"/solana-release.tar.bz2
-
 exit 0
 
diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh
index 9d45e3c8c4..ea4acee18a 100644
--- a/multinode-demo/common.sh
+++ b/multinode-demo/common.sh
@@ -49,8 +49,6 @@ elif [[ -n $USE_INSTALL ]]; then # Assume |cargo install| was run
     declare program="$1"
     printf "solana-%s" "$program"
   }
-  # CUDA was/wasn't selected at build time, can't affect CUDA state here
-  unset SOLANA_CUDA
 else
   solana_program() {
     declare program="$1"
diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh
index 771a804b52..4551489462 100755
--- a/net/remote/remote-node.sh
+++ b/net/remote/remote-node.sh
@@ -92,6 +92,10 @@ local|tar)
 
   case $nodeType in
   leader)
+    if [[ -e /dev/nvidia0 && -x ~/.cargo/bin/solana-fullnode-cuda ]]; then
+      echo Selecting solana-fullnode-cuda
+      export SOLANA_CUDA=1
+    fi
     ./multinode-demo/setup.sh -t leader $setupArgs
     ./multinode-demo/drone.sh > drone.log 2>&1 &
     ./multinode-demo/leader.sh > leader.log 2>&1 &
@@ -99,6 +103,11 @@ local|tar)
   validator)
     net/scripts/rsync-retry.sh -vPrc "$entrypointIp:~/.cargo/bin/solana*" ~/.cargo/bin/
 
+    if [[ -e /dev/nvidia0 && -x ~/.cargo/bin/solana-fullnode-cuda ]]; then
+      echo Selecting solana-fullnode-cuda
+      export SOLANA_CUDA=1
+    fi
+
     ./multinode-demo/setup.sh -t validator $setupArgs
     ./multinode-demo/validator.sh "$entrypointIp":~/solana "$entrypointIp:8001" >validator.log 2>&1 &
     ;;