X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=inference-engine%2Fthirdparty%2FclDNN%2Fkernel_selector%2Fcore%2Factual_kernels%2Fconvolution%2Fconvolution_kernel_bfyx_f16.cpp;h=5a60d585eedfee1e8849dac6036f4c10d2f51260;hb=0923303e0201c5b59386ab146d0e30b2ef79272d;hp=61bbb2f5d55e9058d095f149bcd22a76f4795460;hpb=ba6e22b1b5ee4cbefcc30e8d9493cddb0bb3dfdf;p=platform%2Fupstream%2Fdldt.git

diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_bfyx_f16.cpp b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_bfyx_f16.cpp
index 61bbb2f..5a60d58 100644
--- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_bfyx_f16.cpp
+++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_bfyx_f16.cpp
@@ -128,6 +128,13 @@ JitConstants ConvolutionKernel_bfyx_f16::GetJitConstants(const convolution_param
     auto jit = Parent::GetJitConstants(params, runInfo);
 
     auto blockWidth = runInfo.cldnnStyle.blockWidth;
+    if (params.fused_ops.size() > 0) {
+        FusedOpsConfiguration conf_vec = {"_VEC", {"b", "(f_block*16)", "y", "x"}, "dst", blockWidth, true, false, true, false };
+        FusedOpsConfiguration conf_scalar = {"_SCALAR", {"b", "(f_block*16)", "y", "(x+i)"}, "dst[i]", 1, true, false, true, false };
+        jit.Merge(MakeFusedOpsJitConstants(params, {conf_vec, conf_scalar}));
+        jit.Merge(MakeTypeJitConstants(Datatype::F32, "float"));
+        jit.Merge(MakeTypeJitConstants(Datatype::F16, "half"));
+    }
 
     size_t input_line_size = std::min(params.stride.x * (blockWidth - 1) + (params.weights.X().v - 1)*params.dilation.x + 1,
                                       input.X().v + input.X().pad.Total());
@@ -176,84 +183,4 @@ KernelsData ConvolutionKernel_bfyx_f16::GetKernelsDataForAutoTune(const Params&
     return res;
 }
 
-JitConstants ConvolutionKernel_bfyx_f16::GetFusedPrimitivesJitConstants(const convolution_params& params,
-                                                                        const DispatchData& kd) const {
-    JitConstants jit = {};
-
-    size_t op_id = 0;
-    std::string input_decls = "";
-    std::string load_decls_vec = "";
-    std::string load_decls = "";
-    std::string eltwise_fused_ops_vec = "";
-    std::string eltwise_fused_ops = "";
-
-    auto make_jit_vector_type = [](std::string tensor_name, size_t vec_size) -> std::string {
-        if (vec_size == 0 || vec_size > 8)
-            throw std::invalid_argument("Invalid vector size in jit definitions");
-        if (vec_size > 1)
-            return "MAKE_VECTOR_TYPE(" + tensor_name + "_TYPE," + std::to_string(vec_size) + ")";
-        else
-            return tensor_name + "_TYPE";
-    };
-
-    auto make_jit_load = [](std::string tensor_name, std::string ptr_name, size_t vec_size) -> std::string {
-        if (vec_size == 0 || vec_size > 8)
-            throw std::invalid_argument("Invalid vector size in jit definitions");
-
-        std::string index_func_call_vec = tensor_name + "_GET_INDEX(b, f_block*16, y, x)";
-        std::string index_func_call = tensor_name + "_GET_INDEX(b, f_block*16, y, x+i)";
-        if (vec_size > 1)
-            return " UNIT_BLOCK_READ" + std::to_string(vec_size) + "(" + ptr_name + ", " + index_func_call_vec + ")";
-        else
-            return " UNIT_BLOCK_READ(" + ptr_name + ", " + index_func_call + ")";
-    };
-
-    for (auto& fused_dep : params.fused_ops) {
-        std::string op_type = "";
-        switch (fused_dep.type) {
-            case convolution_params::fused_operation_desc::Type::ELTWISE: {
-                op_type = "eltwise";
-                eltwise_fused_ops_vec += "dst = (dst + " + op_type + "_data);";
-                eltwise_fused_ops += "dst[i] = (dst[i] + " + op_type + "_data);";
-                break;
-            }
-            default:
-                throw std::invalid_argument("Invalid fused op in binary_convolution kernel: " + params.layerID);
-        }
-
-        for (size_t op_input_id = 0; op_input_id < fused_dep.tensors.size(); op_input_id++) {
-            std::string name = "FUSED_OP_" + std::to_string(op_id) + "_INPUT" + std::to_string(op_input_id);
-            std::string ptr_name = op_type + "_input" + std::to_string(op_input_id);
-
-            std::string var_name = op_type + "_data";
-            jit.AddConstant(MakeJitConstant(name, fused_dep.tensors[op_input_id]));
-            input_decls += "const __global " + toCLType(fused_dep.tensors[op_input_id].GetDType()) +
-                           "* " + ptr_name + ",";
-            load_decls_vec += make_jit_vector_type(name, kd.cldnnStyle.blockWidth) + " " + var_name + " = " +
-                              make_jit_load(name, ptr_name, kd.cldnnStyle.blockWidth) + ";";
-            load_decls += make_jit_vector_type(name, 1) + " " + var_name + " = " +
-                          make_jit_load(name, ptr_name, 1) + ";";
-        }
-
-        if (fused_dep.activation.function != ActivationFunction::NONE) {
-            std::string temp_op_type = op_type;
-            for (auto& ch : temp_op_type)
-                ch = static_cast<char>(std::toupper(static_cast<unsigned char>(ch)));
-            std::string suffix = "_" + temp_op_type;
-
-            jit.Merge(MakeActivationJitConstants(fused_dep.activation, suffix));
-            eltwise_fused_ops_vec += "dst = ACTIVATION"+suffix+"(dst, ACTIVATION_PARAMS"+suffix+");";
-            eltwise_fused_ops += "dst[i] = ACTIVATION"+suffix+"(dst[i], ACTIVATION_PARAMS"+suffix+");";
-        }
-        op_id++;
-    }
-    jit.AddConstant(MakeJitConstant("FUSED_OPS_DECLS", input_decls));
-    jit.AddConstant(MakeJitConstant("FUSED_OPS_LOAD_DATA_VEC", load_decls_vec));
-    jit.AddConstant(MakeJitConstant("FUSED_OPS_LOAD_DATA", load_decls));
-    jit.AddConstant(MakeJitConstant("DO_ELTWISE_FUSED_OPS_VEC", eltwise_fused_ops_vec));
-    jit.AddConstant(MakeJitConstant("DO_ELTWISE_FUSED_OPS", eltwise_fused_ops));
-
-    return jit;
-}
-
 }  // namespace kernel_selector