Skip to content

Commit

Permalink
Update configs/containers/docker-ubuntu-intel-impi.yaml, configs/cont…
Browse files Browse the repository at this point in the history
…ainers/docker-ubuntu-clang-mpich.yaml, configs/containers/docker-ubuntu-gcc-openmpi.yaml and setup.sh with name of new spack-stack extension repo
  • Loading branch information
climbfuji committed Jan 24, 2024
1 parent 041c7a0 commit ce2207d
Showing 4 changed files with 22 additions and 16 deletions.
13 changes: 5 additions & 8 deletions configs/containers/docker-ubuntu-clang-mpich.yaml
Original file line number Diff line number Diff line change
@@ -174,14 +174,11 @@ spack:

# Extra instructions
extra_instructions:

pre_build: |
# Copy the spack extension repos into the spack code
ADD spack-ext-SPACK_STACK_HASH/repos/* $SPACK_ROOT/var/spack/repos/
# Register spack extension repos
RUN spack repo add $SPACK_ROOT/var/spack/repos/jcsda-emc --scope defaults \
spack repo add $SPACK_ROOT/var/spack/repos/jcsda-emc-bundles --scope defaults
# Copy the spack-stack extension repo into the spack code
COPY spack-ext-SPACK_STACK_HASH/repos/spack-stack $SPACK_ROOT/var/spack/repos/jcsda-emc
# Register spack-stack extension repo
RUN spack repo add $SPACK_ROOT/var/spack/repos/spack-stack --scope defaults
# Create symbolic links for clang compilers
RUN cd /usr/bin && \
ln -svf clang-10 clang && \
@@ -213,7 +210,7 @@ spack:
spack env activate -d . && \
spack find 2>&1 | tee /root/spack_find.out
pre_final: |
#Set environment variables for installing tzdata
# Set environment variables for installing tzdata
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Etc/UTC
ENV MPICH_VERSION=4.1.1
17 changes: 10 additions & 7 deletions configs/containers/docker-ubuntu-gcc-openmpi.yaml
Original file line number Diff line number Diff line change
@@ -35,12 +35,11 @@ spack:
externals:
- spec: gcc@9.4.0
prefix: /usr
# Try this next time, already used for clang/intel
#gmake:
# buildable: false
# externals:
# - spec: gmake@4.2.1
# prefix: /usr
gmake:
buildable: false
externals:
- spec: gmake@4.2.1
prefix: /usr
diffutils:
buildable: false
externals:
@@ -150,8 +149,12 @@ spack:

# Extra instructions
extra_instructions:
# Copy the spack-stack extension repo into the spack code
COPY spack-ext-SPACK_STACK_HASH/repos/spack-stack $SPACK_ROOT/var/spack/repos/jcsda-emc
# Register spack-stack extension repo
RUN spack repo add $SPACK_ROOT/var/spack/repos/spack-stack --scope defaults
pre_final: |
#Set environment variables for installing tzdata
# Set environment variables for installing tzdata
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Etc/UTC
ENV CC=gcc
6 changes: 6 additions & 0 deletions configs/containers/docker-ubuntu-intel-impi.yaml
Original file line number Diff line number Diff line change
@@ -171,6 +171,11 @@ spack:
# Extra instructions
extra_instructions:
pre_build: |
# Copy the spack-stack extension repo into the spack code
COPY spack-ext-SPACK_STACK_HASH/repos/spack-stack $SPACK_ROOT/var/spack/repos/jcsda-emc
# Register spack-stack extension repo
RUN spack repo add $SPACK_ROOT/var/spack/repos/spack-stack --scope defaults
# Install Intel compilers and MPI library
RUN apt update && apt install apt-utils && \
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && \
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list && \
@@ -189,6 +194,7 @@ spack:
spack env activate -d . && \
spack find 2>&1 | tee /root/spack_find.out
final: |
# Install Intel compilers and MPI library
RUN apt update && apt install apt-utils && \
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && \
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list && \
2 changes: 1 addition & 1 deletion setup.sh
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ fi
# Register the jcsda-emc repos
msg1="Added repo with namespace"
msg2="Repository is already registered with Spack"
for repo in jcsda-emc jcsda-emc-bundles; do
for repo in spack-stack; do
repodir=${SPACK_STACK_DIR}/spack-ext/repos/$repo
othererrors=$( ( spack repo add $repodir --scope defaults |& grep -v -e "$msg1" -e "$msg2" ) || true )
if [ $(echo "$othererrors" | grep -c .) -ne 0 ]; then

0 comments on commit ce2207d

Please sign in to comment.