diff --git a/docker/carpetx-cpu.dockerfile b/docker/carpetx-cpu.dockerfile index 16955deb5..484342c51 100644 --- a/docker/carpetx-cpu.dockerfile +++ b/docker/carpetx-cpu.dockerfile @@ -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 \ @@ -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 \ diff --git a/docker/carpetx-cuda.dockerfile b/docker/carpetx-cuda.dockerfile index be9a88fb4..25ab8e4c9 100644 --- a/docker/carpetx-cuda.dockerfile +++ b/docker/carpetx-cuda.dockerfile @@ -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 \ diff --git a/docker/carpetx-rocm.dockerfile b/docker/carpetx-rocm.dockerfile index 2e2c1e6e3..1eb3be7ee 100644 --- a/docker/carpetx-rocm.dockerfile +++ b/docker/carpetx-rocm.dockerfile @@ -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 \ @@ -34,6 +32,7 @@ RUN apt-get update && \ gfortran \ git \ hdf5-tools \ + hiprand-dev \ language-pack-en \ less \ libblosc-dev \ @@ -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 \ @@ -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++ \ diff --git a/scripts/actions-rocm-real64.cfg b/scripts/actions-rocm-real64.cfg index 59c495116..5142c1f13 100644 --- a/scripts/actions-rocm-real64.cfg +++ b/scripts/actions-rocm-real64.cfg @@ -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