diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index cb36f8f..15faa73 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -13,7 +13,7 @@ defaults: jobs: build: runs-on: ubuntu-24.04 - name: ${{ matrix.sys.compiler }} ${{ matrix.sys.version }} + name: ${{ matrix.sys.compiler }} ${{ matrix.sys.version }} ${{ matrix.sys.novendor == 1 && ' no-vendor' || ' vendoring' }} strategy: fail-fast: false matrix: diff --git a/tools/0001-Remove-pragmas.patch b/tools/0001-Remove-pragmas.patch deleted file mode 100644 index ea97666..0000000 --- a/tools/0001-Remove-pragmas.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 679e57f92c455287555ab15b474a392b417642fc Mon Sep 17 00:00:00 2001 -From: Sylvain Corlay -Date: Mon, 18 Mar 2019 19:10:04 +0100 -Subject: [PATCH] Remove pragmas - ---- - include/xtensor/xstorage.hpp | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/include/xtensor/xstorage.hpp b/include/xtensor/xstorage.hpp -index d6662a6..376b774 100644 ---- a/include/xtensor/xstorage.hpp -+++ b/include/xtensor/xstorage.hpp -@@ -1795,15 +1795,6 @@ namespace xt - * std::tuple_size extensions * - ******************************/ - --// The C++ standard defines tuple_size as a class, however --// G++ 8 C++ library does define it as a struct hence we get --// clang warnings here -- --#if defined(__clang__) -- # pragma clang diagnostic push -- # pragma clang diagnostic ignored "-Wmismatched-tags" --#endif -- - namespace std - { - template -@@ -1829,10 +1820,6 @@ namespace std - class tuple_size>; - } - --#if defined(__clang__) -- # pragma clang diagnostic pop --#endif -- - #undef XTENSOR_CONST - #undef XTENSOR_ALIGNMENT - #undef XTENSOR_SELECT_ALIGN --- -2.17.1 - diff --git a/tools/vendor b/tools/vendor index e325285..ac0e187 100755 --- a/tools/vendor +++ b/tools/vendor @@ -1,5 +1,5 @@ XTL_VERSION=0.8.1 -XSIMD_VERSION=13.2.1 +XSIMD_VERSION=13.2.0 XTENSOR_VERSION=0.27.0 XTENSOR_R_VERSION=0.17.0 @@ -32,7 +32,6 @@ then else git clone https://github.com/xtensor-stack/xtensor --branch ${XTENSOR_VERSION} DIRECTORY=$(cd `dirname $0` && pwd) - git -C xtensor apply $DIRECTORY/0001-Remove-pragmas.patch cp -r xtensor/include/xtensor ./inst/include rm -rf xtensor fi