Skip to content

Commit

Permalink
Merge branch 'eschnett:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
lucass-carneiro authored Feb 1, 2024
2 parents 5126d95 + d30ccca commit a48140e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
9 changes: 4 additions & 5 deletions docker/carpetx-cpu.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
# docker push einsteintoolkit/carpetx:cpu-real32

# jammy is ubuntu:22.04
# [GOOD] FROM ubuntu:jammy-20231128
FROM ubuntu:jammy-20231211.1
FROM ubuntu:jammy-20240111

ENV DEBIAN_FRONTEND=noninteractive \
LANGUAGE=en_US.en \
Expand Down Expand Up @@ -103,9 +102,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.11.3.tar.gz && \
tar xzf v2.11.3.tar.gz && \
cd c-blosc2-2.11.3 && \
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 && \
cmake -B build -G Ninja -S . \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr/local \
Expand Down
6 changes: 3 additions & 3 deletions docker/carpetx-cuda.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,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.11.3.tar.gz && \
tar xzf v2.11.3.tar.gz && \
cd c-blosc2-2.11.3 && \
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 && \
cmake -B build -G Ninja -S . \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr/local \
Expand Down
12 changes: 6 additions & 6 deletions docker/carpetx-rocm.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
# docker build --build-arg real_precision=real32 --file carpetx-rocm.dockerfile --tag einsteintoolkit/carpetx:rocm-real32 .
# docker push einsteintoolkit/carpetx:rocm-real32

# [GOOD] FROM rocm/dev-ubuntu-22.04:5.7
FROM rocm/dev-ubuntu-22.04:5.7.1
# [BROKEN] FROM rocm/dev-ubuntu-22.04:6.0
FROM rocm/dev-ubuntu-22.04:6.0

ENV DEBIAN_FRONTEND=noninteractive \
LANGUAGE=en_US.UTF-8 \
Expand All @@ -34,6 +32,7 @@ RUN apt-get update && \
gfortran \
git \
hdf5-tools \
hiprand-dev \
language-pack-en \
less \
libblosc-dev \
Expand Down Expand Up @@ -106,9 +105,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.11.3.tar.gz && \
tar xzf v2.11.3.tar.gz && \
cd c-blosc2-2.11.3 && \
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 && \
cmake -B build -G Ninja -S . \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr/local \
Expand Down Expand Up @@ -271,6 +270,7 @@ RUN mkdir src && \
real64) precision=DOUBLE;; \
*) exit 1;; \
esac && \
env LDFLAGS=-Wl,-rpath,/opt/rocm/lib \
cmake -B build -G Ninja -S . \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_COMPILER=/opt/rocm/llvm/bin/clang++ \
Expand Down
2 changes: 1 addition & 1 deletion scripts/actions-rocm-real64.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ FPPFLAGS = -traditional
F90FLAGS = -pipe -g -fcray-pointer -ffixed-line-length-none

SYS_INC_DIRS = /opt/rocm/include
LIBDIRS = /usr/local/lib /opt/rocm/hip/lib
LIBDIRS = /usr/local/lib /opt/rocm/lib
LIBS = amdhip64 dl hwloc ltdl open-pal open-rte udev util gfortran

C_LINE_DIRECTIVES = yes
Expand Down

0 comments on commit a48140e

Please sign in to comment.