Defer CUDA selection to env.sh, also always create env.sh
This commit is contained in:
parent
2562e48b9d
commit
8bd1c57448
|
@ -44,6 +44,7 @@ test-stable-perf)
|
||||||
Cargo.toml$ \
|
Cargo.toml$ \
|
||||||
ci/test-stable-perf.sh \
|
ci/test-stable-perf.sh \
|
||||||
ci/test-stable.sh \
|
ci/test-stable.sh \
|
||||||
|
^fetch-perf-libs.sh \
|
||||||
^programs/ \
|
^programs/ \
|
||||||
^sdk/ \
|
^sdk/ \
|
||||||
|| {
|
|| {
|
||||||
|
|
|
@ -26,66 +26,70 @@ if [[ ! -f target/perf-libs/.$PERF_LIBS_VERSION ]]; then
|
||||||
rm -f solana-perf.tgz
|
rm -f solana-perf.tgz
|
||||||
touch .$PERF_LIBS_VERSION
|
touch .$PERF_LIBS_VERSION
|
||||||
)
|
)
|
||||||
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cat > target/perf-libs/env.sh <<'EOF'
|
||||||
write_env() {
|
if [[ -n $SOLANA_PERF_LIBS ]]; then
|
||||||
rm -f target/perf-libs/env.sh
|
echo "solana-perf-libs version: $(cat $SOLANA_PERF_LIBS/solana-perf-HEAD.txt)"
|
||||||
cat >> target/perf-libs/env.sh <<EOF
|
return
|
||||||
export CUDA_HOME="$CUDA_HOME"
|
fi
|
||||||
export SOLANA_PERF_LIBS_CUDA="$SOLANA_PERF_LIBS_CUDA"
|
|
||||||
EOF
|
|
||||||
cat >> target/perf-libs/env.sh <<'EOF'
|
|
||||||
SOLANA_PERF_LIBS="$(cd $(dirname "${BASH_SOURCE[0]}"); pwd)"
|
SOLANA_PERF_LIBS="$(cd $(dirname "${BASH_SOURCE[0]}"); pwd)"
|
||||||
|
|
||||||
echo "solana-perf-libs version: $(cat $SOLANA_PERF_LIBS/solana-perf-HEAD.txt)"
|
SOLANA_PERF_LIBS_CUDA=
|
||||||
echo CUDA_HOME="$CUDA_HOME"
|
for _supported_cuda in $(cd $SOLANA_PERF_LIBS; find . -maxdepth 1 -type d -regex './cuda-.*' | sort -r); do
|
||||||
|
_supported_cuda=$(basename "$_supported_cuda")
|
||||||
echo LD_LIBRARY_PATH="$SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA:$CUDA_HOME/lib64:$LD_LIBRARY_PATH"
|
CUDA_HOME=/usr/local/$_supported_cuda
|
||||||
export LD_LIBRARY_PATH="$SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA:$CUDA_HOME/lib64:$LD_LIBRARY_PATH"
|
|
||||||
|
|
||||||
echo PATH="$SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA:$CUDA_HOME/bin:$PATH"
|
|
||||||
export PATH="$SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA:$CUDA_HOME/bin:$PATH"
|
|
||||||
|
|
||||||
if [[ -r "$CUDA_HOME"/version.txt && -r $SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA/cuda-version.txt ]]; then
|
|
||||||
if ! diff "$CUDA_HOME"/version.txt "$SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA"/cuda-version.txt > /dev/null; then
|
|
||||||
echo ==============================================
|
|
||||||
echo "Warning: possible CUDA version mismatch with $CUDA_HOME"
|
|
||||||
echo
|
|
||||||
echo "Expected version: $(cat "$SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA"/cuda-version.txt)"
|
|
||||||
echo "Detected version: $(cat "$CUDA_HOME"/version.txt)"
|
|
||||||
echo ==============================================
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo ==============================================
|
|
||||||
echo Warning: unable to validate CUDA version
|
|
||||||
echo ==============================================
|
|
||||||
fi
|
|
||||||
EOF
|
|
||||||
echo
|
|
||||||
echo "source $PWD/target/perf-libs/env.sh to setup environment"
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
for cuda in $(cd target/perf-libs; find . -maxdepth 1 -type d -regex './cuda-.*' | sort -r); do
|
|
||||||
cuda=$(basename "$cuda")
|
|
||||||
CUDA_HOME=/usr/local/$cuda
|
|
||||||
SOLANA_PERF_LIBS_CUDA=$cuda
|
|
||||||
[[ -d $CUDA_HOME ]] || {
|
[[ -d $CUDA_HOME ]] || {
|
||||||
echo "$cuda not detected: $CUDA_HOME directory does not exist"
|
echo "$_supported_cuda not detected: $CUDA_HOME directory does not exist"
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
[[ -r $CUDA_HOME/version.txt ]] || {
|
[[ -r $CUDA_HOME/version.txt ]] || {
|
||||||
echo "$cuda not detected: $CUDA_HOME/version.txt does not exist"
|
echo "$_supported_cuda not detected: $CUDA_HOME/version.txt does not exist"
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
echo
|
echo
|
||||||
cat "$CUDA_HOME/version.txt"
|
cat "$CUDA_HOME/version.txt"
|
||||||
echo "CUDA_HOME=$CUDA_HOME"
|
echo "CUDA_HOME=$CUDA_HOME"
|
||||||
write_env
|
SOLANA_PERF_LIBS_CUDA=$_supported_cuda
|
||||||
|
export CUDA_HOME
|
||||||
|
export SOLANA_PERF_LIBS_CUDA
|
||||||
|
break
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [[ -z $SOLANA_PERF_LIBS_CUDA ]]; then
|
||||||
|
echo No supported CUDA versions detected
|
||||||
|
echo
|
||||||
|
echo LD_LIBRARY_PATH="$SOLANA_PERF_LIBS:$LD_LIBRARY_PATH"
|
||||||
|
export LD_LIBRARY_PATH="$SOLANA_PERF_LIBS:$SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA:$CUDA_HOME/lib64:$LD_LIBRARY_PATH"
|
||||||
|
else
|
||||||
|
echo
|
||||||
|
echo LD_LIBRARY_PATH="$SOLANA_PERF_LIBS:$SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA:$CUDA_HOME/lib64:$LD_LIBRARY_PATH"
|
||||||
|
export LD_LIBRARY_PATH="$SOLANA_PERF_LIBS:$SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA:$CUDA_HOME/lib64:$LD_LIBRARY_PATH"
|
||||||
|
|
||||||
|
echo PATH="$SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA:$CUDA_HOME/bin:$PATH"
|
||||||
|
export PATH="$SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA:$CUDA_HOME/bin:$PATH"
|
||||||
|
|
||||||
|
if [[ -r "$CUDA_HOME"/version.txt && -r $SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA/cuda-version.txt ]]; then
|
||||||
|
if ! diff "$CUDA_HOME"/version.txt "$SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA"/cuda-version.txt > /dev/null; then
|
||||||
|
echo ==============================================
|
||||||
|
echo "Warning: possible CUDA version mismatch with $CUDA_HOME"
|
||||||
|
echo
|
||||||
|
echo "Expected version: $(cat "$SOLANA_PERF_LIBS/$SOLANA_PERF_LIBS_CUDA"/cuda-version.txt)"
|
||||||
|
echo "Detected version: $(cat "$CUDA_HOME"/version.txt)"
|
||||||
|
echo ==============================================
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo ==============================================
|
||||||
|
echo Warning: unable to validate CUDA version
|
||||||
|
echo ==============================================
|
||||||
|
fi
|
||||||
|
fi
|
||||||
echo
|
echo
|
||||||
echo No supported CUDA versions detected
|
echo "solana-perf-libs version: $(cat $SOLANA_PERF_LIBS/solana-perf-HEAD.txt)"
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
||||||
|
echo "Setup shell environment with:"
|
||||||
|
echo " source $PWD/target/perf-libs/env.sh"
|
||||||
exit 0
|
exit 0
|
||||||
|
|
Loading…
Reference in New Issue