Skip to content

Commit

Permalink
CI: Update to AMReX 24.04
Browse files Browse the repository at this point in the history
  • Loading branch information
eschnett committed Apr 13, 2024
1 parent 2293a31 commit b584efe
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
16 changes: 8 additions & 8 deletions docker/carpetx-cpu.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# docker push einsteintoolkit/carpetx:cpu-real32

# jammy is ubuntu:22.04
# FROM ubuntu:jammy-20240125
FROM ubuntu:jammy-20240212
# FROM ubuntu:jammy-20240212
FROM ubuntu:jammy-20240227

ENV DEBIAN_FRONTEND=noninteractive \
LANGUAGE=en_US.en \
Expand Down Expand Up @@ -103,9 +103,9 @@ RUN apt-get update && \
# blosc2 is a compression library, comparable to zlib
RUN mkdir src && \
(cd src && \
wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.13.1.tar.gz && \
tar xzf v2.13.1.tar.gz && \
cd c-blosc2-2.13.1 && \
wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.14.4.tar.gz && \
tar xzf v2.14.4.tar.gz && \
cd c-blosc2-2.14.4 && \
cmake -B build -G Ninja -S . \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr/local \
Expand Down Expand Up @@ -261,9 +261,9 @@ ARG real_precision=real64
# Should we keep the AMReX source tree around for debugging?
RUN mkdir src && \
(cd src && \
wget https://github.com/AMReX-Codes/amrex/archive/24.02.tar.gz && \
tar xzf 24.02.tar.gz && \
cd amrex-24.02 && \
wget https://github.com/AMReX-Codes/amrex/archive/24.04.tar.gz && \
tar xzf 24.04.tar.gz && \
cd amrex-24.04 && \
case $real_precision in \
real32) precision=SINGLE;; \
real64) precision=DOUBLE;; \
Expand Down
16 changes: 8 additions & 8 deletions docker/carpetx-cuda.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# docker build --build-arg real_precision=real32 --file carpetx-cuda.dockerfile --tag einsteintoolkit/carpetx:cuda-real32 .
# docker push einsteintoolkit/carpetx:cuda-real32

# FROM nvidia/cuda:12.3.1-devel-ubuntu22.04
FROM nvidia/cuda:12.3.2-devel-ubuntu22.04
# FROM nvidia/cuda:12.3.2-devel-ubuntu22.04
FROM nvidia/cuda:12.4.1-devel-ubuntu22.04

ENV DEBIAN_FRONTEND=noninteractive \
LANGUAGE=en_US.UTF-8 \
Expand Down Expand Up @@ -103,9 +103,9 @@ RUN apt-get update && \
# blosc2 is a compression library, comparable to zlib
RUN mkdir src && \
(cd src && \
wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.13.1.tar.gz && \
tar xzf v2.13.1.tar.gz && \
cd c-blosc2-2.13.1 && \
wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.14.4.tar.gz && \
tar xzf v2.14.4.tar.gz && \
cd c-blosc2-2.14.4 && \
cmake -B build -G Ninja -S . \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr/local \
Expand Down Expand Up @@ -261,9 +261,9 @@ ARG real_precision=real64
# Should we keep the AMReX source tree around for debugging?
RUN mkdir src && \
(cd src && \
wget https://github.com/AMReX-Codes/amrex/archive/24.02.tar.gz && \
tar xzf 24.02.tar.gz && \
cd amrex-24.02 && \
wget https://github.com/AMReX-Codes/amrex/archive/24.04.tar.gz && \
tar xzf 24.04.tar.gz && \
cd amrex-24.04 && \
case $real_precision in \
real32) precision=SINGLE;; \
real64) precision=DOUBLE;; \
Expand Down
12 changes: 6 additions & 6 deletions docker/carpetx-rocm.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ RUN apt-get update && \
# blosc2 is a compression library, comparable to zlib
RUN mkdir src && \
(cd src && \
wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.13.1.tar.gz && \
tar xzf v2.13.1.tar.gz && \
cd c-blosc2-2.13.1 && \
wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.14.4.tar.gz && \
tar xzf v2.14.4.tar.gz && \
cd c-blosc2-2.14.4 && \
cmake -B build -G Ninja -S . \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr/local \
Expand Down Expand Up @@ -264,9 +264,9 @@ ARG real_precision=real64
# Should we keep the AMReX source tree around for debugging?
RUN mkdir src && \
(cd src && \
wget https://github.com/AMReX-Codes/amrex/archive/24.02.tar.gz && \
tar xzf 24.02.tar.gz && \
cd amrex-24.02 && \
wget https://github.com/AMReX-Codes/amrex/archive/24.04.tar.gz && \
tar xzf 24.04.tar.gz && \
cd amrex-24.04 && \
case $real_precision in \
real32) precision=SINGLE;; \
real64) precision=DOUBLE;; \
Expand Down

0 comments on commit b584efe

Please sign in to comment.