1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
| diff --git a/thpp/CMakeLists.txt b/thpp/CMakeLists.txt index 4ae3683..603702b 100644 --- a/thpp/CMakeLists.txt +++ b/thpp/CMakeLists.txt @@ -42,7 +42,7 @@ ELSE() ADD_DEFINITIONS(-DNO_THRIFT) ENDIF()
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14")
SET(src Storage.cpp ------------------------------------------------------ diff --git a/thpp/build.sh b/thpp/build.sh index 79af5d9..7c807e7 100755 --- a/thpp/build.sh +++ b/thpp/build.sh @@ -52,4 +52,4 @@ make ctest
# Install -make install +sudo make install ------------------------------------------------------ diff --git a/thpp/detail/TensorGeneric.h b/thpp/detail/TensorGeneric.h index a8837f6..6b67c72 100644 --- a/thpp/detail/TensorGeneric.h +++ b/thpp/detail/TensorGeneric.h @@ -188,17 +188,17 @@ template <> struct TensorOps<Tensor<real>> { } static void _max(THTensor* values, THLongTensor* indices, THTensor* t, int dim) { - return THTensor_(max)(values, indices, t, dim); + return THTensor_(max)(values, indices, t, dim, 1); } static void _min(THTensor* values, THLongTensor* indices, THTensor* t, int dim) { - return THTensor_(min)(values, indices, t, dim); + return THTensor_(min)(values, indices, t, dim, 1); } static void _sum(THTensor* r, THTensor* t, int dim) { - return THTensor_(sum)(r, t, dim); + return THTensor_(sum)(r, t, dim, 1); } static void _prod(THTensor* r, THTensor* t, int dim) { - return THTensor_(prod)(r, t, dim); + return THTensor_(prod)(r, t, dim, 1); } static void _cumsum(THTensor* r, THTensor* t, int dim) { return THTensor_(cumsum)(r, t, dim);
|