Skip to content
Snippets Groups Projects
Commit 4555ef26 authored by Olivier BICHLER's avatar Olivier BICHLER
Browse files

Merge branch 'clone_bugs' into 'dev'

Fixed Meta op and Generic op clone bugs

See merge request !218
parents 2b579869 8b016d0c
No related branches found
No related tags found
3 merge requests!279v0.4.0,!253v0.4.0,!218Fixed Meta op and Generic op clone bugs
Pipeline #56504 passed
......@@ -522,6 +522,9 @@ bool Aidge::GraphView::forwardDims(const std::vector<std::vector<Aidge::DimSize_
}
if (parentsForwarded && op->forwardDims(allowDataDependency)) {
Log::debug("Dimensions forwarded for node {} (of type {})",
nodePtr->name(), nodePtr->type());
// Recompute everytime, even if it was already computed in a
// previous call of forwardDims(), as the graph may have changed!
dimsForwarded.insert(nodePtr);
......@@ -532,7 +535,9 @@ bool Aidge::GraphView::forwardDims(const std::vector<std::vector<Aidge::DimSize_
}
}
else {
Log::debug("Unable to forward dimensions for node {} (of type {}) yet", nodePtr->name(), nodePtr->type());
if (parentsForwarded) {
Log::debug("Unable to forward dimensions for node {} (of type {})", nodePtr->name(), nodePtr->type());
}
nextList.insert(nodePtr);
}
}
......
......@@ -43,6 +43,7 @@ Aidge::GenericOperator_Op::GenericOperator_Op(const std::string& type,
Aidge::GenericOperator_Op::GenericOperator_Op(const Aidge::GenericOperator_Op& op)
: OperatorTensor(op),
mForwardDims(op.mForwardDims),
mAttributes(op.attributes() ? op.mAttributes : std::make_shared<DynamicAttributes>())
{
mImpl = std::make_shared<OperatorImpl>(*this, op.backend());
......
......@@ -46,7 +46,7 @@ Aidge::MetaOperator_Op::MetaOperator_Op(const std::string& type, const std::shar
}
std::shared_ptr<Aidge::Operator> Aidge::MetaOperator_Op::clone() const {
return std::make_shared<MetaOperator_Op>(*this);
return std::make_shared<MetaOperator_Op>(type(), mGraph->clone());
}
void Aidge::MetaOperator_Op::associateInput(const IOIndex_t inputIdx, const std::shared_ptr<Data>& data) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment