diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh index 17e8b04ae..e92ebc6aa 100755 --- a/net/remote/remote-node.sh +++ b/net/remote/remote-node.sh @@ -53,7 +53,12 @@ snap) " if [[ -e /dev/nvidia0 ]]; then - commonNodeConfig="$commonNodeConfig enable-cuda=1" + echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo + echo "WARNING: GPU detected by snap builds to not support CUDA." + echo " Consider using instances with a GPU to reduce cost." + echo + echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" fi if [[ $nodeType = leader ]]; then diff --git a/scripts/snap-config-to-env.sh b/scripts/snap-config-to-env.sh index 8cce4ac83..fa1b7bcef 100755 --- a/scripts/snap-config-to-env.sh +++ b/scripts/snap-config-to-env.sh @@ -9,12 +9,10 @@ if [[ -d $SNAP ]]; then # Running inside a Linux Snap? RUST_LOG="$(snapctl get rust-log)" - SOLANA_CUDA="$(snapctl get enable-cuda)" SOLANA_DEFAULT_METRICS_RATE="$(snapctl get default-metrics-rate)" SOLANA_METRICS_CONFIG="$(snapctl get metrics-config)" export RUST_LOG - export SOLANA_CUDA export SOLANA_DEFAULT_METRICS_RATE export SOLANA_METRICS_CONFIG fi diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index d5db151a3..53989ae01 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -26,12 +26,6 @@ apps: - network - network-bind - home - fullnode-cuda: - command: solana-fullnode-cuda - plugs: - - network - - network-bind - - home fullnode-config: command: solana-fullnode-config plugs: @@ -97,24 +91,7 @@ parts: - scripts - usr/lib override-build: | - # Install CUDA 9.2 runtime - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/lib/nvidia-396/ - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/lib/x86_64-linux-gnu/ - cp -rav /usr/local/cuda-9.2/targets/x86_64-linux/lib/libcudart.so* $SNAPCRAFT_PART_INSTALL/usr/lib - cp -rav /usr/lib/x86_64-linux-gnu/libcuda.so* $SNAPCRAFT_PART_INSTALL/usr/lib/x86_64-linux-gnu/ - cp -v /usr/lib/nvidia-396/libnvidia-fatbinaryloader.so* $SNAPCRAFT_PART_INSTALL/usr/lib/nvidia-396/ - - # Build/install solana-fullnode-cuda - ./fetch-perf-libs.sh - cargo install --features=cuda --root $SNAPCRAFT_PART_INSTALL --bin solana-fullnode - mv $SNAPCRAFT_PART_INSTALL/bin/solana-fullnode $SNAPCRAFT_PART_INSTALL - rm -rf $SNAPCRAFT_PART_INSTALL/bin/* - mv $SNAPCRAFT_PART_INSTALL/solana-fullnode $SNAPCRAFT_PART_INSTALL/bin/solana-fullnode-cuda - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/lib/ - cp -f target/perf-libs/libJerasure.so $SNAPCRAFT_PART_INSTALL/usr/lib/libJerasure.so.2 - cp -f target/perf-libs/libgf_complete.so $SNAPCRAFT_PART_INSTALL/usr/lib/libgf_complete.so.1 - - # Build/install all other programs + # Build/install all programs cargo install --root $SNAPCRAFT_PART_INSTALL --bins # Install native programs