diff --git a/aidge_core/__init__.py b/aidge_core/__init__.py
index c65dcc6cfc4be8825d1213854014718fb7170854..4b5c448355a17fd4274ba45f5cd98afa70b1ae53 100644
--- a/aidge_core/__init__.py
+++ b/aidge_core/__init__.py
@@ -8,4 +8,5 @@ http://www.eclipse.org/legal/epl-2.0.
SPDX-License-Identifier: EPL-2.0
"""
from aidge_core.aidge_core import * # import so generated by PyBind
-from aidge_core.export import ExportNode
+from aidge_core.export import ExportNode, generate_file, generate_str
+import aidge_core.utils
diff --git a/aidge_core/export/__init__.py b/aidge_core/export/__init__.py
index 00b44121d68af06171525fdf953bf50e53328421..6fc846d93301f45b0635cd9b2fabae65fa7be8ab 100644
--- a/aidge_core/export/__init__.py
+++ b/aidge_core/export/__init__.py
@@ -1 +1,2 @@
from .node_export import *
+from .code_generation import *
diff --git a/aidge_core/export/code_generation.py b/aidge_core/export/code_generation.py
new file mode 100644
index 0000000000000000000000000000000000000000..b18b5476f8e083bcbe3d4f6c4a57132ebe7b780f
--- /dev/null
+++ b/aidge_core/export/code_generation.py
@@ -0,0 +1,47 @@
+import os
+from jinja2 import Environment, FileSystemLoader
+
+
+def generate_file(file_path: str, template_path: str, **kwargs) -> None:
+ """Generate a file at `file_path` using the jinja template located at `file_path`.
+
+ kwargs are used to fill the template.
+
+ :param file_path: path where to generate the file
+ :type file_path: str
+ :param template_path: Path to the template to use for code generation
+ :type template_path: str
+ """
+ # Get directory name of the file
+ dirname = os.path.dirname(file_path)
+
+ # If directory doesn't exist, create it
+ if not os.path.exists(dirname):
+ os.makedirs(dirname)
+
+ # Get directory name and name of the template
+ template_dir = os.path.dirname(template_path)
+ template_name = os.path.basename(template_path)
+
+ # Select template
+ template = Environment(loader=FileSystemLoader(
+ template_dir)).get_template(template_name)
+
+ # Generate file
+ content = template.render(kwargs)
+ with open(file_path, mode="w", encoding="utf-8") as message:
+ message.write(content)
+
+def generate_str(template_path:str, **kwargs) -> str:
+ """Generate a string using the jinja template located at `file_path`.
+ kwargs are used to fill the template.
+
+ :param template_path: Path to the template to use for code generation
+ :type template_path: str
+ :return: A string of the interpreted template
+ :rtype: str
+ """
+ dirname = os.path.dirname(template_path)
+ filename = os.path.basename(template_path)
+ template = Environment(loader=FileSystemLoader(dirname)).get_template(filename)
+ return template.render(kwargs)
diff --git a/aidge_core/utils.py b/aidge_core/utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..d82d524b7e886ed396507376a5934a748a89e44c
--- /dev/null
+++ b/aidge_core/utils.py
@@ -0,0 +1,16 @@
+def template_docstring(template_keyword, text_to_replace):
+ """Method to template docstring
+
+ :param template: Template keyword to replace, in the documentation you template word must be between `{` `}`
+ :type template: str
+ :param text_to_replace: Text to replace your template with.
+ :type text_to_replace: str
+ """
+ def dec(func):
+ if "{"+template_keyword+"}" not in func.__doc__:
+ raise RuntimeError(
+ f"The function {function.__name__} docstring does not contain the template keyword: {template_keyword}.")
+ func.__doc__ = func.__doc__.replace(
+ "{"+template_keyword+"}", text_to_replace)
+ return func
+ return dec
diff --git a/include/aidge/graph/GraphView.hpp b/include/aidge/graph/GraphView.hpp
index 59c538ce640f9fb8a45c26a29b0c2599d883553e..6a0460941940f33a3be33bc9edbf84da32777730 100644
--- a/include/aidge/graph/GraphView.hpp
+++ b/include/aidge/graph/GraphView.hpp
@@ -160,7 +160,7 @@ public:
/**
* @brief List outside input connections of the GraphView. The vector
- * size is garanteed to match the number of outside inputs of the GraphView. If there is
+ * size is guaranteed to match the number of outside inputs of the GraphView. If there is
* no external connection to a given input, a pair of nullptr and gk_IODefaultIndex is returned.
* @return std::vector<std::pair<NodePtr, IOIndex_t>>
*/
@@ -376,6 +376,12 @@ public:
addChild(toOtherNode, mNodeRegistry.at(fromOutNodeName), fromTensor, toTensor);
}
+ inline void updateNodeName(const std::string& oldName, const std::string& newName){
+ AIDGE_ASSERT(mNodeRegistry.find(oldName) != mNodeRegistry.end(), "No node named {} in graph {}, the graph may be corrupted !", oldName, name());
+ mNodeRegistry[newName] = mNodeRegistry[oldName];
+ mNodeRegistry.erase(oldName);
+ }
+
/**
* @brief Include a GraphView content in the current GraphView and link
* the two sets by linking one Node from each GraphView.
diff --git a/include/aidge/graph/Node.hpp b/include/aidge/graph/Node.hpp
index 908f56295887bd2fbed3350a026045a4ab6b21d9..2a0a4a3b703670c8ace05e03fc5c797fe861a423 100644
--- a/include/aidge/graph/Node.hpp
+++ b/include/aidge/graph/Node.hpp
@@ -235,8 +235,8 @@ public:
///////////////////////////////////////////////////////
/**
- * @brief Vector of pointers to each GraphView containing the object
- * @return std::vector<GraphView>
+ * @brief Set of pointers to each GraphView containing this Node
+ * @return std::set<GraphView>
*/
inline std::set<std::shared_ptr<GraphView>> views() const noexcept {
std::set<std::shared_ptr<GraphView>> res;
@@ -460,10 +460,10 @@ private:
// OPERATOR FUNCTIONNAL but commented out to avoid iostream inclusion
// /**
// * @brief operator<< overload to ease print & debug of nodes
- // * @param[inout] ostream to print to
+ // * @param[inout] ostream to print to
// * @param[in] n node to print
// */
- // friend std::ostream& operator << (std::ostream& os, Node& n);
+ // friend std::ostream& operator << (std::ostream& os, Node& n);
};
} // namespace Aidge
diff --git a/python_binding/data/pybind_Database.cpp b/python_binding/data/pybind_Database.cpp
index 903e692ca3d14d6ae25f0d6f151b1b08d557d924..4bc28a19d350236933c3b6c139e9e3a4d980fa3f 100644
--- a/python_binding/data/pybind_Database.cpp
+++ b/python_binding/data/pybind_Database.cpp
@@ -1,13 +1,40 @@
#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
#include "aidge/data/Database.hpp"
+#include "aidge/data/Tensor.hpp"
namespace py = pybind11;
namespace Aidge {
-void init_Database(py::module& m){
+/**
+ * @brief Trampoline class for binding
+ *
+ */
+class pyDatabase : public Database {
+ public:
+ using Database::Database; // Inherit constructors
- py::class_<Database, std::shared_ptr<Database>>(m,"Database");
+ std::vector<std::shared_ptr<Tensor>> getItem(
+ const std::size_t index) const override {
+ PYBIND11_OVERRIDE_PURE_NAME(std::vector<std::shared_ptr<Tensor>>, Database,
+ "get_item", getItem, index);
+ }
+ std::size_t getLen() const noexcept override {
+ PYBIND11_OVERRIDE_PURE_NAME(std::size_t, Database, "len", getLen);
+ }
+ std::size_t getNbModalities() const noexcept override {
+ PYBIND11_OVERRIDE_PURE_NAME(std::size_t, Database, "get_nb_modalities",
+ getNbModalities);
+ }
+};
-
-}
+void init_Database(py::module& m) {
+ py::class_<Database, std::shared_ptr<Database>, pyDatabase>(
+ m, "Database", py::dynamic_attr())
+ .def(py::init<>())
+ .def("get_item", &Database::getItem)
+ .def("len", &Database::getLen)
+ .def("get_nb_modalities", &Database::getNbModalities);
}
+} // namespace Aidge
diff --git a/requirements.txt b/requirements.txt
index 24ce15ab7ead32f98c7ac3edcd34bb2010ff4326..32ec29bb9b826038eb21ce2927f2fef08973b2b8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
numpy
+Jinja2
diff --git a/src/data/Tensor.cpp b/src/data/Tensor.cpp
index b6aa4f2e50a5a3db8c3965a8e618fcf4f0299fe8..677bd0246e145ebf760f210000728bd2d99a3807 100644
--- a/src/data/Tensor.cpp
+++ b/src/data/Tensor.cpp
@@ -23,29 +23,26 @@ Aidge::Tensor& Aidge::Tensor::operator=(const Aidge::Tensor& other) {
return *this;
}
resize(other.dims(), other.strides());
- setDataType(other.dataType(), false); // do not convert existing data
+ setDataType(other.dataType(), false); // do not convert existing data
if (other.hasImpl()) {
if (hasImpl()) {
copyFrom(other);
- }
- else {
+ } else {
// Perform a shallow copy only
setImpl(other.mImpl, other.mImplOffset);
}
- }
- else {
+ } else {
setImpl(nullptr);
}
return *this;
}
-
Aidge::Tensor::~Tensor() noexcept = default;
-
-void Aidge::Tensor::resize(const std::vector<Aidge::DimSize_t> &dims, std::vector<Aidge::DimSize_t> strides) {
+void Aidge::Tensor::resize(const std::vector<Aidge::DimSize_t>& dims,
+ std::vector<Aidge::DimSize_t> strides) {
// TODO: scalar Tensor not handled
- if (dims.empty()) { // scalar
+ if (dims.empty()) { // scalar
mDims = std::vector<DimSize_t>(0);
mStrides = std::vector<DimSize_t>({1});
mContiguous = true;
@@ -63,20 +60,21 @@ void Aidge::Tensor::resize(const std::vector<Aidge::DimSize_t> &dims, std::vecto
size_t expectedStride = 1;
for (int dim = dims.size() - 1; dim >= 0; --dim) {
strides[dim] = expectedStride;
- expectedStride*= dims[dim];
+ expectedStride *= dims[dim];
}
checkContiguous = false;
- }
- else {
- AIDGE_ASSERT(strides.size() == dims.size(), "Number of strides must match number of dims");
+ } else {
+ AIDGE_ASSERT(strides.size() == dims.size(),
+ "Number of strides must match number of dims");
}
if (mImpl && mImpl.use_count() > 1) {
// Here we could also create a new storage for this tensor in this case
- // But, is it more likely that the user really wants this, or that he did a mistake?
- AIDGE_ASSERT(dims == mDims && strides == mStrides, "Cannot resize Tensor with shared storage");
- }
- else {
+ // But, is it more likely that the user really wants this, or that he
+ // did a mistake?
+ AIDGE_ASSERT(dims == mDims && strides == mStrides,
+ "Cannot resize Tensor with shared storage");
+ } else {
mDims = dims;
mStrides = strides;
@@ -88,12 +86,12 @@ void Aidge::Tensor::resize(const std::vector<Aidge::DimSize_t> &dims, std::vecto
// mContiguous&= (strides[i] == expectedStride);
// expectedStride*= dims[i];
// }
- for (std::size_t i = dims.size()-1; i > 0; --i) {
+ for (std::size_t i = dims.size() - 1; i > 0; --i) {
if (strides[i] != expectedStride) {
mContiguous = false;
break;
}
- expectedStride*= dims[i];
+ expectedStride *= dims[i];
}
mContiguous &= (strides[0] == expectedStride);
}
@@ -106,53 +104,59 @@ void Aidge::Tensor::resize(const std::vector<Aidge::DimSize_t> &dims, std::vecto
}
std::string Aidge::Tensor::toString() const {
- AIDGE_ASSERT(mImpl && (dims().empty() || (dims() == std::vector<DimSize_t>({0})) || (mImpl->hostPtr() != nullptr)), "tensor should have a valid host pointer");
+ AIDGE_ASSERT(
+ mImpl && (dims().empty() || (dims() == std::vector<DimSize_t>({0})) ||
+ (mImpl->hostPtr() != nullptr)),
+ "tensor should have a valid host pointer");
// TODO: move lambda elsewhere?
auto ptrToString = [](DataType dt, void* ptr, std::size_t idx) {
switch (dt) {
- case DataType::Float64:
- return std::to_string(static_cast<double*>(ptr)[idx]);
- case DataType::Float32:
- return std::to_string(static_cast<float*>(ptr)[idx]);
- case DataType::Float16:
- return std::to_string(static_cast<half_float::half*>(ptr)[idx]);
- case DataType::Int8:
- return std::to_string(static_cast<int8_t*>(ptr)[idx]);
- case DataType::Int16:
- return std::to_string(static_cast<int16_t*>(ptr)[idx]);
- case DataType::Int32:
- return std::to_string(static_cast<int32_t*>(ptr)[idx]);
- case DataType::Int64:
- return std::to_string(static_cast<int64_t*>(ptr)[idx]);
- case DataType::UInt8:
- return std::to_string(static_cast<uint8_t*>(ptr)[idx]);
- case DataType::UInt16:
- return std::to_string(static_cast<uint16_t*>(ptr)[idx]);
- case DataType::UInt32:
- return std::to_string(static_cast<uint32_t*>(ptr)[idx]);
- case DataType::UInt64:
- return std::to_string(static_cast<uint64_t*>(ptr)[idx]);
- default:
- AIDGE_ASSERT(true, "unsupported type to convert to string");
+ case DataType::Float64:
+ return std::to_string(static_cast<double*>(ptr)[idx]);
+ case DataType::Float32:
+ return std::to_string(static_cast<float*>(ptr)[idx]);
+ case DataType::Float16:
+ return std::to_string(static_cast<half_float::half*>(ptr)[idx]);
+ case DataType::Int8:
+ return std::to_string(static_cast<int8_t*>(ptr)[idx]);
+ case DataType::Int16:
+ return std::to_string(static_cast<int16_t*>(ptr)[idx]);
+ case DataType::Int32:
+ return std::to_string(static_cast<int32_t*>(ptr)[idx]);
+ case DataType::Int64:
+ return std::to_string(static_cast<int64_t*>(ptr)[idx]);
+ case DataType::UInt8:
+ return std::to_string(static_cast<uint8_t*>(ptr)[idx]);
+ case DataType::UInt16:
+ return std::to_string(static_cast<uint16_t*>(ptr)[idx]);
+ case DataType::UInt32:
+ return std::to_string(static_cast<uint32_t*>(ptr)[idx]);
+ case DataType::UInt64:
+ return std::to_string(static_cast<uint64_t*>(ptr)[idx]);
+ default:
+ AIDGE_ASSERT(true, "unsupported type to convert to string");
}
return std::string("?"); // To make Clang happy
};
- if (dims().empty()) { return ptrToString(mDataType, mImpl->hostPtr(), 0); }
+ if (dims().empty()) {
+ return ptrToString(mDataType, mImpl->hostPtr(), 0);
+ }
std::string res;
std::size_t dim = 0;
std::size_t counter = 0;
- if (nbDims()>=2) {
+ if (nbDims() >= 2) {
std::vector<std::size_t> dimVals(nbDims(), 0);
res += "{\n";
while (counter < mSize) {
- std::string spaceString = std::string((dim+1)<<1,' ');
- if (dim < nbDims()-2) {
+ std::string spaceString = std::string((dim + 1) << 1, ' ');
+ if (dim < nbDims() - 2) {
if (dimVals[dim] == 0) {
res += spaceString + "{\n";
++dim;
- } else if (dimVals[dim] < static_cast<std::size_t>(dims()[dim])) {
+ } else if (dimVals[dim] <
+ static_cast<std::size_t>(dims()[dim])) {
res += spaceString + "},\n" + spaceString + "{\n";
++dim;
} else {
@@ -161,13 +165,22 @@ std::string Aidge::Tensor::toString() const {
dimVals[dim]++;
}
} else {
- for (; dimVals[dim] < static_cast<std::size_t>(dims()[dim]); ++dimVals[dim]) {
+ for (; dimVals[dim] < static_cast<std::size_t>(dims()[dim]);
+ ++dimVals[dim]) {
res += spaceString + "{";
for (DimSize_t j = 0; j < dims()[dim + 1] - 1; ++j) {
- res += " " + ptrToString(mDataType, mImpl->hostPtr(mImplOffset), counter++) + ",";
+ res +=
+ " " +
+ ptrToString(mDataType, mImpl->hostPtr(mImplOffset),
+ counter++) +
+ ",";
}
- res += " " + ptrToString(mDataType, mImpl->hostPtr(mImplOffset), counter++) + "}";
- if (dimVals[dim] < static_cast<std::size_t>(dims()[dim] - 1)) {
+ res += " " +
+ ptrToString(mDataType, mImpl->hostPtr(mImplOffset),
+ counter++) +
+ "}";
+ if (dimVals[dim] <
+ static_cast<std::size_t>(dims()[dim] - 1)) {
res += ",";
}
res += "\n";
@@ -179,35 +192,45 @@ std::string Aidge::Tensor::toString() const {
dimVals[dim]++;
}
}
-
- for(int i = static_cast<int>(dim); i > 0; --i) {
- res += std::string((dim+1)<<1,' ') + "}\n";
+ if (nbDims() != 2) { // If nbDims == 2, parenthesis is already closed
+ for (int i = static_cast<int>(dim); i >= 0; --i) {
+ res += std::string((i + 1) << 1, ' ') + "}\n";
+ }
}
} else {
res += "{";
for (DimSize_t j = 0; j < dims()[0]; ++j) {
- res += " " + ptrToString(mDataType, mImpl->hostPtr(mImplOffset), j) + ((j < dims()[0]-1) ? "," : " ");
+ res += " " +
+ ptrToString(mDataType, mImpl->hostPtr(mImplOffset), j) +
+ ((j < dims()[0] - 1) ? "," : " ");
}
}
res += "}";
return res;
}
-Aidge::Tensor Aidge::Tensor::extract(const std::vector<std::size_t>& fixedCoord) const {
+Aidge::Tensor Aidge::Tensor::extract(
+ const std::vector<std::size_t>& fixedCoord) const {
AIDGE_ASSERT(isContiguous(), "Tensor must be contiguous");
- AIDGE_ASSERT(fixedCoord.size() <= mDims.size(), "Number of coordinates is higher than number of dimensions");
+ AIDGE_ASSERT(fixedCoord.size() <= mDims.size(),
+ "Number of coordinates is higher than number of dimensions");
Tensor subTensor(mDataType);
- subTensor.resize(std::vector<size_t>(mDims.cbegin() + fixedCoord.size(), mDims.cend()),
- std::vector<size_t>(mStrides.cbegin() + fixedCoord.size(), mStrides.cend()));
+ subTensor.resize(
+ std::vector<size_t>(mDims.cbegin() + fixedCoord.size(), mDims.cend()),
+ std::vector<size_t>(mStrides.cbegin() + fixedCoord.size(),
+ mStrides.cend()));
subTensor.setBackend(mImpl->backend(), mImpl->device().second);
subTensor.setImpl(mImpl, mImplOffset + getStorageIdx(fixedCoord));
return subTensor;
}
-Aidge::Tensor Aidge::Tensor::extract(const std::vector<std::size_t>& startCoord, const std::vector<std::size_t>& dims) const {
+Aidge::Tensor Aidge::Tensor::extract(
+ const std::vector<std::size_t>& startCoord,
+ const std::vector<std::size_t>& dims) const {
AIDGE_ASSERT(isContiguous(), "Tensor must be contiguous");
- AIDGE_ASSERT(startCoord.size() == mDims.size(), "Coordinates does not match number of dimensions");
+ AIDGE_ASSERT(startCoord.size() == mDims.size(),
+ "Coordinates does not match number of dimensions");
Tensor subTensor(mDataType);
subTensor.resize(dims, mStrides);
@@ -224,7 +247,8 @@ void Aidge::Tensor::makeContiguous() {
// Block so that mImpl ref count is 1 for resize()
{
// Create a new storage that will be contiguous
- std::shared_ptr<TensorImpl> newImpl = Registrar<Tensor>::create({mImpl->backend(), mDataType})(mImpl->device().second, mDims);
+ std::shared_ptr<TensorImpl> newImpl = Registrar<Tensor>::create(
+ {mImpl->backend(), mDataType})(mImpl->device().second, mDims);
// Copy elements from old to new storage
std::size_t idx = 0;
while (idx < mSize) {
@@ -233,13 +257,14 @@ void Aidge::Tensor::makeContiguous() {
// Determine the size of the contiguous chunk
std::size_t copySize = 1;
while (idx + copySize < mSize &&
- getStorageIdx(getCoord(idx + copySize)) == storageIdx + copySize)
- {
+ getStorageIdx(getCoord(idx + copySize)) ==
+ storageIdx + copySize) {
++copySize;
}
// Perform a single copy for the contiguous chunk
- newImpl->copy(mImpl->rawPtr(mImplOffset + storageIdx), copySize, idx);
+ newImpl->copy(mImpl->rawPtr(mImplOffset + storageIdx), copySize,
+ idx);
// Move to the next index after the contiguous chunk
idx += copySize;
@@ -267,8 +292,10 @@ void Aidge::Tensor::copyCast(const Tensor& src) {
}
resize(src.dims());
- AIDGE_ASSERT(src.getImpl()->device() == getImpl()->device(), "cannot copy-cast from a different backend/device");
- getImpl()->copyCast(src.getImpl()->rawPtr(src.mImplOffset), src.dataType(), src.size(), mImplOffset);
+ AIDGE_ASSERT(src.getImpl()->device() == getImpl()->device(),
+ "cannot copy-cast from a different backend/device");
+ getImpl()->copyCast(src.getImpl()->rawPtr(src.mImplOffset), src.dataType(),
+ src.size(), mImplOffset);
}
void Aidge::Tensor::copyFrom(const Tensor& src) {
@@ -286,16 +313,20 @@ void Aidge::Tensor::copyFrom(const Tensor& src) {
}
resize(src.dims());
- AIDGE_ASSERT(src.dataType() == dataType(), "cannot copy from a different data type");
- getImpl()->copyFrom(*(src.getImpl()), src.size(), src.mImplOffset, mImplOffset);
+ AIDGE_ASSERT(src.dataType() == dataType(),
+ "cannot copy from a different data type");
+ getImpl()->copyFrom(*(src.getImpl()), src.size(), src.mImplOffset,
+ mImplOffset);
}
-void Aidge::Tensor::copyCastFrom(const Tensor& src, std::shared_ptr<Tensor>& movedSrcPtr) {
+void Aidge::Tensor::copyCastFrom(const Tensor& src,
+ std::shared_ptr<Tensor>& movedSrcPtr) {
if (&src == this) {
return;
}
- AIDGE_ASSERT(src.isContiguous(), "cannot copy-cast from non-contiguous tensor");
+ AIDGE_ASSERT(src.isContiguous(),
+ "cannot copy-cast from non-contiguous tensor");
// Current Tensor has necessarily a data type, but may not have backend
if (!getImpl()) {
@@ -308,29 +339,33 @@ void Aidge::Tensor::copyCastFrom(const Tensor& src, std::shared_ptr<Tensor>& mov
if (dataType() != src.dataType()) {
// First move data to the target device (only if needed)
const auto device = getImpl()->device();
- const Tensor& movedSrc = src.refFrom(movedSrcPtr, device.first, device.second);
+ const Tensor& movedSrc =
+ src.refFrom(movedSrcPtr, device.first, device.second);
// Second, copy-cast data (necessary)
- getImpl()->copyCast(movedSrc.getImpl()->rawPtr(movedSrc.mImplOffset), movedSrc.dataType(), movedSrc.size(), mImplOffset);
- }
- else {
+ getImpl()->copyCast(movedSrc.getImpl()->rawPtr(movedSrc.mImplOffset),
+ movedSrc.dataType(), movedSrc.size(), mImplOffset);
+ } else {
// Directly copy, no conversion necessary
// Avoid making a double copy if both data type and device are the same
- getImpl()->copyFrom(*(src.getImpl()), src.size(), src.mImplOffset, mImplOffset);
+ getImpl()->copyFrom(*(src.getImpl()), src.size(), src.mImplOffset,
+ mImplOffset);
}
}
Aidge::Tensor& Aidge::Tensor::refContiguous(std::shared_ptr<Tensor>& fallback) {
// Scott Meyers' solution to avoid code duplication
- return const_cast<Tensor&>(static_cast<const Tensor&>(*this).refContiguous(fallback));
+ return const_cast<Tensor&>(
+ static_cast<const Tensor&>(*this).refContiguous(fallback));
}
-const Aidge::Tensor& Aidge::Tensor::refContiguous(std::shared_ptr<Tensor>& fallback) const {
- AIDGE_ASSERT(getImpl(), "no backend was set for tensor, cannot refCast() it");
+const Aidge::Tensor& Aidge::Tensor::refContiguous(
+ std::shared_ptr<Tensor>& fallback) const {
+ AIDGE_ASSERT(getImpl(),
+ "no backend was set for tensor, cannot refCast() it");
if (isContiguous()) {
return *this;
- }
- else {
+ } else {
if (this != fallback.get()) {
// Shallow copy to fallback
*fallback = *this;
@@ -342,96 +377,117 @@ const Aidge::Tensor& Aidge::Tensor::refContiguous(std::shared_ptr<Tensor>& fallb
}
}
-Aidge::Tensor& Aidge::Tensor::refCast(std::shared_ptr<Tensor>& fallback, const Aidge::DataType& dt) {
+Aidge::Tensor& Aidge::Tensor::refCast(std::shared_ptr<Tensor>& fallback,
+ const Aidge::DataType& dt) {
// Scott Meyers' solution to avoid code duplication
- return const_cast<Tensor&>(static_cast<const Tensor&>(*this).refCast(fallback, dt));
+ return const_cast<Tensor&>(
+ static_cast<const Tensor&>(*this).refCast(fallback, dt));
}
-const Aidge::Tensor& Aidge::Tensor::refCast(std::shared_ptr<Tensor>& fallback, const Aidge::DataType& dt) const {
- AIDGE_ASSERT(getImpl(), "no backend was set for tensor, cannot refCast() it");
+const Aidge::Tensor& Aidge::Tensor::refCast(std::shared_ptr<Tensor>& fallback,
+ const Aidge::DataType& dt) const {
+ AIDGE_ASSERT(getImpl(),
+ "no backend was set for tensor, cannot refCast() it");
if (dt == dataType()) {
return *this;
- }
- else {
+ } else {
if (this == fallback.get()) {
// if refFrom() was called before, just change the type
fallback->setDataType(dt);
- }
- else {
- AIDGE_ASSERT(isContiguous(), "cannot refCast non-contiguous tensor");
+ } else {
+ AIDGE_ASSERT(isContiguous(),
+ "cannot refCast non-contiguous tensor");
if (!fallback) {
fallback = std::make_shared<Tensor>(dt);
- }
- else {
- fallback->setDataType(dt, false); // don't keep previous data (no copy)
+ } else {
+ fallback->setDataType(
+ dt, false); // don't keep previous data (no copy)
}
const auto device = getImpl()->device();
- fallback->setBackend(device.first, device.second, false); // don't keep previous data (no copy)
+ fallback->setBackend(device.first, device.second,
+ false); // don't keep previous data (no copy)
fallback->resize(dims());
- fallback->getImpl()->copyCast(getImpl()->rawPtr(mImplOffset), dataType(), size(), fallback->mImplOffset);
+ fallback->getImpl()->copyCast(getImpl()->rawPtr(mImplOffset),
+ dataType(), size(),
+ fallback->mImplOffset);
}
return *fallback;
}
}
-Aidge::Tensor& Aidge::Tensor::refFrom(std::shared_ptr<Tensor>& fallback, const std::string &backend, DeviceIdx_t device) {
+Aidge::Tensor& Aidge::Tensor::refFrom(std::shared_ptr<Tensor>& fallback,
+ const std::string& backend,
+ DeviceIdx_t device) {
// Scott Meyers' solution to avoid code duplication
- return const_cast<Tensor&>(static_cast<const Tensor&>(*this).refFrom(fallback, backend, device));
+ return const_cast<Tensor&>(
+ static_cast<const Tensor&>(*this).refFrom(fallback, backend, device));
}
-const Aidge::Tensor& Aidge::Tensor::refFrom(std::shared_ptr<Tensor>& fallback, const std::string &backend, DeviceIdx_t device) const {
- AIDGE_ASSERT(getImpl(), "no backend was set for tensor, cannot refFrom() it");
+const Aidge::Tensor& Aidge::Tensor::refFrom(std::shared_ptr<Tensor>& fallback,
+ const std::string& backend,
+ DeviceIdx_t device) const {
+ AIDGE_ASSERT(getImpl(),
+ "no backend was set for tensor, cannot refFrom() it");
if (std::make_pair(backend, device) == getImpl()->device()) {
return *this;
- }
- else {
+ } else {
if (this == fallback.get()) {
// if refCast() was called before, just change the backend
fallback->setBackend(backend, device);
- }
- else {
- AIDGE_ASSERT(isContiguous(), "cannot refFrom non-contiguous tensor");
+ } else {
+ AIDGE_ASSERT(isContiguous(),
+ "cannot refFrom non-contiguous tensor");
if (!fallback) {
fallback = std::make_shared<Tensor>(dataType());
- }
- else {
- fallback->setDataType(dataType(), false); // don't keep previous data (no copy)
+ } else {
+ fallback->setDataType(
+ dataType(), false); // don't keep previous data (no copy)
}
- fallback->setBackend(backend, device, false); // don't keep previous data (no copy)
+ fallback->setBackend(backend, device,
+ false); // don't keep previous data (no copy)
fallback->resize(dims());
- fallback->getImpl()->copyFrom(*getImpl(), size(), mImplOffset, fallback->mImplOffset);
+ fallback->getImpl()->copyFrom(*getImpl(), size(), mImplOffset,
+ fallback->mImplOffset);
}
return *fallback;
}
}
-Aidge::Tensor& Aidge::Tensor::ref(std::shared_ptr<Tensor>& fallback, const Aidge::DataType& dt, const std::string &backend, DeviceIdx_t device) {
+Aidge::Tensor& Aidge::Tensor::ref(std::shared_ptr<Tensor>& fallback,
+ const Aidge::DataType& dt,
+ const std::string& backend,
+ DeviceIdx_t device) {
// Scott Meyers' solution to avoid code duplication
- return const_cast<Tensor&>(static_cast<const Tensor&>(*this).ref(fallback, dt, backend, device));
+ return const_cast<Tensor&>(
+ static_cast<const Tensor&>(*this).ref(fallback, dt, backend, device));
}
-const Aidge::Tensor& Aidge::Tensor::ref(std::shared_ptr<Tensor>& fallback, const Aidge::DataType& dt, const std::string &backend, DeviceIdx_t device) const {
+const Aidge::Tensor& Aidge::Tensor::ref(std::shared_ptr<Tensor>& fallback,
+ const Aidge::DataType& dt,
+ const std::string& backend,
+ DeviceIdx_t device) const {
AIDGE_ASSERT(getImpl(), "no backend was set for tensor, cannot ref() it");
- if (dt == dataType() && std::make_pair(backend, device) == getImpl()->device()) {
+ if (dt == dataType() &&
+ std::make_pair(backend, device) == getImpl()->device()) {
return *this;
- }
- else {
+ } else {
// Change fallback type, backend & device, without any data copy
if (!fallback) {
fallback = std::make_shared<Tensor>(dt);
- }
- else {
- fallback->setDataType(dt, false); // don't keep previous data (no copy)
+ } else {
+ fallback->setDataType(dt,
+ false); // don't keep previous data (no copy)
}
- fallback->setBackend(backend, device, false); // don't keep previous data (no copy)
+ fallback->setBackend(backend, device,
+ false); // don't keep previous data (no copy)
fallback->resize(dims());
return *fallback;
}
@@ -439,7 +495,7 @@ const Aidge::Tensor& Aidge::Tensor::ref(std::shared_ptr<Tensor>& fallback, const
std::set<std::string> Aidge::Tensor::getAvailableBackends() {
std::set<std::string> backendsList;
- for(const auto& tupleKey : Registrar<Tensor>::getKeys())
+ for (const auto& tupleKey : Registrar<Tensor>::getKeys())
backendsList.insert(std::get<0>(tupleKey));
return backendsList;
}
diff --git a/src/graph/Node.cpp b/src/graph/Node.cpp
index 149691f796d1d84212e9d7842a28e4cb79469e6a..b08bb4c2056e8c14f5b1dd3aae62fbacf8d8c14e 100644
--- a/src/graph/Node.cpp
+++ b/src/graph/Node.cpp
@@ -57,7 +57,10 @@ Aidge::Connector Aidge::Node::operator()(const std::vector<Connector>& ctors) {
// INNER
///////////////////////////////////////////////////////
-void Aidge::Node::setName(const std::string& name) { mName = name; }
+void Aidge::Node::setName(const std::string& name) {
+ for (auto graphView : views()) graphView->updateNodeName(mName, name);
+ mName = name;
+}
///////////////////////////////////////////////////////
// OPERATORS