WIP002

Author: dakotablair

docker/ubuntu18.04/openmpi4.0.4/all_spack/Dockerfile.spack_dev_ddb

@@ -4,14 +4,13 @@ RUN apt-get update && apt-get install -y emacs-nox gdb tmux vim
 
 WORKDIR /src
 
-RUN echo 0.1.3
-
 RUN git clone https://github.com/CODARcode/PerformanceAnalysis.git \
         --branch ckelly_develop_ddb \
     && git -C PerformanceAnalysis checkout ckelly_develop_ddb \
     && cp -r PerformanceAnalysis/spack/repo/chimbuko /sds/ \
-    && cp -r PerformanceAnalysis/benchmark_suite . \
-    && rm -rf PerformanceAnalysis
+    && cp -r PerformanceAnalysis/benchmark_suite .
+#    && cp -r PerformanceAnalysis/benchmark_suite . \
+#    && rm -rf PerformanceAnalysis
 
 ENV TAU_OPTIONS="-optShared -optRevert -optVerbose -optCompInst"
 
@@ -37,12 +36,18 @@ RUN source /spack/spack/share/spack/setup-env.sh \
     && spack gc -y \
     && spack clean -a
 
+RUN echo 0.1.4
+RUN git -C /src/PerformanceAnalysis pull
+
 COPY docker/ubuntu18.04/openmpi4.0.4/all_spack/chimbuko_config.sh \
     /bld/benchmark_suite/func_multimodal/
 
 COPY scripts/docker/spack_dev_ddb.sh /build.spack.sh
 RUN /build.spack.sh
 
+# COPY scripts/docker/spack_dev_ddb.sh /build.pip.sh
+# RUN /build.pip.sh
+
 COPY scripts/docker/spack_dev_ddb.rcfile.sh /rcfile.sh
 
 # ENTRYPOINT ["/bin/bash"]  # see Dockerfile.spack_env

spack/repo/chimbuko/packages/chimbuko-visualization2/package.py

@@ -31,6 +31,7 @@ class ChimbukoVisualization2(Package):
     depends_on('py-idna', type=('build', 'run'))
     # depends_on('py-jinja2@3.0.3:3.0', type=('build', 'run'))
     depends_on('py-jinja2', type=('build', 'run'))
+    # depends_on('py-pip', type=('build', 'run'))
     # depends_on('py-redis@4.5.4:4.5', type=('build', 'run'))
     # depends_on('py-requests@2.32.3:', type=('build','run'))
     depends_on('py-requests', type=('build','run'))