Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion .github/workflows/build_and_test_compiler_zoo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/scripts/compiler_setup.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
#/bin/bash
#!/bin/bash

export CSUITE=$1
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
Expand All @@ -20,3 +23,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)"
9 changes: 7 additions & 2 deletions include/integratorxx/quadratures/radial/radial_transform.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<class T = RadialTraitsType,
class = std::enable_if_t<std::is_default_constructible<T>::value>>
RadialTransformQuadrature() : base_type(T{}) {}

RadialTransformQuadrature(const RadialTraits& traits) :
RadialTransformQuadrature(radial_traits_cast<RadialTraitsType>(traits)) { }

Expand Down