Skip to content

Commit 33c3ae2

Browse files
committed
WIP003
1 parent ed7d9cf commit 33c3ae2

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,19 @@ RUN source /spack/spack/share/spack/setup-env.sh \
3636
&& spack gc -y \
3737
&& spack clean -a
3838

39-
RUN echo 0.1.4
40-
RUN git -C /src/PerformanceAnalysis pull
39+
RUN echo 0.1.9
40+
RUN git config --global user.email "[email protected]" \
41+
&& git config --global user.name "Dakota Blair"
42+
RUN git -C /src/PerformanceAnalysis pull --strategy-option=theirs
4143

4244
COPY docker/ubuntu18.04/openmpi4.0.4/all_spack/chimbuko_config.sh \
4345
/bld/benchmark_suite/func_multimodal/
4446

4547
COPY scripts/docker/spack_dev_ddb.sh /build.spack.sh
4648
RUN /build.spack.sh
4749

48-
# COPY scripts/docker/spack_dev_ddb.sh /build.pip.sh
49-
# RUN /build.pip.sh
50+
COPY scripts/docker/spack_dev_ddb.pip.sh /build.pip.sh
51+
RUN /build.pip.sh
5052

5153
COPY scripts/docker/spack_dev_ddb.rcfile.sh /rcfile.sh
5254

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
set -eux
4+
5+
source /spack/spack/share/spack/setup-env.sh
6+
cd /opt/spack-environment/
7+
spack env activate .
8+
cd /opt/spack-environment/chimbuko-visualization2/
9+
pip3 install -r requirements.txt

scripts/docker/spack_dev_ddb.rcfile.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ spack env activate .
88
export CHIMBUKO_VIZ_ROOT=$(spack location -i chimbuko-visualization2)
99
cd /bld/benchmark_suite/func_multimodal
1010
# ./run.sh
11+
set +ex

0 commit comments

Comments
 (0)