fix(install_zutils): can't precompile waterz

ZettaAI · Jan 28, 2025 · 15a17a9 · 15a17a9 · trivoldus28 · Jan 28, 2025
1 parent 4c7f97a
commit 15a17a9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 23 deletions.
diff --git a/compile_waterz b/compile_waterz
diff --git a/docker/Dockerfile.all b/docker/Dockerfile.all
@@ -19,7 +19,12 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
   && ./install_zutils.py --dockerfile --mode modules \
   && rm -rf /root/.cache/bazel/ \
   && apt-mark auto '.*' > /dev/null \
-  && apt-mark manual $savedAptMark zstd parallel coreutils libtbb2 libjemalloc2 \
+  && apt-mark manual \
+    $savedAptMark \
+    # abiss
+    zstd parallel coreutils libjemalloc2 \
+    # waterz
+    libboost-dev g++ \
   && find /usr/local/lib /opt/conda -type f -executable -exec ldd '{}' ';' \
       | awk '/=>/ { print $(NF-1) }' \
       | sort -u \

diff --git a/docker/Dockerfile.all_pcg b/docker/Dockerfile.all_pcg
@@ -19,7 +19,12 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
   && ./install_zutils.py --dockerfile --mode modules --pcg \
   && rm -rf /root/.cache/bazel/ \
   && apt-mark auto '.*' > /dev/null \
-  && apt-mark manual $savedAptMark zstd parallel coreutils libtbb2 libjemalloc2 \
+  && apt-mark manual \
+    $savedAptMark \
+    # abiss
+    zstd parallel coreutils libjemalloc2 \
+    # waterz
+    libboost-dev g++ \
   && find /usr/local/lib /opt/conda -type f -executable -exec ldd '{}' ';' \
       | awk '/=>/ { print $(NF-1) }' \
       | sort -u \

diff --git a/install_zutils.py b/install_zutils.py
@@ -628,21 +628,22 @@ def main():
             "git",
             "build-essential",
             "wget",
-            "ffmpeg",
-            "libsm6",
-            "libxext6",
-            "curl",
-            "cmake",
-            "ninja-build",
-            "pkg-config",
-            "zstd",
-            "parallel",
-            "coreutils",
-            "libboost-system-dev",
-            "libboost-iostreams-dev",
-            "libjemalloc-dev",
-            "libtbb-dev",
-            "unixodbc-dev",
+            "ffmpeg",  # opencv
+            "libsm6",  # opencv
+            "libxext6",  # opencv
+            "curl",  # abiss
+            "cmake",  # abiss
+            "ninja-build",  # abiss
+            "pkg-config",  # abiss
+            "zstd",  # abiss
+            "parallel",  # abiss
+            "coreutils",  # abiss
+            "libboost-system-dev",  # abiss
+            "libboost-iostreams-dev",  # abiss
+            "libjemalloc-dev",  # abiss
+            "libtbb-dev",  # abiss
+            "libboost-dev",  # waterz
+            "unixodbc-dev",  # ???
         ]
         run_command(f"{sudo_prefix}apt-get update", "Updating package lists")
         apt_install_flags = '-y --no-install-recommends -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"'
@@ -669,7 +670,6 @@ def main():
         run_command(
             f"pip install --upgrade .[{install_mode}]", "Installing `zetta_utils` python package"
         )
-        run_command("python3 ./compile_waterz", "Compiling waterz")
         if args.pcg:
             run_command(
                 "pip install --no-deps git+https://github.com/CAVEconnectome/[email protected]",