Skip to content
Snippets Groups Projects
Commit 0529e30c authored by Maxence Naud's avatar Maxence Naud
Browse files

Merge remote-tracking branch 'origin/dev' into fowarddims

parents bc61fe4e c3b322c5
No related branches found
No related tags found
No related merge requests found
......@@ -63,7 +63,7 @@ bool Aidge::Add_Op::forwardDims(bool /*allowDataDependency*/) {
*it = dim;
}
else if ((dim != *it) && (dim != 1)) {
AIDGE_THROW_OR_ABORT(std::runtime_error, "Unsopported Tensor shape for Add operation");
AIDGE_THROW_OR_ABORT(std::runtime_error, "Unsupported Tensor shape for Add operation: {}", outDims);
}
}
}
......
......@@ -44,7 +44,7 @@ bool Aidge::Div_Op::forwardDims(bool /*allowDataDependency*/) {
outDims[out_id] = lowDims[low_id];
}
else if ((lowDims[low_id] != 1) && (lowDims[low_id] != outDims[out_id])) {
AIDGE_THROW_OR_ABORT(std::runtime_error, "Unsopported Tensor shape for Div Operation");
AIDGE_THROW_OR_ABORT(std::runtime_error, "Unsupported Tensor shape for Div Operation: {}", outDims);
}
--out_id;
--low_id;
......
......@@ -45,7 +45,7 @@ bool Aidge::Mul_Op::forwardDims(bool /*allowDataDependency*/) {
outDims[out_id] = lowDims[low_id];
}
else if ((lowDims[low_id] != 1) && (lowDims[low_id] != outDims[out_id])) {
AIDGE_THROW_OR_ABORT(std::runtime_error, "Unsopported Tensor shape for Div Operation");
AIDGE_THROW_OR_ABORT(std::runtime_error, "Unsupported Tensor shape for Mul Operation: {}", outDims);
}
--out_id;
--low_id;
......
......@@ -44,7 +44,7 @@ bool Aidge::Pow_Op::forwardDims(bool /*allowDataDependency*/) {
outDims[out_id] = lowDims[low_id];
}
else if ((lowDims[low_id] != 1) && (lowDims[low_id] != outDims[out_id])) {
AIDGE_THROW_OR_ABORT(std::runtime_error, "Unsopported Tensor shape for Div Operation");
AIDGE_THROW_OR_ABORT(std::runtime_error, "Unsupported Tensor shape for Pow Operation: {}", outDims);
}
--out_id;
--low_id;
......
......@@ -46,7 +46,7 @@ bool Aidge::Sub_Op::forwardDims(bool /*allowDataDependency*/) {
outDims[out_id] = lowDims[low_id];
}
else if ((lowDims[low_id] != 1) && (lowDims[low_id] != outDims[out_id])) {
AIDGE_THROW_OR_ABORT(std::runtime_error, "Unsopported Tensor shape for Div Operation");
AIDGE_THROW_OR_ABORT(std::runtime_error, "Unsupported Tensor shape for Sub Operation: {}", outDims);
}
--out_id;
--low_id;
......
......@@ -85,8 +85,12 @@ void Aidge::fuseMulAdd(std::shared_ptr<Aidge::Node> matmulNode, std::shared_ptr<
AIDGE_ASSERT(outSize, "Couldnt get output number of channels for FC operator.");
// Instanciate FC
//std::shared_ptr<Node> fc = FC(dim[0], false, "Fc");
std::shared_ptr<Node> fc = std::make_shared<Node>(std::make_shared<FC_Op>(outSize, bias ? false : true));
std::string fcName = matmulNode->name();
if (!addNode->name().empty()) {
fcName += "_" + addNode->name();
}
std::shared_ptr<Node> fc = std::make_shared<Node>(std::make_shared<FC_Op>(outSize, bias ? false : true), fcName);
// Step 2 : Branch existing producers & create the others
// link weights & bias
......
......@@ -56,7 +56,7 @@ void Aidge::Log::log(Level level, const std::string& msg) {
// the log file.
const auto modifier
= (level == Debug) ? fmt::fg(fmt::color::gray)
: (level == Notice) ? fmt::fg(fmt::color::light_yellow)
: (level == Notice) ? fmt::fg(fmt::color::medium_purple)
: (level == Warn) ? fmt::fg(fmt::color::orange)
: (level == Error) ? fmt::fg(fmt::color::red)
: (level == Fatal) ? fmt::bg(fmt::color::red)
......
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