Skip to content

Commit

Permalink
Merge pull request #46 from pika-org/spdlog
Browse files Browse the repository at this point in the history
Add spdlog
  • Loading branch information
msimberg authored Apr 17, 2024
2 parents 256dbfa + 17abea5 commit c0099cf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
5 changes: 4 additions & 1 deletion Dockerfile.hip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c0099cf

Please sign in to comment.