From e64a952fa2af792e4d3956c27dab5005cb95233b Mon Sep 17 00:00:00 2001
From: steveri <steveri@steveri.com>
Date: Mon, 25 Sep 2023 16:34:55 -0700
Subject: [PATCH] cleanup

---
 Dockerfile | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ae9a8163..a904e9f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -87,7 +87,9 @@ 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
+    echo -n "BEFORE CLEANUP: " && du -hs /aha && \
+    /bin/rm -rf $TMPDIR && \
+    echo -n "AFTER  CLEANUP: " && du -hs /aha && \
 # Restore original value of TMPDIR
 ENV TMPDIR=$TMPTMPDIR
 
@@ -95,25 +97,25 @@ ENV TMPDIR=$TMPTMPDIR
 COPY ./pono /aha/pono
 COPY ./aha/bin/setup-smt-switch.sh /aha/pono/contrib/
 WORKDIR /aha/pono
-RUN printf -- "--- TIME %s %s\n" `date +%H:%M` pono &&\
-  pip install Cython==0.29 pytest toml scikit-build==0.13.0 &&\
-  ./contrib/setup-bison.sh && ./contrib/setup-flex.sh &&\
-  ./contrib/setup-smt-switch.sh --python && ./contrib/setup-btor2tools.sh &&\
-  ./configure.sh --python &&\
-  (cd /aha/pono/build && make -j4 && pip install -e ./python) &&\
-  pip install -e deps/smt-switch/build/python &&\
-  echo -n "BEFORE CLEANUP: " && du -hs /aha/pono &&\
-  /bin/rm -rf deps build/tests/ build/CMakefiles/ build/CMakeTmp/ &&\
+RUN printf -- "--- TIME %s %s\n" `date +%H:%M` pono && \
+  pip install Cython==0.29 pytest toml scikit-build==0.13.0 && \
+  ./contrib/setup-bison.sh && ./contrib/setup-flex.sh && \
+  ./contrib/setup-smt-switch.sh --python && ./contrib/setup-btor2tools.sh && \
+  ./configure.sh --python && \
+  (cd /aha/pono/build && make -j4 && pip install -e ./python) && \
+  pip install -e deps/smt-switch/build/python && \
+  echo -n "BEFORE CLEANUP: " && du -hs /aha/pono && \
+  /bin/rm -rf deps build/tests/ build/CMakefiles/ build/CMakeTmp/ && \
   echo -n "AFTER  CLEANUP: " && du -hs /aha/pono
 
 # CoreIR
 WORKDIR /aha
 COPY ./coreir /aha/coreir
 WORKDIR /aha/coreir/build
-RUN printf -- "--- TIME %s %s\n" `date +%H:%M` CoreIR &&\
-  cmake .. && make && make install &&\
-  echo -n "BEFORE CLEANUP: " && du -hs /aha/coreir/build &&\
-  /bin/rm -rf src bin tests &&\
+RUN printf -- "--- TIME %s %s\n" `date +%H:%M` CoreIR && \
+  cmake .. && make && make install && \
+  echo -n "BEFORE CLEANUP: " && du -hs /aha/coreir/build && \
+  /bin/rm -rf src bin tests && \
   echo -n "AFTER  CLEANUP: " && du -hs /aha/coreir/build
 
 # CoreIR cleanup notes
@@ -123,7 +125,7 @@ RUN printf -- "--- TIME %s %s\n" `date +%H:%M` CoreIR &&\
 # Lake
 COPY ./BufferMapping /aha/BufferMapping
 WORKDIR /aha/BufferMapping/cfunc
-RUN printf -- "--- TIME %s %s\n" `date +%H:%M` lake &&\
+RUN printf -- "--- TIME %s %s\n" `date +%H:%M` lake && \
   export COREIR_DIR=/aha/coreir && make lib
 
 # mflowgen