Remove CUDA feature (#6094)

This commit is contained in:
Michael Vines
2019-09-26 13:36:51 -07:00
committed by GitHub
parent a964570b1a
commit b4da83a3ab
33 changed files with 375 additions and 512 deletions

View File

@ -73,12 +73,6 @@ $ ./ec2.sh create -g ...
If deploying a tarball-based network nothing further is required, as GPU presence
is detected at runtime and the CUDA build is auto selected.
If deploying a locally-built network, first run `./fetch-perf-libs.sh` then
ensure the `cuda` feature is specified at network start:
```bash
$ ./net.sh start -f "cuda"
```
### How to interact with a CD testnet deployed by ci/testnet-deploy.sh
**AWS-Specific Extra Setup**: Follow the steps in

View File

@ -32,8 +32,6 @@ Operate a configured testnet
-t edge|beta|stable|vX.Y.Z - Deploy the latest tarball release for the
specified release channel (edge|beta|stable) or release tag
(vX.Y.Z)
-f [cargoFeatures] - List of |cargo --feaures=| to activate
(ignored if -s or -S is specified)
-r / --skip-setup - Reuse existing node/ledger configuration from a
previous |start| (ie, don't run ./multinode-demo/setup.sh).
-d / --debug - Build/deploy the testnet with debug binaries
@ -111,7 +109,6 @@ releaseChannel=
deployMethod=local
deployIfNewer=
sanityExtraArgs=
cargoFeatures=
skipSetup=false
customPrograms=
updatePlatforms=
@ -220,9 +217,6 @@ while getopts "h?T:t:o:f:rD:c:Fn:i:d" opt "${shortArgs[@]}"; do
;;
esac
;;
f)
cargoFeatures=$OPTARG
;;
n)
numFullnodesRequested=$OPTARG
;;
@ -340,11 +334,6 @@ build() {
set -x
rm -rf farf
if [[ -r target/perf-libs/env.sh ]]; then
# shellcheck source=/dev/null
source target/perf-libs/env.sh
fi
buildVariant=
if $debugBuild; then
buildVariant=debug
@ -352,7 +341,7 @@ build() {
$MAYBE_DOCKER bash -c "
set -ex
scripts/cargo-install-all.sh farf \"$cargoFeatures\" \"$buildVariant\"
scripts/cargo-install-all.sh farf \"$buildVariant\"
if [[ -n \"$customPrograms\" ]]; then
scripts/cargo-install-custom-programs.sh farf $customPrograms
fi

View File

@ -33,12 +33,7 @@ case $deployMethod in
local|tar)
PATH="$HOME"/.cargo/bin:"$PATH"
export USE_INSTALL=1
./fetch-perf-libs.sh
# shellcheck source=/dev/null
source ./target/perf-libs/env.sh
net/scripts/rsync-retry.sh -vPrc "$entrypointIp:~/.cargo/bin/solana*" ~/.cargo/bin/
net/scripts/rsync-retry.sh -vPrc "$entrypointIp:~/.cargo/bin/*" ~/.cargo/bin/
;;
skip)
;;

View File

@ -93,15 +93,12 @@ local|tar|skip)
export USE_INSTALL=1
./fetch-perf-libs.sh
# shellcheck source=/dev/null
source ./target/perf-libs/env.sh
cat >> ~/solana/on-reboot <<EOF
PATH="$HOME"/.cargo/bin:"$PATH"
export USE_INSTALL=1
# shellcheck source=/dev/null
source ./target/perf-libs/env.sh
SUDO_OK=1 source scripts/tune-system.sh
(
@ -113,7 +110,7 @@ cat >> ~/solana/on-reboot <<EOF
scripts/net-stats.sh > net-stats.log 2>&1 &
echo \$! > net-stats.pid
if [[ -e /dev/nvidia0 && -x ~/.cargo/bin/solana-validator-cuda ]]; then
if [[ -e /dev/nvidia0 ]]; then
echo Selecting solana-validator-cuda
export SOLANA_CUDA=1
fi

View File

@ -67,11 +67,6 @@ case $deployMethod in
local|tar|skip)
PATH="$HOME"/.cargo/bin:"$PATH"
export USE_INSTALL=1
if [[ -r target/perf-libs/env.sh ]]; then
# shellcheck source=/dev/null
source target/perf-libs/env.sh
fi
solana_gossip=solana-gossip
solana_install=solana-install
;;