Publishing 2019 R1 content

[platform/upstream/dldt.git] / inference-engine / thirdparty / clDNN / kernel_selector / core / actual_kernels / roi_pooling / roi_pooling_kernel_ref.cpp

diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/roi_pooling/roi_pooling_kernel_ref.cpp b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/roi_pooling/roi_pooling_kernel_ref.cpp
index 1e5a0f5..375db2d 100644 (file)
--- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/roi_pooling/roi_pooling_kernel_ref.cpp
+++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/roi_pooling/roi_pooling_kernel_ref.cpp
@@ -1,5 +1,5 @@
 /*
-// Copyright (c) 2016-2018 Intel Corporation
+// Copyright (c) 2016-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.
@@ -27,81 +27,18 @@ namespace kernel_selector {
         k.EnableOutputDataType(Datatype::F32);
         k.EnableInputLayout(DataLayout::bfyx);
         k.EnableOutputLayout(DataLayout::brfyx);
-        k.EnablePoolType(PoolType::MAX);
-        k.EnablePoolType(PoolType::AVG);
-        k.EnablePoolType(PoolType::BILINEAR);
         k.EnableTensorOffset();
         k.EnableTensorPitches();
         k.EnableBatching();
         k.EnableDifferentTypes();
+        k.EnablePoolType(PoolType::MAX);
+        k.EnablePoolType(PoolType::AVG);
+        k.EnablePoolType(PoolType::BILINEAR);
         return k;
     }
 
-    static ROIPoolingKernelRef::DispatchData SetDefault(const roi_pooling_params& params)
-    {
-        ROIPoolingKernelRef::DispatchData kd;
-
-        kd.fp16UnitUsed = (params.inputs[0].GetDType() == Datatype::F16);
-
-        // Determine global work sizes.
-        kd.gws0 = params.output.LogicalSize();
-        kd.gws1 = 1;
-        kd.gws2 = 1;
-
-        // Find largest positive local work size that is divider for global work size.
-        kd.lws0 = std::min(std::max(kd.gws0, static_cast<size_t>(1)), static_cast<size_t>(32));
-        while (kd.gws0 % kd.lws0 != 0)
-        {
-            --kd.lws0;
-        }
-        kd.lws1 = 1;
-        kd.lws2 = 1;
-
-        return kd;
-    }
-
-    JitConstants ROIPoolingKernelRef::GetJitConstants(const roi_pooling_params& rp) const
-    {
-        JitConstants jit = MakeBaseParamsJitConstants(rp);
-
-        jit.AddConstants({
-            MakeJitConstant("POOLED_HEIGHT",     rp.pooledHeight),
-            MakeJitConstant("POOLED_WIDTH",      rp.pooledWidth),
-            MakeJitConstant("SPATIAL_SCALE",     rp.spatialScale),
-            MakeJitConstant("GROUP_SIZE",        rp.groupSize),
-            MakeJitConstant(toString(rp.mode) + "_POOLING", 1),
-        });
-
-        jit.AddConstants({
-            MakeJitConstant("USE_OLD_SCALE_AND_ROUNDING",   rp.groupSize == 0)
-        });
-
-        return jit;
-    }
-
     KernelsData ROIPoolingKernelRef::GetKernelsData(const Params& params, const optional_params& options) const
     {
-        assert(params.GetType() == KernelType::ROI_POOLING);
-        const roi_pooling_params& orgParams = static_cast<const roi_pooling_params&>(params);
-
-        if (orgParams.activationFunc != ActivationFunction::NONE)
-        {
-            return{};
-        }
-
-        DispatchData runInfo = SetDefault(orgParams);
-        KernelData kd = KernelData::Default<roi_pooling_params>(params);
-
-        auto cldnn_jit = GetJitConstants(orgParams);
-        auto entry_point = GetEntryPoint(kernelName, orgParams.layerID, options);
-        auto jit = CreateJit(kernelName, cldnn_jit, entry_point);
-
-        auto& kernel = kd.kernels[0];
-        FillCLKernelData(kernel, runInfo, params.engineInfo, kernelName, jit, entry_point);
-        kernel.arguments.push_back({ ArgumentDescriptor::Types::INPUT, 1 });
-
-        kd.estimatedTime = FORCE_PRIORITY_9;
-
-        return{ kd };
+        return GetCommonKernelsData(params, options, FORCE_PRIORITY_9);
     }
 }