Publishing 2019 R3 content

[platform/upstream/dldt.git] / inference-engine / thirdparty / clDNN / kernel_selector / core / actual_kernels / convolution / convolution_kernel_bfzyx_f16.h

diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_tutorial.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_bfzyx_f16.h
similarity index 69%
rename from inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_tutorial.h
rename to inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_bfzyx_f16.h
index e5c6743..600cd9d 100644 (file)
--- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_tutorial.h
+++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_bfzyx_f16.h
@@ -1,4 +1,5 @@
-// Copyright (c) 2016 Intel Corporation
+//
+// Copyright (c) 2019 Intel Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,27 +12,24 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-
+//
 
 #pragma once
 
 #include "convolution_kernel_base.h"
 #include <vector>
 
-// Step 0:
-//
-// 1. choose a tutorial mode
-// 2. modify convolution_tutorial.cl as well
-
-#define ADVANCED_TUTORIAL  // simple runnable example with explanations
-
 namespace kernel_selector {
 
-class ConvolutionKernel_Tutorial : public ConvolutionKernelBase {
+class ConvolutionKernel_bfzyx_f16 : public ConvolutionKernelBase {
 public:
     using Parent = ConvolutionKernelBase;
-    ConvolutionKernel_Tutorial() : Parent("convolution_tutorial") {}
-    virtual ~ConvolutionKernel_Tutorial() {}
+
+    explicit ConvolutionKernel_bfzyx_f16(Datatype use_data_type) :
+        ConvolutionKernelBase(use_data_type == Datatype::F32 ? "gen9_common_conv_fwd_data_f32" : "gen9_common_conv_fwd_data_f16"),
+        use_data_type(use_data_type) {}
+
+    virtual ~ConvolutionKernel_bfzyx_f16() {}
 
     KernelsData GetKernelsData(const Params& params, const optional_params& options) const override;
     ParamsKey GetSupportedKey() const override;
@@ -39,17 +37,14 @@ public:
 protected:
     std::vector<WeightsLayout> GetSupportedWeightLayouts(const convolution_params&) const override {
         return {
-            WeightsLayout::oiyx,
-            WeightsLayout::yxio,
-            WeightsLayout::iyxo,
-            WeightsLayout::oyxi,
+            WeightsLayout::o_i_zyx_i16_o16,
         };
     }
-
-#ifdef ADVANCED_TUTORIAL
     bool Validate(const Params& p, const optional_params& o) const override;
-    JitConstants GetJitConstants(const convolution_params& params, const DispatchData& kd) const override;
     DispatchData SetDefault(const convolution_params& arg, int autoTuneIndex = -1) const override;
-#endif
+    JitConstants GetJitConstants(const convolution_params& params, const DispatchData& kd) const override;
+
+    // This class is base one for FP16 and FP32 classes
+    Datatype use_data_type;
 };
-}  // namespace kernel_selector
\ No newline at end of file
+}  // namespace kernel_selector