Skip to content

Commit 1bb1479

Browse files
JohanMabilleemmenlau
JohanMabille
and
emmenlau
authored
Updated include paths for xtensor 0.26.0 (#249)
Superseding of #246 since I cannot force push to it and it needed to be rebased. --------- Co-authored-by: Mario Emmenlauer <[email protected]>
1 parent fe0ca7e commit 1bb1479

23 files changed

+94
-106
lines changed

‎.github/workflows/osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
run: micromamba install 'openblas==0.3.29=openmp*' blas-devel
4040

4141
- name: Configure using CMake
42-
run: cmake -Bbuild -DDOWNLOAD_GTEST=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib
42+
run: cmake -Bbuild -DCMAKE_CXX_STANDARD=17 -DDOWNLOAD_GTEST=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib
4343

4444
- name: Build
4545
working-directory: build

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ message(STATUS "xtensor-blas v${${PROJECT_NAME}_VERSION}")
4444
# Dependencies
4545
# ============
4646

47-
set(xtensor_REQUIRED_VERSION 0.25.0)
47+
set(xtensor_REQUIRED_VERSION 0.26.0)
4848
if(TARGET xtensor)
4949
set(xtensor_VERSION ${XTENSOR_VERSION_MAJOR}.${XTENSOR_VERSION_MINOR}.${XTENSOR_VERSION_PATCH})
5050
# Note: This is not SEMVER compatible comparison

‎benchmark/CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
2828
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
2929
endif()
3030
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-parameter -Wextra -Wreorder")
31-
CHECK_CXX_COMPILER_FLAG("-std=c++14" HAS_CPP14_FLAG)
32-
33-
if (HAS_CPP14_FLAG)
34-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
35-
else()
36-
message(FATAL_ERROR "Unsupported compiler -- xtensor requires C++14 support!")
37-
endif()
31+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
3832

3933
# Enable link time optimization and set the default symbol
4034
# visibility to hidden (very important to obtain small binaries)

‎benchmark/benchmark_blas.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
#include <benchmark/benchmark.h>
1313

14-
#include "xtensor/xarray.hpp"
15-
#include "xtensor/xnoalias.hpp"
16-
#include "xtensor/xtensor.hpp"
14+
#include "xtensor/containers/xarray.hpp"
15+
#include "xtensor/containers/xtensor.hpp"
16+
#include "xtensor/core/xnoalias.hpp"
1717

1818
#include "xtensor-blas/xlinalg.hpp"
1919

‎environment-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ channels:
33
- conda-forge
44
dependencies:
55
- cmake
6-
- xtensor>=0.25.0,<0.26
6+
- xtensor>=0.26.0,<0.27

‎include/xtensor-blas/xblas.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
#include <algorithm>
1414

15-
#include "xtensor/xarray.hpp"
16-
#include "xtensor/xcomplex.hpp"
17-
#include "xtensor/xio.hpp"
18-
#include "xtensor/xtensor.hpp"
19-
#include "xtensor/xutils.hpp"
15+
#include "xtensor/containers/xarray.hpp"
16+
#include "xtensor/containers/xtensor.hpp"
17+
#include "xtensor/io/xio.hpp"
18+
#include "xtensor/misc/xcomplex.hpp"
19+
#include "xtensor/utils/xutils.hpp"
2020

2121
#include "xflens/cxxblas/cxxblas.cxx"
2222
#include "xtensor-blas/xblas_config.hpp"

‎include/xtensor-blas/xblas_utils.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <tuple>
1515
#include <type_traits>
1616

17-
#include "xtensor/xutils.hpp"
17+
#include "xtensor/utils/xutils.hpp"
1818

1919
#include "xflens/cxxblas/typedefs.h"
2020
#include "xtensor-blas/xblas_config.hpp"

‎include/xtensor-blas/xlapack.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
#include <algorithm>
1414

15-
#include "xtensor/xarray.hpp"
16-
#include "xtensor/xcomplex.hpp"
17-
#include "xtensor/xio.hpp"
18-
#include "xtensor/xstorage.hpp"
19-
#include "xtensor/xtensor.hpp"
20-
#include "xtensor/xutils.hpp"
15+
#include "xtensor/containers/xarray.hpp"
16+
#include "xtensor/containers/xstorage.hpp"
17+
#include "xtensor/containers/xtensor.hpp"
18+
#include "xtensor/io/xio.hpp"
19+
#include "xtensor/misc/xcomplex.hpp"
20+
#include "xtensor/utils/xutils.hpp"
2121

2222
#include "xflens/cxxlapack/cxxlapack.cxx"
2323
#include "xtensor-blas/xblas_config.hpp"

‎include/xtensor-blas/xlinalg.hpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
#include <limits>
1616
#include <sstream>
1717

18-
#include "xtensor/xarray.hpp"
19-
#include "xtensor/xcomplex.hpp"
20-
#include "xtensor/xeval.hpp"
21-
#include "xtensor/xio.hpp"
22-
#include "xtensor/xmanipulation.hpp"
23-
#include "xtensor/xstrided_view.hpp"
24-
#include "xtensor/xtensor.hpp"
25-
#include "xtensor/xutils.hpp"
26-
#include "xtensor/xview.hpp"
18+
#include "xtensor/containers/xarray.hpp"
19+
#include "xtensor/containers/xtensor.hpp"
20+
#include "xtensor/core/xeval.hpp"
21+
#include "xtensor/io/xio.hpp"
22+
#include "xtensor/misc/xcomplex.hpp"
23+
#include "xtensor/misc/xmanipulation.hpp"
24+
#include "xtensor/utils/xutils.hpp"
25+
#include "xtensor/views/xstrided_view.hpp"
26+
#include "xtensor/views/xview.hpp"
2727

2828
#include "xtensor-blas/xblas.hpp"
2929
#include "xtensor-blas/xblas_utils.hpp"

‎test/CMakeLists.txt

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,27 @@ string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
3333

3434
include(set_compiler_flag.cmake)
3535

36-
if(CPP17)
37-
# User requested C++17, but compiler might not oblige.
36+
if(CPP20)
37+
# User requested C++20, but compiler might not oblige.
3838
set_compiler_flag(
3939
_cxx_std_flag CXX
40-
"-std=c++17" # this should work with GNU, Intel, PGI
41-
"/std:c++17" # this should work with MSVC
40+
"-std=c++20" # this should work with GNU, Intel, PGI
41+
"/std:c++20" # this should work with MSVC
4242
)
4343
if(_cxx_std_flag)
44-
message(STATUS "Building with C++17")
44+
message(STATUS "Building with C++20")
4545
endif()
4646
else()
4747
set_compiler_flag(
4848
_cxx_std_flag CXX REQUIRED
49-
"-std=c++14" # this should work with GNU, Intel, PGI
50-
"/std:c++14" # this should work with MSVC
49+
"-std=c++17" # this should work with GNU, Intel, PGI
50+
"/std:c++17" # this should work with MSVC
5151
)
52-
message(STATUS "Building with C++14")
52+
message(STATUS "Building with C++17")
5353
endif()
5454

5555
if(NOT _cxx_std_flag)
56-
message(FATAL_ERROR "xtensor-blas needs a C++14-compliant compiler.")
56+
message(FATAL_ERROR "xtensor-blas needs a C++17-compliant compiler.")
5757
endif()
5858

5959
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Intel" AND NOT WIN32))
@@ -115,10 +115,7 @@ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
115115
${CMAKE_CURRENT_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL)
116116

117117
set(GTEST_INCLUDE_DIRS "${gtest_SOURCE_DIR}/include")
118-
add_library(GTest::GTest INTERFACE IMPORTED)
119-
target_link_libraries(GTest::GTest INTERFACE gtest)
120-
add_library(GTest::Main INTERFACE IMPORTED)
121-
target_link_libraries(GTest::Main INTERFACE gtest_main)
118+
set(GTEST_BOTH_LIBRARIES gtest_main gtest)
122119
else()
123120
find_package(GTest REQUIRED)
124121
endif()
@@ -161,7 +158,7 @@ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
161158
add_dependencies(test_xtensor_blas gtest_main)
162159
endif()
163160

164-
target_link_libraries(test_xtensor_blas ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} GTest::GTest GTest::Main ${CMAKE_THREAD_LIBS_INIT})
161+
target_link_libraries(test_xtensor_blas ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
165162

166163
add_custom_target(xtest COMMAND test_xtensor_blas DEPENDS test_xtensor_blas)
167164
add_test(NAME xtest COMMAND test_xtensor_blas)

‎test/test_blas.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
* The full license is in the file LICENSE, distributed with this software. *
88
****************************************************************************/
99

10-
#include "xtensor/xarray.hpp"
11-
#include "xtensor/xbuilder.hpp"
12-
#include "xtensor/xrandom.hpp"
13-
#include "xtensor/xview.hpp"
10+
#include "xtensor/containers/xarray.hpp"
11+
#include "xtensor/generators/xbuilder.hpp"
12+
#include "xtensor/generators/xrandom.hpp"
13+
#include "xtensor/views/xview.hpp"
1414

1515
#include "gtest/gtest.h"
1616
#include "xtensor-blas/xblas.hpp"

‎test/test_dot.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
* The full license is in the file LICENSE, distributed with this software. *
88
****************************************************************************/
99

10-
#include "xtensor/xarray.hpp"
11-
#include "xtensor/xbuilder.hpp"
12-
#include "xtensor/xstrided_view.hpp"
13-
#include "xtensor/xview.hpp"
10+
#include "xtensor/containers/xarray.hpp"
11+
#include "xtensor/generators/xbuilder.hpp"
12+
#include "xtensor/views/xstrided_view.hpp"
13+
#include "xtensor/views/xview.hpp"
1414

1515
#include "gtest/gtest.h"
1616
#include "xtensor-blas/xlinalg.hpp"

‎test/test_dot_extended.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#include <algorithm>
1414

15-
#include "xtensor/xarray.hpp"
16-
#include "xtensor/xtensor.hpp"
15+
#include "xtensor/containers/xarray.hpp"
16+
#include "xtensor/containers/xtensor.hpp"
1717

1818
#include "gtest/gtest.h"
1919
#include "xtensor-blas/xlinalg.hpp"

‎test/test_float_norm.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
// this test is for https://github.com/xtensor-stack/xtensor-blas/issues/206
1111

12-
#include "xtensor/xarray.hpp"
13-
#include "xtensor/xbuilder.hpp"
14-
#include "xtensor/xrandom.hpp"
15-
#include "xtensor/xview.hpp"
12+
#include "xtensor/containers/xarray.hpp"
13+
#include "xtensor/generators/xbuilder.hpp"
14+
#include "xtensor/generators/xrandom.hpp"
15+
#include "xtensor/views/xview.hpp"
1616

1717
#include "gtest/gtest.h"
1818
#include "xtensor-blas/xblas.hpp"

‎test/test_generator/cppy_source/test_dot_extended.cppy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include <algorithm>
1111

1212
#include "gtest/gtest.h"
13-
#include "xtensor/xarray.hpp"
14-
#include "xtensor/xtensor.hpp"
13+
#include "xtensor/containers/xarray.hpp"
14+
#include "xtensor/containers/xtensor.hpp"
1515

1616
#include "xtensor-blas/xlinalg.hpp"
1717

‎test/test_generator/cppy_source/test_lstsq.cppy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
#include <algorithm>
1111

1212
#include "gtest/gtest.h"
13-
#include "xtensor/xarray.hpp"
14-
#include "xtensor/xfixed.hpp"
15-
#include "xtensor/xnoalias.hpp"
16-
#include "xtensor/xstrided_view.hpp"
17-
#include "xtensor/xtensor.hpp"
18-
#include "xtensor/xview.hpp"
13+
#include "xtensor/containers/xarray.hpp"
14+
#include "xtensor/containers/xfixed.hpp"
15+
#include "xtensor/core/xnoalias.hpp"
16+
#include "xtensor/views/xstrided_view.hpp"
17+
#include "xtensor/containers/xtensor.hpp"
18+
#include "xtensor/views/xview.hpp"
1919

2020
#include "xtensor-blas/xlinalg.hpp"
2121

‎test/test_generator/cppy_source/test_qr.cppy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
#include <algorithm>
1111

1212
#include "gtest/gtest.h"
13-
#include "xtensor/xarray.hpp"
14-
#include "xtensor/xfixed.hpp"
15-
#include "xtensor/xnoalias.hpp"
16-
#include "xtensor/xstrided_view.hpp"
17-
#include "xtensor/xtensor.hpp"
18-
#include "xtensor/xview.hpp"
13+
#include "xtensor/containers/xarray.hpp"
14+
#include "xtensor/containers/xfixed.hpp"
15+
#include "xtensor/core/xnoalias.hpp"
16+
#include "xtensor/views/xstrided_view.hpp"
17+
#include "xtensor/containers/xtensor.hpp"
18+
#include "xtensor/views/xview.hpp"
1919

2020
#include "xtensor-blas/xlinalg.hpp"
2121

‎test/test_lapack.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
* The full license is in the file LICENSE, distributed with this software. *
88
****************************************************************************/
99

10-
#include "xtensor/xarray.hpp"
11-
#include "xtensor/xbuilder.hpp"
12-
#include "xtensor/xcomplex.hpp"
13-
#include "xtensor/xio.hpp"
14-
#include "xtensor/xview.hpp"
10+
#include "xtensor/containers/xarray.hpp"
11+
#include "xtensor/generators/xbuilder.hpp"
12+
#include "xtensor/io/xio.hpp"
13+
#include "xtensor/misc/xcomplex.hpp"
14+
#include "xtensor/views/xview.hpp"
1515

1616
#include "gtest/gtest.h"
1717
#include "xtensor-blas/xblas.hpp"

‎test/test_linalg.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
* The full license is in the file LICENSE, distributed with this software. *
88
****************************************************************************/
99

10-
#include "xtensor/xarray.hpp"
11-
#include "xtensor/xbuilder.hpp"
12-
#include "xtensor/xcomplex.hpp"
13-
#include "xtensor/xio.hpp"
14-
#include "xtensor/xrandom.hpp"
15-
#include "xtensor/xview.hpp"
10+
#include "xtensor/containers/xarray.hpp"
11+
#include "xtensor/generators/xbuilder.hpp"
12+
#include "xtensor/generators/xrandom.hpp"
13+
#include "xtensor/io/xio.hpp"
14+
#include "xtensor/misc/xcomplex.hpp"
15+
#include "xtensor/views/xview.hpp"
1616

1717
#include "gtest/gtest.h"
1818
#include "xtensor-blas/xblas.hpp"

‎test/test_lstsq.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
#include <algorithm>
1414

15-
#include "xtensor/xarray.hpp"
16-
#include "xtensor/xfixed.hpp"
17-
#include "xtensor/xnoalias.hpp"
18-
#include "xtensor/xstrided_view.hpp"
19-
#include "xtensor/xtensor.hpp"
20-
#include "xtensor/xview.hpp"
15+
#include "xtensor/containers/xarray.hpp"
16+
#include "xtensor/containers/xfixed.hpp"
17+
#include "xtensor/containers/xtensor.hpp"
18+
#include "xtensor/core/xnoalias.hpp"
19+
#include "xtensor/views/xstrided_view.hpp"
20+
#include "xtensor/views/xview.hpp"
2121

2222
#include "gtest/gtest.h"
2323
#include "xtensor-blas/xlinalg.hpp"

‎test/test_qr.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
#include <algorithm>
1414

15-
#include "xtensor/xarray.hpp"
16-
#include "xtensor/xfixed.hpp"
17-
#include "xtensor/xnoalias.hpp"
18-
#include "xtensor/xstrided_view.hpp"
19-
#include "xtensor/xtensor.hpp"
20-
#include "xtensor/xview.hpp"
15+
#include "xtensor/containers/xarray.hpp"
16+
#include "xtensor/containers/xfixed.hpp"
17+
#include "xtensor/containers/xtensor.hpp"
18+
#include "xtensor/core/xnoalias.hpp"
19+
#include "xtensor/views/xstrided_view.hpp"
20+
#include "xtensor/views/xview.hpp"
2121

2222
#include "gtest/gtest.h"
2323
#include "xtensor-blas/xlinalg.hpp"

‎test/test_tensordot.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
* The full license is in the file LICENSE, distributed with this software. *
88
****************************************************************************/
99

10-
#include "xtensor/xarray.hpp"
11-
#include "xtensor/xbuilder.hpp"
12-
#include "xtensor/xstrided_view.hpp"
13-
#include "xtensor/xview.hpp"
10+
#include "xtensor/containers/xarray.hpp"
11+
#include "xtensor/generators/xbuilder.hpp"
12+
#include "xtensor/views/xstrided_view.hpp"
13+
#include "xtensor/views/xview.hpp"
1414

1515
#include "gtest/gtest.h"
1616
#include "xtensor-blas/xlinalg.hpp"

‎xtensor-blasConfig.cmake.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ if(NOT TARGET @PROJECT_NAME@)
2323
find_dependency(BLAS REQUIRED)
2424
find_dependency(LAPACK REQUIRED)
2525
target_link_libraries(xtensor-blas INTERFACE ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
26-
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.8)
27-
target_compile_features(xtensor-blas INTERFACE cxx_std_14)
28-
endif()
2926
endif()
3027

3128
set(PN xtensor_blas)

0 commit comments

Comments
 (0)