From 28450df2d687739b94f058fb0b2b1d092f854a6e Mon Sep 17 00:00:00 2001
From: "Peter St. John" <pstjohn@nvidia.com>
Date: Tue, 21 Jan 2025 11:20:44 -0700
Subject: [PATCH] bump nemo and remove manual tensorstore install (#619)

With NVIDIA/NeMo#11777, NVIDIA/NeMo#11858, and
https://github.com/NVIDIA/Megatron-LM/commit/a26b93d48e7d902d7d76e7a113fda05398043e6c,
we're now ready to remove the manual tensorstore install from bionemo.

Signed-off-by: Peter St. John <pstjohn@nvidia.com>
---
 3rdparty/NeMo |  2 +-
 Dockerfile    | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/3rdparty/NeMo b/3rdparty/NeMo
index abd4bf7e6..0cd990d97 160000
--- a/3rdparty/NeMo
+++ b/3rdparty/NeMo
@@ -1 +1 @@
-Subproject commit abd4bf7e6961856c04404452b50e7574dd7629e4
+Subproject commit 0cd990d97f01ab946fc53108ed43c7be7140a0d8
diff --git a/Dockerfile b/Dockerfile
index 1452a6f4b..7a760a4dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -105,18 +105,6 @@ COPY --from=rust-env /usr/local/rustup /usr/local/rustup
 ENV PATH="/usr/local/cargo/bin:/usr/local/rustup/bin:${PATH}"
 ENV RUSTUP_HOME="/usr/local/rustup"
 
-RUN --mount=type=cache,target=/root/.cache <<EOF
-set -eo pipefail
-uv pip install maturin --no-build-isolation
-
-pip install --use-deprecated=legacy-resolver  --no-build-isolation \
-  tensorstore==0.1.45
-sed -i 's/^Version: 0\.0\.0$/Version: 0.1.45/' \
-  /usr/local/lib/python3.12/dist-packages/tensorstore-0.0.0.dist-info/METADATA
-mv /usr/local/lib/python3.12/dist-packages/tensorstore-0.0.0.dist-info \
-/usr/local/lib/python3.12/dist-packages/tensorstore-0.1.45.dist-info
-EOF
-
 WORKDIR /workspace/bionemo2
 
 # Install 3rd-party deps and bionemo submodules.
@@ -133,6 +121,8 @@ RUN --mount=type=bind,source=./.git,target=./.git \
     --mount=type=cache,target=/root/.cache <<EOF
 set -eo pipefail
 
+uv pip install maturin --no-build-isolation
+
 uv pip install --no-build-isolation \
   ./3rdparty/* \
   ./sub-packages/bionemo-* \