Merge branch 'master' into fix/complex_float_lstsq

Author: JohanMabille

.github/workflows/linux.yml

@@ -74,7 +74,7 @@ jobs:
       run: micromamba install 'openblas==0.3.29=pthreads*' blas-devel
 
     - name: Configure using CMake
-      run: cmake -Bbuild -DDOWNLOAD_GTEST=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib
+      run: cmake -Bbuild -DBUILD_TESTS=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib
 
     - name: Build
       working-directory: build

.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 -Bbuild -DCMAKE_CXX_STANDARD=17 -DDOWNLOAD_GTEST=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib
+      run: cmake -Bbuild -DCMAKE_CXX_STANDARD=17 -DBUILD_TESTS=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib
 
     - name: Build
       working-directory: build

.github/workflows/windows.yml

@@ -51,7 +51,7 @@ jobs:
       run: micromamba install mkl-devel
 
     - name: Configure using CMake
-      run: cmake -Bbuild -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DDOWNLOAD_GTEST=ON -G Ninja
+      run: cmake -Bbuild -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DBUILD_TESTS=ON -G Ninja
 
     - name: Build
       working-directory: build

CMakeLists.txt

@@ -101,13 +101,6 @@ endif()
 OPTION(BUILD_TESTS "xtensor-blas test suite" OFF)
 OPTION(BUILD_BENCHMARK "xtensor-blas test suite" OFF)
 
-OPTION(DOWNLOAD_GTEST "download gtest and build from source" OFF)
-OPTION(DOWNLOAD_GBENCHMARK "download google benchmark and build from source" OFF)
-
-if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
-    set(BUILD_TESTS ON)
-endif()
-
 if(BUILD_TESTS)
     enable_testing()
     include_directories(${XTENSOR_BLAS_INCLUDE_DIR})

environment-dev.yml

@@ -4,3 +4,4 @@ channels:
 dependencies:
 - cmake
 - xtensor>=0.26.0,<0.27
+- doctest

test/CMakeLists.txt

@@ -20,6 +20,9 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     set(XTENSOR_BLAS_INCLUDE_DIR ${xblas_INCLUDE_DIRS})
 endif ()
 
+find_package(doctest REQUIRED)
+find_package(Threads)
+
 if(NOT CMAKE_BUILD_TYPE)
     message(STATUS "Setting tests build type to Release")
     set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
@@ -86,43 +89,6 @@ else()
   message(FATAL_ERROR "Unsupported compiler: ${CMAKE_CXX_COMPILER_ID}")
 endif()
 
-if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
-    if(DOWNLOAD_GTEST)
-        # Download and unpack googletest at configure time
-        configure_file(downloadGTest.cmake.in googletest-download/CMakeLists.txt)
-    else()
-        # Copy local source of googletest at configure time
-        configure_file(copyGTest.cmake.in googletest-download/CMakeLists.txt)
-    endif()
-    execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
-                    RESULT_VARIABLE result
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
-    if(result)
-        message(FATAL_ERROR "CMake step for googletest failed: ${result}")
-    endif()
-    execute_process(COMMAND ${CMAKE_COMMAND} --build .
-                    RESULT_VARIABLE result
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
-    if(result)
-        message(FATAL_ERROR "Build step for googletest failed: ${result}")
-    endif()
-
-    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-
-    # Add googletest directly to our build. This defines
-    # the gtest and gtest_main targets.
-    add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
-                     ${CMAKE_CURRENT_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL)
-
-    set(GTEST_INCLUDE_DIRS "${gtest_SOURCE_DIR}/include")
-    set(GTEST_BOTH_LIBRARIES gtest_main gtest)
-else()
-    find_package(GTest REQUIRED)
-endif()
-
-find_package(Threads)
-
-include_directories(${GTEST_INCLUDE_DIRS} SYSTEM)
 include_directories(${XTENSOR_INCLUDE_DIR})
 include_directories(${XBLAS_INCLUDE_DIR})
 
@@ -154,11 +120,7 @@ set(XTENSOR_BLAS_TESTS
 )
 
 add_executable(test_xtensor_blas ${XTENSOR_BLAS_TESTS} ${XTENSOR_BLAS_HEADERS} ${XTENSOR_HEADERS})
-if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
-    add_dependencies(test_xtensor_blas gtest_main)
-endif()
-
-target_link_libraries(test_xtensor_blas ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(test_xtensor_blas ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} doctest::doctest ${CMAKE_THREAD_LIBS_INIT})
 
 add_custom_target(xtest COMMAND test_xtensor_blas DEPENDS test_xtensor_blas)
 add_test(NAME xtest COMMAND test_xtensor_blas)

test/copyGTest.cmake.in

@@ -6,10 +6,5 @@
  * The full license is in the file LICENSE, distributed with this software. *
  ****************************************************************************/
 
-#include "gtest/gtest.h"
-
-int main(int argc, char* argv[])
-{
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "doctest/doctest.h"