feat: get rid of custom index_sequence

Author: zmij

CMakeLists.txt

@@ -23,22 +23,45 @@ else()
     set(PROJECT_VERSION ${_pversion})
 endif()
 
-option(BUILD_TESTS "Build tests for ${lib_name} library" ON)
-option(BUILD_BENCHMARKS "Build benchmarks for ${lib_name} library" ON)
+option(PSST_MATH_BUILD_TESTS "Build tests for ${lib_name} library" ON)
+option(PSST_MATH_BUILD_BENCHMARKS "Build benchmarks for ${lib_name} library" ON)
 
 set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
-add_definitions("-std=c++11")
-add_definitions(-Wall -Werror -pedantic)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_definitions(-Wall -Werror -Wpedantic)
+
+option(USE_CCACHE "Use ccache for build" ON)
+if (USE_CCACHE)
+    find_program(CCACHE ccache)
+    if (CCACHE)
+        message(STATUS "ccache found and enabled")
+        set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
+        set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
+    else()
+        message(WARNING "ccache enabled, but not found")
+    endif()
+else()
+    message(STATUS "ccache disabled")
+endif()
+
+
 add_subdirectory(include)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-if (BUILD_TESTS)
+
+if (PSST_MATH_BUILD_TESTS OR PSST_MATH_BUILD_BENCHMARKS)
+find_package(ExternalProjectZmijModules)
+endif()
+
+if (PSST_MATH_BUILD_TESTS)
     enable_testing()
     add_subdirectory(test)
 endif()
 
-if (BUILD_BENCHMARKS)
+if (PSST_MATH_BUILD_BENCHMARKS)
     enable_testing()
     add_subdirectory(benchmark)
 endif()

benchmark/CMakeLists.txt

@@ -2,9 +2,7 @@
 # Created on: 13 дек. 2016 г.
 #     Author: sergey.fedorov
 
-if (NOT GBENCH_FOUND)
-    find_package(GBenchmark REQUIRED)
-endif()
+find_package(ExternalProjectGBench REQUIRED)
 if (NOT CMAKE_THREAD_LIBS_INIT)
     find_package(Threads REQUIRED)
 endif()

benchmark/matrix_benchmarks.cpp

@@ -5,7 +5,7 @@
  *      Author: zmij
  */
 
-#include <benchmark/benchmark_api.h>
+#include <benchmark/benchmark.h>
 #include <pushkin/math/vector.hpp>
 #include <pushkin/math/matrix.hpp>
 

benchmark/vector_benchmarks.cpp

@@ -5,7 +5,7 @@
  *      Author: sergey.fedorov
  */
 
-#include <benchmark/benchmark_api.h>
+#include <benchmark/benchmark.h>
 #include <pushkin/math/vector.hpp>
 #include <pushkin/math/matrix.hpp>
 
@@ -259,4 +259,4 @@ BENCHMARK_TEMPLATE(VectorNorm,          vector<float,   10>);
 }  /* namespace math */
 }  /* namespace psst */
 
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();

cmake/modules/FindExternalProjectZmijModules.cmake

@@ -0,0 +1,21 @@
+#FindExternalProjectZmijModules.cmake
+# Created on: Dec 2, 2018
+#     Author: ser-fedorov
+
+if (TARGET libzmijcmake)
+    return()
+endif()
+
+find_program(GIT_EXECUTABLE git)
+
+if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/cmake-scripts)
+    execute_process(COMMAND ${GIT_EXECUTABLE} pull
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cmake-scripts)
+else()
+    execute_process(COMMAND ${GIT_EXECUTABLE} clone -b develop https://github.com/zmij/cmake-scripts.git cmake-scripts
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+endif()
+
+set(ZMIJ_CMAKE_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/cmake-scripts)
+add_library(libzmijcmake IMPORTED INTERFACE)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ZMIJ_CMAKE_SCRIPTS}/modules")

cmake/modules/FindGBenchmark.cmake

@@ -20,23 +20,23 @@ template < typename RowIndexTuple, ::std::size_t ColCount, typename T, typename
 struct matrix_builder;
 
 template < ::std::size_t ... RowIndexes, ::std::size_t CC, typename T, typename Axes >
-struct matrix_builder < indexes_tuple< RowIndexes ... >, CC, T, Axes > :
+struct matrix_builder < std::index_sequence< RowIndexes ... >, CC, T, Axes > :
         data_holder< RowIndexes, vector< T, CC, Axes > > ...,
         axes_names<Axes>::template type<sizeof ... (RowIndexes),
-            matrix_builder< indexes_tuple<RowIndexes...>, CC, T, Axes >,
+            matrix_builder< std::index_sequence<RowIndexes...>, CC, T, Axes >,
             vector<T, CC, Axes>> {
 
-    using row_index_tuple       = detail::indexes_tuple< RowIndexes ... >;
+    using row_index_tuple       = std::index_sequence< RowIndexes ... >;
     using row_type              = vector< T, CC, Axes >;
 
-    static constexpr ::std::size_t row_count    = row_index_tuple::size;
+    static constexpr ::std::size_t row_count    = sizeof...(RowIndexes);
     static constexpr ::std::size_t col_count    = row_type::size;
     static constexpr ::std::size_t size         = row_count * col_count;
 
     using this_type             = matrix_builder < row_index_tuple, CC, T, Axes >;
 
-    using col_index_tuple       = typename detail::index_builder< CC >::type;
-    using transposed_type       = matrix_builder< col_index_tuple, row_index_tuple::size, T, Axes >;
+    using col_index_tuple       = std::make_index_sequence< CC >;
+    using transposed_type       = matrix_builder< col_index_tuple, row_count, T, Axes >;
 
 
     using row_iterator          = row_type*;

include/pushkin/math/detail/matrix_detail.hpp

@@ -9,15 +9,17 @@
 #define PUSHKIN_VECTOR_DETAIL_HPP_
 
 #include <type_traits>
+#include <utility>
+
 #include <pushkin/math/detail/axis_names.hpp>
 #include <pushkin/math/detail/value_traits.hpp>
 
 namespace psst {
 namespace math {
 
 namespace detail {
-/** Variadic template arguments unwrapping */
 
+/** Variadic template arguments unwrapping */
 template< ::std::size_t Index, typename T >
 struct data_holder {
     static constexpr ::std::size_t index = Index;
@@ -60,34 +62,15 @@ struct data_holder {
     }
 };
 
-template< ::std::size_t ... Indexes >
-struct indexes_tuple {
-    static constexpr ::std::size_t size = sizeof ... (Indexes);
-};
-
-template< ::std::size_t num, typename tp = indexes_tuple< > >
-struct index_builder;
-
-template< ::std::size_t num, size_t ... Indexes >
-struct index_builder< num, indexes_tuple< Indexes ... > > : index_builder<
-        num - 1, indexes_tuple< Indexes ..., sizeof ... (Indexes) > > {
-};
-
-template< ::std::size_t ... Indexes >
-struct index_builder< 0, indexes_tuple< Indexes ... > > {
-    using type = indexes_tuple< Indexes ... >;
-    static constexpr ::std::size_t size = sizeof ... (Indexes);
-};
-
 template < typename IndexTuple, typename T >
 struct vector_builder;
 
 template < ::std::size_t ... Indexes, typename T >
-struct vector_builder< indexes_tuple< Indexes ... >, T > :
+struct vector_builder< std::index_sequence< Indexes ... >, T > :
     data_holder< Indexes, T > ... {
 
     static constexpr ::std::size_t size = sizeof ... (Indexes);
-    using indexes_tuple_type    = indexes_tuple< Indexes ... >;
+    using indexes_tuple_type    = std::index_sequence< Indexes ... >;
     using this_type             = vector_builder< indexes_tuple_type, T >;
 
     using element_type          = T;
@@ -120,7 +103,7 @@ struct vector_builder< indexes_tuple< Indexes ... >, T > :
      */
     template < size_t ... IndexesR, typename U >
     vector_builder(
-            vector_builder< indexes_tuple< IndexesR ... >, U > const& rhs,
+            vector_builder< std::index_sequence< IndexesR ... >, U > const& rhs,
             typename ::std::enable_if< size <= sizeof ... (IndexesR) >::type* = 0 )
         : data_holder< Indexes, T >( rhs.template at< Indexes >() ) ... {}
 
@@ -187,7 +170,7 @@ struct vector_builder< indexes_tuple< Indexes ... >, T > :
     iterator
     end()
     {
-        return begin() + indexes_tuple_type::size;
+        return begin() + size;
     }
 
     const_iterator
@@ -198,13 +181,13 @@ struct vector_builder< indexes_tuple< Indexes ... >, T > :
     const_iterator
     cend() const
     {
-        return begin() + indexes_tuple_type::size;
+        return begin() + size;
     }
 
     lvalue_reference
     operator[](size_t idx)
     {
-        assert(idx < indexes_tuple_type::size);
+        assert(idx < size);
         return begin()[idx];
     }
 

include/pushkin/math/detail/vector_detail.hpp

@@ -20,10 +20,10 @@ namespace math {
  * @tparam CC column count;
  */
 template < typename T, ::std::size_t RC, ::std::size_t CC, typename Axes >
-struct matrix : detail::matrix_builder< typename detail::index_builder< RC >::type, CC, T, Axes > {
+struct matrix : detail::matrix_builder< std::make_index_sequence< RC >, CC, T, Axes > {
 
     using base_type         = detail::matrix_builder<
-                                typename detail::index_builder< RC >::type, CC, T, Axes >;
+                                std::make_index_sequence< RC >, CC, T, Axes >;
 
     using this_type         = matrix< T, RC, CC, Axes >;
     using transposed_type   = matrix< T, CC, RC, Axes >;

include/pushkin/math/matrix.hpp

@@ -24,12 +24,12 @@ namespace math {
 template < typename T, size_t Size, typename Axes >
 struct vector
     : detail::vector_builder<
-    typename detail::index_builder< Size >::type, T >,
+      std::make_index_sequence< Size >, T >,
       detail::calculus_selector<T, Size, Axes>,
     detail::axes_names<Axes>::template type<Size, vector<T, Size, Axes>, T> {
 
     using base_type         = detail::vector_builder<
-                                typename detail::index_builder< Size >::type, T >;
+                                std::make_index_sequence< Size >, T >;
     using this_type         = vector< T, Size, Axes >;
 
     using value_traits      = typename base_type::value_traits;

include/pushkin/math/vector.hpp

@@ -5,9 +5,7 @@
 
 cmake_minimum_required(VERSION 2.6)
 
-if (NOT GTEST_INCLUDE_DIRS)
-    find_package(GTest REQUIRED)
-endif()
+find_package(ExternalProjectGTest REQUIRED)
 if (NOT CMAKE_THREAD_LIBS_INIT)
     find_package(Threads REQUIRED)
 endif()