From 18a2269f5e309deddcfff1733695c14637936de8 Mon Sep 17 00:00:00 2001 From: NAUD Maxence <maxence.naud@cea.fr> Date: Fri, 24 Nov 2023 14:54:31 +0000 Subject: [PATCH] [Fix] missing include in Scaling kernel, [Fix] missing 'override' keyword in SliceImpl.hpp --- .../operator/ScalingImpl_forward_kernels.hpp | 10 +++++---- .../aidge/backend/cpu/operator/SliceImpl.hpp | 22 +++++++++---------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/include/aidge/backend/cpu/operator/ScalingImpl_forward_kernels.hpp b/include/aidge/backend/cpu/operator/ScalingImpl_forward_kernels.hpp index 7d31dd5a..5258c4c3 100644 --- a/include/aidge/backend/cpu/operator/ScalingImpl_forward_kernels.hpp +++ b/include/aidge/backend/cpu/operator/ScalingImpl_forward_kernels.hpp @@ -9,8 +9,10 @@ * ********************************************************************************/ -#ifndef __AIDGE_CPU_OPERATOR_ScalingIMPL_FORWARD_KERNEL_H__ -#define __AIDGE_CPU_OPERATOR_ScalingIMPL_FORWARD_KERNEL_H__ +#ifndef AIDGE_CPU_OPERATOR_SCALINGIMPL_FORWARD_KERNEL_H +#define AIDGE_CPU_OPERATOR_SCALINGIMPL_FORWARD_KERNEL_H + +#include <cmath> #include "aidge/utils/Registrar.hpp" @@ -61,7 +63,7 @@ const O& clamp(const O& x, const O& min, const O& max) template<class O> O saturate(O value, std::size_t quantizedNbBits, bool isOutputUnsigned) { assert(quantizedNbBits > 0); - + const O min = isOutputUnsigned?0: -(1ll << (quantizedNbBits - 1ll)); const O max = isOutputUnsigned?(1ll << quantizedNbBits) - 1ll: @@ -101,4 +103,4 @@ static Registrar<ScalingImplForward_cpu> registrarScalingImplForward_cpu_Float64 } // namespace } // namespace Aidge -#endif /* __AIDGE_CPU_OPERATOR_ScalingIMPL_FORWARD_KERNEL_H__ */ +#endif /* AIDGE_CPU_OPERATOR_SCALINGIMPL_FORWARD_KERNEL_H */ diff --git a/include/aidge/backend/cpu/operator/SliceImpl.hpp b/include/aidge/backend/cpu/operator/SliceImpl.hpp index 69dd88bb..06c7cf29 100644 --- a/include/aidge/backend/cpu/operator/SliceImpl.hpp +++ b/include/aidge/backend/cpu/operator/SliceImpl.hpp @@ -72,7 +72,7 @@ class SliceImpl_cpu : public OperatorImpl { NbElts_t getNbConsumedData(const IOIndex_t /*inputIdx*/) const override final { return mNbConsumedData[0]; } - NbElts_t getNbProducedData(const IOIndex_t outputIdx) const override final { + NbElts_t getNbProducedData(const IOIndex_t /*outputIdx*/) const override final { return mNbProducedData[0]; } void updateConsummerProducer() override final { @@ -82,7 +82,7 @@ class SliceImpl_cpu : public OperatorImpl { mNbProducedData[0] += getRequiredMemory(0, {}); } - void forward() { + void forward() override { // FIXME: uncomment the following code once memory handling will work assert(std::static_pointer_cast<Tensor>(mOp.getRawInput(0)) && "missing input #0"); @@ -103,7 +103,7 @@ class SliceImpl_cpu : public OperatorImpl { mNbProducedData[0] += getRequiredMemory(0, {}); } - void backward() { printf("Not implemented yet.\n"); } + void backward() override { printf("Not implemented yet.\n"); } }; /******************************************************************************/ @@ -126,8 +126,8 @@ public: NbElts_t getNbProducedData(const IOIndex_t outputIdx) const override final; void updateConsummerProducer() override final; - void forward(); - void backward(); + void forward() override; + void backward() override; }; /******************************************************************************/ @@ -150,8 +150,8 @@ class SliceImpl_cpu<2> : public OperatorImpl { NbElts_t getNbProducedData(const IOIndex_t outputIdx) const override final; void updateConsummerProducer() override final; - void forward(); - void backward(); + void forward() override; + void backward() override; }; /******************************************************************************/ @@ -174,8 +174,8 @@ class SliceImpl_cpu<3> : public OperatorImpl { NbElts_t getNbProducedData(const IOIndex_t outputIdx) const override final; void updateConsummerProducer() override final; - void forward(); - void backward(); + void forward() override; + void backward() override; }; /******************************************************************************/ @@ -198,8 +198,8 @@ class SliceImpl_cpu<4> : public OperatorImpl { NbElts_t getNbProducedData(const IOIndex_t outputIdx) const override final; void updateConsummerProducer() override final; - void forward(); - void backward(); + void forward() override; + void backward() override; }; -- GitLab