diff --git a/src/operator/Add.cpp b/src/operator/Add.cpp index 8fbb4cdf77db1c14be05845bb33bb0fecf0fb049..6bafb3b7905ae36e23af32f8d60be33a4ba178bf 100644 --- a/src/operator/Add.cpp +++ b/src/operator/Add.cpp @@ -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); } } } diff --git a/src/operator/Div.cpp b/src/operator/Div.cpp index f22a93f803417c028ba3860b154fb4b5182ba1d0..813ab774b11cd72f440d28f61843500686d7df2d 100644 --- a/src/operator/Div.cpp +++ b/src/operator/Div.cpp @@ -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; diff --git a/src/operator/Mul.cpp b/src/operator/Mul.cpp index d4bfdc66b8c1071ba7d291e9d633e954516b18d0..5a25e4dd447f44220dbe4124e63f567520ad8d1e 100644 --- a/src/operator/Mul.cpp +++ b/src/operator/Mul.cpp @@ -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; diff --git a/src/operator/Pow.cpp b/src/operator/Pow.cpp index 6bdfb48d19dfc91ba449f87eaa3da2e03f7c30e6..42715516e6804c1a48ef848fbda8f9d596f0e69e 100644 --- a/src/operator/Pow.cpp +++ b/src/operator/Pow.cpp @@ -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; diff --git a/src/operator/Sub.cpp b/src/operator/Sub.cpp index b3d8351de3114ffae0e7cf54dd61559acdda56a6..50e556ad97a90b7a9868594cebe350d955983fd7 100644 --- a/src/operator/Sub.cpp +++ b/src/operator/Sub.cpp @@ -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; diff --git a/src/recipes/FuseMulAdd.cpp b/src/recipes/FuseMulAdd.cpp index 6582038e981bb58534d04ded57052f6a0f83e9a9..9a89f8af583fa8567f62ed7c8f42d160d80a1e99 100644 --- a/src/recipes/FuseMulAdd.cpp +++ b/src/recipes/FuseMulAdd.cpp @@ -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 diff --git a/src/utils/Log.cpp b/src/utils/Log.cpp index 03ecded8f5a193a8ab00cf9dc7be502b98205de2..54af888caca8dc2c4b512515ff70663f9437dd45 100644 --- a/src/utils/Log.cpp +++ b/src/utils/Log.cpp @@ -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)