Skip to content

Commit

Permalink
Install spdlog manually to use correct fmt version in HIP image
Browse files Browse the repository at this point in the history
  • Loading branch information
msimberg committed May 6, 2024
1 parent 0070b02 commit bcf7e3c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
base_image_version: 25
base_image_name: pika-ci-base
hip_base_image_version: 21
hip_image_version: 15
hip_image_version: 16
hip_image_name: pika-ci-hip

jobs:
Expand Down
17 changes: 12 additions & 5 deletions Dockerfile.hip
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ 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} \
# Installing spdlog here separately since the required base image for the
# HIP image does not yet have spdlog installed
libspdlog-dev && \
rocblas${rocm_version} && \
rm -rf /var/lib/apt/lists/* && apt-get clean

ENV ROCM_PATH=/opt/rocm
Expand All @@ -44,4 +41,14 @@ RUN cd /tmp && \
cmake -DBUILD_SHARED_LIBS=ON . && \
make install && \
cd /tmp && \
rm -rf /tmp/fmt
rm -rf /tmp/fmt \
# Installing spdlog here separately since the required base image for the
# HIP image does not yet have spdlog installed
cd /tmp && \
git clone https://github.com/gabime/spdlog.git && \
cd fmt && \
git checkout 1.9.2 && \
cmake -DBUILD_SHARED_LIBS=ON -DSPDLOG_FMT_EXTERNAL=ON . && \
make install && \
cd /tmp && \
rm -rf /tmp/spdlog

0 comments on commit bcf7e3c

Please sign in to comment.