Remove all cuda dependencies from release tarball beyond solana-fullnode-cuda
This commit is contained in:
parent
39e1bdeb71
commit
a537154c28
|
@ -5,6 +5,7 @@ cd "$(dirname "$0")/.."
|
||||||
DRYRUN=
|
DRYRUN=
|
||||||
if [[ -z $BUILDKITE_BRANCH ]]; then
|
if [[ -z $BUILDKITE_BRANCH ]]; then
|
||||||
DRYRUN="echo"
|
DRYRUN="echo"
|
||||||
|
CHANNEL=unknown
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval "$(ci/channel-info.sh)"
|
eval "$(ci/channel-info.sh)"
|
||||||
|
@ -32,36 +33,39 @@ fi
|
||||||
|
|
||||||
|
|
||||||
echo --- Creating tarball
|
echo --- Creating tarball
|
||||||
if [[ -z $DRYRUN ]]; then
|
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
rm -rf solana-release/
|
rm -rf solana-release/
|
||||||
mkdir solana-release/
|
mkdir solana-release/
|
||||||
(
|
(
|
||||||
echo "$CHANNEL_OR_TAG "
|
echo "$CHANNEL_OR_TAG"
|
||||||
git rev-parse HEAD
|
git rev-parse HEAD
|
||||||
) > solana-release/version.txt
|
) > solana-release/version.txt
|
||||||
|
|
||||||
./fetch-perf-libs.sh
|
cargo install --root solana-release
|
||||||
cargo install --features=cuda --root solana-release
|
|
||||||
./scripts/install-native-programs.sh 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/
|
tar jvcf solana-release.tar.bz2 solana-release/
|
||||||
)
|
)
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
echo --- AWS S3 Store
|
echo --- AWS S3 Store
|
||||||
|
if [[ -z $DRYRUN ]]; then
|
||||||
set -x
|
(
|
||||||
if [[ ! -r s3cmd-2.0.1/s3cmd ]]; then
|
set -x
|
||||||
|
if [[ ! -r s3cmd-2.0.1/s3cmd ]]; then
|
||||||
rm -rf s3cmd-2.0.1.tar.gz s3cmd-2.0.1
|
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 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 tar zxf s3cmd-2.0.1.tar.gz
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$DRYRUN python ./s3cmd-2.0.1/s3cmd --acl-public put solana-release.tar.bz2 \
|
$DRYRUN python ./s3cmd-2.0.1/s3cmd --acl-public put solana-release.tar.bz2 \
|
||||||
s3://solana-release/"$CHANNEL_OR_TAG"/solana-release.tar.bz2
|
s3://solana-release/"$CHANNEL_OR_TAG"/solana-release.tar.bz2
|
||||||
|
)
|
||||||
|
else
|
||||||
|
echo Skipped due to DRYRUN
|
||||||
|
fi
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
|
|
|
@ -49,8 +49,6 @@ elif [[ -n $USE_INSTALL ]]; then # Assume |cargo install| was run
|
||||||
declare program="$1"
|
declare program="$1"
|
||||||
printf "solana-%s" "$program"
|
printf "solana-%s" "$program"
|
||||||
}
|
}
|
||||||
# CUDA was/wasn't selected at build time, can't affect CUDA state here
|
|
||||||
unset SOLANA_CUDA
|
|
||||||
else
|
else
|
||||||
solana_program() {
|
solana_program() {
|
||||||
declare program="$1"
|
declare program="$1"
|
||||||
|
|
|
@ -92,6 +92,10 @@ local|tar)
|
||||||
|
|
||||||
case $nodeType in
|
case $nodeType in
|
||||||
leader)
|
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/setup.sh -t leader $setupArgs
|
||||||
./multinode-demo/drone.sh > drone.log 2>&1 &
|
./multinode-demo/drone.sh > drone.log 2>&1 &
|
||||||
./multinode-demo/leader.sh > leader.log 2>&1 &
|
./multinode-demo/leader.sh > leader.log 2>&1 &
|
||||||
|
@ -99,6 +103,11 @@ local|tar)
|
||||||
validator)
|
validator)
|
||||||
net/scripts/rsync-retry.sh -vPrc "$entrypointIp:~/.cargo/bin/solana*" ~/.cargo/bin/
|
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/setup.sh -t validator $setupArgs
|
||||||
./multinode-demo/validator.sh "$entrypointIp":~/solana "$entrypointIp:8001" >validator.log 2>&1 &
|
./multinode-demo/validator.sh "$entrypointIp":~/solana "$entrypointIp:8001" >validator.log 2>&1 &
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in New Issue