diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/activation/activation_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/activation/activation_kernel_base.h index 3059e5d99dd..21ebf8025dd 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/activation/activation_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/activation/activation_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 Intel Corporation +// Copyright (c) 2016-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" namespace kernel_selector { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -56,10 +56,10 @@ struct activation_fuse_params : fuse_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ActivationKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class ActivationKernelBase : public common_kernel_base { +class ActivationKernelBase : public KernelBaseOpenCL { public: using DispatchData = CommonDispatchData; - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~ActivationKernelBase() {} diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/arg_max_min/arg_max_min_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/arg_max_min/arg_max_min_kernel_base.h index 2337f8d4917..01ad2d65aa7 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/arg_max_min/arg_max_min_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/arg_max_min/arg_max_min_kernel_base.h @@ -1,5 +1,5 @@ /* -// Copyright (c) 2018 Intel Corporation +// Copyright (c) 2018-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -51,9 +51,9 @@ struct arg_max_min_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ArgMaxMinKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class ArgMaxMinKernelBase : public common_kernel_base { +class ArgMaxMinKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~ArgMaxMinKernelBase() {} struct DispatchData : public CommonDispatchData { @@ -65,4 +65,4 @@ protected: virtual DispatchData SetDefault(const arg_max_min_params& params) const; KernelsData GetCommonKernelsData(const Params& params, const optional_params&, float estimatedTime) const; }; -} // namespace kernel_selector \ No newline at end of file +} // namespace kernel_selector diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/average_unpooling/average_unpooling_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/average_unpooling/average_unpooling_kernel_base.h index 588a53c0ae1..bd0a578e020 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/average_unpooling/average_unpooling_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/average_unpooling/average_unpooling_kernel_base.h @@ -1,5 +1,5 @@ /* -// Copyright (c) 2018 Intel Corporation +// Copyright (c) 2018-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -44,9 +44,9 @@ struct average_unpooling_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // AverageUnpoolingKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class AverageUnpoolingKernelBase : public common_kernel_base { +class AverageUnpoolingKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~AverageUnpoolingKernelBase() {} struct DispatchData : public CommonDispatchData { @@ -59,4 +59,4 @@ protected: virtual DispatchData SetDefault(const average_unpooling_params& params) const; KernelsData GetCommonKernelsData(const Params& params, const optional_params&, float estimatedTime) const; }; -} // namespace kernel_selector \ No newline at end of file +} // namespace kernel_selector diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/batch_to_space/batch_to_space_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/batch_to_space/batch_to_space_kernel_base.h index de0bccc5332..475116ebf5f 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/batch_to_space/batch_to_space_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/batch_to_space/batch_to_space_kernel_base.h @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" #include @@ -46,9 +46,9 @@ struct batch_to_space_fuse_params : fuse_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // BatchToSpaceKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class BatchToSpaceKernelBase : public common_kernel_base { +class BatchToSpaceKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~BatchToSpaceKernelBase() {} struct DispatchData : public CommonDispatchData {}; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/border/border_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/border/border_kernel_base.h index 50c6637d20b..1befc874ce6 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/border/border_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/border/border_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// Copyright (c) 2018-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -46,9 +46,9 @@ struct border_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // BorderKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class BorderKernelBase : public common_kernel_base { +class BorderKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/broadcast/broadcast_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/broadcast/broadcast_kernel_base.h index 716bd0f5302..12fbfccb7b8 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/broadcast/broadcast_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/broadcast/broadcast_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2019 Intel Corporation +// Copyright (c) 2018-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" #include @@ -37,9 +37,9 @@ struct broadcast_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // BroadcastKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class BroadcastKernelBase : public common_kernel_base { +class BroadcastKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/concatenation/concatenation_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/concatenation/concatenation_kernel_base.h index 645bc998e71..4fdd9408d43 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/concatenation/concatenation_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/concatenation/concatenation_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 Intel Corporation +// Copyright (c) 2016-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -58,9 +58,9 @@ struct concatenation_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ConcatenationKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class ConcatenationKernelBase : public common_kernel_base { +class ConcatenationKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~ConcatenationKernelBase() {} using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/deformable_convolution_kernel_bfyx_interp.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/deformable_convolution_kernel_bfyx_interp.h index 60bb429ca47..079ebac8b1a 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/deformable_convolution_kernel_bfyx_interp.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/deformable_convolution_kernel_bfyx_interp.h @@ -1,5 +1,5 @@ /* -// Copyright (c) 2019 Intel Corporation +// Copyright (c) 2019-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ namespace kernel_selector { -class DeformableConvolutionKernel_bfyx_interp : public common_kernel_base { +class DeformableConvolutionKernel_bfyx_interp : public KernelBaseOpenCL { public: - DeformableConvolutionKernel_bfyx_interp() : common_kernel_base("deformable_convolution_gpu_bfyx_interp") {} + DeformableConvolutionKernel_bfyx_interp() : KernelBaseOpenCL("deformable_convolution_gpu_bfyx_interp") {} virtual ~DeformableConvolutionKernel_bfyx_interp() {} KernelsData GetKernelsData(const Params& params, const optional_params& options) const override; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/ctc_greedy_decoder/ctc_greedy_decoder_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/ctc_greedy_decoder/ctc_greedy_decoder_kernel_base.h index 0181bce32f2..36e83e1a3cf 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/ctc_greedy_decoder/ctc_greedy_decoder_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/ctc_greedy_decoder/ctc_greedy_decoder_kernel_base.h @@ -13,7 +13,7 @@ // limitations under the License. #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" #include @@ -37,9 +37,9 @@ struct ctc_greedy_decoder_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // CTCGreedyDecoderKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class CTCGreedyDecoderKernelBase : public common_kernel_base { +class CTCGreedyDecoderKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~CTCGreedyDecoderKernelBase() {} using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/cum_sum/cum_sum_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/cum_sum/cum_sum_kernel_base.h index 4ec34bbe66c..0842a162a23 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/cum_sum/cum_sum_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/cum_sum/cum_sum_kernel_base.h @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" namespace kernel_selector { @@ -40,9 +40,9 @@ struct cum_sum_optional_params : optional_params { cum_sum_optional_params() : optional_params(KernelType::CUM_SUM) {} }; -class CumSumKernelBase : public common_kernel_base { +class CumSumKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~CumSumKernelBase() = default; struct DispatchData : public CommonDispatchData { diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/depth_to_space/depth_to_space_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/depth_to_space/depth_to_space_kernel_base.h index fec700b33a8..8440e64a006 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/depth_to_space/depth_to_space_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/depth_to_space/depth_to_space_kernel_base.h @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -48,9 +48,9 @@ struct depth_to_space_fuse_params : fuse_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // DepthToSpaceKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class DepthToSpaceKernelBase : public common_kernel_base { +class DepthToSpaceKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~DepthToSpaceKernelBase() {} struct DispatchData : public CommonDispatchData { diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/detection_output/detection_output_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/detection_output/detection_output_kernel_base.h index e131ac64ca6..607947b1399 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/detection_output/detection_output_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/detection_output/detection_output_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// Copyright (c) 2018-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -64,9 +64,9 @@ struct detection_output_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // DetectionOutputKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class DetectionOutputKernelBase : public common_kernel_base { +class DetectionOutputKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base ::common_kernel_base; + using KernelBaseOpenCL ::KernelBaseOpenCL; virtual ~DetectionOutputKernelBase() {} using DispatchData = CommonDispatchData; @@ -75,4 +75,4 @@ protected: JitConstants GetJitConstants(const detection_output_params& params) const; virtual DispatchData SetDefault(const detection_output_params& params) const; }; -} // namespace kernel_selector \ No newline at end of file +} // namespace kernel_selector diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/eltwise/eltwise_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/eltwise/eltwise_kernel_base.h index 4524435e270..81245f46d00 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/eltwise/eltwise_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/eltwise/eltwise_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 Intel Corporation +// Copyright (c) 2016-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include namespace kernel_selector { @@ -112,9 +112,9 @@ struct scale_fuse_params : fuse_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // EltwiseKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class EltwiseKernelBase : public common_kernel_base { +class EltwiseKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~EltwiseKernelBase() {} using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/embedding_bag/embedding_bag_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/embedding_bag/embedding_bag_kernel_ref.h index 3333d79ec26..541a2f84d14 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/embedding_bag/embedding_bag_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/embedding_bag/embedding_bag_kernel_ref.h @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -42,9 +42,9 @@ struct embedding_bag_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // EmbeddingBagKernelRef //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class EmbeddingBagKernelRef : public common_kernel_base { +class EmbeddingBagKernelRef : public KernelBaseOpenCL { public: - EmbeddingBagKernelRef() : common_kernel_base("embedding_bag_ref") {} + EmbeddingBagKernelRef() : KernelBaseOpenCL("embedding_bag_ref") {} virtual ~EmbeddingBagKernelRef() = default; protected: diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/extract_image_patches/extract_image_patches_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/extract_image_patches/extract_image_patches_kernel_base.h index b06ff357bd1..d37fbf4da45 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/extract_image_patches/extract_image_patches_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/extract_image_patches/extract_image_patches_kernel_base.h @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" #include @@ -41,9 +41,9 @@ struct extract_image_patches_optional_params : optional_params { extract_image_patches_optional_params() : optional_params(KernelType::EXTRACT_IMAGE_PATCHES) {} }; -class ExtractImagePatchesKernelBase : public common_kernel_base { +class ExtractImagePatchesKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; using DispatchData = CommonDispatchData; virtual ~ExtractImagePatchesKernelBase() {} diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/gather/gather_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/gather/gather_kernel_ref.h index 3b1f5aefd69..0015adf5fde 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/gather/gather_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/gather/gather_kernel_ref.h @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" namespace kernel_selector { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -37,9 +37,9 @@ struct gather_optional_params : optional_params { gather_optional_params() : optional_params(KernelType::GATHER) {} }; -class GatherKernelRef : public common_kernel_base { +class GatherKernelRef : public KernelBaseOpenCL { public: - GatherKernelRef() : common_kernel_base("gather_ref") {} + GatherKernelRef() : KernelBaseOpenCL("gather_ref") {} virtual ~GatherKernelRef() {} virtual JitConstants GetJitConstants(const gather_params& params) const; virtual CommonDispatchData SetDefault(const gather_params& params, const optional_params&) const; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/gather_tree/gather_tree_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/gather_tree/gather_tree_kernel_base.h index 4e5de0f629a..6b0a45d41f2 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/gather_tree/gather_tree_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/gather_tree/gather_tree_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Intel Corporation +// Copyright (c) 2019-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -34,9 +34,9 @@ struct gather_tree_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // BorderKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class GatherTreeKernelBase : public common_kernel_base { +class GatherTreeKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; using DispatchData = CommonDispatchData; protected: diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/gemm/gemm_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/gemm/gemm_kernel_base.h index 5df5bb03c16..9fa2b32f117 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/gemm/gemm_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/gemm/gemm_kernel_base.h @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -48,9 +48,9 @@ struct gemm_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // BorderKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class GemmKernelBase : public common_kernel_base { +class GemmKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; using FusedOpDesc = fused_operation_desc; using DispatchData = CommonDispatchData; virtual ~GemmKernelBase() {} diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/grn/grn_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/grn/grn_kernel_base.h index f17fca8bab5..ce05b63428b 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/grn/grn_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/grn/grn_kernel_base.h @@ -13,7 +13,7 @@ // limitations under the License. #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" #include @@ -37,9 +37,9 @@ struct grn_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // GRNKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class GRNKernelBase : public common_kernel_base { +class GRNKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~GRNKernelBase() {} using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lrn/lrn_kernel_base.cpp b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lrn/lrn_kernel_base.cpp index 9f4fa16cdb1..cb59dc6f1ae 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lrn/lrn_kernel_base.cpp +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lrn/lrn_kernel_base.cpp @@ -18,7 +18,7 @@ namespace kernel_selector { bool LRNKernelBase::Validate(const Params& p, const optional_params& o) const { - if (!common_kernel_base::Validate(p, o) || p.GetType() != KernelType::LRN || o.GetType() != KernelType::LRN) { + if (!KernelBaseOpenCL::Validate(p, o) || p.GetType() != KernelType::LRN || o.GetType() != KernelType::LRN) { return false; } diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lrn/lrn_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lrn/lrn_kernel_base.h index 8b95eff3124..a58306fa1e3 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lrn/lrn_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lrn/lrn_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 Intel Corporation +// Copyright (c) 2016-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -52,9 +52,9 @@ struct lrn_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // lrn_kernel_base //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class LRNKernelBase : public common_kernel_base { +class LRNKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~LRNKernelBase() {} using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm/lstm_elt_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm/lstm_elt_kernel_base.h index f0fe1385a6b..c4b77e41b88 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm/lstm_elt_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm/lstm_elt_kernel_base.h @@ -1,5 +1,5 @@ /* -// Copyright (c) 2016 Intel Corporation +// Copyright (c) 2016-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" #include #include @@ -82,9 +82,9 @@ struct lstm_elt_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // LSTMEltKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class LSTMEltKernelBase : public common_kernel_base { +class LSTMEltKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~LSTMEltKernelBase() {} struct DispatchData : public CommonDispatchData {}; @@ -101,4 +101,4 @@ protected: return true; } }; -} // namespace kernel_selector \ No newline at end of file +} // namespace kernel_selector diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm/lstm_gemm_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm/lstm_gemm_kernel_base.h index 8a08f815b38..8713fffe3a7 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm/lstm_gemm_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm/lstm_gemm_kernel_base.h @@ -1,5 +1,5 @@ /* -// Copyright (c) 2018 Intel Corporation +// Copyright (c) 2018-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -71,9 +71,9 @@ struct lstm_gemm_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // LSTMGemmKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class LSTMGemmKernelBase : public common_kernel_base { +class LSTMGemmKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~LSTMGemmKernelBase() {} struct DispatchData : public CommonDispatchData {}; @@ -90,4 +90,4 @@ protected: return true; } }; -} // namespace kernel_selector \ No newline at end of file +} // namespace kernel_selector diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm_dynamic/lstm_dynamic_input_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm_dynamic/lstm_dynamic_input_kernel_base.h index 41ce4ea1b98..49f06eeae5f 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm_dynamic/lstm_dynamic_input_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm_dynamic/lstm_dynamic_input_kernel_base.h @@ -1,5 +1,5 @@ /* -// Copyright (c) 2019 Intel Corporation +// Copyright (c) 2019-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once #include "weight_bias_params.h" -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -39,9 +39,9 @@ struct lstm_dynamic_input_optional_params : weight_bias_optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // LSTM_DynamicInputKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class LSTM_DynamicInputKernelBase : public common_kernel_base { +class LSTM_DynamicInputKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~LSTM_DynamicInputKernelBase() {} struct DispatchData : public CommonDispatchData {}; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm_dynamic/lstm_dynamic_timeloop_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm_dynamic/lstm_dynamic_timeloop_kernel_base.h index cc13b64d335..ecfd7ce5df3 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm_dynamic/lstm_dynamic_timeloop_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/lstm_dynamic/lstm_dynamic_timeloop_kernel_base.h @@ -1,5 +1,5 @@ /* -// Copyright (c) 2019 Intel Corporation +// Copyright (c) 2019-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -93,9 +93,9 @@ struct lstm_dynamic_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // LSTM_DynamicTimeloopKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class LSTM_DynamicTimeloopKernelBase : public common_kernel_base { +class LSTM_DynamicTimeloopKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~LSTM_DynamicTimeloopKernelBase() {} struct DispatchData : public CommonDispatchData {}; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/max_unpooling/max_unpooling_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/max_unpooling/max_unpooling_kernel_base.h index a9b386fa256..1336371d2b2 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/max_unpooling/max_unpooling_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/max_unpooling/max_unpooling_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// Copyright (c) 2018-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -38,9 +38,9 @@ struct max_unpooling_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // MaxUnpoolingKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class MaxUnpoolingKernelBase : public common_kernel_base { +class MaxUnpoolingKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~MaxUnpoolingKernelBase() {} struct DispatchData : public CommonDispatchData { @@ -53,4 +53,4 @@ protected: virtual DispatchData SetDefault(const max_unpooling_params& params) const; KernelsData GetCommonKernelsData(const Params& params, const optional_params&, float estimatedTime) const; }; -} // namespace kernel_selector \ No newline at end of file +} // namespace kernel_selector diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/mvn/mvn_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/mvn/mvn_kernel_base.h index da2e8165349..b546bb22ceb 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/mvn/mvn_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/mvn/mvn_kernel_base.h @@ -15,7 +15,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" #include @@ -52,9 +52,9 @@ struct mvn_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // MVNKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class MVNKernelBase : public common_kernel_base { +class MVNKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~MVNKernelBase() {} struct DispatchData : public CommonDispatchData { diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/normalize/normalize_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/normalize/normalize_kernel_base.h index 043fa1b04af..0d930edf24a 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/normalize/normalize_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/normalize/normalize_kernel_base.h @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -47,9 +47,9 @@ struct normalize_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // NormalizeKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class NormalizeKernelBase : public common_kernel_base { +class NormalizeKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~NormalizeKernelBase() {} using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/one_hot/one_hot_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/one_hot/one_hot_kernel_base.h index 1f937507e99..eb119207d7d 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/one_hot/one_hot_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/one_hot/one_hot_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Intel Corporation +// Copyright (c) 2019-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -40,9 +40,9 @@ struct one_hot_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // OneHotKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class OneHotKernelBase : public common_kernel_base { +class OneHotKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/permute/permute_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/permute/permute_kernel_ref.h index 1d39fdad4b5..8d7bbb3f717 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/permute/permute_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/permute/permute_kernel_ref.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2019 Intel Corporation +// Copyright (c) 2016-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include namespace kernel_selector { @@ -40,13 +40,13 @@ struct permute_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // PermuteKernelRef //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class PermuteKernelRef : public common_kernel_base { +class PermuteKernelRef : public KernelBaseOpenCL { public: - PermuteKernelRef() : common_kernel_base("permute_ref") {} + PermuteKernelRef() : KernelBaseOpenCL("permute_ref") {} virtual ~PermuteKernelRef() {} JitConstants GetJitConstants(const permute_params& params) const; KernelsData GetKernelsData(const Params& params, const optional_params& options) const override; ParamsKey GetSupportedKey() const override; }; -} // namespace kernel_selector \ No newline at end of file +} // namespace kernel_selector diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/pooling/pooling_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/pooling/pooling_kernel_base.h index 76e6bab6302..b06f1d72ac3 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/pooling/pooling_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/pooling/pooling_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 Intel Corporation +// Copyright (c) 2016-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -54,9 +54,9 @@ struct pooling_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // PoolingKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class PoolingKernelBase : public common_kernel_base { +class PoolingKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~PoolingKernelBase() {} struct DispatchData : public CommonDispatchData { diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/pyramid_roi_align/pyramid_roi_align_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/pyramid_roi_align/pyramid_roi_align_kernel_base.h index f035bdd7a55..eb4caa1adc6 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/pyramid_roi_align/pyramid_roi_align_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/pyramid_roi_align/pyramid_roi_align_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2019 Intel Corporation +// Copyright (c) 2018-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -43,9 +43,9 @@ struct PyramidROIAlign_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // PyramidROIAlignKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class PyramidROIAlignKernelBase : public common_kernel_base { +class PyramidROIAlignKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~PyramidROIAlignKernelBase() {} using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/quantize/quantize_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/quantize/quantize_kernel_base.h index c03ef65e853..1c97ab22357 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/quantize/quantize_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/quantize/quantize_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Intel Corporation +// Copyright (c) 2019-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,14 +15,14 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "quantize_kernel_params.h" namespace kernel_selector { -class QuantizeKernelBase : public common_kernel_base { +class QuantizeKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~QuantizeKernelBase() {} bool Validate(const Params& p, const optional_params& o) const override; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/quantize/quantize_kernel_params.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/quantize/quantize_kernel_params.h index 6bcd271a5a4..39dc7ec4ba5 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/quantize/quantize_kernel_params.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/quantize/quantize_kernel_params.h @@ -15,7 +15,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" namespace kernel_selector { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reduce/reduce_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reduce/reduce_kernel_base.h index 143d6af56a2..3670bb69bc8 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reduce/reduce_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reduce/reduce_kernel_base.h @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -41,9 +41,9 @@ struct reduce_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ReduceKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class ReduceKernelBase : public common_kernel_base { +class ReduceKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; using DispatchData = CommonDispatchData; virtual ~ReduceKernelBase() {} diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/region_yolo/region_yolo_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/region_yolo/region_yolo_kernel_ref.h index 826535e5467..05f7f8b1de5 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/region_yolo/region_yolo_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/region_yolo/region_yolo_kernel_ref.h @@ -1,5 +1,5 @@ /* -// Copyright (c) 2018 Intel Corporation +// Copyright (c) 2018-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -49,9 +49,9 @@ struct region_yolo_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // RegionYoloKernelRef //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class RegionYoloKernelRef : public common_kernel_base { +class RegionYoloKernelRef : public KernelBaseOpenCL { public: - RegionYoloKernelRef() : common_kernel_base("region_yolo_gpu_ref") {} + RegionYoloKernelRef() : KernelBaseOpenCL("region_yolo_gpu_ref") {} virtual ~RegionYoloKernelRef() {} using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reorder/reorder_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reorder/reorder_kernel_base.h index 83f861421a3..aeefdfa598b 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reorder/reorder_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reorder/reorder_kernel_base.h @@ -15,7 +15,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" #include @@ -94,9 +94,9 @@ struct reorder_weights_params : public Params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ReorderKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class ReorderKernelBase : public common_kernel_base { +class ReorderKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~ReorderKernelBase() {} using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reorg_yolo/reorg_yolo_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reorg_yolo/reorg_yolo_kernel_ref.h index 6cecc71ba1d..4e0ce26cffb 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reorg_yolo/reorg_yolo_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reorg_yolo/reorg_yolo_kernel_ref.h @@ -1,5 +1,5 @@ /* -// Copyright (c) 2018 Intel Corporation +// Copyright (c) 2018-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -44,9 +44,9 @@ struct reorg_yolo_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ReorgYoloKernelRef //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class ReorgYoloKernelRef : public common_kernel_base { +class ReorgYoloKernelRef : public KernelBaseOpenCL { public: - ReorgYoloKernelRef() : common_kernel_base("reorg_yolo_gpu_ref") {} + ReorgYoloKernelRef() : KernelBaseOpenCL("reorg_yolo_gpu_ref") {} virtual ~ReorgYoloKernelRef() {} using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/resample/resample_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/resample/resample_kernel_base.h index bc4e34a05f0..1e3cc42d6d4 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/resample/resample_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/resample/resample_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2019 Intel Corporation +// Copyright (c) 2016-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include @@ -54,10 +54,10 @@ struct resample_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ResampleKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class ResampleKernelBase : public common_kernel_base { +class ResampleKernelBase : public KernelBaseOpenCL { public: using DispatchData = CommonDispatchData; - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~ResampleKernelBase() {} diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reshape/reshape_kernel_ref.cpp b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reshape/reshape_kernel_ref.cpp index 213f9c17ce8..09dc2c9a58d 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reshape/reshape_kernel_ref.cpp +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reshape/reshape_kernel_ref.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2019 Intel Corporation +// Copyright (c) 2016-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -73,7 +73,7 @@ KernelsData ReshapeKernelRef::GetKernelsData(const Params& params, const optiona } bool ReshapeKernelRef::Validate(const Params& p, const optional_params& op) const { - if (!common_kernel_base::Validate(p, op)) + if (!KernelBaseOpenCL::Validate(p, op)) return false; const auto& rp = static_cast(p); diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reshape/reshape_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reshape/reshape_kernel_ref.h index 553b56c6ec6..e04fffedf58 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reshape/reshape_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reshape/reshape_kernel_ref.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2019 Intel Corporation +// Copyright (c) 2016-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" namespace kernel_selector { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -33,9 +33,9 @@ struct reshape_optional_params : optional_params { reshape_optional_params() : optional_params(KernelType::RESHAPE) {} }; -class ReshapeKernelRef : public common_kernel_base { +class ReshapeKernelRef : public KernelBaseOpenCL { public: - ReshapeKernelRef() : common_kernel_base("reshape_ref") {} + ReshapeKernelRef() : KernelBaseOpenCL("reshape_ref") {} virtual ~ReshapeKernelRef() {} KernelsData GetKernelsData(const Params& params, const optional_params& options) const override; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reverse_sequence/reverse_sequence_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reverse_sequence/reverse_sequence_kernel_ref.h index 5db66fad37a..6a8b28321a2 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reverse_sequence/reverse_sequence_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/reverse_sequence/reverse_sequence_kernel_ref.h @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Intel Corporation +// Copyright (c) 2019-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" namespace kernel_selector { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -37,9 +37,9 @@ struct reverse_sequence_optional_params : optional_params { reverse_sequence_optional_params() : optional_params(KernelType::REVERSE_SEQUENCE) {} }; -class ReverseSequenceKernelRef : public common_kernel_base { +class ReverseSequenceKernelRef : public KernelBaseOpenCL { public: - ReverseSequenceKernelRef() : common_kernel_base("reverse_sequence_ref") {} + ReverseSequenceKernelRef() : KernelBaseOpenCL("reverse_sequence_ref") {} virtual ~ReverseSequenceKernelRef() {} virtual JitConstants GetJitConstants(const reverse_sequence_params& params) const; virtual CommonDispatchData SetDefault(const reverse_sequence_params& params, const optional_params&) const; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/roi_pooling/roi_pooling_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/roi_pooling/roi_pooling_kernel_base.h index ebaf268d89d..05cde23f810 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/roi_pooling/roi_pooling_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/roi_pooling/roi_pooling_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Intel Corporation +// Copyright (c) 2019-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ #pragma once #include -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" namespace kernel_selector { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -57,9 +57,9 @@ struct roi_pooling_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ROIPoolingKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class ROIPoolingKernelBase : public common_kernel_base { +class ROIPoolingKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~ROIPoolingKernelBase() {} using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/scatter_update/scatter_update_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/scatter_update/scatter_update_kernel_ref.h index 8db8199b685..3d7fd8bf264 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/scatter_update/scatter_update_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/scatter_update/scatter_update_kernel_ref.h @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" namespace kernel_selector { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -37,9 +37,9 @@ struct scatter_update_optional_params : optional_params { scatter_update_optional_params() : optional_params(KernelType::SCATTER_UPDATE) {} }; -class ScatterUpdateKernelRef : public common_kernel_base { +class ScatterUpdateKernelRef : public KernelBaseOpenCL { public: - ScatterUpdateKernelRef() : common_kernel_base("scatter_update_ref") {} + ScatterUpdateKernelRef() : KernelBaseOpenCL("scatter_update_ref") {} virtual ~ScatterUpdateKernelRef() {} virtual JitConstants GetJitConstants(const scatter_update_params& params) const; virtual CommonDispatchData SetDefault(const scatter_update_params& params, const optional_params&, bool is_second) const; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/select/select_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/select/select_kernel_base.h index 7a6eb93de34..883bbb61791 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/select/select_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/select/select_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// Copyright (c) 2018-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" namespace kernel_selector { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -36,9 +36,9 @@ struct select_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // SelectKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class SelectKernelBase : public common_kernel_base { +class SelectKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~SelectKernelBase() {} using DispatchData = CommonDispatchData; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/shuffle_channels/shuffle_channels_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/shuffle_channels/shuffle_channels_kernel_ref.h index 758dc14dfee..e9459231124 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/shuffle_channels/shuffle_channels_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/shuffle_channels/shuffle_channels_kernel_ref.h @@ -1,5 +1,5 @@ /* -// Copyright (c) 2019 Intel Corporation +// Copyright (c) 2019-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" namespace kernel_selector { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -38,9 +38,9 @@ struct shuffle_channels_optional_params : optional_params { shuffle_channels_optional_params() : optional_params(KernelType::SHUFFLE_CHANNELS) {} }; -class ShuffleChannelsKernelRef : public common_kernel_base { +class ShuffleChannelsKernelRef : public KernelBaseOpenCL { public: - ShuffleChannelsKernelRef() : common_kernel_base("shuffle_channels_ref") {} + ShuffleChannelsKernelRef() : KernelBaseOpenCL("shuffle_channels_ref") {} virtual ~ShuffleChannelsKernelRef() {} 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/softmax/softmax_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/softmax/softmax_kernel_base.h index 937d0ebdd42..eea3de6071c 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/softmax/softmax_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/softmax/softmax_kernel_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 Intel Corporation +// Copyright (c) 2016-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" namespace kernel_selector { @@ -43,9 +43,9 @@ struct softmax_optional_params : optional_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // SoftmaxKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class SoftmaxKernelBase : public common_kernel_base { +class SoftmaxKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~SoftmaxKernelBase() {} struct DispatchData : public CommonDispatchData { diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/space_to_batch/space_to_batch_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/space_to_batch/space_to_batch_kernel_base.h index 916ab5343e9..b2883668c12 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/space_to_batch/space_to_batch_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/space_to_batch/space_to_batch_kernel_base.h @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "kernel_selector_params.h" #include @@ -47,9 +47,9 @@ struct space_to_batch_fuse_params : fuse_params { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // SpaceToBatchKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class SpaceToBatchKernelBase : public common_kernel_base { +class SpaceToBatchKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~SpaceToBatchKernelBase() {} struct DispatchData : public CommonDispatchData {}; 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 29af4c54c84..ec86b548ec6 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 @@ -16,7 +16,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" namespace kernel_selector { @@ -40,9 +40,9 @@ struct space_to_depth_optional_params : optional_params { space_to_depth_optional_params() : optional_params(KernelType::SPACE_TO_DEPTH) {} }; -class SpaceToDepthKernelRef : public common_kernel_base { +class SpaceToDepthKernelRef : public KernelBaseOpenCL { public: - SpaceToDepthKernelRef() : common_kernel_base("space_to_depth_ref") {} + SpaceToDepthKernelRef() : KernelBaseOpenCL("space_to_depth_ref") {} virtual ~SpaceToDepthKernelRef() = default; 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/strided_slice/strided_slice_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/strided_slice/strided_slice_kernel_ref.h index c37d299be31..96abb7ddcb6 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/strided_slice/strided_slice_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/strided_slice/strided_slice_kernel_ref.h @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include namespace kernel_selector { @@ -41,9 +41,9 @@ struct strided_slice_optional_params : optional_params { strided_slice_optional_params() : optional_params(KernelType::STRIDED_SLICE) {} }; -class StridedSliceKernelRef : public common_kernel_base { +class StridedSliceKernelRef : public KernelBaseOpenCL { public: - StridedSliceKernelRef() : common_kernel_base("strided_slice_ref") {} + StridedSliceKernelRef() : KernelBaseOpenCL("strided_slice_ref") {} virtual ~StridedSliceKernelRef() {} virtual JitConstants GetJitConstants(const strided_slice_params& params) const; virtual CommonDispatchData SetDefault(const strided_slice_params& params, const optional_params&) const; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/tile/tile_kernel_ref.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/tile/tile_kernel_ref.h index f2464b03ff6..0650403fe93 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/tile/tile_kernel_ref.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/tile/tile_kernel_ref.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Intel Corporation +// Copyright (c) 2018-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" namespace kernel_selector { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -36,9 +36,9 @@ struct tile_optional_params : optional_params { tile_optional_params() : optional_params(KernelType::TILE) {} }; -class TileKernelRef : public common_kernel_base { +class TileKernelRef : public KernelBaseOpenCL { public: - TileKernelRef() : common_kernel_base("tile_ref") {} + TileKernelRef() : KernelBaseOpenCL("tile_ref") {} virtual ~TileKernelRef() {} virtual JitConstants GetJitConstants(const tile_params& params) const; diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/common/common_kernel_base.cpp b/inference-engine/thirdparty/clDNN/kernel_selector/core/common/kernel_base_opencl.cpp similarity index 81% rename from inference-engine/thirdparty/clDNN/kernel_selector/core/common/common_kernel_base.cpp rename to inference-engine/thirdparty/clDNN/kernel_selector/core/common/kernel_base_opencl.cpp index 4bf514bbae2..26f20e6d48b 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/common/common_kernel_base.cpp +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/common/kernel_base_opencl.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2019 Intel Corporation +// Copyright (c) 2016-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include #include #include @@ -72,7 +72,7 @@ public: }; } // namespace -std::string common_kernel_base::GetEntryPoint(const std::string& templateName, +std::string KernelBaseOpenCL::GetEntryPoint(const std::string& templateName, const std::string& layerID, const optional_params& options) const { std::string kernelID = layerID; @@ -89,7 +89,7 @@ std::string common_kernel_base::GetEntryPoint(const std::string& templateName, return kernelID; } -std::string common_kernel_base::CreateJit(const std::string& template_name, +std::string KernelBaseOpenCL::CreateJit(const std::string& template_name, const JitConstants& constants, const std::string& kernel_id) const { class CodeBuilder code; @@ -109,7 +109,7 @@ std::string common_kernel_base::CreateJit(const std::string& template_name, return jit; } -Arguments common_kernel_base::GetArgsDesc(uint32_t num_of_input, +Arguments KernelBaseOpenCL::GetArgsDesc(uint32_t num_of_input, bool use_weights, bool use_bias, uint32_t number_of_inputs_for_fused_prim) const { @@ -136,7 +136,7 @@ Arguments common_kernel_base::GetArgsDesc(uint32_t num_of_input, return args; } -std::shared_ptr common_kernel_base::GetKernelString(const std::string& name, +std::shared_ptr KernelBaseOpenCL::GetKernelString(const std::string& name, const std::string& jit, const std::string& entry_point, const EngineInfo& engine_info, @@ -160,7 +160,7 @@ std::shared_ptr common_kernel_base::GetKernelString(const std::str return kernel_string; } -uint32_t common_kernel_base::GetFusedPrimitiveInputsCount(const Params ¶ms) const { +uint32_t KernelBaseOpenCL::GetFusedPrimitiveInputsCount(const Params ¶ms) const { auto p = dynamic_cast(params); uint32_t fused_deps_total = 0; for (auto fused_op : p.fused_ops) { @@ -170,18 +170,18 @@ uint32_t common_kernel_base::GetFusedPrimitiveInputsCount(const Params ¶ms) return fused_deps_total; } -void common_kernel_base::FillCLKernelData(clKernelData& kernel, - const CommonDispatchData& dispatchData, - const EngineInfo& engine_info, - const std::string& kernelMapName, - const std::string& jit, - const std::string& entryPoint, - const std::string& exeMode, - bool weights, - bool bias, - int number_of_inputs, - uint32_t number_of_inputs_for_fused_prims) const { - CheckDispatchData(kernelMapName, dispatchData); +void KernelBaseOpenCL::FillCLKernelData(clKernelData& kernel, + const CommonDispatchData& dispatchData, + const EngineInfo& engine_info, + const std::string& kernelMapName, + const std::string& jit, + const std::string& entryPoint, + const std::string& exeMode, + bool weights, + bool bias, + int number_of_inputs, + uint32_t number_of_inputs_for_fused_prims) const { + KernelBase::CheckDispatchData(kernelMapName, dispatchData); kernel.workGroups.global = dispatchData.gws; kernel.workGroups.local = dispatchData.lws; kernel.kernelString = GetKernelString(kernelMapName, jit, entryPoint, engine_info, exeMode); diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/common/common_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/common/kernel_base_opencl.h similarity index 96% rename from inference-engine/thirdparty/clDNN/kernel_selector/core/common/common_kernel_base.h rename to inference-engine/thirdparty/clDNN/kernel_selector/core/common/kernel_base_opencl.h index cb89cc1b711..7f0e0e9a83c 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/common/common_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/common/kernel_base_opencl.h @@ -22,10 +22,10 @@ namespace kernel_selector { -class common_kernel_base : public KernelBase { +class KernelBaseOpenCL : public KernelBase { public: using KernelBase::KernelBase; - virtual ~common_kernel_base() {} + virtual ~KernelBaseOpenCL() {} protected: virtual bool Validate(const Params&, const optional_params&) const { return true; } diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/common/weight_bias_kernel_base.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/common/weight_bias_kernel_base.h index 2845101b505..478bee59787 100644 --- a/inference-engine/thirdparty/clDNN/kernel_selector/core/common/weight_bias_kernel_base.h +++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/common/weight_bias_kernel_base.h @@ -1,5 +1,5 @@ /* -// Copyright (c) 2016 Intel Corporation +// Copyright (c) 2016-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,19 +16,19 @@ #pragma once -#include "common_kernel_base.h" +#include "kernel_base_opencl.h" #include "weight_bias_params.h" namespace kernel_selector { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // WeightsBiasKernelBase //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class WeightBiasKernelBase : public common_kernel_base { +class WeightBiasKernelBase : public KernelBaseOpenCL { public: - using common_kernel_base::common_kernel_base; + using KernelBaseOpenCL::KernelBaseOpenCL; virtual ~WeightBiasKernelBase() {} protected: virtual JitConstants GetJitConstants(const weight_bias_params& params) const; }; -} // namespace kernel_selector \ No newline at end of file +} // namespace kernel_selector