diff --git a/docker/Dockerfile b/docker/Dockerfile index 9605f3f..a8478ee 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ FROM rockylinux:9.1 AS base ENV TROUTE_REPO=CIROH-UA/t-route ENV TROUTE_BRANCH=datastream ENV NGEN_REPO=CIROH-UA/ngen -ENV NGEN_BRANCH=main +ENV NGEN_BRANCH=ngiab # Install system dependencies RUN echo "max_parallel_downloads=10" >> /etc/dnf/dnf.conf @@ -194,6 +194,10 @@ RUN uv pip install numpy==$(/dmod/bin/ngen --info | grep -e 'NumPy Version: ' | # we can add the venv to the path so ngen can find it ENV PATH="/ngen/.venv/bin:${PATH}" +# Install lstm - the extra index url installs cpu-only pytorch which is ~6gb smaller +COPY --from=ngen_clone /ngen/ngen/extern/lstm/lstm /ngen/ngen/extern/lstm +RUN uv pip install --no-cache-dir /ngen/ngen/extern/lstm --extra-index-url https://download.pytorch.org/whl/cpu + ## add some metadata to the image COPY --from=troute_build /tmp/troute_url /ngen/troute_url COPY --from=ngen_build /tmp/ngen_url /ngen/ngen_url diff --git a/docker/HelloNGEN.sh b/docker/HelloNGEN.sh index 4a0c4ac..4b9955d 100644 --- a/docker/HelloNGEN.sh +++ b/docker/HelloNGEN.sh @@ -80,9 +80,9 @@ select option in "${options[@]}"; do case $option in "Run NextGen model framework in serial mode"|"Run NextGen model framework in parallel mode") echo -e "\n" - n1=${selected_catchment:-$(read -p "Enter the hydrofabric catchment file path: " n1; echo "$n1")} - n2=${selected_nexus:-$(read -p "Enter the hydrofabric nexus file path: " n2; echo "$n2")} - n3=${selected_realization:-$(read -p "Enter the Realization file path: " n3; echo "$n3")} + n1=${selected_catchment:-$(read -erp "Enter the hydrofabric catchment file path: " n1; echo "$n1")} + n2=${selected_nexus:-$(read -erp "Enter the hydrofabric nexus file path: " n2; echo "$n2")} + n3=${selected_realization:-$(read -erp "Enter the Realization file path: " n3; echo "$n3")} echo -e "${GREEN}Selected files:\nCatchment: $n1\nNexus: $n2\nRealization: $n3${RESET}\n"