Skip to content
Snippets Groups Projects
Commit e316161e authored by Houssem ROUIS's avatar Houssem ROUIS
Browse files

fix merge error

parent f653463e
No related branches found
No related tags found
2 merge requests!212Version 0.3.0,!178Learning backend cuda
...@@ -27,11 +27,12 @@ ...@@ -27,11 +27,12 @@
const std::string Aidge::ReduceMean_Op::Type = "ReduceMean"; const std::string Aidge::ReduceMean_Op::Type = "ReduceMean";
Aidge::ReduceMean_Op::ReduceMean_Op(const std::vector<std::int32_t>& axes, Aidge::DimSize_t keep_dims) Aidge::ReduceMean_Op::ReduceMean_Op(const std::vector<std::int32_t>& axes, bool keep_dims, bool noop_with_empty_axes)
: OperatorTensor(Type, {InputCategory::Data}, 1), : OperatorTensor(Type, {InputCategory::Data}, 1),
mAttributes(std::make_shared<Attributes_>( mAttributes(std::make_shared<Attributes_>(
attr<ReduceMeanAttr::Axes>(axes), attr<ReduceMeanAttr::Axes>(axes),
attr<ReduceMeanAttr::KeepDims>(keep_dims))) attr<ReduceMeanAttr::KeepDims>(keep_dims),
attr<ReduceMeanAttr::NoopWithEmptyAxes>(noop_with_empty_axes)))
{} {}
Aidge::ReduceMean_Op::ReduceMean_Op(const Aidge::ReduceMean_Op& op) Aidge::ReduceMean_Op::ReduceMean_Op(const Aidge::ReduceMean_Op& op)
...@@ -96,8 +97,9 @@ void Aidge::ReduceMean_Op::setBackend(const std::string& name, Aidge::DeviceIdx_ ...@@ -96,8 +97,9 @@ void Aidge::ReduceMean_Op::setBackend(const std::string& name, Aidge::DeviceIdx_
//////////////////////////////////////////// ////////////////////////////////////////////
std::shared_ptr<Aidge::Node> Aidge::ReduceMean(const std::vector<std::int32_t> &axes, std::shared_ptr<Aidge::Node> Aidge::ReduceMean(const std::vector<std::int32_t> &axes,
Aidge::DimSize_t keep_dims, bool keep_dims,
bool noop_with_empty_axes,
const std::string& name) { const std::string& name) {
AIDGE_ASSERT(axes.size()<=MaxDim, "Too many kernel dimensions required by ReduceMean, not supported"); AIDGE_ASSERT(axes.size()<=MaxDim, "Too many kernel dimensions required by ReduceMean, not supported");
return std::make_shared<Node>(std::make_shared<ReduceMean_Op>(axes, keep_dims), name); return std::make_shared<Node>(std::make_shared<ReduceMean_Op>(axes, keep_dims, noop_with_empty_axes), name);
} }
\ No newline at end of file
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