Fix C++23 build (GCC 13.1.0)

.github/workflows/cmake.yml

@@ -102,8 +102,6 @@ jobs:
 
   test-stdBLAS:
     runs-on: ubuntu-latest
-    container:
-      image: amklinv/mdspan-dependencies:latest
     needs: build-stdblas
 
     steps:

examples/01_scale.cpp

@@ -1,3 +1,9 @@
+// Examples currently use parentheses (e.g., A(i,j))
+// for the array access operator,
+// instead of square brackets (e.g., A[i,j]).
+// This must be defined before including any mdspan headers.
+#define MDSPAN_USE_PAREN_OPERATOR 1
+
 #include <experimental/linalg>
 
 #include <iostream>
@@ -10,10 +16,14 @@
 #  include <execution>
 #endif
 
-// Make mdspan less verbose
 using std::experimental::mdspan;
 using std::experimental::extents;
-using std::experimental::dynamic_extent;
+#if defined(__cpp_lib_span)
+#include <span>
+  using std::dynamic_extent;
+#else
+  using std::experimental::dynamic_extent;
+#endif
 
 int main(int argc, char* argv[]) {
   std::cout << "Scale" << std::endl;
@@ -23,7 +33,10 @@ int main(int argc, char* argv[]) {
     std::vector<double> x_vec(N);
 
     // Create and initialize mdspan
-    // With CTAD working we could do, GCC 11.1 works but some others are buggy
+    //
+    // With CTAD working we could do the following.
+    // GCC 11.1 works but some other compilers are buggy.
+    //
     // mdspan x(x_vec.data(), N);
     mdspan<double, extents<std::size_t, dynamic_extent>> x(x_vec.data(),N);
     for(int i=0; i<x.extent(0); i++) x(i) = i;

examples/02_matrix_vector_product_basic.cpp

@@ -1,3 +1,9 @@
+// Examples currently use parentheses (e.g., A(i,j))
+// for the array access operator,
+// instead of square brackets (e.g., A[i,j]).
+// This must be defined before including any mdspan headers.
+#define MDSPAN_USE_PAREN_OPERATOR 1
+
 #include <experimental/linalg>
 
 #include <iostream>
@@ -10,10 +16,14 @@
 #  include <execution>
 #endif
 
-// Make mdspan less verbose
 using std::experimental::mdspan;
 using std::experimental::extents;
-using std::experimental::dynamic_extent;
+#if defined(__cpp_lib_span)
+#include <span>
+  using std::dynamic_extent;
+#else
+  using std::experimental::dynamic_extent;
+#endif
 
 int main(int argc, char* argv[]) {
   std::cout << "Matrix Vector Product Basic" << std::endl;

examples/03_matrix_vector_product_mixedprec.cpp

@@ -1,13 +1,23 @@
+// Examples currently use parentheses (e.g., A(i,j))
+// for the array access operator,
+// instead of square brackets (e.g., A[i,j]).
+// This must be defined before including any mdspan headers.
+#define MDSPAN_USE_PAREN_OPERATOR 1
+
 #include <experimental/linalg>
 
 #include <iostream>
 
-// Make mdspan less verbose
-using std::experimental::mdspan;
+#if defined(__cpp_lib_span)
+#include <span>
+  using std::dynamic_extent;
+#else
+  using std::experimental::dynamic_extent;
+#endif
 using std::experimental::extents;
-using std::experimental::dynamic_extent;
+using std::full_extent; // not in experimental namespace
+using std::experimental::mdspan;
 using std::experimental::submdspan;
-using std::experimental::full_extent;
 
 int main(int argc, char* argv[]) {
   std::cout << "Matrix Vector Product MixedPrec" << std::endl;
@@ -44,4 +54,3 @@ int main(int argc, char* argv[]) {
     for(int i=0; i<y.extent(0); i+=5) std::cout << i << " " << y(i,1) << std::endl;
   }
 }
-

tests/native/add.cpp

@@ -1,14 +1,10 @@
-#include "gtest/gtest.h"
+#include "./gtest_fixtures.hpp"
 
 #include <experimental/linalg>
-#include <experimental/mdspan>
 #include <array>
 #include <vector>
 
 namespace {
-  using std::experimental::dynamic_extent;
-  using std::experimental::extents;
-  using std::experimental::mdspan;
   using std::experimental::linalg::add;
 
   TEST(BLAS1_add, vector_double)

tests/native/conjugate_transposed.cpp

@@ -1,14 +1,8 @@
-#include "gtest/gtest.h"
+#include "./gtest_fixtures.hpp"
 
 #include <experimental/linalg>
-#include <experimental/mdspan>
-#include <complex>
-#include <vector>
 
 namespace {
-  using std::experimental::dynamic_extent;
-  using std::experimental::extents;
-  using std::experimental::mdspan;
   using std::experimental::linalg::conjugate_transposed;
 
   TEST(conjugate_transposed, mdspan_complex_double)

tests/native/conjugated.cpp

@@ -1,15 +1,8 @@
-#include "gtest/gtest.h"
+#include "./gtest_fixtures.hpp"
 
 #include <experimental/linalg>
-#include <experimental/mdspan>
-#include <complex>
-#include <vector>
 
 namespace {
-  using std::experimental::dextents;
-  using std::experimental::dynamic_extent;
-  using std::experimental::extents;
-  using std::experimental::mdspan;
   using std::experimental::linalg::conjugated;
 
   template<class ValueType>

tests/native/copy.cpp

@@ -1,14 +1,8 @@
-#include "gtest/gtest.h"
+#include "./gtest_fixtures.hpp"
 
 #include <experimental/linalg>
-#include <experimental/mdspan>
-#include <complex>
-#include <vector>
 
 namespace {
-  using std::experimental::dynamic_extent;
-  using std::experimental::extents;
-  using std::experimental::mdspan;
   using std::experimental::linalg::copy;
 
   template<class Real>

tests/native/dot.cpp

@@ -1,8 +1,6 @@
-#include "gtest/gtest.h"
+#include "./gtest_fixtures.hpp"
 
 #include <experimental/linalg>
-#include <experimental/mdspan>
-#include <vector>
 
 // FIXME (mfh 2022/06/17) Temporarily disable calling the BLAS,
 // to get PR testing workflow running with mdspan tag.
@@ -22,9 +20,6 @@ double ddot_wrapper (const int N, const double* DX,
 #endif // 0
 
 namespace {
-  using std::experimental::dynamic_extent;
-  using std::experimental::extents;
-  using std::experimental::mdspan;
   using std::experimental::linalg::dot;
   using std::experimental::linalg::dotc;
 

tests/native/gemm.cpp

@@ -1,20 +1,14 @@
-#include "gtest/gtest.h"
+#include "./gtest_fixtures.hpp"
 
 #include <experimental/linalg>
-#include <experimental/mdspan>
-#include <vector>
 #include <iostream>
 
 namespace {
-  using std::experimental::mdspan;
-  using std::experimental::dynamic_extent;
-  using std::experimental::extents;
-  using std::experimental::layout_left;
   using std::experimental::linalg::explicit_diagonal;
   using std::experimental::linalg::implicit_unit_diagonal;
   using std::experimental::linalg::lower_triangle;
   using std::experimental::linalg::matrix_product;
-  using std::experimental::linalg::scaled;  
+  using std::experimental::linalg::scaled;
   using std::experimental::linalg::transposed;
   using std::experimental::linalg::upper_triangle;
   using std::cout;

tests/native/gemv.cpp

@@ -1,15 +1,9 @@
-#include "gtest/gtest.h"
+#include "./gtest_fixtures.hpp"
 
 #include <experimental/linalg>
-#include <experimental/mdspan>
-#include <vector>
 #include <iostream>
 
 namespace {
-  using std::experimental::mdspan;
-  using std::experimental::dynamic_extent;
-  using std::experimental::extents;
-  using std::experimental::layout_left;
   using std::experimental::linalg::matrix_vector_product;
   using std::experimental::linalg::transposed;
   using std::cout;

tests/native/gemv_no_ambig.cpp

@@ -1,8 +1,6 @@
-#include "gtest/gtest.h"
+#include "./gtest_fixtures.hpp"
 
 #include <experimental/linalg>
-#include <experimental/mdspan>
-#include <vector>
 #include <iostream>
 
 #if (! defined(__GNUC__)) || (__GNUC__ > 9)
@@ -14,9 +12,6 @@
 
 namespace {
 
-using std::experimental::mdspan;
-using std::experimental::extents;
-using std::experimental::dynamic_extent;
 using std::experimental::linalg::matrix_vector_product;
 using std::experimental::linalg::scaled;
 

tests/native/givens.cpp

@@ -1,14 +1,9 @@
-#include "gtest/gtest.h"
+#include "./gtest_fixtures.hpp"
 
 #include <experimental/linalg>
-#include <experimental/mdspan>
 #include <limits>
-#include <vector>
 
 namespace {
-  using std::experimental::dynamic_extent;
-  using std::experimental::extents;
-  using std::experimental::mdspan;
   using std::experimental::linalg::givens_rotation_setup;
   using std::experimental::linalg::givens_rotation_apply;
 

tests/native/gtest_fixtures.hpp

@@ -45,13 +45,32 @@
 
 #include "gtest/gtest.h"
 
+// Tests currently use parentheses (e.g., A(i,j))
+// for the array access operator,
+// instead of square brackets (e.g., A[i,j]).
+// This must be defined before including any mdspan headers.
+#define MDSPAN_USE_PAREN_OPERATOR 1
+
 #include <experimental/mdspan>
 #include <complex>
 #include <vector>
 
+  using std::experimental::default_accessor;
+  using std::dextents; // not in experimental namespace
+#if defined(__cpp_lib_span)
+#include <span>
+  using std::dynamic_extent;
+#else
   using std::experimental::dynamic_extent;
+#endif
   using std::experimental::extents;
+  using std::full_extent; // not in experimental namespace
+  using std::experimental::layout_left;
+  using std::experimental::layout_right;
+  using std::experimental::layout_stride;
   using std::experimental::mdspan;
+  using std::experimental::submdspan;
+
   using dbl_vector_t = mdspan<double, extents<std::size_t, dynamic_extent>>;
   using cpx_vector_t = mdspan<std::complex<double>, extents<std::size_t, dynamic_extent>>;
   constexpr ptrdiff_t NROWS(10);
@@ -64,8 +83,8 @@
         storage(10),
         v(storage.data(), 10)
       {
-        v(0) = 0.5;  
-        v(1) = 0.2;  
+        v(0) = 0.5;
+        v(1) = 0.2;
         v(2) = 0.1;
         v(3) = 0.4;
         v(4) = 0.8;
@@ -75,7 +94,7 @@
         v(8) = 0.2;
         v(9) = 0.9;
       }
-    
+
       std::vector<double> storage;
       dbl_vector_t v;
   }; // end class unsigned_double_vector
@@ -88,8 +107,8 @@
         storage(10),
         v(storage.data(), 10)
       {
-        v(0) =  0.5;  
-        v(1) =  0.2;  
+        v(0) =  0.5;
+        v(1) =  0.2;
         v(2) =  0.1;
         v(3) =  0.4;
         v(4) = -0.8;
@@ -99,7 +118,7 @@
         v(8) =  0.2;
         v(9) = -0.9;
       }
-    
+
       std::vector<double> storage;
       dbl_vector_t v;
   }; // end class signed_double_vector
@@ -119,7 +138,7 @@
         v(3) = std::complex<double>(-0.3,  0.5);
         v(4) = std::complex<double>( 0.2, -0.9);
       }
-    
+
       std::vector<std::complex<double>> storage;
       cpx_vector_t v;
   }; // end class signed_double_vector