From fae8d1fea16fb912bcc00b1b04128c9414f5b0d6 Mon Sep 17 00:00:00 2001
From: steveri <steveri@steveri.com>
Date: Mon, 25 Sep 2023 14:21:49 -0700
Subject: [PATCH] scrubbed torch layer

---
 Dockerfile | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c852ce35..3e88964b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -150,18 +150,30 @@ RUN printf -- "--- TIME %s %s\n" `date +%H:%M` sam && \
     make sam && \
     source /aha/bin/activate && pip install scipy numpy pytest && pip install -e .
 
-# Install torch (need big tmp folder)
-WORKDIR /aha
-RUN mkdir -p /aha/tmp/torch_install/
 # Save (and later restore) existing value for TMPDIR, if any
 ENV TMPTMPDIR=$TMPDIR
 ENV TMPDIR=/aha/tmp/torch_install/
-RUN source /aha/bin/activate && pip install --cache-dir=$TMPDIR --build=$TMPDIR torch==1.7.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
-RUN rm -rf $TMPDIR
+
+# Install torch (need big tmp folder)
+WORKDIR /aha
+RUN printf -- "--- TIME %s %s\n" `date +%H:%M` torch && \
+    mkdir -p /aha/tmp/torch_install/ && \
+    source /aha/bin/activate && \
+    pip install --cache-dir=$TMPDIR --build=$TMPDIR torch==1.7.1+cpu -f https://download.pytorch.org/whl/torch_stable.html && \
+    /bin/rm -rf $TMPDIR
+
+# Restore original value of TMPDIR
 ENV TMPDIR=$TMPTMPDIR
 
 WORKDIR /aha
-RUN source bin/activate && pip install urllib3==1.26.15 && pip install wheel six && pip install systemrdl-compiler peakrdl-html && pip install -e . && pip install packaging==21.3 && pip install -e ./pono/deps/smt-switch/build/python && pip install -e pono/build/python/ && aha deps install
+RUN source bin/activate && \
+  pip install urllib3==1.26.15 && \
+  pip install wheel six && \
+  pip install systemrdl-compiler peakrdl-html && \
+  pip install -e . && \
+  pip install packaging==21.3 && \
+  pip install -e ./pono/deps/smt-switch/build/python && \
+  pip install -e pono/build/python/ && aha deps install
 
 WORKDIR /aha