Skip to content

Commit 487d890

Browse files
JohanMabilleJohanMabille
authored
Merge pull request #2832 from JohanMabille/compilers
Migrated to more recent compilers
2 parents 1860b6c + 3abd17d commit 487d890

File tree

4 files changed

+36
-49
lines changed

4 files changed

+36
-49
lines changed

‎.github/workflows/linux.yml‎

Lines changed: 34 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -12,52 +12,44 @@ defaults:
1212
shell: bash -e -l {0}
1313
jobs:
1414
build:
15+
runs-on: ubuntu-24.04
1516
name: ${{ matrix.sys.compiler }} ${{ matrix.sys.version }} - ${{ matrix.sys.name }}
1617
strategy:
1718
fail-fast: false
1819
matrix:
1920
sys:
20-
- {os: ubuntu-20.04, compiler: clang, version: '15', name: assert, flags: -DXTENSOR_ENABLE_ASSERT=ON}
21-
- {os: ubuntu-20.04, compiler: clang, version: '16', name: column-major, flags: -DDEFAULT_COLUMN_MAJOR=ON}
22-
- {os: ubuntu-20.04, compiler: gcc, version: '8', name: openmp, flags: -DXTENSOR_USE_OPENMP=ON}
23-
- {os: ubuntu-20.04, compiler: gcc, version: '9', name: noexcept, flags: -DXTENSOR_DISABLE_EXCEPTIONS=ON}
24-
- {os: ubuntu-22.04, compiler: gcc, version: '10', name: xsimd, flags: -DXTENSOR_USE_XSIMD=ON}
25-
- {os: ubuntu-22.04, compiler: gcc, version: '11', name: c++17, flags: -DCPP17=ON}
26-
- {os: ubuntu-22.04, compiler: gcc, version: '11', name: xsimd-tbb, flags: -DXTENSOR_USE_XSIMD=ON -DXTENSOR_USE_TBB=ON}
27-
- {os: ubuntu-22.04, compiler: gcc, version: '11', name: tbb, flags: -DXTENSOR_USE_TBB=ON -DTBB_INCLUDE_DIR=$CONDA_PREFIX/include -DTBB_LIBRARY=$CONDA_PREFIX/lib}
28-
- {os: ubuntu-22.04, compiler: gcc, version: '12', name: c++17, flags: -DCPP17=ON}
29-
- {os: ubuntu-22.04, compiler: gcc, version: '12', name: xsimd-tbb, flags: -DXTENSOR_USE_XSIMD=ON -DXTENSOR_USE_TBB=ON}
30-
- {os: ubuntu-22.04, compiler: gcc, version: '12', name: tbb, flags: -DXTENSOR_USE_TBB=ON -DTBB_INCLUDE_DIR=$CONDA_PREFIX/include -DTBB_LIBRARY=$CONDA_PREFIX/lib}
31-
runs-on: ${{ matrix.sys.os }}
21+
- {compiler: clang, version: '17', name: assert, flags: -DXTENSOR_ENABLE_ASSERT=ON}
22+
- {compiler: clang, version: '18', name: column-major, flags: -DDEFAULT_COLUMN_MAJOR=ON}
23+
#- {compiler: clang, version: '19', name: assert, flags: -DXTENSOR_ENABLE_ASSERT=ON}
24+
#- {compiler: clang, version: '20', name: column-major, flags: -DDEFAULT_COLUMN_MAJOR=ON}
25+
- {compiler: gcc, version: '11', name: openmp, flags: -DXTENSOR_USE_OPENMP=ON}
26+
- {compiler: gcc, version: '11', name: noexcept, flags: -DXTENSOR_DISABLE_EXCEPTIONS=ON}
27+
- {compiler: gcc, version: '12', name: xsimd, flags: -DXTENSOR_USE_XSIMD=ON}
28+
- {compiler: gcc, version: '13', name: xsimd-tbb, flags: -DXTENSOR_USE_XSIMD=ON -DXTENSOR_USE_TBB=ON}
29+
- {compiler: gcc, version: '13', name: tbb, flags: -DXTENSOR_USE_TBB=ON -DTBB_INCLUDE_DIR=$CONDA_PREFIX/include -DTBB_LIBRARY=$CONDA_PREFIX/lib}
30+
- {compiler: gcc, version: '14', name: xsimd-tbb, flags: -DXTENSOR_USE_XSIMD=ON -DXTENSOR_USE_TBB=ON}
31+
- {compiler: gcc, version: '14', name: tbb, flags: -DXTENSOR_USE_TBB=ON -DTBB_INCLUDE_DIR=$CONDA_PREFIX/include -DTBB_LIBRARY=$CONDA_PREFIX/lib}
3232
steps:
33-
- name: Setup GCC
34-
if: ${{ matrix.sys.compiler == 'gcc' }}
35-
run: |
36-
GCC_VERSION=${{ matrix.sys.version }}
37-
sudo apt-get update
38-
sudo apt-get --no-install-suggests --no-install-recommends install g++-$GCC_VERSION
39-
CC=gcc-$GCC_VERSION
40-
echo "CC=$CC" >> $GITHUB_ENV
41-
CXX=g++-$GCC_VERSION
42-
echo "CXX=$CXX" >> $GITHUB_ENV
43-
- name: Setup clang
44-
if: ${{ matrix.sys.compiler == 'clang' }}
33+
- name: Install GCC
34+
if: matrix.sys.compiler == 'gcc'
35+
uses: egor-tensin/setup-gcc@v1
36+
with:
37+
version: ${{matrix.sys.version}}
38+
platform: x64
39+
40+
- name: Install LLVM and Clang
41+
if: matrix.sys.compiler == 'clang'
4542
run: |
46-
LLVM_VERSION=${{ matrix.sys.version }}
47-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - || exit 1
48-
if [[ $LLVM_VERSION -ge 13 ]]; then
49-
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-$LLVM_VERSION main" || exit 1
50-
else
51-
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" || exit 1
52-
fi || exit 1
53-
sudo apt-get update || exit 1
54-
sudo apt-get --no-install-suggests --no-install-recommends install clang-$LLVM_VERSION || exit 1
55-
sudo apt-get --no-install-suggests --no-install-recommends install g++-9 g++-9-multilib || exit 1
56-
sudo ln -s /usr/include/asm-generic /usr/include/asm
57-
CC=clang-$LLVM_VERSION
58-
echo "CC=$CC" >> $GITHUB_ENV
59-
CXX=clang++-$LLVM_VERSION
60-
echo "CXX=$CXX" >> $GITHUB_ENV
43+
wget https://apt.llvm.org/llvm.sh
44+
chmod +x llvm.sh
45+
sudo ./llvm.sh ${{matrix.sys.version}}
46+
sudo apt-get install -y clang-tools-${{matrix.sys.version}}
47+
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${{matrix.sys.version}} 200
48+
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{matrix.sys.version}} 200
49+
sudo update-alternatives --install /usr/bin/clang-scan-deps clang-scan-deps /usr/bin/clang-scan-deps-${{matrix.sys.version}} 200
50+
sudo update-alternatives --set clang /usr/bin/clang-${{matrix.sys.version}}
51+
sudo update-alternatives --set clang++ /usr/bin/clang++-${{matrix.sys.version}}
52+
sudo update-alternatives --set clang-scan-deps /usr/bin/clang-scan-deps-${{matrix.sys.version}}
6153
6254
- name: Checkout code
6355
uses: actions/checkout@v3
@@ -73,10 +65,9 @@ jobs:
7365
${{ (matrix.sys.name == 'tbb' || matrix.sys.name == 'xsimd-tbb' ) && 'tbb-devel' || '' }}
7466
7567
- name: Configure using CMake
76-
# env:
77-
# CC: ${{ env.CC }}
78-
# CXX: ${{ env.CXX }}
79-
run: cmake -G Ninja -Bbuild -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DBUILD_TESTS=ON ${{ matrix.sys.flags }}
68+
run: |
69+
if [[ "${{matrix.sys.compiler}}" = "gcc" ]]; then export CC=gcc-${{matrix.sys.version}}; export CXX=g++-${{matrix.sys.version}}; else export CC=clang; export CXX=clang++; fi
70+
cmake -G Ninja -Bbuild -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DBUILD_TESTS=ON ${{ matrix.sys.flags }}
8071
8172
- name: Install
8273
working-directory: build

‎CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,6 @@ if(DEFAULT_COLUMN_MAJOR)
226226
add_definitions(-DXTENSOR_DEFAULT_LAYOUT=layout_type::column_major)
227227
endif()
228228

229-
if(DISABLE_VS2017)
230-
add_definitions(-DDISABLE_VS2017)
231-
endif()
232-
233229
if(MSVC AND DISABLE_MSVC_ITERATOR_CHECK)
234230
add_compile_definitions($<$<CONFIG:Debug>:_ITERATOR_DEBUG_LEVEL=0>)
235231
endif()

‎test/test_xfixed.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
// test_fixed removed from MSVC x86 because of recurring ICE.
3939
// Will be enabled again when the compiler is fixed
4040

41-
#if (_MSC_VER < 1910 && _WIN64) || (_MSC_VER >= 1910 && !defined(DISABLE_VS2017)) || !defined(_MSC_VER)
41+
#if (_MSC_VER < 1910 && _WIN64) || (_MSC_VER >= 1910) || !defined(_MSC_VER)
4242

4343
namespace xt
4444
{

‎test/test_xsimd.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef VS_SKIP_XFIXED
1616

1717

18-
#if (_MSC_VER < 1910 && _WIN64) || (_MSC_VER >= 1910 && !defined(DISABLE_VS2017)) || !defined(_MSC_VER)
18+
#if (_MSC_VER < 1910 && _WIN64) || (_MSC_VER >= 1910) || !defined(_MSC_VER)
1919

2020
#include <complex>
2121
#include <limits>

0 commit comments

Comments
 (0)