From 820397c9e0d346fa2f85860d46270650ecc2ef0c Mon Sep 17 00:00:00 2001 From: Thomas Baumann Date: Tue, 30 May 2023 11:35:14 +0200 Subject: [PATCH] Added other compressors to the Libpressio container --- .github/workflows/ci_pipeline.yml | 2 +- pySDC/projects/compression/Docker/Dockerfile | 2 +- .../projects/compression/compression_convergence_controller.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml index c2e8aff67b..b32490a60b 100644 --- a/.github/workflows/ci_pipeline.yml +++ b/.github/workflows/ci_pipeline.yml @@ -99,7 +99,7 @@ jobs: runs-on: ubuntu-latest container: - image: brownbaerchen/libpressio:amd64 + image: brownbaerchen/libpressio:amd64_2 volumes: - ${{ github.workspace }}:/pySDC diff --git a/pySDC/projects/compression/Docker/Dockerfile b/pySDC/projects/compression/Docker/Dockerfile index fb88902fd4..5500bd6b72 100644 --- a/pySDC/projects/compression/Docker/Dockerfile +++ b/pySDC/projects/compression/Docker/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt update -y && apt install -y cmake ccache pkg-config python3 pip mpich # Install libpressio with Python and SZ3 support -RUN spack install libpressio+python+sz3 +RUN spack install libpressio+mgard+python+sz+sz3 +szauto+zfp +bitgrooming+digitrounding+fpzip+openmp+qoz+blosc ^sz@master+stats+random_access+time_compression # Prepare an entrypoint that installs pySDC COPY docker_entrypoint.sh /bin/ diff --git a/pySDC/projects/compression/compression_convergence_controller.py b/pySDC/projects/compression/compression_convergence_controller.py index 8ea952a991..10e431942b 100644 --- a/pySDC/projects/compression/compression_convergence_controller.py +++ b/pySDC/projects/compression/compression_convergence_controller.py @@ -1,5 +1,7 @@ from pySDC.core.ConvergenceController import ConvergenceController import numpy as np + +np.bool = np.bool_ import libpressio