SOLANA_CUDA=1 works again (#5968)

* SOLANA_CUDA=1 works again

* Minor comment reformat

* Set SOLANA_CUDA=1 explictly
This commit is contained in:
Michael Vines 2019-09-19 08:52:00 -07:00 committed by GitHub
parent 355564e486
commit 1650519962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions

View File

@ -74,6 +74,7 @@ test-stable-perf)
# shellcheck source=/dev/null
source ./target/perf-libs/env.sh
ROOT_FEATURES=cuda
export SOLANA_CUDA=1
fi
# Run root package library tests
@ -91,11 +92,9 @@ test-local-cluster)
;;
esac
# Assumes target/debug is populated. Ensure last build command
# leaves target/debug in the state intended for localnet-sanity
echo --- ci/localnet-sanity.sh
export CARGO_TOOLCHAIN=+"$rust_stable"
(
set -x
export PATH=$PWD/target/debug:$PATH
USE_INSTALL=1 ci/localnet-sanity.sh -x
ci/localnet-sanity.sh -x
)

View File

@ -55,8 +55,8 @@ else
if [[ -n $NDEBUG ]]; then
maybe_release=--release
fi
declare manifest_path="--manifest-path=$SOLANA_ROOT/Cargo.toml"
printf "cargo run $manifest_path $maybe_release $maybe_package --bin %s %s -- " "$program" "$features"
declare manifest_path="--manifest-path=$SOLANA_ROOT/$crate/Cargo.toml"
printf "cargo $CARGO_TOOLCHAIN run $manifest_path $maybe_release $maybe_package --bin %s %s -- " "$program" "$features"
}
fi