diff --git a/install.sh b/install.sh index 68e5dd1..106dfe8 100644 --- a/install.sh +++ b/install.sh @@ -8,7 +8,6 @@ IMAGE_TAG="${TENTACLE_TAG:-latest}" # ----------------------------- REGISTRY="hub.krkn.tech" IMAGE_BASE="hub.krkn.tech/krkncli/cuda" -IMAGE_TAG="latest" CONTAINER_NAME="tentacle" SUPPORTED_CUDA=("12.4.1" "12.5.1" "12.6.3" "13.0.1" "13.1.0") @@ -88,35 +87,22 @@ fi DETECTED_CUDA="$(nvidia-smi | grep 'CUDA Version' | sed 's/.*CUDA Version: *\([0-9.]*\).*/\1/')" log "Detected CUDA capability: ${DETECTED_CUDA}" - choose_cuda() { - # Pick highest supported version <= detected CUDA capability - for v in $(printf '%s\n' "${SUPPORTED_CUDA[@]}" | sort -rV); do - if [ "$(printf '%s\n%s\n' "$v" "$DETECTED_CUDA" | sort -V | head -n1)" = "$v" ]; then - echo "$v" - return - fi - done - echo "" - } - - # fallback: highest <= detected - if [ -z "$CUDA_VERSION" ]; then - warn "Could not auto-match CUDA version, defaulting to highest supported" - CUDA_VERSION="$(printf '%s\n' "${SUPPORTED_CUDA[@]}" | sort -V | tail -n1)" - else - log "Selected CUDA image version: ${CUDA_VERSION}" - fi - - echo "" +choose_cuda() { + # Pick highest supported version <= detected CUDA capability + for v in $(printf '%s\n' "${SUPPORTED_CUDA[@]}" | sort -rV); do + if [ "$(printf '%s\n%s\n' "$v" "$DETECTED_CUDA" | sort -V | head -n1)" = "$v" ]; then + echo "$v" + return 0 + fi + done + return 1 } -CUDA_VERSION="$(choose_cuda)" - -if [ -z "$CUDA_VERSION" ]; then - warn "Could not auto-match CUDA version, defaulting to latest (12.6.3)" - CUDA_VERSION="12.6.3" -else +if CUDA_VERSION="$(choose_cuda)"; then log "Selected CUDA image version: ${CUDA_VERSION}" +else + warn "Could not auto-match CUDA version, defaulting to highest supported" + CUDA_VERSION="$(printf '%s\n' "${SUPPORTED_CUDA[@]}" | sort -V | tail -n1)" fi IMAGE="${IMAGE_BASE}/${CUDA_VERSION}/tentacle:${IMAGE_TAG}"