Added hack to fix spack not setting correct PYTHONPATH in ubuntu18.04 docker images

Fixed redis path not in PATH in viz docker image

Author: giltirn

docker/ubuntu18.04/openmpi4.0.4/Dockerfile.chimbuko.benchmark_suite

@@ -52,12 +52,13 @@ WORKDIR /benchmark_suite/zmq_worker_client
 RUN cp /Downloads/PerformanceAnalysis/benchmark_suite/zmq_worker_client/* . && \
     source /spack/spack/share/spack/setup-env.sh && spack load boost mochi-sonata && make all
 
-
 #Cleanup
 FROM base
 
 COPY --from=build /benchmark_suite /benchmark_suite
 WORKDIR /benchmark_suite
 
+#Fix redis path
+ENV PATH=/opt/chimbuko/viz/redis-stable/src/:${PATH}
 
 ENTRYPOINT [ "/bin/bash" ]

docker/ubuntu18.04/openmpi4.0.4/Dockerfile.mochi

@@ -18,6 +18,9 @@ RUN pip3 install cython pkgconfig
 RUN source /spack/spack/share/spack/setup-env.sh && spack install py-mochi-sonata ^python@3.6.0 ^libfabric@1.9.0 ^py-numpy@1.19.5 ^argobots@main+stackunwind+tool ^mochi-margo@main ^mercury@2.0.1   && \
     spack gc -y && spack clean -a
 
+COPY fixup_spack_python.sh /root/.spack/
+RUN /root/.spack/fixup_spack_python.sh
+
 WORKDIR /
 
 ENTRYPOINT [ "/bin/bash" ]

docker/ubuntu18.04/openmpi4.0.4/fixup_spack_python.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+cd /spack/spack/opt/spack/linux-ubuntu18.04-broadwell/gcc-7.5.0
+pydirs=$(ls | grep '^py-')
+echo $pydirs
+echo "PWD is" $(pwd)
+for p in $pydirs; do
+    echo "cd to ${p}"
+    cd ${p}/lib/python3.6
+    ls -lrt
+    mv site-packages site-packages-old
+    ln -s ../python3/dist-packages site-packages
+    ls -lrt
+    cd -
+done