Merge remote-tracking branch 'upstream/master'

Alex-PLACET · Alex-PLACET · commit 1d158a90b015 · 2026-05-05T14:29:37.000+02:00
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -23,17 +23,25 @@ jobs:
         - {compiler: clang, version: '19', name: assert, flags: -DXTENSOR_ENABLE_ASSERT=ON}
         - {compiler: clang, version: '20', name: column-major, flags: -DDEFAULT_COLUMN_MAJOR=ON}
         - {compiler: clang, version: '21', name: assert, flags: -DXTENSOR_ENABLE_ASSERT=ON}
+        - {compiler: clang, version: '21', name: column-major, flags: -DDEFAULT_COLUMN_MAJOR=ON}
+        - {compiler: clang, version: '22', name: assert, flags: -DXTENSOR_ENABLE_ASSERT=ON}
+        - {compiler: clang, version: '22', name: column-major, flags: -DDEFAULT_COLUMN_MAJOR=ON}
         - {compiler: gcc, version: '11', name: openmp, flags: -DXTENSOR_USE_OPENMP=ON}
         - {compiler: gcc, version: '11', name: noexcept, flags: -DXTENSOR_DISABLE_EXCEPTIONS=ON}
         - {compiler: gcc, version: '12', name: xsimd, flags: -DXTENSOR_USE_XSIMD=ON}
         - {compiler: gcc, version: '13', name: xsimd-tbb, flags: -DXTENSOR_USE_XSIMD=ON -DXTENSOR_USE_TBB=ON}
         - {compiler: gcc, version: '13', name: tbb, flags: -DXTENSOR_USE_TBB=ON -DTBB_INCLUDE_DIR=$CONDA_PREFIX/include -DTBB_LIBRARY=$CONDA_PREFIX/lib}
         - {compiler: gcc, version: '14', name: xsimd-tbb, flags: -DXTENSOR_USE_XSIMD=ON -DXTENSOR_USE_TBB=ON}
         - {compiler: gcc, version: '14', name: tbb, flags: -DXTENSOR_USE_TBB=ON -DTBB_INCLUDE_DIR=$CONDA_PREFIX/include -DTBB_LIBRARY=$CONDA_PREFIX/lib}
+        # TODO: Activate following gcc versions when switching github runner to ubuntu 26.04
+        # - {compiler: gcc, version: '15', name: xsimd-tbb, flags: -DXTENSOR_USE_XSIMD=ON -DXTENSOR_USE_TBB=ON}
+        # - {compiler: gcc, version: '15', name: tbb, flags: -DXTENSOR_USE_TBB=ON -DTBB_INCLUDE_DIR=$CONDA_PREFIX/include -DTBB_LIBRARY=$CONDA_PREFIX/lib}
+        # - {compiler: gcc, version: '16', name: xsimd-tbb, flags: -DXTENSOR_USE_XSIMD=ON -DXTENSOR_USE_TBB=ON}
+        # - {compiler: gcc, version: '16', name: tbb, flags: -DXTENSOR_USE_TBB=ON -DTBB_INCLUDE_DIR=$CONDA_PREFIX/include -DTBB_LIBRARY=$CONDA_PREFIX/lib}
     steps:
     - name: Install GCC
       if: matrix.sys.compiler == 'gcc'
-      uses: egor-tensin/setup-gcc@v1
+      uses: egor-tensin/setup-gcc@v2
       with:
         version: ${{matrix.sys.version}}
         platform: x64
@@ -53,7 +61,7 @@ jobs:
         sudo update-alternatives --set clang-scan-deps /usr/bin/clang-scan-deps-${{matrix.sys.version}}
 
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Set conda environment
       uses: mamba-org/setup-micromamba@main
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -10,8 +10,8 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: pre-commit/action@v3.0.0
+    - uses: actions/checkout@v6
+    - uses: pre-commit/action@v3.0.1
 
   include-check:
     runs-on: ubuntu-latest
diff --git a/include/xtensor/generators/xbuilder.hpp b/include/xtensor/generators/xbuilder.hpp
@@ -574,18 +574,18 @@ namespace xt
                         }
                         const auto& shape = arr.shape();
                         const size_t stride = std::accumulate(
-                            shape.begin() + i + 1,
+                            shape.begin() + static_cast<std::ptrdiff_t>(i) + 1,
                             shape.end(),
-                            1,
+                            size_t(1),
                             std::multiplies<size_t>()
                         );
-                        const auto len = (*(first + i + after_axis));
+                        const auto len = (*(first + static_cast<std::ptrdiff_t>(i + after_axis)));
                         offset += len * stride;
                     }
-                    const auto element = arr.begin() + offset;
+                    const auto element = arr.begin() + static_cast<std::ptrdiff_t>(offset);
                     return *element;
                 };
-                size_type i = *(first + axis);
+                size_type i = *(first + static_cast<std::ptrdiff_t>(axis));
                 return apply<value_type>(i, get_item, t);
             }
         };
diff --git a/include/xtensor/views/index_mapper.hpp b/include/xtensor/views/index_mapper.hpp
@@ -402,8 +402,9 @@ namespace xt
     {
         constexpr size_t n_indices_full = n_indices_full_v<FirstIndice, OtherIndices...>;
 
-        constexpr size_t underlying_n_dimensions = xt::static_dimension<
-            typename std::decay_t<UnderlyingContainer>::shape_type>::value;
+        constexpr size_t underlying_n_dimensions = static_cast<size_t>(
+            xt::static_dimension<typename std::decay_t<UnderlyingContainer>::shape_type>::value
+        );
 
         // If there is too many indices, we need to drop the first ones.
         // If the number of dimensions of the underlying container is known at compile time we can drop them
@@ -462,7 +463,9 @@ namespace xt
         const view_type& view
     ) const -> conditional_reference<IS_CONST>
     {
-        constexpr size_t n_indices_full = n_indices_full_v<>;
+        // Work around compilers failing to deduce nb_integral_slices as a non-type template argument inline
+        // (error: use of variable template 'n_indices_full_v' requires template arguments)
+        constexpr size_t n_indices_full = nb_integral_slices;
 
         return map_all_indices(
             is_const,
@@ -517,8 +520,9 @@ namespace xt
             }
             else
             {
+                using slice_size_type = typename current_slice::size_type;
                 assert(i < slice.size());
-                return size_t(slice(i));
+                return size_t(slice(static_cast<slice_size_type>(i)));
             }
         }
         else
diff --git a/include/xtensor/views/xslice.hpp b/include/xtensor/views/xslice.hpp
@@ -708,7 +708,7 @@ namespace xt
 
             type operator()(T t)
             {
-                return (xtl::is_integral<T>::value) ? static_cast<type>(t) : t;
+                return static_cast<type>(t);
             }
         };
 
@@ -770,7 +770,7 @@ namespace xt
     {
         if constexpr (is_xslice<S>::value)
         {
-            return slice.size();
+            return static_cast<std::size_t>(slice.size());
         }
         else
         {
@@ -787,7 +787,7 @@ namespace xt
     {
         if constexpr (is_xslice<S>::value)
         {
-            return slice.step_size(idx);
+            return static_cast<std::size_t>(slice.step_size(idx));
         }
         else
         {
@@ -800,7 +800,7 @@ namespace xt
     {
         if constexpr (is_xslice<S>::value)
         {
-            return slice.step_size(idx, n);
+            return static_cast<std::size_t>(slice.step_size(idx, n));
         }
         else
         {
@@ -818,7 +818,7 @@ namespace xt
         if constexpr (is_xslice<S>::value)
         {
             using ST = typename S::size_type;
-            return slice(static_cast<ST>(i));
+            return static_cast<std::size_t>(slice(static_cast<ST>(i)));
         }
         else
         {
diff --git a/include/xtensor/views/xstrided_view.hpp b/include/xtensor/views/xstrided_view.hpp
@@ -833,7 +833,7 @@ namespace xt
                 if (iter != std::end(shape))
                 {
                     const auto total = std::accumulate(shape.cbegin(), shape.cend(), -1, std::multiplies<int>{});
-                    const auto missing_dimension = size / total;
+                    const auto missing_dimension = size / static_cast<size_t>(total);
                     (*iter) = static_cast<value_type>(missing_dimension);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -402,8 +402,9 @@ namespace xt`
`402`	`402`	`{`
`403`	`403`	`constexpr size_t n_indices_full = n_indices_full_v<FirstIndice, OtherIndices...>;`
`404`	`404`
`405`		`- constexpr size_t underlying_n_dimensions = xt::static_dimension<`
`406`		`- typename std::decay_t<UnderlyingContainer>::shape_type>::value;`
	`405`	`+ constexpr size_t underlying_n_dimensions = static_cast<size_t>(`
	`406`	`+ xt::static_dimension<typename std::decay_t<UnderlyingContainer>::shape_type>::value`
	`407`	`+ );`
`407`	`408`
`408`	`409`	`// If there is too many indices, we need to drop the first ones.`
`409`	`410`	`// If the number of dimensions of the underlying container is known at compile time we can drop them`
`@@ -462,7 +463,9 @@ namespace xt`
`462`	`463`	`const view_type& view`
`463`	`464`	`) const -> conditional_reference<IS_CONST>`
`464`	`465`	`{`
`465`		`- constexpr size_t n_indices_full = n_indices_full_v<>;`
	`466`	`+ // Work around compilers failing to deduce nb_integral_slices as a non-type template argument inline`
	`467`	`+ // (error: use of variable template 'n_indices_full_v' requires template arguments)`
	`468`	`+ constexpr size_t n_indices_full = nb_integral_slices;`
`466`	`469`
`467`	`470`	`return map_all_indices(`
`468`	`471`	`is_const,`
`@@ -517,8 +520,9 @@ namespace xt`
`517`	`520`	`}`
`518`	`521`	`else`
`519`	`522`	`{`
	`523`	`+ using slice_size_type = typename current_slice::size_type;`
`520`	`524`	`assert(i < slice.size());`
`521`		`- return size_t(slice(i));`
	`525`	`+ return size_t(slice(static_cast<slice_size_type>(i)));`
`522`	`526`	`}`
`523`	`527`	`}`
`524`	`528`	`else`
Original file line number	Diff line number	Diff line change
`@@ -708,7 +708,7 @@ namespace xt`
`708`	`708`
`709`	`709`	`type operator()(T t)`
`710`	`710`	`{`
`711`		`- return (xtl::is_integral<T>::value) ? static_cast<type>(t) : t;`
	`711`	`+ return static_cast<type>(t);`
`712`	`712`	`}`
`713`	`713`	`};`
`714`	`714`
`@@ -770,7 +770,7 @@ namespace xt`
`770`	`770`	`{`
`771`	`771`	`if constexpr (is_xslice<S>::value)`
`772`	`772`	`{`
`773`		`- return slice.size();`
	`773`	`+ return static_cast<std::size_t>(slice.size());`
`774`	`774`	`}`
`775`	`775`	`else`
`776`	`776`	`{`
`@@ -787,7 +787,7 @@ namespace xt`
`787`	`787`	`{`
`788`	`788`	`if constexpr (is_xslice<S>::value)`
`789`	`789`	`{`
`790`		`- return slice.step_size(idx);`
	`790`	`+ return static_cast<std::size_t>(slice.step_size(idx));`
`791`	`791`	`}`
`792`	`792`	`else`
`793`	`793`	`{`
`@@ -800,7 +800,7 @@ namespace xt`
`800`	`800`	`{`
`801`	`801`	`if constexpr (is_xslice<S>::value)`
`802`	`802`	`{`
`803`		`- return slice.step_size(idx, n);`
	`803`	`+ return static_cast<std::size_t>(slice.step_size(idx, n));`
`804`	`804`	`}`
`805`	`805`	`else`
`806`	`806`	`{`
`@@ -818,7 +818,7 @@ namespace xt`
`818`	`818`	`if constexpr (is_xslice<S>::value)`
`819`	`819`	`{`
`820`	`820`	`using ST = typename S::size_type;`
`821`		`- return slice(static_cast<ST>(i));`
	`821`	`+ return static_cast<std::size_t>(slice(static_cast<ST>(i)));`
`822`	`822`	`}`
`823`	`823`	`else`
`824`	`824`	`{`
Original file line number	Diff line number	Diff line change
`@@ -833,7 +833,7 @@ namespace xt`
`833`	`833`	`if (iter != std::end(shape))`
`834`	`834`	`{`
`835`	`835`	`const auto total = std::accumulate(shape.cbegin(), shape.cend(), -1, std::multiplies<int>{});`
`836`		`- const auto missing_dimension = size / total;`
	`836`	`+ const auto missing_dimension = size / static_cast<size_t>(total);`
`837`	`837`	`(*iter) = static_cast<value_type>(missing_dimension);`
`838`	`838`	`}`
`839`	`839`	`}`