diff --git a/include/aidge/utils/ArrayHelpers.hpp b/include/aidge/utils/ArrayHelpers.hpp index bd9f2e65011df6d3b765d1d9f6fb4c3aeaa30954..3f241fa6a163522c81238757da1efb6a8df24001 100644 --- a/include/aidge/utils/ArrayHelpers.hpp +++ b/include/aidge/utils/ArrayHelpers.hpp @@ -103,32 +103,32 @@ constexpr std::array<T, N + 1> append(T t, std::array<T, N> a) { // Generic helper for initializing a Tensor template <typename T, std::size_t SIZE_0> struct Array1D { - Array1D(std::initializer_list<T> list) { - auto it = list.begin(); - for (std::size_t i = 0; i < SIZE_0; ++i, ++it) { - data[i] = *it; - } - } - Array1D(const T (&dataArray)[SIZE_0]) { - std::copy_n(&dataArray[0], SIZE_0, &data[0]); - } + // Array1D(std::initializer_list<T> list) { + // auto it = list.begin(); + // for (std::size_t i = 0; i < SIZE_0; ++i, ++it) { + // data[i] = *it; + // } + // } + // Array1D(const T (&dataArray)[SIZE_0]) { + // std::copy_n(&dataArray[0], SIZE_0, &data[0]); + // } T data[SIZE_0]; }; template <typename T, std::size_t SIZE_0, std::size_t SIZE_1> struct Array2D { - Array2D(std::initializer_list<std::initializer_list<T>> list) { - auto it1 = list.begin(); - for (std::size_t i = 0; i < SIZE_0; ++i, ++it1) { - auto it2 = it1->begin(); - for (std::size_t j = 0; j < SIZE_1; ++j, ++it2) { - data[i][j] = *it2; - } - } - } - Array2D(const T (&dataArray)[SIZE_0][SIZE_1]) { - std::copy_n(&dataArray[0][0], SIZE_0 * SIZE_1, &data[0][0]); - } + // Array2D(std::initializer_list<std::initializer_list<T>> list) { + // auto it1 = list.begin(); + // for (std::size_t i = 0; i < SIZE_0; ++i, ++it1) { + // auto it2 = it1->begin(); + // for (std::size_t j = 0; j < SIZE_1; ++j, ++it2) { + // data[i][j] = *it2; + // } + // } + // } + // Array2D(const T (&dataArray)[SIZE_0][SIZE_1]) { + // std::copy_n(&dataArray[0][0], SIZE_0 * SIZE_1, &data[0][0]); + // } T data[SIZE_0][SIZE_1]; }; diff --git a/unit_tests/backend/Test_TensorImpl.cpp b/unit_tests/backend/Test_TensorImpl.cpp index fef9c7d2085ab974617efe5b65d92a43368651e6..43e25092a0f502698bbff7b0142969154f2cb0b0 100644 --- a/unit_tests/backend/Test_TensorImpl.cpp +++ b/unit_tests/backend/Test_TensorImpl.cpp @@ -33,7 +33,7 @@ TEST_CASE("[backend/cpu/data] Tensor", "[TensorImpl]") { } } -TEST_CASE("Tensor fill") { +TEST_CASE("Tensor fill", "[TensorImpl][fill]") { SECTION("Instantiate batches independantly") { // initialization with 0s std::shared_ptr<Tensor> concatenatedTensor= std::make_shared<Tensor>(Array2D<int, 3, 5>{});