Skip to content

Commit d092d40

Browse files
committed
Update CI and oldest docker image
1 parent 443d6f5 commit d092d40

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

.github/workflows/tests-macos.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,7 @@ jobs:
113113
path: ginkgo
114114
- name: Install Ginkgo
115115
run: |
116-
# Ginkgo 1.8 needs the flags "-undefined dynamic_lookup" to link, recent versions should not need it
117116
cmake \
118-
-D CMAKE_SHARED_LINKER_FLAGS="-undefined dynamic_lookup" \
119117
-D GINKGO_BUILD_BENCHMARKS=OFF \
120118
-D GINKGO_BUILD_EXAMPLES=OFF \
121119
-D GINKGO_BUILD_MPI=OFF \

.github/workflows/tests-ubuntu.yaml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
- name: 'cpu'
128128
c_compiler: 'gcc'
129129
cxx_compiler: 'g++'
130-
cxx_version: ['17']
130+
cxx_version: ['20']
131131
cmake_build_type: ['None']
132132
runs-on: ubuntu-latest
133133
needs: [docker-build, id_repo]
@@ -224,18 +224,14 @@ jobs:
224224
cxx_compiler: 'hipcc'
225225
ddc_extra_cxx_flags: ''
226226
kokkos_extra_cmake_flags: '-D Kokkos_ENABLE_HIP=ON -D Kokkos_ENABLE_HIP_RELOCATABLE_DEVICE_CODE=ON -D Kokkos_ENABLE_ROCTHRUST=OFF -D Kokkos_ARCH_AMD_GFX90A=ON'
227-
cxx_version: ['17', '20', '23']
227+
cxx_version: ['20', '23']
228228
build_type:
229229
- cmake_build_type: 'Release'
230230
cxx_flags: ''
231231
- cmake_build_type: 'Debug'
232232
cxx_flags: '-O1'
233233
exclude:
234-
- image: 'oldest' # nvcc 11 only supports C++-17
235-
backend:
236-
name: 'cuda'
237-
cxx_version: '20'
238-
- image: 'oldest' # nvcc 11 only supports C++-17
234+
- image: 'oldest' # nvcc 12 only supports C++-20
239235
backend:
240236
name: 'cuda'
241237
cxx_version: '23'
@@ -421,7 +417,7 @@ jobs:
421417
- name: 'cpu'
422418
c_compiler: 'gcc'
423419
cxx_compiler: 'g++'
424-
cxx_version: ['17']
420+
cxx_version: ['20']
425421
cmake_build_type: ['Debug']
426422
sanitizer: ['address', 'undefined']
427423
runs-on: ubuntu-latest
@@ -522,7 +518,7 @@ jobs:
522518
- name: 'cpu'
523519
c_compiler: 'clang-21'
524520
cxx_compiler: 'clang++-21'
525-
cxx_version: ['17']
521+
cxx_version: ['20']
526522
cmake_build_type: ['Release']
527523
runs-on: ubuntu-latest
528524
needs: [docker-build, id_repo]

docker/oldest/Dockerfile

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ FROM ubuntu:jammy@sha256:3ba65aa20f86a0fad9df2b2c259c613df006b2e6d0bfcc8a146afb8
77
LABEL "org.opencontainers.image.source"="https://github.com/CExA-project/ddc"
88

99
ARG BACKEND
10-
ARG AMDGPU_VERSION=5.7.3
10+
ARG AMDGPU_VERSION=6.2.4
1111
ARG CMAKE_VERSION=3.25.3
12-
ARG CUDA_MAJOR_VERSION=11
13-
ARG CUDA_MINOR_VERSION=8
12+
ARG CUDA_MAJOR_VERSION=12
13+
ARG CUDA_MINOR_VERSION=2
1414
ARG GINKGO_VERSION=1.8.0
15-
ARG ROCM_VERSION=5.7.3
15+
ARG ROCM_VERSION=6.2.4
1616

1717
COPY bash_run /bin/
1818
ENV BASH_ENV=/etc/profile
@@ -73,8 +73,6 @@ RUN chmod +x /bin/bash_run \
7373
libcufft-dev-${CUDA_MAJOR_VERSION}-${CUDA_MINOR_VERSION} \
7474
libcurand-dev-${CUDA_MAJOR_VERSION}-${CUDA_MINOR_VERSION} \
7575
libcusparse-dev-${CUDA_MAJOR_VERSION}-${CUDA_MINOR_VERSION} \
76-
gcc-10 \
77-
g++-10 \
7876
;; "hip") \
7977
apt-get install -y --no-install-recommends \
8078
hipblas-dev${ROCM_VERSION} \
@@ -95,9 +93,13 @@ RUN chmod +x /bin/bash_run \
9593
"cpu") \
9694
cmake -DCMAKE_BUILD_TYPE=Release -DGINKGO_BUILD_OMP=ON -DGINKGO_BUILD_TESTS=OFF -DGINKGO_BUILD_EXAMPLES=OFF -DGINKGO_BUILD_BENCHMARKS=OFF -B ginkgo/build -S ginkgo \
9795
;; "cuda") \
98-
cmake -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_CUDA_HOST_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=Release -DGINKGO_CUDA_ARCHITECTURES=70 -DGINKGO_BUILD_CUDA=ON -DGINKGO_BUILD_TESTS=OFF -DGINKGO_BUILD_EXAMPLES=OFF -DGINKGO_BUILD_BENCHMARKS=OFF -B ginkgo/build -S ginkgo \
96+
cmake -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CUDA_HOST_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DGINKGO_CUDA_ARCHITECTURES=70 -DGINKGO_BUILD_CUDA=ON -DGINKGO_BUILD_TESTS=OFF -DGINKGO_BUILD_EXAMPLES=OFF -DGINKGO_BUILD_BENCHMARKS=OFF -B ginkgo/build -S ginkgo \
9997
;; "hip") \
100-
cmake -DCMAKE_PREFIX_PATH=/opt/rocm -DCMAKE_BUILD_TYPE=Release -DCMAKE_HIP_ARCHITECTURES=gfx90a -DGINKGO_BUILD_HIP=ON -DGINKGO_BUILD_TESTS=OFF -DGINKGO_BUILD_EXAMPLES=OFF -DGINKGO_BUILD_BENCHMARKS=OFF -B ginkgo/build -S ginkgo \
98+
# HIP_PATH needs to be set to avoid Ginkgo defining it (https://github.com/ginkgo-project/ginkgo/blob/develop/cmake/hip_path.cmake).
99+
# The Ginkgo heuristic does not seem to be compatible with the new HIP v6 directory layout.
100+
# This makes amdclang++ fail during cmake compiler test (https://releases.llvm.org/18.1.0/tools/clang/docs/HIPSupport.html#order-of-precedence-for-hip-path)
101+
export HIP_PATH=`hipconfig --path` \
102+
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_HIP_ARCHITECTURES=gfx90a -DGINKGO_BUILD_HIP=ON -DGINKGO_BUILD_TESTS=OFF -DGINKGO_BUILD_EXAMPLES=OFF -DGINKGO_BUILD_BENCHMARKS=OFF -B ginkgo/build -S ginkgo \
101103
;; esac \
102104
&& cmake --build ginkgo/build \
103105
&& cmake --install ginkgo/build --prefix /usr \
@@ -113,8 +115,8 @@ RUN chmod +x /bin/bash_run \
113115
&& rm -rf /var/lib/apt/lists/* \
114116
&& useradd -d /data -m -U ci \
115117
&& if [ "xcuda" = "x${BACKEND}" ] \
116-
; then echo 'CUDA_GCC=gcc-10' > /etc/profile.d/ddc-cuda.sh \
117-
; echo 'CUDA_GXX=g++-10' >> /etc/profile.d/ddc-cuda.sh \
118+
; then echo 'CUDA_GCC=gcc' > /etc/profile.d/ddc-cuda.sh \
119+
; echo 'CUDA_GXX=g++' >> /etc/profile.d/ddc-cuda.sh \
118120
; fi
119121

120122
USER ci:ci

0 commit comments

Comments
 (0)