From c5bcef9b08f303ddb87a14113427748714287e05 Mon Sep 17 00:00:00 2001 From: Abhishek Bagusetty Date: Mon, 8 Sep 2025 23:44:25 +0000 Subject: [PATCH 1/3] fix for clang-19,20,21 version --- .../integratorxx/quadratures/radial/radial_transform.hpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/integratorxx/quadratures/radial/radial_transform.hpp b/include/integratorxx/quadratures/radial/radial_transform.hpp index a319a49..89257ef 100644 --- a/include/integratorxx/quadratures/radial/radial_transform.hpp +++ b/include/integratorxx/quadratures/radial/radial_transform.hpp @@ -32,8 +32,13 @@ struct RadialTransformQuadrature : using point_container = typename base_type::point_container; using weight_container = typename base_type::weight_container; - RadialTransformQuadrature(const RadialTraitsType& traits = RadialTraitsType()) : - base_type(traits) { } + RadialTransformQuadrature(const RadialTraitsType& traits) + : base_type(traits) {} + + template::value>> + RadialTransformQuadrature() : base_type(T{}) {} + RadialTransformQuadrature(const RadialTraits& traits) : RadialTransformQuadrature(radial_traits_cast(traits)) { } From 119e0018dc5a0d84a26b5ae9c9a98922ba05bf2a Mon Sep 17 00:00:00 2001 From: Abhishek Bagusetty Date: Tue, 9 Sep 2025 15:18:07 +0000 Subject: [PATCH 2/3] Add just clang 19 & 21 into the pipeline for release-only testing --- .../workflows/build_and_test_compiler_zoo.yml | 17 ++++++++++++++++- .github/workflows/scripts/compiler_setup.sh | 5 ++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test_compiler_zoo.yml b/.github/workflows/build_and_test_compiler_zoo.yml index be32d71..6471de3 100644 --- a/.github/workflows/build_and_test_compiler_zoo.yml +++ b/.github/workflows/build_and_test_compiler_zoo.yml @@ -14,11 +14,26 @@ jobs: image: dbwy/chemistry strategy: matrix: - compiler: [ {suite: gnu, version: 12}, {suite: llvm, version: 14} ] + compiler: + - {suite: gnu, version: 12} + - {suite: llvm, version: 14} + - {suite: llvm, version: 19} + - {suite: llvm, version: 21} steps: - uses: actions/checkout@v3 + - name: Install LLVM toolchain + if: ${{ matrix.compiler.suite == 'llvm' }} + shell: bash + run: | + set -euo pipefail + apt-get update + apt-get install -y wget gnupg lsb-release software-properties-common + wget https://apt.llvm.org/llvm.sh + chmod +x llvm.sh + ./llvm.sh ${{ matrix.compiler.version }} -y + - name: Setup Compiler shell: bash run: $GITHUB_WORKSPACE/.github/workflows/scripts/compiler_setup.sh diff --git a/.github/workflows/scripts/compiler_setup.sh b/.github/workflows/scripts/compiler_setup.sh index 2d6fae0..b600a45 100755 --- a/.github/workflows/scripts/compiler_setup.sh +++ b/.github/workflows/scripts/compiler_setup.sh @@ -1,4 +1,4 @@ -#/bin/bash +#!/bin/bash export CSUITE=$1 export CVER=$2 @@ -20,3 +20,6 @@ else exit 125 fi +echo "Selected compilers:" +echo " cc -> $(command -v cc) | $(cc --version | head -1)" +echo " c++ -> $(command -v c++) | $(c++ --version | head -1)" From 9675011acb79bbef55230b9913f46a68b0e0695a Mon Sep 17 00:00:00 2001 From: Abhishek Bagusetty Date: Tue, 9 Sep 2025 16:36:49 +0000 Subject: [PATCH 3/3] Set any clang-version to defaults per run --- .github/workflows/scripts/compiler_setup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/scripts/compiler_setup.sh b/.github/workflows/scripts/compiler_setup.sh index b600a45..467ed0f 100755 --- a/.github/workflows/scripts/compiler_setup.sh +++ b/.github/workflows/scripts/compiler_setup.sh @@ -5,6 +5,9 @@ export CVER=$2 if [[ "${CSUITE}" == "llvm" ]] then + # register the specific clang version as an alternative (needed once per version) + update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CVER} 50 + update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${CVER} 50 update-alternatives --set clang /usr/bin/clang-${CVER} update-alternatives --set clang++ /usr/bin/clang++-${CVER} update-alternatives --install /usr/bin/cc cc /usr/bin/clang 30