From 764504df1e83a8c556ba68020376ac3cc5c57a68 Mon Sep 17 00:00:00 2001
From: Jerome Hue <jerome.hue@cea.fr>
Date: Wed, 12 Feb 2025 16:29:33 +0100
Subject: [PATCH 1/7] Add a Tensor.repeat() method
---
include/aidge/data/Spikegen.hpp | 10 +++++++++
include/aidge/data/Tensor.hpp | 16 +++++++++++---
src/data/Tensor.cpp | 37 +++++++++++++++++++++++++++++++++
3 files changed, 60 insertions(+), 3 deletions(-)
create mode 100644 include/aidge/data/Spikegen.hpp
diff --git a/include/aidge/data/Spikegen.hpp b/include/aidge/data/Spikegen.hpp
new file mode 100644
index 000000000..1267fda9d
--- /dev/null
+++ b/include/aidge/data/Spikegen.hpp
@@ -0,0 +1,10 @@
+#ifndef AIDGE_CORE_DATA_SPIKEGEN_H_
+#define AIDGE_CORE_DATA_SPIKEGEN_H_
+
+// Spikegen algorithm :
+//
+// time_data = data.repeat(time_steps)
+// spike_data = rate_conv(time_data)
+// return spike_data
+
+#endif
diff --git a/include/aidge/data/Tensor.hpp b/include/aidge/data/Tensor.hpp
index 5df59becd..76295270e 100644
--- a/include/aidge/data/Tensor.hpp
+++ b/include/aidge/data/Tensor.hpp
@@ -13,9 +13,7 @@
#define AIDGE_CORE_DATA_TENSOR_H_
#include <algorithm>
-#include <cstddef> // std::size_t
-#include <cstring>
-#include <functional> // std::multiplies
+#include <cstddef> // std::size_t #include <cstring> #include <functional> // std::multiplies
#include <set>
#include <memory>
#include <numeric> // std::accumulate
@@ -989,6 +987,18 @@ public:
return ref(fallback, targetReqs.dataType(), device.first, device.second);
}
+
+ /**
+ * @brief Repeat the tensor along a new first dimension.
+ * For example, if the current tensor has dimensions (n, m),
+ * calling repeat(10) returns a tensor of shape (10, n, m)
+ * with 10 copies of the original data.
+ *
+ * @param times number of repetitions (must be positive)
+ * @return Tensor new tensor containing the repeated data.
+ */
+ Tensor repeat(int times) const;
+
private:
/**
* @brief Compute the number of elements in the Tensor.
diff --git a/src/data/Tensor.cpp b/src/data/Tensor.cpp
index b128833c9..cf8430684 100644
--- a/src/data/Tensor.cpp
+++ b/src/data/Tensor.cpp
@@ -802,6 +802,43 @@ const Tensor& Tensor::ref(std::shared_ptr<Tensor>& fallback,
}
}
+Tensor Tensor::repeat(int times) const {
+ AIDGE_ASSERT(times > 0, "repeat count must be positive");
+
+ // Ensure that the source tensor is contiguous.
+ Tensor src = *this;
+ if (not src.isContiguous()) {
+ src = src.clone();
+ src.makeContiguous();
+ }
+
+ // Build new dimensions: new_dims = {times} followed by current dims.
+ std::vector<DimSize_t> newDims;
+ newDims.push_back(static_cast<DimSize_t>(times));
+ for (const auto &d : dims()) {
+ newDims.push_back(d);
+ }
+
+ // Create an output tensor with the new dimensions.
+ Tensor out(newDims);
+ out.setDataType(dataType(), false);
+ out.setDataFormat(dataFormat());
+ if (hasImpl()) {
+ out.setBackend(getImpl()->backend(), device());
+ }
+
+ // Each "block" is a copy of the data from the original tensor.
+ const std::size_t block = src.size();
+ // Loop over the repeat count and copy the block each time.
+ for (int i = 0; i < times; ++i) {
+ // out.getImpl()->copy(source pointer, number of elements, destination offset)
+ out.getImpl()->copy(src.getImpl()->rawPtr(src.getImplOffset()),
+ block,
+ i * block);
+ }
+ return out;
+}
+
std::vector<std::size_t>
Tensor::toCoord(const std::vector<DimSize_t>& dimensions, std::size_t index) {
--
GitLab
From 70a0be1f8b0949975cc3791294d589b610313715 Mon Sep 17 00:00:00 2001
From: Jerome Hue <jerome.hue@cea.fr>
Date: Wed, 12 Feb 2025 16:41:55 +0100
Subject: [PATCH 2/7] Add unit test for Tensor.repeat()
---
unit_tests/data/Test_Tensor.cpp | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/unit_tests/data/Test_Tensor.cpp b/unit_tests/data/Test_Tensor.cpp
index bfdc1a6b9..28f3a5fde 100644
--- a/unit_tests/data/Test_Tensor.cpp
+++ b/unit_tests/data/Test_Tensor.cpp
@@ -505,6 +505,35 @@ TEST_CASE("[core/data] Tensor(other)", "[Tensor][extract][zeros][print]") {
}
}
+ SECTION("repeat") {
+ Tensor tensor = Array2D<int, 2, 3>{{{1, 2, 3},
+ {4, 5, 6}}};
+ const int repeatTimes = 4;
+
+ Tensor repeated;
+ REQUIRE_NOTHROW(repeated = tensor.repeat(repeatTimes));
+
+ // The expected shape after repeating is {repeatTimes, 2, 3}
+ std::vector<DimSize_t> expectedDims = {static_cast<DimSize_t>(repeatTimes), 2, 3};
+ CHECK(repeated.dims() == expectedDims);
+
+ // For each repetition along the new dimension, extract the slice and verify
+ // that it matches the original tensor
+ for (int i = 0; i < repeatTimes; ++i) {
+ Tensor slice;
+ REQUIRE_NOTHROW(slice = repeated.extract({static_cast<std::size_t>(i)}));
+ CHECK(slice.dims() == tensor.dims());
+
+ // Compare slice with original tensor elementwise
+ for (std::size_t idx = 0; idx < tensor.size(); ++idx) {
+ int expectedVal = tensor.get<int>(idx);
+ int sliceVal = slice.get<int>(idx);
+ INFO("Mismatch in repetition " << i << " at flat index " << idx);
+ CHECK(sliceVal == expectedVal);
+ }
+ }
+ }
+
// print, toString,
SECTION("Pretty printing for debug") {
Tensor x{};
--
GitLab
From cada2936e4dd63a4c2a33a646dbe468e41e8b8eb Mon Sep 17 00:00:00 2001
From: Jerome Hue <jerome.hue@cea.fr>
Date: Wed, 12 Feb 2025 17:52:40 +0100
Subject: [PATCH 3/7] First draft of spikegen rate convert function
---
include/aidge/data/Spikegen.hpp | 21 +++++++++++----
src/data/SpikeGen.cpp | 45 +++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+), 5 deletions(-)
create mode 100644 src/data/SpikeGen.cpp
diff --git a/include/aidge/data/Spikegen.hpp b/include/aidge/data/Spikegen.hpp
index 1267fda9d..cbb2963f2 100644
--- a/include/aidge/data/Spikegen.hpp
+++ b/include/aidge/data/Spikegen.hpp
@@ -1,10 +1,21 @@
+/********************************************************************************
+ * Copyright (c) 2025 CEA-List
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
#ifndef AIDGE_CORE_DATA_SPIKEGEN_H_
#define AIDGE_CORE_DATA_SPIKEGEN_H_
-// Spikegen algorithm :
-//
-// time_data = data.repeat(time_steps)
-// spike_data = rate_conv(time_data)
-// return spike_data
+#include "aidge/data/Tensor.hpp"
+namespace Aidge {
+std::shared_ptr<Tensor> spikegenRate(std::shared_ptr<Tensor> tensor);
+}
+
#endif
diff --git a/src/data/SpikeGen.cpp b/src/data/SpikeGen.cpp
new file mode 100644
index 000000000..977c64de9
--- /dev/null
+++ b/src/data/SpikeGen.cpp
@@ -0,0 +1,45 @@
+/********************************************************************************
+ * Copyright (c) 2025 CEA-List
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+#include <memory>
+#include <random>
+
+#include "aidge/data/Spikegen.hpp"
+
+namespace Aidge {
+std::shared_ptr<Tensor> rateConvert(const Tensor& tensor) {
+
+ auto result = std::make_shared<Tensor>(tensor.clone());
+
+ // Bernoulli sampling
+ std::random_device rd;
+ std::mt19937 gen(rd());
+ std::uniform_real_distribution<float> dis(0.0f, 1.0f);
+
+ // Clip values between 0 and 1, equivalent to torch.clamp(min=0, max=1)
+ for (size_t i = 0; i < tensor.size(); i++) {
+ auto val = tensor.get<float>(i);
+ val = (val < 0.0f) ? 0.0f : ((val > 1.0f) ? 1.0f : val);
+ auto randomValue = dis(gen);
+ result->set(i, randomValue < val ? 1.0f : 0.0f);
+ }
+
+ return result;
+}
+
+std::shared_ptr<Tensor> spikegenRate(std::shared_ptr<Tensor> tensor) {
+ auto newTensor = tensor->repeat(10);
+
+ newTensor.print(); // DEBUG
+
+ return rateConvert(newTensor);
+}
+} // namespace Aidge
--
GitLab
From d12e93cd3aeaa540c9fc4c37c5eeec77410ebc78 Mon Sep 17 00:00:00 2001
From: Jerome Hue <jerome.hue@cea.fr>
Date: Fri, 14 Feb 2025 10:09:35 +0100
Subject: [PATCH 4/7] Minor changes (doc, functions signatures)
---
include/aidge/data/Spikegen.hpp | 12 +++++++++++-
src/data/SpikeGen.cpp | 14 +++++---------
unit_tests/data/Test_Spikegen.cpp | 0
3 files changed, 16 insertions(+), 10 deletions(-)
create mode 100644 unit_tests/data/Test_Spikegen.cpp
diff --git a/include/aidge/data/Spikegen.hpp b/include/aidge/data/Spikegen.hpp
index cbb2963f2..30fd5decb 100644
--- a/include/aidge/data/Spikegen.hpp
+++ b/include/aidge/data/Spikegen.hpp
@@ -12,9 +12,19 @@
#ifndef AIDGE_CORE_DATA_SPIKEGEN_H_
#define AIDGE_CORE_DATA_SPIKEGEN_H_
+#include <cstdint>
+
#include "aidge/data/Tensor.hpp"
+
namespace Aidge {
-std::shared_ptr<Tensor> spikegenRate(std::shared_ptr<Tensor> tensor);
+
+/*
+ * @brief Spike rate encoding of input data
+ */
+Tensor spikegenRate(std::shared_ptr<Tensor> tensor, std::uint32_t numSteps);
+
+
+Tensor spikegenLatency(std::shared_ptr<Tensor> tensor);
}
diff --git a/src/data/SpikeGen.cpp b/src/data/SpikeGen.cpp
index 977c64de9..91b1ec433 100644
--- a/src/data/SpikeGen.cpp
+++ b/src/data/SpikeGen.cpp
@@ -15,11 +15,10 @@
#include "aidge/data/Spikegen.hpp"
namespace Aidge {
-std::shared_ptr<Tensor> rateConvert(const Tensor& tensor) {
+Tensor rateConvert(const Tensor& tensor) {
- auto result = std::make_shared<Tensor>(tensor.clone());
+ auto result = tensor.clone();
- // Bernoulli sampling
std::random_device rd;
std::mt19937 gen(rd());
std::uniform_real_distribution<float> dis(0.0f, 1.0f);
@@ -29,17 +28,14 @@ std::shared_ptr<Tensor> rateConvert(const Tensor& tensor) {
auto val = tensor.get<float>(i);
val = (val < 0.0f) ? 0.0f : ((val > 1.0f) ? 1.0f : val);
auto randomValue = dis(gen);
- result->set(i, randomValue < val ? 1.0f : 0.0f);
+ result.set(i, randomValue < val ? 1.0f : 0.0f);
}
return result;
}
-std::shared_ptr<Tensor> spikegenRate(std::shared_ptr<Tensor> tensor) {
- auto newTensor = tensor->repeat(10);
-
- newTensor.print(); // DEBUG
-
+Tensor spikegenRate(std::shared_ptr<Tensor> tensor, std::uint32_t numSteps) {
+ auto newTensor = tensor->repeat(numSteps);
return rateConvert(newTensor);
}
} // namespace Aidge
diff --git a/unit_tests/data/Test_Spikegen.cpp b/unit_tests/data/Test_Spikegen.cpp
new file mode 100644
index 000000000..e69de29bb
--
GitLab
From b76754c48cfc6cda5bc0ed8fc9b30711250c9950 Mon Sep 17 00:00:00 2001
From: Jerome Hue <jerome.hue@cea.fr>
Date: Fri, 14 Feb 2025 11:11:02 +0100
Subject: [PATCH 5/7] Add basic test for Spikegen functions
---
unit_tests/data/Test_Spikegen.cpp | 42 +++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/unit_tests/data/Test_Spikegen.cpp b/unit_tests/data/Test_Spikegen.cpp
index e69de29bb..06f33197d 100644
--- a/unit_tests/data/Test_Spikegen.cpp
+++ b/unit_tests/data/Test_Spikegen.cpp
@@ -0,0 +1,42 @@
+/********************************************************************************
+ * Copyright (c) 2025 CEA-List
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+#include <cstdint> // std::uint8_t, std::uint16_t, std::int32_t
+#include <vector> // std::vector
+
+#include <catch2/catch_test_macros.hpp>
+
+#include "aidge/data/Spikegen.hpp"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/utils/ArrayHelpers.hpp"
+#include "aidge/utils/TensorUtils.hpp"
+
+
+namespace Aidge
+{
+TEST_CASE("[core/data] SpikeGen zeros", "[SpikeGen]") {
+ auto input = Tensor(Array1D<float, 3>({0,0,0}));
+ auto expectedOutput = Tensor(Array2D<float, 3, 3>({{{0,0,0}, {0,0,0}, {0,0,0}}}));
+
+ auto spikes = spikegenRate(std::make_shared<Tensor>(input), 3);
+
+ REQUIRE(approxEq<float>(spikes, expectedOutput));
+}
+
+TEST_CASE("[core/data] SpikeGen ones", "[SpikeGen]") {
+ auto input = Tensor(Array1D<float, 3>({1,1,1}));
+ auto expectedOutput = Tensor(Array2D<float, 3, 3>({{{1,1,1}, {1,1,1}, {1,1,1}}}));
+
+ auto spikes = spikegenRate(std::make_shared<Tensor>(input), 3);
+
+ REQUIRE(approxEq<float>(spikes, expectedOutput));
+}
+} // namespace Aidge
--
GitLab
From 7bb394054dce714bca7e5aeffefc3219a4950333 Mon Sep 17 00:00:00 2001
From: Jerome Hue <jerome.hue@cea.fr>
Date: Tue, 25 Feb 2025 10:32:38 +0100
Subject: [PATCH 6/7] Add python binding for spikegen rate function
---
python_binding/data/pybind_Spikegen.cpp | 26 +++++++++++++++++++++++++
python_binding/pybind_core.cpp | 3 +++
2 files changed, 29 insertions(+)
create mode 100644 python_binding/data/pybind_Spikegen.cpp
diff --git a/python_binding/data/pybind_Spikegen.cpp b/python_binding/data/pybind_Spikegen.cpp
new file mode 100644
index 000000000..de4636bb2
--- /dev/null
+++ b/python_binding/data/pybind_Spikegen.cpp
@@ -0,0 +1,26 @@
+/********************************************************************************
+ * Copyright (c) 2025 CEA-List
+ *
+ * This program and the accompanying materials are made available under
+ * the terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+#include <pybind11/pybind11.h>
+
+#include "aidge/data/Spikegen.hpp"
+#include "aidge/data/Tensor.hpp"
+
+namespace py = pybind11;
+namespace Aidge {
+
+void init_Spikegen(py::module &m) {
+ m.def("spikegen_rate", &spikegenRate,
+ py::arg("tensor"), py::arg("numSteps"),
+ "Performs spike rate encoding on a Tensor");
+}
+
+} // namespace Aidge
diff --git a/python_binding/pybind_core.cpp b/python_binding/pybind_core.cpp
index ef1111b39..e9e246ad1 100644
--- a/python_binding/pybind_core.cpp
+++ b/python_binding/pybind_core.cpp
@@ -32,8 +32,10 @@ void init_OperatorImpl(py::module&);
void init_Log(py::module&);
void init_Operator(py::module&);
void init_OperatorTensor(py::module&);
+void init_Spikegen(py::module&);
void init_StaticAnalysis(py::module&);
+
void init_Abs(py::module&);
void init_Add(py::module&);
void init_And(py::module&);
@@ -122,6 +124,7 @@ void init_Aidge(py::module& m) {
init_Tensor(m);
init_TensorImpl(m);
init_Attributes(m);
+ init_Spikegen(m);
init_Node(m);
init_GraphView(m);
--
GitLab
From fd3f8a3bd334fd3e57fd7a8f47826fcf130caabd Mon Sep 17 00:00:00 2001
From: Jerome Hue <jerome.hue@cea.fr>
Date: Mon, 3 Mar 2025 10:10:45 +0100
Subject: [PATCH 7/7] Make a local function static
Also remove some meaningless comments
---
src/data/SpikeGen.cpp | 2 +-
src/data/Tensor.cpp | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/data/SpikeGen.cpp b/src/data/SpikeGen.cpp
index 91b1ec433..eecd6c86e 100644
--- a/src/data/SpikeGen.cpp
+++ b/src/data/SpikeGen.cpp
@@ -15,7 +15,7 @@
#include "aidge/data/Spikegen.hpp"
namespace Aidge {
-Tensor rateConvert(const Tensor& tensor) {
+static Tensor rateConvert(const Tensor& tensor) {
auto result = tensor.clone();
diff --git a/src/data/Tensor.cpp b/src/data/Tensor.cpp
index cf8430684..d44168564 100644
--- a/src/data/Tensor.cpp
+++ b/src/data/Tensor.cpp
@@ -805,21 +805,19 @@ const Tensor& Tensor::ref(std::shared_ptr<Tensor>& fallback,
Tensor Tensor::repeat(int times) const {
AIDGE_ASSERT(times > 0, "repeat count must be positive");
- // Ensure that the source tensor is contiguous.
Tensor src = *this;
if (not src.isContiguous()) {
src = src.clone();
src.makeContiguous();
}
- // Build new dimensions: new_dims = {times} followed by current dims.
+ // Build new dimensions: new_dims = {times} followed by current dims
std::vector<DimSize_t> newDims;
newDims.push_back(static_cast<DimSize_t>(times));
for (const auto &d : dims()) {
newDims.push_back(d);
}
- // Create an output tensor with the new dimensions.
Tensor out(newDims);
out.setDataType(dataType(), false);
out.setDataFormat(dataFormat());
@@ -829,7 +827,6 @@ Tensor Tensor::repeat(int times) const {
// Each "block" is a copy of the data from the original tensor.
const std::size_t block = src.size();
- // Loop over the repeat count and copy the block each time.
for (int i = 0; i < times; ++i) {
// out.getImpl()->copy(source pointer, number of elements, destination offset)
out.getImpl()->copy(src.getImpl()->rawPtr(src.getImplOffset()),
--
GitLab