Fixed for good

Author: JohanMabille

.github/workflows/osx.yml

@@ -39,7 +39,7 @@ jobs:
       run: micromamba install 'openblas==0.3.29=openmp*' blas-devel
 
     - name: Configure using CMake
-      run: cmake --trace-expand -Bbuild -DCMAKE_CXX_STANDARD=17 -DDOWNLOAD_GTEST=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib
+      run: cmake -Bbuild -DCMAKE_CXX_STANDARD=17 -DDOWNLOAD_GTEST=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib
 
     - name: Build
       working-directory: build

benchmark/benchmark_blas.hpp

@@ -12,8 +12,8 @@
 #include <benchmark/benchmark.h>
 
 #include "xtensor/containers/xarray.hpp"
-#include "xtensor/core/xnoalias.hpp"
 #include "xtensor/containers/xtensor.hpp"
+#include "xtensor/core/xnoalias.hpp"
 
 #include "xtensor-blas/xlinalg.hpp"
 

include/xtensor-blas/xblas.hpp

@@ -13,9 +13,9 @@
 #include <algorithm>
 
 #include "xtensor/containers/xarray.hpp"
-#include "xtensor/misc/xcomplex.hpp"
-#include "xtensor/io/xio.hpp"
 #include "xtensor/containers/xtensor.hpp"
+#include "xtensor/io/xio.hpp"
+#include "xtensor/misc/xcomplex.hpp"
 #include "xtensor/utils/xutils.hpp"
 
 #include "xflens/cxxblas/cxxblas.cxx"

include/xtensor-blas/xlapack.hpp

@@ -13,10 +13,10 @@
 #include <algorithm>
 
 #include "xtensor/containers/xarray.hpp"
-#include "xtensor/misc/xcomplex.hpp"
-#include "xtensor/io/xio.hpp"
 #include "xtensor/containers/xstorage.hpp"
 #include "xtensor/containers/xtensor.hpp"
+#include "xtensor/io/xio.hpp"
+#include "xtensor/misc/xcomplex.hpp"
 #include "xtensor/utils/xutils.hpp"
 
 #include "xflens/cxxlapack/cxxlapack.cxx"

include/xtensor-blas/xlinalg.hpp

@@ -16,13 +16,13 @@
 #include <sstream>
 
 #include "xtensor/containers/xarray.hpp"
-#include "xtensor/misc/xcomplex.hpp"
+#include "xtensor/containers/xtensor.hpp"
 #include "xtensor/core/xeval.hpp"
 #include "xtensor/io/xio.hpp"
+#include "xtensor/misc/xcomplex.hpp"
 #include "xtensor/misc/xmanipulation.hpp"
-#include "xtensor/views/xstrided_view.hpp"
-#include "xtensor/containers/xtensor.hpp"
 #include "xtensor/utils/xutils.hpp"
+#include "xtensor/views/xstrided_view.hpp"
 #include "xtensor/views/xview.hpp"
 
 #include "xtensor-blas/xblas.hpp"

test/test_lapack.cpp

@@ -9,8 +9,8 @@
 
 #include "xtensor/containers/xarray.hpp"
 #include "xtensor/generators/xbuilder.hpp"
-#include "xtensor/misc/xcomplex.hpp"
 #include "xtensor/io/xio.hpp"
+#include "xtensor/misc/xcomplex.hpp"
 #include "xtensor/views/xview.hpp"
 
 #include "gtest/gtest.h"

test/test_linalg.cpp

@@ -9,9 +9,9 @@
 
 #include "xtensor/containers/xarray.hpp"
 #include "xtensor/generators/xbuilder.hpp"
-#include "xtensor/misc/xcomplex.hpp"
-#include "xtensor/io/xio.hpp"
 #include "xtensor/generators/xrandom.hpp"
+#include "xtensor/io/xio.hpp"
+#include "xtensor/misc/xcomplex.hpp"
 #include "xtensor/views/xview.hpp"
 
 #include "gtest/gtest.h"

test/test_lstsq.cpp

@@ -14,9 +14,9 @@
 
 #include "xtensor/containers/xarray.hpp"
 #include "xtensor/containers/xfixed.hpp"
+#include "xtensor/containers/xtensor.hpp"
 #include "xtensor/core/xnoalias.hpp"
 #include "xtensor/views/xstrided_view.hpp"
-#include "xtensor/containers/xtensor.hpp"
 #include "xtensor/views/xview.hpp"
 
 #include "gtest/gtest.h"

test/test_qr.cpp

@@ -14,9 +14,9 @@
 
 #include "xtensor/containers/xarray.hpp"
 #include "xtensor/containers/xfixed.hpp"
+#include "xtensor/containers/xtensor.hpp"
 #include "xtensor/core/xnoalias.hpp"
 #include "xtensor/views/xstrided_view.hpp"
-#include "xtensor/containers/xtensor.hpp"
 #include "xtensor/views/xview.hpp"
 
 #include "gtest/gtest.h"