From 005ec152a43b3e61a65f3736b602445773770bb7 Mon Sep 17 00:00:00 2001 From: Olivier BICHLER <olivier.bichler@cea.fr> Date: Tue, 29 Aug 2023 18:05:38 +0200 Subject: [PATCH] Fixed errors --- include/aidge/operator/Add.hpp | 3 ++- include/aidge/operator/AvgPooling.hpp | 6 ++++-- include/aidge/operator/BatchNorm.hpp | 3 ++- include/aidge/operator/Conv.hpp | 3 ++- include/aidge/operator/ConvDepthWise.hpp | 3 ++- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/aidge/operator/Add.hpp b/include/aidge/operator/Add.hpp index aa249a228..c96b2c571 100644 --- a/include/aidge/operator/Add.hpp +++ b/include/aidge/operator/Add.hpp @@ -99,8 +99,9 @@ public: assert(static_cast<std::size_t>(inputIdx) < NUM && "wrong inputIdx for Add operator."); return mInputs[inputIdx]; } - inline std::shared_ptr<Tensor> getOutput(const IOIndex_t /*outputIdx*/) const override final { + inline std::shared_ptr<Tensor> getOutput(const IOIndex_t outputIdx) const override final { assert(outputIdx == 0 && "Add Operators has only 1 outputs"); + (void) outputIdx; // avoid unused warning return mOutput; } diff --git a/include/aidge/operator/AvgPooling.hpp b/include/aidge/operator/AvgPooling.hpp index bfd5dc89b..12a11e8ba 100644 --- a/include/aidge/operator/AvgPooling.hpp +++ b/include/aidge/operator/AvgPooling.hpp @@ -98,12 +98,14 @@ public: inline Tensor& output(const IOIndex_t /*outputIdx*/) const override final { return *(mOutput.get()); } - inline std::shared_ptr<Tensor> getInput(const IOIndex_t /*inputIdx*/) const override final { + inline std::shared_ptr<Tensor> getInput(const IOIndex_t inputIdx) const override final { assert(inputIdx == 0 && "AvgPooling Operators supports only 1 inputs"); + (void) inputIdx; // avoid unused warning return mInput; } - inline std::shared_ptr<Tensor> getOutput(const IOIndex_t /*outputIdx*/) const override final { + inline std::shared_ptr<Tensor> getOutput(const IOIndex_t outputIdx) const override final { assert(outputIdx == 0 && "AvgPooling Operators has only 1 outputs"); + (void) outputIdx; // avoid unused warning return mOutput; } diff --git a/include/aidge/operator/BatchNorm.hpp b/include/aidge/operator/BatchNorm.hpp index 4817ce5f5..7515037e8 100644 --- a/include/aidge/operator/BatchNorm.hpp +++ b/include/aidge/operator/BatchNorm.hpp @@ -97,8 +97,9 @@ public: assert(inputIdx < 5 && "BatchNorm Operators supports only 5 inputs"); return mInputs[inputIdx]; } - inline std::shared_ptr<Tensor> getOutput(const IOIndex_t /*outputIdx*/) const override final { + inline std::shared_ptr<Tensor> getOutput(const IOIndex_t outputIdx) const override final { assert((outputIdx == 0) && "BatchNorm Operator has only 1 output"); + (void) outputIdx; // avoid unused warning return mOutput; } diff --git a/include/aidge/operator/Conv.hpp b/include/aidge/operator/Conv.hpp index 51e4f36c9..a2b16142c 100644 --- a/include/aidge/operator/Conv.hpp +++ b/include/aidge/operator/Conv.hpp @@ -132,8 +132,9 @@ public: assert(inputIdx < 3 && "operators supports only 3 inputs"); return std::static_pointer_cast<Data>(mInputs[inputIdx]); } - std::shared_ptr<Data> getRawOutput(const IOIndex_t /*outputIdx*/) const override final { + std::shared_ptr<Data> getRawOutput(const IOIndex_t outputIdx) const override final { assert(outputIdx == 0 && "operator supports only 1 output"); + (void) outputIdx; // avoid unused warning return std::static_pointer_cast<Data>(mOutput); } diff --git a/include/aidge/operator/ConvDepthWise.hpp b/include/aidge/operator/ConvDepthWise.hpp index 788541564..257a86dd1 100644 --- a/include/aidge/operator/ConvDepthWise.hpp +++ b/include/aidge/operator/ConvDepthWise.hpp @@ -132,8 +132,9 @@ class ConvDepthWise_Op : public Operator, assert(inputIdx < 3 && "operators supports only 3 inputs"); return std::static_pointer_cast<Data>(mInputs[inputIdx]); } - std::shared_ptr<Data> getRawOutput(const IOIndex_t /*outputIdx*/) const override final { + std::shared_ptr<Data> getRawOutput(const IOIndex_t outputIdx) const override final { assert(outputIdx == 0 && "operator supports only 1 output"); + (void) outputIdx; // avoid unused warning return std::static_pointer_cast<Data>(mOutput); } -- GitLab