Fixed CI added OSX 13 and GCC 12

xtensor-stack · Jul 4, 2024 · f832f01 · f832f01
1 parent edc67a3
commit f832f01
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 22 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -12,23 +12,24 @@ defaults:
     shell: bash -e -l {0}
 jobs:
   build:
-    runs-on: ubuntu-20.04
     name: ${{ matrix.sys.compiler }} ${{ matrix.sys.version }} - ${{ matrix.sys.name }}
     strategy:
       fail-fast: false
       matrix:
         sys:
-        - {compiler: clang, version: '15', name: assert, flags: -DXTENSOR_ENABLE_ASSERT=ON}
-        - {compiler: clang, version: '16', name: column-major, flags: -DDEFAULT_COLUMN_MAJOR=ON}
-        - {compiler: gcc, version: '8', name: openmp, flags: -DXTENSOR_USE_OPENMP=ON}
-        - {compiler: gcc, version: '9', name: noexcept, flags: -DXTENSOR_DISABLE_EXCEPTIONS=ON}
-        - {compiler: gcc, version: '10', name: xsimd, flags: -DXTENSOR_USE_XSIMD=ON}
-        - {compiler: gcc, version: '11', name: c++17, flags: -DCPP17=ON}
-        - {compiler: gcc, version: '11', name: xsimd-tbb, flags: -DXTENSOR_USE_XSIMD=ON -DXTENSOR_USE_TBB=ON}
-        - {compiler: gcc, version: '11', name: tbb, flags: -DXTENSOR_USE_TBB=ON -DTBB_INCLUDE_DIR=$CONDA_PREFIX/include -DTBB_LIBRARY=$CONDA_PREFIX/lib}
-
+        - {os: ubuntu-20.04, compiler: clang, version: '15', name: assert, flags: -DXTENSOR_ENABLE_ASSERT=ON}
+        - {os: ubuntu-20.04, compiler: clang, version: '16', name: column-major, flags: -DDEFAULT_COLUMN_MAJOR=ON}
+        - {os: ubuntu-20.04, compiler: gcc, version: '8', name: openmp, flags: -DXTENSOR_USE_OPENMP=ON}
+        - {os: ubuntu-20.04, compiler: gcc, version: '9', name: noexcept, flags: -DXTENSOR_DISABLE_EXCEPTIONS=ON}
+        - {os: ubuntu-22.04, compiler: gcc, version: '10', name: xsimd, flags: -DXTENSOR_USE_XSIMD=ON}
+        - {os: ubuntu-22.04, compiler: gcc, version: '11', name: c++17, flags: -DCPP17=ON}
+        - {os: ubuntu-22.04, compiler: gcc, version: '11', name: xsimd-tbb, flags: -DXTENSOR_USE_XSIMD=ON -DXTENSOR_USE_TBB=ON}
+        - {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}
+        - {os: ubuntu-22.04, compiler: gcc, version: '12', name: c++17, flags: -DCPP17=ON}
+        - {os: ubuntu-22.04, compiler: gcc, version: '12', name: xsimd-tbb, flags: -DXTENSOR_USE_XSIMD=ON -DXTENSOR_USE_TBB=ON}
+        - {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}
+    runs-on: ${{ matrix.sys.os }}
     steps:
-
     - name: Setup GCC
       if: ${{ matrix.sys.compiler == 'gcc' }}
       run: |
@@ -39,7 +40,6 @@ jobs:
         echo "CC=$CC" >> $GITHUB_ENV
         CXX=g++-$GCC_VERSION
         echo "CXX=$CXX" >> $GITHUB_ENV
-
     - name: Setup clang
       if: ${{ matrix.sys.compiler == 'clang' }}
       run: |

diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -18,8 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-        - 11
         - 12
+        - 13
 
     steps:
 

diff --git a/include/xtensor/xutils.hpp b/include/xtensor/xutils.hpp
@@ -807,12 +807,12 @@ namespace xt
     {
         using base_type = A;
         using value_type = typename A::value_type;
-        using reference = typename A::reference;
-        using const_reference = typename A::const_reference;
-        using pointer = typename A::pointer;
-        using const_pointer = typename A::const_pointer;
-        using size_type = typename A::size_type;
-        using difference_type = typename A::difference_type;
+        using reference = value_type&;
+        using const_reference = const value_type&;
+        using pointer = typename std::allocator_traits<A>::pointer;
+        using const_pointer = typename std::allocator_traits<A>::const_pointer;
+        using size_type = typename std::allocator_traits<A>::size_type;
+        using difference_type = typename std::allocator_traits<A>::difference_type;
 
         tracking_allocator() = default;
 
@@ -835,9 +835,13 @@ namespace xt
             return base_type::allocate(n);
         }
 
-        using base_type::construct;
         using base_type::deallocate;
+
+// Construct and destroy are removed in --std=c++-20
+#if ((defined(__cplusplus) && __cplusplus < 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG < 202002L))
+        using base_type::construct;
         using base_type::destroy;
+#endif
 
         template <class U>
         struct rebind

diff --git a/test/test_xbuffer_adaptor.cpp b/test/test_xbuffer_adaptor.cpp
@@ -76,9 +76,9 @@ namespace xt
     {
     public:
 
-        size_t* allocate(size_t n, const void* hint = 0)
+        size_t* allocate(size_t n)
         {
-            size_t* res = std::allocator<size_t>::allocate(n, hint);
+            size_t* res = std::allocator<size_t>::allocate(n);
             // store the size into the result so we can
             // check if the size is correct when we deallocate.
             res[0] = n;