Add pip installation step.

Some package requirements cannot easily be satisfied by spack, therefore
some packages must be installed via pip.

Also make the filenames more in line with the purpose of this
Dockerfile, namely to provide and end-to-end test of the
ChimbukoVisualizationII (cv2) package.

Author: dakotablair

docker/ubuntu18.04/openmpi4.0.4/all_spack/Dockerfile.spack_dev_ddb renamed to docker/ubuntu18.04/openmpi4.0.4/all_spack/Dockerfile.cv2

@@ -4,14 +4,11 @@ RUN apt-get update && apt-get install -y emacs-nox gdb tmux vim
 
 WORKDIR /src
 
-RUN echo 0.1.2
-
 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 .
 
 ENV TAU_OPTIONS="-optShared -optRevert -optVerbose -optCompInst"
 
@@ -37,15 +34,30 @@ RUN source /spack/spack/share/spack/setup-env.sh \
     && spack gc -y \
     && spack clean -a
 
+RUN echo 0.1.9
+# Save build time while working on non-spack dependencies
+RUN git config --global user.email "[email protected]" \
+    && git config --global user.name "Dakota Blair"
+RUN git -C /src/PerformanceAnalysis pull --strategy-option=theirs
+
 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
+COPY scripts/docker/cv2/build.sh /build.spack.sh
 RUN /build.spack.sh
 
-COPY scripts/docker/spack_dev_ddb.rcfile.sh /rcfile.sh
+COPY scripts/docker/cv2/pip.sh /build.pip.sh
+RUN /build.pip.sh
+
+COPY scripts/docker/cv2/rcfile.sh /rcfile.sh
 
 # ENTRYPOINT ["/bin/bash"]  # see Dockerfile.spack_env
 
-CMD ["--rcfile", "/rcfile.sh"]
+CMD [ \
+    "--rcfile", \
+    "/rcfile.sh", \
+    "-i", \
+    "-c", \
+    "/bld/benchmark_suite/func_multimodal/run.sh" \
+]
 

docker/ubuntu18.04/openmpi4.0.4/all_spack/README.md

@@ -1,6 +1,6 @@
 # Dockerfiles
 
-## `Dockerfile.spack_dev_ddb`
+## `Dockerfile.cv2`
 
 This Dockerfile defines an image which can be used to validate the visualization
 package upgrades. The build will clone the `chimbuko-visualization2` (CV2) repository
@@ -17,8 +17,8 @@ test changes to CV2:
 
 ```sh
 docker build \
-    -f docker/ubuntu18.04/openmpi4.0.4/all_spack/Dockerfile.spack_dev_ddb \
-    -t chimbuko/chimbuko-spack-dev-ddb:ubuntu18.04 \
+    -f docker/ubuntu18.04/openmpi4.0.4/all_spack/Dockerfile.cv2 \
+    -t chimbuko/chimbuko-cv2:ubuntu18.04 \
     .
 ```
 
@@ -28,7 +28,7 @@ docker build \
 docker run --rm -it --cap-add=SYS_PTRACE --security-opt seccomp=unconfined \
     -p $HOST_PORT:5002 \
     -v $(pwd):$(pwd) \
-    -name ddb-csd \
+    -name test-cv2 \
     chimbuko/chimbuko-spack-dev:ubuntu18.04
 ```
 

scripts/docker/spack_dev_ddb.sh renamed to scripts/docker/cv2/build.sh

@@ -8,6 +8,3 @@ spack env activate .
 spack develop chimbuko-visualization2 @git.dependency_upgrades=dev
 spack concretize -f
 spack install
-cd /opt/spack-environment/chimbuko-visualization2
-# git checkout dependency_upgrades
-# spack install

scripts/docker/cv2/pip.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -eux
+
+source /spack/spack/share/spack/setup-env.sh
+cd /opt/spack-environment/
+spack env activate .
+cd /opt/spack-environment/chimbuko-visualization2/
+pip3 install -r requirements.txt

scripts/docker/spack_dev_ddb.rcfile.sh renamed to scripts/docker/cv2/rcfile.sh

@@ -7,4 +7,4 @@ cd /opt/spack-environment/
 spack env activate .
 export CHIMBUKO_VIZ_ROOT=$(spack location -i chimbuko-visualization2)
 cd /bld/benchmark_suite/func_multimodal
-# ./run.sh
+set +ex

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

@@ -15,28 +15,19 @@ class ChimbukoVisualization2(Package):
     depends_on('[email protected]')
     depends_on('py-mochi-sonata', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
-    # depends_on('[email protected]:2024.7', type=('build', 'run'))
     depends_on('py-certifi', type=('build', 'run'))
-    # depends_on('[email protected]:2.6', type=('build', 'run'))
     depends_on('py-dnspython', type=('build', 'run'))
-    # depends_on('[email protected]:0.35', type=('build', 'run'))
     depends_on('py-eventlet', type=('build', 'run'))
-    # depends_on('py-flask-script@=2.0.6', type=('build', 'run'))
     depends_on('py-flask-script', type=('build', 'run'))
     depends_on('[email protected]:2.9', type=('build', 'run'))
     depends_on('[email protected]:2.5', type=('build', 'run'))
     depends_on('py-flask@=1.1.2', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
-    # depends_on('[email protected]:', type=('build', 'run'))
     depends_on('py-idna', type=('build', 'run'))
-    # depends_on('[email protected]:3.0', type=('build', 'run'))
     depends_on('py-jinja2', type=('build', 'run'))
-    # depends_on('[email protected]:4.5', type=('build', 'run'))
-    # depends_on('[email protected]:', type=('build','run'))
     depends_on('py-requests', type=('build','run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('[email protected]:1.4', type=('build', 'run'))
-    # depends_on('[email protected]:1.26', type=('build', 'run'))
     depends_on('[email protected]:', type=('build', 'run'))
     depends_on('redis', type='run')
     depends_on('curl', type='run')