dev-0.7.0 (#81)

lgarithm · web-flow · commit a0e972236de9 · 2020-02-18T22:53:47.000Z
* new API :: device_type

* more constructors

* chebyshev_distenace

* stdc++fs

* COC

* deprecate &lt;stdtensor&gt;

* fix test

* support .at() for rank 0 tensor

* raw to flat

* flat_tensor::{rank,size,dims}

* simplify opencv example

* fix test for gcc
diff --git a/.gitignore b/.gitignore
@@ -47,3 +47,5 @@ compile_commands.json
 CTestTestfile.cmake
 install_manifest.txt
 Makefile
+
+*.png
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,6 +33,12 @@ ELSE()
     ADD_DEFINITIONS(-DUSE_FAKE_CUDA_RUNTIME)
 ENDIF()
 
+IF(APPLE)
+    ADD_DEFINITIONS(-DHAVE_STD_CPP_FS)
+ELSE()
+    LINK_LIBRARIES(stdc++fs)
+ENDIF()
+
 IF(BUILD_TESTS)
     ENABLE_TESTING()
     INCLUDE(cmake/tests.cmake)
diff --git a/CODE_OF_CONDUCT b/CODE_OF_CONDUCT
@@ -0,0 +1,8 @@
+"All things were made of numbers."
+Pythagoras (c. 570 BC ~ c. 495 BC)
+
+"Beauty is the first test: there is no permanent place in the world for ugly mathematics."
+G. H. Hardy (1877 - 1947)
+
+"I, in any case, am convinced that He does not play dice."
+Albert Einstein (1879 - 1955)
diff --git a/cmake/tests.cmake b/cmake/tests.cmake
@@ -1,8 +1,10 @@
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/gtest.cmake)
 
-FUNCTION(ADD_GTEST target)
+FUNCTION(ADD_UNIT_TEST target)
     ADD_EXECUTABLE(${target} ${ARGN} tests/main.cpp)
     TARGET_USE_GTEST(${target})
+    TARGET_INCLUDE_DIRECTORIES(${target}
+                               PRIVATE ${CMAKE_SOURCE_DIR}/tests/include)
     TARGET_LINK_LIBRARIES(${target} stdtensor)
     IF(HAVE_CUDA)
         TARGET_LINK_LIBRARIES(${target} cudart)
@@ -13,9 +15,6 @@ ENDFUNCTION()
 FILE(GLOB tests tests/test_*.cpp)
 FOREACH(t ${tests})
     GET_FILENAME_COMPONENT(name ${t} NAME_WE)
-    STRING(REPLACE "_"
-                   "-"
-                   name
-                   ${name})
-    ADD_GTEST(${name} ${t})
+    STRING(REPLACE "_" "-" name ${name})
+    ADD_UNIT_TEST(${name} ${t})
 ENDFOREACH()
diff --git a/examples/example_opencv.cpp b/examples/example_opencv.cpp
@@ -8,8 +8,10 @@ using bmp_t = ttl::matrix<pixel_t>;
 
 void save_bmp(const bmp_t &bmp)
 {
-    const cv::Mat img(cv::Size(bmp.shape().dims()[1], bmp.shape().dims()[0]),
-                      CV_8UC(3), (void *)bmp.data());
+    uint32_t h, w;
+    std::tie(h, w) = bmp.dims();
+    // const auto [h, w] = bmp.dims();  // c++17
+    const cv::Mat img(cv::Size(w, h), CV_8UC(3), bmp.data());
     cv::imwrite("i.png", img);
 }
 
diff --git a/include/stdtensor b/include/stdtensor
diff --git a/include/ttl/algorithm b/include/ttl/algorithm
@@ -6,6 +6,7 @@ namespace ttl
 {
 using ttl::internal::argmax;
 using ttl::internal::cast;
+using ttl::internal::chebyshev_distenace;
 using ttl::internal::fill;
 using ttl::internal::hamming_distance;
 using ttl::internal::max;
diff --git a/include/ttl/bits/flat_tensor_mixin.hpp b/include/ttl/bits/flat_tensor_mixin.hpp
@@ -46,6 +46,12 @@ class flat_tensor_mixin
     using shape_type = S;
     using device_type = D;
 
+    rank_t rank() const { return shape_.rank(); }
+
+    Dim size() const { return shape_.size(); }
+
+    const auto &dims() const { return shape_.dims(); }
+
     size_t data_size() const { return shape_.size() * sizeof(R); }
 
     const S &shape() const { return shape_; }
diff --git a/include/ttl/bits/raw_tensor_mixin.hpp b/include/ttl/bits/raw_tensor_mixin.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include <stdexcept>
 #include <ttl/bits/raw_shape.hpp>
+#include <ttl/bits/std_access_traits.hpp>
 #include <ttl/bits/std_tensor_fwd.hpp>
 #include <ttl/bits/std_tensor_traits.hpp>
 
@@ -86,6 +87,14 @@ class raw_tensor_mixin
         return reinterpret_cast<ptr_type>(data_.get());
     }
 
+    template <typename R>
+    auto typed() const
+    {
+        using Access = typename basic_access_traits<A>::type;
+        using T = basic_tensor<R, basic_raw_shape<Dim>, D, Access>;
+        return T(data<R>(), shape_);
+    }
+
     template <typename R, rank_t r, typename A1 = A>
     basic_tensor<R, basic_shape<r, Dim>, D, A1> ranked_as() const
     {
diff --git a/include/ttl/bits/std_access_traits.hpp b/include/ttl/bits/std_access_traits.hpp
@@ -0,0 +1,29 @@
+#pragma once
+
+namespace ttl
+{
+namespace internal
+{
+struct owner;
+struct readwrite;
+struct readonly;
+
+template <typename A>
+struct basic_access_traits;
+
+template <>
+struct basic_access_traits<owner> {
+    using type = readwrite;
+};
+
+template <>
+struct basic_access_traits<readwrite> {
+    using type = readwrite;
+};
+
+template <>
+struct basic_access_traits<readonly> {
+    using type = readonly;
+};
+}  // namespace internal
+}  // namespace ttl
diff --git a/include/ttl/bits/std_host_tensor_algo.hpp b/include/ttl/bits/std_host_tensor_algo.hpp
@@ -37,6 +37,19 @@ Dim hamming_distance(const basic_host_tensor_view<R, r, Dim> &x,
                               std::not_equal_to<R>());
 }
 
+template <typename R, rank_t r, typename Dim>
+R chebyshev_distenace(const basic_host_tensor_view<R, r, Dim> &x,
+                      const basic_host_tensor_view<R, r, Dim> &y)
+{
+    return std::inner_product(
+        x.data(), x.data_end(), y.data(), static_cast<R>(0),
+        [](R a, R d) { return std::max<R>(a, d); },
+        [](R x, R y) {
+            // FIXME: make sure it is commutative for floats
+            return x > y ? x - y : y - x;
+        });
+}
+
 template <typename R, rank_t r, typename Dim>
 R max(const basic_host_tensor_view<R, r, Dim> &t)
 {
diff --git a/include/ttl/bits/std_tensor_mixin.hpp b/include/ttl/bits/std_tensor_mixin.hpp
@@ -47,6 +47,12 @@ class basic_scalar_mixin
     data_ptr data_end() const { return data_.get() + 1; }
 
     S shape() const { return S(); }
+
+    data_ref at() const
+    {  // FIXME: support other devices
+        static_assert(std::is_same<D, host_memory>::value, "");
+        return data_.get()[0];
+    }
 };
 
 template <typename R, typename S, typename D, typename A>
diff --git a/include/ttl/bits/std_tensor_traits.hpp b/include/ttl/bits/std_tensor_traits.hpp
@@ -1,15 +1,12 @@
 #pragma once
 #include <memory>
+#include <ttl/bits/std_access_traits.hpp>
 #include <ttl/bits/std_tensor_fwd.hpp>
 
 namespace ttl
 {
 namespace internal
 {
-struct owner;
-struct readwrite;
-struct readonly;
-
 template <typename R, typename D>
 using own_ptr = std::unique_ptr<R[], basic_deallocator<R, D>>;
 
@@ -45,7 +42,7 @@ struct basic_tensor_traits<R, owner, D> {
     using ref_type = R &;
 
     using Data = own_ptr<R, D>;
-    using Access = readwrite;
+    using Access = readwrite;  // FIXME: use basic_access_traits
 };
 
 template <typename R, typename D>
diff --git a/tests/include/ttl/filesystem b/tests/include/ttl/filesystem
@@ -0,0 +1,21 @@
+// -*- mode: c++ -*-
+#pragma once
+
+#ifdef HAVE_STD_CPP_FS
+#include <filesystem>
+
+namespace std
+{
+namespace filesystem = std::__fs::filesystem;
+}
+
+#else
+
+#include <experimental/filesystem>
+
+namespace std
+{
+namespace filesystem = std::experimental::filesystem;
+}
+
+#endif
diff --git a/tests/test_algo.cpp b/tests/test_algo.cpp
@@ -8,7 +8,7 @@ TEST(tensor_algo_test, test_argmax)
     using R = float;
     ttl::tensor<R, 1> t(10);
     std::iota(t.data(), t.data_end(), 1);
-    ASSERT_EQ(static_cast<uint32_t>(9), ttl::argmax(view(t)));
+    ASSERT_EQ(static_cast<uint32_t>(9), ttl::argmax(ttl::view(t)));
 }
 
 TEST(tensor_algo_test, test_cast)
@@ -23,22 +23,22 @@ TEST(tensor_algo_test, test_cast)
     });
 
     ttl::tensor<int, 1> y(n);
-    ttl::cast(view(x), ref(y));
+    ttl::cast(ttl::view(x), ttl::ref(y));
 
-    ASSERT_EQ(5, ttl::sum(view(y)));
+    ASSERT_EQ(5, ttl::sum(ttl::view(y)));
 }
 
 TEST(tensor_algo_test, test_fill)
 {
     {
         using R = int;
         ttl::tensor<R, 1> t(10);
-        ttl::fill(ref(t), 1);
+        ttl::fill(ttl::ref(t), 1);
     }
     {
         using R = float;
         ttl::tensor<R, 1> t(10);
-        ttl::fill(ref(t), static_cast<R>(1.1));
+        ttl::fill(ttl::ref(t), static_cast<R>(1.1));
     }
 }
 
@@ -47,11 +47,26 @@ TEST(tensor_algo_test, test_hamming_distance)
     using R = int;
     int n = 0xffff;
     ttl::tensor<R, 1> x(n);
-    ttl::fill(ref(x), -1);
+    ttl::fill(ttl::ref(x), -1);
     ttl::tensor<R, 1> y(n);
-    ttl::fill(ref(y), 1);
+    ttl::fill(ttl::ref(y), 1);
     ASSERT_EQ(static_cast<uint32_t>(n),
-              ttl::hamming_distance(view(x), view(y)));
+              ttl::hamming_distance(ttl::view(x), ttl::view(y)));
+}
+
+TEST(tensor_algo_test, chebyshev_distenace)
+{
+    using R = int;
+    int n = 0xffff;
+    ttl::tensor<R, 1> x(n);
+    ttl::tensor<R, 1> y(n);
+    std::iota(x.data(), x.data_end(), 1);
+    std::iota(y.data(), y.data_end(), 1);
+    ASSERT_EQ(static_cast<R>(0),
+              ttl::chebyshev_distenace(ttl::view(x), ttl::view(y)));
+    std::reverse(y.data(), y.data_end());
+    ASSERT_EQ(static_cast<R>(n - 1),
+              ttl::chebyshev_distenace(ttl::view(x), ttl::view(y)));
 }
 
 TEST(tensor_algo_test, test_summaries_int)
@@ -60,10 +75,10 @@ TEST(tensor_algo_test, test_summaries_int)
     const int n = 10;
     ttl::tensor<R, 1> x(n);
     std::iota(x.data(), x.data_end(), -5);
-    ASSERT_EQ(-5, ttl::min(view(x)));
-    ASSERT_EQ(4, ttl::max(view(x)));
-    ASSERT_EQ(-5, ttl::sum(view(x)));
-    ASSERT_EQ(0, ttl::mean(view(x)));
+    ASSERT_EQ(-5, ttl::min(ttl::view(x)));
+    ASSERT_EQ(4, ttl::max(ttl::view(x)));
+    ASSERT_EQ(-5, ttl::sum(ttl::view(x)));
+    ASSERT_EQ(0, ttl::mean(ttl::view(x)));
 }
 
 TEST(tensor_algo_test, test_summaries_float)
@@ -72,8 +87,8 @@ TEST(tensor_algo_test, test_summaries_float)
     const int n = 10;
     ttl::tensor<R, 1> x(n);
     std::iota(x.data(), x.data_end(), -5);
-    ASSERT_EQ(-5, ttl::min(view(x)));
-    ASSERT_EQ(4, ttl::max(view(x)));
-    ASSERT_EQ(-5, ttl::sum(view(x)));
-    ASSERT_EQ(-0.5, ttl::mean(view(x)));
+    ASSERT_EQ(-5, ttl::min(ttl::view(x)));
+    ASSERT_EQ(4, ttl::max(ttl::view(x)));
+    ASSERT_EQ(-5, ttl::sum(ttl::view(x)));
+    ASSERT_EQ(-0.5, ttl::mean(ttl::view(x)));
 }
diff --git a/tests/test_include_ttl_tensor.cpp b/tests/test_include_ttl_tensor.cpp
@@ -1,6 +1,6 @@
 #include "testing.hpp"
 
-#include <stdtensor>
+#include <ttl/tensor>
 
 using ttl::tensor;
 using ttl::tensor_ref;
diff --git a/tests/test_loc.cpp b/tests/test_loc.cpp
@@ -1,6 +1,6 @@
 #include <cstdlib>
-#include <filesystem>
 #include <iostream>
+#include <ttl/filesystem>
 
 #include "testing.hpp"
 
@@ -20,7 +20,6 @@ int loc(const char *filename)
 
 TEST(test_loc, test1)
 {
-    std::string path = "/path/to/directory";
     int tot = 0;
     int n = 0;
     for (const auto &entry : fs::directory_iterator("include/ttl/bits")) {
diff --git a/tests/test_raw_tensor.cpp b/tests/test_raw_tensor.cpp
@@ -93,7 +93,8 @@ TEST(raw_tensor_test, test_convert)
     }
 }
 
-template <typename R, typename T> void test_raw_accessors(const T &t)
+template <typename R, typename T>
+void test_raw_accessors(const T &t)
 {
     t.shape();
     t.value_type();
@@ -124,3 +125,38 @@ TEST(raw_tensor_test, test_data)
     test_raw_accessors<R>(rr);
     test_raw_accessors<R>(rv);
 }
+
+#include <ttl/experimental/flat_tensor>
+
+TEST(raw_tensor_test, test_convert_to_flat)
+{
+    using ttl::experimental::raw_tensor;
+    using ttl::experimental::raw_tensor_ref;
+    using ttl::experimental::raw_tensor_view;
+    using encoder = raw_tensor::encoder_type;
+    using raw_shape = raw_tensor::shape_type;
+
+    raw_tensor rt(encoder::value<float>(), 1, 2, 3);
+    {
+        static_assert(
+            std::is_same<decltype(rt.typed<float>()),
+                         ttl::experimental::flat_tensor_ref<float>>::value,
+            "");
+        ttl::experimental::flat_tensor_ref<float> ft = rt.typed<float>();
+        ASSERT_EQ(ft.size(), static_cast<raw_shape::dimension_type>(6));
+    }
+    {
+        const raw_tensor_ref rtr(rt);
+        static_assert(
+            std::is_same<decltype(rtr.typed<float>()),
+                         ttl::experimental::flat_tensor_ref<float>>::value,
+            "");
+    }
+    {
+        const raw_tensor_view rtv(rt);
+        static_assert(
+            std::is_same<decltype(rtv.typed<float>()),
+                         ttl::experimental::flat_tensor_view<float>>::value,
+            "");
+    }
+}
diff --git a/tests/test_shape.cpp b/tests/test_shape.cpp
diff --git a/tests/test_tensor.cpp b/tests/test_tensor.cpp

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,10 @@ using bmp_t = ttl::matrix<pixel_t>;`
`8`	`8`
`9`	`9`	`void save_bmp(const bmp_t &bmp)`
`10`	`10`	`{`
`11`		`- const cv::Mat img(cv::Size(bmp.shape().dims()[1], bmp.shape().dims()[0]),`
`12`		`- CV_8UC(3), (void *)bmp.data());`
	`11`	`+ uint32_t h, w;`
	`12`	`+ std::tie(h, w) = bmp.dims();`
	`13`	`+ // const auto [h, w] = bmp.dims(); // c++17`
	`14`	`+ const cv::Mat img(cv::Size(w, h), CV_8UC(3), bmp.data());`
`13`	`15`	`cv::imwrite("i.png", img);`
`14`	`16`	`}`
`15`	`17`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ namespace ttl`
`6`	`6`	`{`
`7`	`7`	`using ttl::internal::argmax;`
`8`	`8`	`using ttl::internal::cast;`
	`9`	`+using ttl::internal::chebyshev_distenace;`
`9`	`10`	`using ttl::internal::fill;`
`10`	`11`	`using ttl::internal::hamming_distance;`
`11`	`12`	`using ttl::internal::max;`