Skip to content

Commit 31ab98b

Browse files
committed
Merge branch 'add-clang19-to-ci' into 'master'
bump clang 18 nvcc See merge request correaa/boost-multi!1340
2 parents 5c5e448 + fb5fa94 commit 31ab98b

File tree

1 file changed

+29
-78
lines changed

1 file changed

+29
-78
lines changed

.gitlab-ci-correaa.yml

Lines changed: 29 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ g++: # debian-stable: default is gcc 12.2.0 as of April 2024
3636
- apt-get -qq update && apt-get -qq install --no-install-recommends -y --quiet ca-certificates cmake g++ make libboost-timer-dev libboost-serialization-dev libblas-dev liblapack-dev libfftw3-dev pkg-config
3737
- g++ --version
3838
- mkdir build && cd build
39-
- cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-D_GLIBCXX_DEBUG=1"
39+
- cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-D_GLIBCXX_ASSERTIONS -D_GLIBCXX_DEBUG=1"
4040
- cmake --build . --parallel 2 || cmake --build . --verbose
4141
- ctest -j 2 --output-on-failure -T Test
4242

@@ -207,7 +207,7 @@ clang++:
207207
- apt-get -qq update && apt-get -qq install --no-install-recommends -y --quiet clang cmake make libboost-timer-dev libboost-serialization-dev libblas-dev libfftw3-dev liblapack-dev pkg-config
208208
- mkdir build && cd build
209209
- clang++ --version
210-
- CXX=clang++ cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-D_GLIBCXX_DEBUG=1"
210+
- CXX=clang++ cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-D_GLIBCXX_ASSERTIONS -D_GLIBCXX_DEBUG=1"
211211
- cmake --build . --parallel 2 || cmake --build . --parallel 1 --verbose
212212
- ctest -j 2 --output-on-failure
213213

@@ -616,55 +616,6 @@ cuda:
616616
- ctest || ctest --rerun-failed --output-on-failure
617617
needs: ["g++"]
618618

619-
# cuda-11.8:
620-
# stage: build
621-
# image: nvcr.io/nvidia/cuda:11.8.0-devel-ubuntu22.04
622-
# tags:
623-
# - non-shared
624-
# - nvidia-gpu
625-
# interruptible: true
626-
# script:
627-
# - nvidia-smi
628-
# - apt-get -qq update && apt-get install --no-install-recommends -y cmake wget pkg-config make libboost-serialization-dev libboost-timer-dev libblas-dev libfftw3-dev
629-
# - mkdir build && cd build
630-
# - ls /usr/local
631-
# - ls /usr/local/cuda-11/bin
632-
# - /usr/local/cuda-11/bin/nvcc --version
633-
# - CUDACXX=/usr/local/cuda-11/bin/nvcc cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=1 -DCMAKE_CUDA_ARCHITECTURES=61
634-
# - cmake --build . --parallel 2 || cmake --build . --verbose
635-
# - ctest -j 2 --output-on-failure
636-
# # - ../build/include/boost/multi/adaptors/thrust/test/speed.cu.x
637-
# # - ../build/include/boost/multi/adaptors/thrust/test/speed_algo.cu.x
638-
# # - ../build/include/boost/multi/adaptors/fftw/test/combinations.cpp.x
639-
# needs: ["cuda"]
640-
641-
# cuda-11.8 mkl:
642-
# stage: build
643-
# image: nvcr.io/nvidia/cuda:11.8.0-devel-ubuntu22.04
644-
# tags:
645-
# - non-shared
646-
# - nvidia-gpu
647-
# - high-bandwidth
648-
# - x86_64
649-
# interruptible: true
650-
# script:
651-
# - nvidia-smi
652-
# - apt-get -qq update && apt-get install --no-install-recommends -y cmake wget pkg-config make libboost-serialization-dev libboost-timer-dev libblas-dev libfftw3-dev
653-
# - DEBIAN_FRONTEND=interactive apt-get install --no-install-recommends --yes --force-yes -y libmkl-full-dev
654-
# - cmake --version
655-
# - wget --no-verbose -O cmake-install.sh https://github.com/Kitware/CMake/releases/download/v3.27.0-rc3/cmake-3.27.0-rc3-linux-x86_64.sh
656-
# - sh ./cmake-install.sh --skip-license --prefix=/usr
657-
# - cmake --version
658-
# - mkdir build && cd build
659-
# - /usr/local/cuda-11/bin/nvcc --version
660-
# - CUDACXX=/usr/local/cuda-11/bin/nvcc cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=1 -DCMAKE_CUDA_ARCHITECTURES=61
661-
# - cmake --build . --parallel 2 || cmake --build . --verbose
662-
# - ctest -j 2 --output-on-failure
663-
# # - ../build/include/boost/multi/adaptors/thrust/test/speed.cu.x
664-
# # - ../build/include/boost/multi/adaptors/thrust/test/speed_algo.cu.x
665-
# # - ../build/include/boost/multi/adaptors/fftw/test/combinations.cpp.x
666-
# needs: ["cuda"]
667-
668619
cuda-11.4.3:
669620
stage: build
670621
image: nvcr.io/nvidia/cuda:11.4.3-devel-ubuntu20.04
@@ -713,32 +664,7 @@ culang++-16 cuda-11.4.3:
713664
- ctest -j 2 --output-on-failure
714665
needs: ["cuda", "clang++"]
715666

716-
culang++-19 cuda-12.1.1 tidy:
717-
stage: build
718-
image: nvcr.io/nvidia/cuda:12.1.1-devel-ubuntu22.04 # nvcr.io/nvidia/cuda:12.0.0-devel-ubuntu22.04
719-
allow_failure: false
720-
tags:
721-
- non-shared
722-
- nvidia-gpu
723-
- high-bandwidth
724-
interruptible: true
725-
script:
726-
- nvidia-smi
727-
- apt-get -qq update && apt-get install --no-install-recommends -y cmake wget pkg-config make libboost-serialization-dev libboost-timer-dev libblas-dev libfftw3-dev
728-
- apt-get install --no-install-recommends -y lsb-release software-properties-common
729-
- wget https://apt.llvm.org/llvm.sh
730-
- chmod u+x llvm.sh
731-
- ./llvm.sh 18
732-
- apt-get install --no-install-recommends -y clang-tidy-18
733-
- mkdir build && cd build
734-
- clang++-18 --version
735-
- clang-tidy-18 --version
736-
- cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_CLANG_TIDY=clang-tidy-18 -DENABLE_CUDA=1 -DCMAKE_CUDA_COMPILER=clang++-18 -DCMAKE_CXX_COMPILER=clang++-18
737-
- cmake --build . --parallel 2 || cmake --build . --verbose
738-
- ctest -j 2 --output-on-failure
739-
needs: ["cuda", "clang++"]
740-
741-
cuda-12.6.0:
667+
cuda-12.6.3:
742668
stage: build
743669
allow_failure: true
744670
image: nvcr.io/nvidia/cuda:12.6.3-devel-ubuntu24.04 # nvcr.io/nvidia/cuda:12.5.0-devel-ubuntu22.04
@@ -755,10 +681,35 @@ cuda-12.6.0:
755681
- g++ --version
756682
- /usr/local/cuda/bin/nvcc --version
757683
- CUDACXX=/usr/local/cuda/bin/nvcc cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=1 -DCMAKE_CXX_STANDARD=20 -DCMAKE_CUDA_STANDARD=20 -DCMAKE_CUDA_ARCHITECTURES=61 -DCMAKE_CUDA_HOST_COMPILER=g++
758-
- cmake --verbose --build . --parallel 2 || cmake --build . --verbose
684+
- cmake --build . --parallel 2 || cmake --build . --verbose
759685
- ctest || ctest --rerun-failed --output-on-failure
760686
needs: ["cuda"]
761687

688+
culang++-19 cuda-12.6.3 tidy: # https://catalog.ngc.nvidia.com/orgs/nvidia/containers/cuda/tags
689+
stage: build
690+
image: nvcr.io/nvidia/cuda:12.6.3-devel-ubuntu24.04
691+
allow_failure: false
692+
tags:
693+
- non-shared
694+
- nvidia-gpu
695+
- high-bandwidth
696+
interruptible: true
697+
script:
698+
- nvidia-smi
699+
- apt-get -qq update && apt-get install --no-install-recommends -y cmake wget pkg-config make libboost-serialization-dev libboost-timer-dev libblas-dev libfftw3-dev
700+
- apt-get install --no-install-recommends -y lsb-release software-properties-common
701+
- wget https://apt.llvm.org/llvm.sh
702+
- chmod u+x llvm.sh
703+
- ./llvm.sh 19
704+
- apt-get install --no-install-recommends -y clang-19 clang-tidy-19
705+
- mkdir build && cd build
706+
- clang++-19 --version
707+
- clang-tidy-19 --version
708+
- cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_CUDA_FLAGS="-Wno-unknown-cuda-version" -DCMAKE_CXX_CLANG_TIDY=clang-tidy-19 -DENABLE_CUDA=1 -DCMAKE_CUDA_COMPILER=clang++-19 -DCMAKE_CXX_COMPILER=clang++-19 -DCMAKE_CUDA_ARCHITECTURES=61
709+
- cmake --build . --parallel 2 || cmake --build . --verbose
710+
- ctest -j 2 --output-on-failure
711+
needs: ["cuda", "clang++"]
712+
762713
rocm:
763714
stage: build
764715
image: rocm/dev-ubuntu-24.04 # rocm/dev-ubuntu-22.04

0 commit comments

Comments
 (0)