Skip to content

Commit b47f30f

Browse files
committed
Merge branch 'add-clang19-to-ci' into 'master'
add clang 19 See merge request correaa/boost-multi!1339
2 parents 23df47e + c851e43 commit b47f30f

File tree

1 file changed

+7
-96
lines changed

1 file changed

+7
-96
lines changed

.gitlab-ci-correaa.yml

Lines changed: 7 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ g++-testing c++20:
450450
- ctest --output-on-failure
451451
needs: ["g++"]
452452

453-
clang++-18-unstable libc++ c++23 boost_1_84:
453+
clang++-19-unstable libc++ c++26 boost_1_87:
454454
stage: build
455455
image: debian:unstable # clang 17 as of March 2024
456456
tags:
@@ -459,15 +459,15 @@ clang++-18-unstable libc++ c++23 boost_1_84:
459459
- high-bandwidth
460460
interruptible: true
461461
script: # clang 17 doesn't work with gcc 13 libstd
462-
- apt-get -qq update && apt-get -qq install --no-install-recommends -y --quiet ca-certificates clang clang-18 cmake make libblas-dev libc++-18-dev libc++abi-18-dev libfftw3-dev pkg-config tar wget
462+
- apt-get -qq update && apt-get -qq install --no-install-recommends -y --quiet ca-certificates clang clang-19 cmake make libblas-dev libc++-19-dev libc++abi-19-dev libfftw3-dev pkg-config tar wget
463463
- wget https://downloads.sourceforge.net/project/boost/boost/1.87.0/boost_1_87_0.tar.gz --no-verbose
464464
- tar -xf boost_1_87_0.tar.gz
465465
- cd boost_1_87_0
466466
- ./bootstrap.sh --with-toolset=clang
467467
- ./b2 toolset=clang cxxflags=-stdlib=libc++ linkflags=-stdlib=libc++ --with-serialization --with-test --with-timer install -j4 # libc++ only works with boost test compiled with libc++
468468
- cd ..
469469
- mkdir build && cd build
470-
- CXX=clang++-18 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_STANDARD=23 -DCMAKE_CXX_FLAGS="-stdlib=libc++ -D_LIBCPP_ENABLE_DEBUG_MODE=1 -D_LIBCPP_DEBUG_RANDOMIZE_UNSPECIFIED_STABILITY=1 -D_LIBCPP_DEBUG_STRICT_WEAK_ORDERING_CHECK=1" # -DBoost_NO_SYSTEM_PATHS=ON
470+
- CXX=clang++-19 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_STANDARD=26 -DCMAKE_CXX_FLAGS="-stdlib=libc++ -D_LIBCPP_ENABLE_DEBUG_MODE=1 -D_LIBCPP_DEBUG_RANDOMIZE_UNSPECIFIED_STABILITY=1 -D_LIBCPP_DEBUG_STRICT_WEAK_ORDERING_CHECK=1" # -DBoost_NO_SYSTEM_PATHS=ON
471471
- cmake --build . --parallel 2 || cmake --build . --verbose
472472
- ctest --output-on-failure
473473
needs: ["clang++-latest libc++", "g++-testing c++20"]
@@ -580,26 +580,9 @@ nvhpc-22.7:
580580
- OMPI_ALLOW_RUN_AS_ROOT=1 OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 ctest --output-on-failure
581581
needs: ["nvhpc"]
582582

583-
# nvhpc-24.5 c++20 par:
584-
# stage: build
585-
# image: nvcr.io/nvidia/nvhpc:24.5-devel-cuda12.4-ubuntu22.04 # https://catalog.ngc.nvidia.com/orgs/nvidia/containers/nvhpc/tags
586-
# tags:
587-
# - non-shared
588-
# - large-disk-space
589-
# - x86_64
590-
# interruptible: true
591-
# script:
592-
# - apt-get update && apt-get install --no-install-recommends -y cmake make libboost-timer-dev libboost-serialization-dev libfftw3-dev pkg-config
593-
# - /opt/nvidia/hpc_sdk/Linux_x86_64/2024/compilers/bin/nvc++ --version
594-
# - mkdir build && cd build
595-
# - CXX=/opt/nvidia/hpc_sdk/Linux_x86_64/2024/compilers/bin/nvc++ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_FLAGS="-stdpar=multicore"
596-
# - cmake --build . --parallel 2 || cmake --build . --verbose
597-
# - OMPI_ALLOW_RUN_AS_ROOT=1 OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 ctest --output-on-failure
598-
# needs: ["nvhpc"]
599-
600-
nvhpc-24.7 c++20 par:
583+
nvhpc-24.11 c++20 par:
601584
stage: build
602-
image: nvcr.io/nvidia/nvhpc:24.7-devel-cuda12.5-ubuntu24.04 # https://catalog.ngc.nvidia.com/orgs/nvidia/containers/nvhpc/tags
585+
image: nvcr.io/nvidia/nvhpc:24.11-devel-cuda12.6-ubuntu24.04 # nvcr.io/nvidia/nvhpc:24.7-devel-cuda12.5-ubuntu24.04 # https://catalog.ngc.nvidia.com/orgs/nvidia/containers/nvhpc/tags
603586
tags:
604587
- non-shared
605588
- large-disk-space
@@ -705,25 +688,6 @@ cuda-11.4.3:
705688
- ctest -j 2 --output-on-failure
706689
needs: ["cuda"]
707690

708-
# cuda-12.3.1:
709-
# stage: build
710-
# allow_failure: false
711-
# image: nvcr.io/nvidia/cuda:12.3.1-devel-ubuntu22.04
712-
# tags:
713-
# - non-shared
714-
# - nvidia-gpu
715-
# interruptible: true
716-
# script:
717-
# - nvidia-smi
718-
# - apt-get -qq update && apt-get install --no-install-recommends -y cmake g++-12 wget pkg-config make libboost-serialization-dev libboost-timer-dev libblas-dev libfftw3-dev
719-
# - mkdir build && cd build
720-
# - g++-12 --version
721-
# - /usr/local/cuda/bin/nvcc --version
722-
# - CUDACXX=/usr/local/cuda/bin/nvcc cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=1 -DCMAKE_CUDA_ARCHITECTURES=61 -DCMAKE_CUDA_HOST_COMPILER=g++-12 -DCMAKE_CUDA_FLAGS="-allow-unsupported-compiler"
723-
# - cmake --build . --parallel 2 || cmake --build . --verbose
724-
# - ctest -j 2 || ctest --rerun-failed --output-on-failure
725-
# needs: ["cuda"]
726-
727691
culang++-16 cuda-11.4.3:
728692
stage: build
729693
image: nvcr.io/nvidia/cuda:11.4.3-devel-ubuntu20.04
@@ -749,32 +713,6 @@ culang++-16 cuda-11.4.3:
749713
- ctest -j 2 --output-on-failure
750714
needs: ["cuda", "clang++"]
751715

752-
culang++-17 cuda-11.8:
753-
stage: build
754-
image: nvcr.io/nvidia/cuda:11.8.0-devel-ubuntu22.04 # nvcr.io/nvidia/cuda:12.0.0-devel-ubuntu22.04
755-
tags:
756-
- non-shared
757-
- nvidia-gpu
758-
- high-bandwidth
759-
interruptible: true
760-
script:
761-
- nvidia-smi
762-
- 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 libtbb-dev
763-
- apt-get install --no-install-recommends -y lsb-release software-properties-common
764-
- wget https://apt.llvm.org/llvm.sh
765-
- chmod u+x llvm.sh
766-
- ./llvm.sh 17
767-
- cmake --version
768-
- wget https://github.com/Kitware/CMake/releases/download/v3.27.0-rc3/cmake-3.27.0-rc3-linux-x86_64.sh --no-verbose
769-
- sh ./cmake-3.27.0-rc3-linux-x86_64.sh --skip-license --prefix=/usr # for CMAKE_CUDA_STANDARD=20
770-
- cmake --version
771-
- mkdir build && cd build
772-
- clang++-17 --version
773-
- cmake .. -DCMAKE_BUILD_TYPE=Release -DBOOST_MULTI_STANDALONE=1 -DBUILD_TESTING=0 -DENABLE_CUDA=1 -DCMAKE_CUDA_COMPILER=clang++-17 -DCMAKE_CXX_COMPILER=clang++-17
774-
- cmake --build . --parallel 2 || cmake --build . --verbose
775-
- ctest -j 2 --output-on-failure
776-
needs: ["cuda", "clang++"]
777-
778716
culang++-19 cuda-12.1.1 tidy:
779717
stage: build
780718
image: nvcr.io/nvidia/cuda:12.1.1-devel-ubuntu22.04 # nvcr.io/nvidia/cuda:12.0.0-devel-ubuntu22.04
@@ -800,30 +738,6 @@ culang++-19 cuda-12.1.1 tidy:
800738
- ctest -j 2 --output-on-failure
801739
needs: ["cuda", "clang++"]
802740

803-
cuda-12.5.0:
804-
stage: build
805-
allow_failure: true
806-
image: nvcr.io/nvidia/cuda:12.5.0-devel-ubuntu22.04
807-
tags:
808-
- non-shared
809-
- nvidia-gpu
810-
interruptible: true
811-
script:
812-
- nvidia-smi
813-
- apt-get -qq update
814-
- apt-get install --no-install-recommends -y cmake g++ wget pkg-config make libboost-serialization-dev libboost-timer-dev libblas-dev libfftw3-dev
815-
- cmake --version
816-
- wget https://github.com/Kitware/CMake/releases/download/v3.27.0-rc3/cmake-3.27.0-rc3-linux-x86_64.sh --no-verbose
817-
- sh ./cmake-3.27.0-rc3-linux-x86_64.sh --skip-license --prefix=/usr # for CMAKE_CUDA_STANDARD=20
818-
- cmake --version
819-
- mkdir build && cd build
820-
- g++ --version
821-
- /usr/local/cuda/bin/nvcc --version
822-
- CUDACXX=/usr/local/cuda/bin/nvcc cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=1 -DCMAKE_CUDA_STANDARD=20 -DCMAKE_CUDA_ARCHITECTURES=61 -DCMAKE_CUDA_HOST_COMPILER=g++
823-
- cmake --verbose --build . --parallel 2 || cmake --build . --verbose
824-
- ctest || ctest --rerun-failed --output-on-failure
825-
needs: ["cuda"]
826-
827741
cuda-12.6.0:
828742
stage: build
829743
allow_failure: true
@@ -837,13 +751,10 @@ cuda-12.6.0:
837751
- apt-get -qq update
838752
- apt-get install --no-install-recommends -y cmake g++ wget pkg-config make libboost-serialization-dev libboost-timer-dev libblas-dev libfftw3-dev
839753
- cmake --version
840-
# - wget https://github.com/Kitware/CMake/releases/download/v3.27.0-rc3/cmake-3.27.0-rc3-linux-x86_64.sh --no-verbose
841-
# - sh ./cmake-3.27.0-rc3-linux-x86_64.sh --skip-license --prefix=/usr # for CMAKE_CUDA_STANDARD=20
842-
# - cmake --version
843754
- mkdir build && cd build
844755
- g++ --version
845756
- /usr/local/cuda/bin/nvcc --version
846-
- CUDACXX=/usr/local/cuda/bin/nvcc cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=1 -DCMAKE_CUDA_STANDARD=20 -DCMAKE_CUDA_ARCHITECTURES=61 -DCMAKE_CUDA_HOST_COMPILER=g++
757+
- 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++
847758
- cmake --verbose --build . --parallel 2 || cmake --build . --verbose
848759
- ctest || ctest --rerun-failed --output-on-failure
849760
needs: ["cuda"]
@@ -906,7 +817,7 @@ circle-latest c++20:
906817
interruptible: true
907818
script:
908819
- apt-get -qq update
909-
- apt-get -qq install --no-install-recommends -y --quiet ca-certificates clang cmake g++-12 gzip libboost-timer-dev libboost-serialization-dev libblas-dev libelf1 libfftw3-dev make pkg-config tar wget
820+
- apt-get -qq install --no-install-recommends -y --quiet ca-certificates clang cmake g++ gzip libboost-timer-dev libboost-serialization-dev libblas-dev libelf1 libfftw3-dev make pkg-config tar wget
910821
- mkdir -p build_latest ; cd build_latest
911822
- wget https://www.circle-lang.org/linux/build_latest.tgz --no-verbose
912823
- tar -zxvf build_*.tgz

0 commit comments

Comments
 (0)