From 890c8e4d38e2a886bc53d8800b089a0941080c20 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 2 Nov 2020 11:56:38 +0300 Subject: [PATCH] Fixed compilation errors / warnings with clang (#2929) --- inference-engine/src/gna_plugin/backend/make_pwl.cpp | 7 ++++--- inference-engine/src/gna_plugin/round_float_define.hpp | 4 ++-- .../tests_deprecated/unit/engines/gna/gna_matcher.cpp | 4 ++-- .../core/actual_kernels/eltwise/eltwise_kernel_ref.h | 2 +- .../actual_kernels/reduce/reduce_kernel_b_fs_yx_fsv16.h | 2 +- .../core/actual_kernels/reduce/reduce_kernel_ref.h | 2 +- .../space_to_depth/space_to_depth_kernel_ref.h | 2 +- inference-engine/thirdparty/clDNN/src/gpu/ocl_base_event.h | 4 ++-- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/inference-engine/src/gna_plugin/backend/make_pwl.cpp b/inference-engine/src/gna_plugin/backend/make_pwl.cpp index 762ea97f562..f7f34d33270 100644 --- a/inference-engine/src/gna_plugin/backend/make_pwl.cpp +++ b/inference-engine/src/gna_plugin/backend/make_pwl.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -413,12 +414,12 @@ void make_gna_pwl(const DnnActivation fun, y_upper = tmp; } - int64_t x_lower_new = FLOAT_TO_INT32((x_lower / in_scale) / abs(pow_scale) * in_scale); - int64_t x_upper_new = FLOAT_TO_INT32((x_upper / in_scale) / abs(pow_scale) * in_scale); + int64_t x_lower_new = FLOAT_TO_INT32((x_lower / in_scale) / std::fabs(pow_scale) * in_scale); + int64_t x_upper_new = FLOAT_TO_INT32((x_upper / in_scale) / std::fabs(pow_scale) * in_scale); x_lower = static_cast(x_lower_new); x_upper = static_cast(x_upper_new); if (x_lower_new < INT32_MIN) { - int16_t offset_lower = abs(x_lower_new - INT32_MIN) / in_scale * out_scale; + int16_t offset_lower = std::abs(x_lower_new - INT32_MIN) / in_scale * out_scale; x_lower = INT32_MIN; y_lower = y_lower + offset_lower; } diff --git a/inference-engine/src/gna_plugin/round_float_define.hpp b/inference-engine/src/gna_plugin/round_float_define.hpp index f17259b847b..d11dd1e0ece 100644 --- a/inference-engine/src/gna_plugin/round_float_define.hpp +++ b/inference-engine/src/gna_plugin/round_float_define.hpp @@ -7,5 +7,5 @@ #include -#define FLOAT_TO_INT16(a) static_cast(((a) < 0)?((a) - 0.5):((a) + 0.5)) -#define FLOAT_TO_INT32(a) static_cast(((a) < 0)?((a)-0.5):((a)+0.5)) +#define FLOAT_TO_INT16(a) static_cast(((a) < 0)?((a) - 0.5f):((a) + 0.5f)) +#define FLOAT_TO_INT32(a) static_cast(((a) < 0)?((a)-0.5f):((a)+0.5f)) diff --git a/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp b/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp index ed787e50bce..0e8443df233 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp @@ -60,10 +60,10 @@ public: void * alloc(size_t size) noexcept override { return ptr; } - virtual bool free(void* handle) noexcept { + bool free(void* handle) noexcept override { return true; } - virtual void Release() noexcept { + void Release() noexcept override { delete this; } }; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/eltwise/eltwise_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/eltwise/eltwise_kernel_ref.h index 8039afad3b4..de96ee7ee57 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/eltwise/eltwise_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/eltwise/eltwise_kernel_ref.h @@ -34,7 +34,7 @@ public: }; } - JitConstants GetJitConstants(const eltwise_params& params) const; + JitConstants GetJitConstants(const eltwise_params& params) const override; protected: bool Validate(const Params& p, const optional_params& o) const override; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reduce/reduce_kernel_b_fs_yx_fsv16.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reduce/reduce_kernel_b_fs_yx_fsv16.h index edc68af6703..a4d1b0dd106 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reduce/reduce_kernel_b_fs_yx_fsv16.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reduce/reduce_kernel_b_fs_yx_fsv16.h @@ -24,7 +24,7 @@ class ReduceKernel_b_fs_yx_fsv16 : public ReduceKernelBase { public: ReduceKernel_b_fs_yx_fsv16() : ReduceKernelBase("reduce_gpu_b_fs_yx_fsv16") {} virtual ~ReduceKernel_b_fs_yx_fsv16() {} - virtual CommonDispatchData SetDefault(const reduce_params& params, const optional_params&) const; + CommonDispatchData SetDefault(const reduce_params& params, const optional_params&) const override; JitConstants GetJitConstants(const reduce_params& params) const override; KernelsData GetKernelsData(const Params& params, const optional_params& options) const override; ParamsKey GetSupportedKey() const override; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reduce/reduce_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reduce/reduce_kernel_ref.h index f54af534eaa..494bcc154b6 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reduce/reduce_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reduce/reduce_kernel_ref.h @@ -24,7 +24,7 @@ class ReduceKernelRef : public ReduceKernelBase { public: ReduceKernelRef() : ReduceKernelBase("reduce_ref") {} virtual ~ReduceKernelRef() {} - virtual CommonDispatchData SetDefault(const reduce_params& params, const optional_params&) const; + CommonDispatchData SetDefault(const reduce_params& params, const optional_params&) const override; KernelsData GetKernelsData(const Params& params, const optional_params& options) const override; ParamsKey GetSupportedKey() const override; JitConstants GetJitConstants(const reduce_params& params) const override; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/space_to_depth/space_to_depth_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/space_to_depth/space_to_depth_kernel_ref.h index ec86b548ec6..14d00a48642 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/space_to_depth/space_to_depth_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/space_to_depth/space_to_depth_kernel_ref.h @@ -50,7 +50,7 @@ public: protected: virtual CommonDispatchData SetDefault(const space_to_depth_params& params, const optional_params&) const; virtual JitConstants GetJitConstants(const space_to_depth_params& params) const; - virtual bool Validate(const Params& p, const optional_params& o) const; + bool Validate(const Params& p, const optional_params& o) const override; std::vector GetSupportedFusedOps() const override { return { FusedOpType::ELTWISE, FusedOpType::QUANTIZE, diff --git a/inference-engine/thirdparty/clDNN/src/gpu/ocl_base_event.h b/inference-engine/thirdparty/clDNN/src/gpu/ocl_base_event.h index e449661e629..c9b1fd163ff 100644 --- a/inference-engine/thirdparty/clDNN/src/gpu/ocl_base_event.h +++ b/inference-engine/thirdparty/clDNN/src/gpu/ocl_base_event.h @@ -55,7 +55,7 @@ public: } std::shared_ptr get_context() const { return _ctx; } - cl::Event get() { return _event; } + cl::Event get() override { return _event; } private: std::shared_ptr _ctx; @@ -91,7 +91,7 @@ public: _attached = true; } - cl::Event get() { return _last_ocl_event; } + cl::Event get() override { return _last_ocl_event; } std::shared_ptr get_context() const { return _ctx; } private: