From 62c5328d26c727aa23c54d592852efec8d7fbf54 Mon Sep 17 00:00:00 2001
From: NAUD Maxence <maxence.naud@cea.fr>
Date: Fri, 29 Mar 2024 21:20:19 +0000
Subject: [PATCH] Remove 'Tensor' object include from GlobalAvgPool_Op and move
setBackend member function from header to source file
---
include/aidge/operator/GlobalAveragePooling.hpp | 13 ++++---------
src/operator/GlobalAveragePooling.cpp | 5 +++++
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/aidge/operator/GlobalAveragePooling.hpp b/include/aidge/operator/GlobalAveragePooling.hpp
index 718782372..12c8eb02d 100644
--- a/include/aidge/operator/GlobalAveragePooling.hpp
+++ b/include/aidge/operator/GlobalAveragePooling.hpp
@@ -17,8 +17,6 @@
#include <vector>
#include "aidge/backend/OperatorImpl.hpp"
-#include "aidge/data/Data.hpp"
-#include "aidge/data/Tensor.hpp"
#include "aidge/graph/Node.hpp"
#include "aidge/operator/OperatorTensor.hpp"
#include "aidge/utils/Registrar.hpp"
@@ -43,9 +41,9 @@ public:
GlobalAveragePooling_Op(const GlobalAveragePooling_Op &op)
: OperatorTensor(op) {
- if (op.mImpl){
- SET_IMPL_MACRO(GlobalAveragePooling_Op, *this, op.mOutputs[0]->getImpl()->backend());
- }else{
+ if (op.mImpl) {
+ SET_IMPL_MACRO(GlobalAveragePooling_Op, *this, op.backend());
+ } else {
mImpl = nullptr;
}
}
@@ -56,10 +54,7 @@ public:
void computeOutputDims() override final;
- void setBackend(const std::string &name, DeviceIdx_t device = 0) override {
- SET_IMPL_MACRO(GlobalAveragePooling_Op, *this, name);
- mOutputs[0]->setBackend(name, device);
- }
+ void setBackend(const std::string &name, DeviceIdx_t device = 0) override final;
static const std::vector<std::string> getInputsName() {
return {"data_input"};
diff --git a/src/operator/GlobalAveragePooling.cpp b/src/operator/GlobalAveragePooling.cpp
index da760a4c8..5781f0144 100644
--- a/src/operator/GlobalAveragePooling.cpp
+++ b/src/operator/GlobalAveragePooling.cpp
@@ -40,3 +40,8 @@ void Aidge::GlobalAveragePooling_Op::computeOutputDims() {
mOutputs[0]->resize(out_dims);
}
}
+
+void Aidge::GlobalAveragePooling_Op::setBackend(const std::string &name, DeviceIdx_t device) {
+ SET_IMPL_MACRO(GlobalAveragePooling_Op, *this, name);
+ mOutputs[0]->setBackend(name, device);
+}
\ No newline at end of file
--
GitLab