diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml index cff9e65..7f04815 100644 --- a/.github/workflows/build_and_deploy.yml +++ b/.github/workflows/build_and_deploy.yml @@ -14,10 +14,10 @@ on: branches: main env: - base_image_version: 23 + base_image_version: 24 base_image_name: pika-ci-base hip_base_image_version: 21 - hip_image_version: 14 + hip_image_version: 15 hip_image_name: pika-ci-hip jobs: diff --git a/Dockerfile.base b/Dockerfile.base index 039649b..fe8097c 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -34,6 +34,7 @@ RUN apt-get update && apt-get dist-upgrade --yes && \ libgoogle-perftools-dev \ libfmt-dev \ libhwloc-dev \ + libspdlog-dev \ lld \ llvm \ mpi-default-dev \ diff --git a/Dockerfile.hip b/Dockerfile.hip index e05288a..9366e20 100644 --- a/Dockerfile.hip +++ b/Dockerfile.hip @@ -16,7 +16,10 @@ RUN rocm_version=5.3.2 && apt-get update && apt-get install -y wget gnupg && \ echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${rocm_version}/ jammy main" | \ tee /etc/apt/sources.list.d/rocm.list && apt-get update -qq && \ apt-get install -y rocm-dev${rocm_version} rocm-libs${rocm_version} \ - rocblas${rocm_version} && \ + rocblas${rocm_version} \ + # Installing spdlog here separately since the required base image for the + # HIP image does not yet have spdlog installed + libspdlog-dev && \ rm -rf /var/lib/apt/lists/* && apt-get clean ENV ROCM_PATH=/opt/rocm