• Dmitry Matveev's avatar
    Merge pull request #12674 from dmatveev:gapi_upd270918 · 2c6ab654
    Dmitry Matveev authored
    * Update G-API code base to 27-Sep-18
    
    Changes mostly improve standalone build support
    
    * G-API code base update 28-09-2018
    
    * Windows/Documentation warnings should be fixed
    * Fixed stability issues in Fluid backend
    * Fixed precompiled headers issues in G-API source files
    
    * G-API code base update 28-09-18 EOD
    
    * Fixed several static analysis issues
    * Fixed issues found when G-API is built in a standalone mode
    2c6ab654
gapi_operators_tests_fluid.cpp 3.63 KB
// This file is part of OpenCV project.
// It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html.
//
// Copyright (C) 2018 Intel Corporation


#include "test_precomp.hpp"
#include "../common/gapi_operators_tests.hpp"
#include "opencv2/gapi/cpu/core.hpp"

#define CORE_FLUID cv::gapi::core::cpu::kernels()

namespace opencv_test
{
    INSTANTIATE_TEST_CASE_P(MathOperatorTestFluid, MathOperatorMatMatTest,
                            Combine(Values( opPlusM, opMinusM, opDivM,
                                            opGreater, opLess, opGreaterEq, opLessEq, opEq, opNotEq),
                                    Values(CV_8UC1, CV_16SC1, CV_32FC1),
                                    Values(cv::Size(1280, 720),
                                       cv::Size(640, 480),
                                       cv::Size(128, 128)),
                                    Values(-1, CV_8U, CV_32F),
    /*init output matrices or not*/ testing::Bool(),
                                    Values(cv::compile_args(CORE_FLUID))));

    //FIXME: Some Mat/Scalar Fluid kernels are not there yet!
    INSTANTIATE_TEST_CASE_P(DISABLED_MathOperatorTestFluid, MathOperatorMatScalarTest,
                            Combine(Values( opPlus, opPlusR, opMinus, opMinusR, opMul, opMulR, opDiv, opDivR,
                                            opGT, opLT, opGE, opLE, opEQ, opNE,
                                            opGTR, opLTR, opGER, opLER, opEQR, opNER),
                                    Values(CV_8UC1, CV_16SC1, CV_32FC1),
                                    Values(cv::Size(1280, 720),
                                           cv::Size(640, 480),
                                           cv::Size(128, 128)),
                                    Values(-1, CV_8U, CV_32F),
    /*init output matrices or not*/ testing::Bool(),
                                    Values(cv::compile_args(CORE_FLUID))));

    INSTANTIATE_TEST_CASE_P(BitwiseOperatorTestFluid, MathOperatorMatMatTest,
                            Combine(Values( opAnd, opOr, opXor ),
                                    Values(CV_8UC1, CV_16UC1, CV_16SC1),
                                    Values(cv::Size(1280, 720),
                                       cv::Size(640, 480),
                                       cv::Size(128, 128)),
                                    Values(-1),
    /*init output matrices or not*/ testing::Bool(),
                                    Values(cv::compile_args(CORE_FLUID))));

    //FIXME: Some Mat/Scalar Fluid kernels are not there yet!
    INSTANTIATE_TEST_CASE_P(DISABLED_BitwiseOperatorTestFluid, MathOperatorMatScalarTest,
                            Combine(Values( opAND, opOR, opXOR, opANDR, opORR, opXORR ),
                                    Values(CV_8UC1, CV_16UC1, CV_16SC1),
                                    Values(cv::Size(1280, 720),
                                           cv::Size(640, 480),
                                           cv::Size(128, 128)),
                                    Values(-1),
    /*init output matrices or not*/ testing::Bool(),
                                    Values(cv::compile_args(CORE_FLUID))));

    INSTANTIATE_TEST_CASE_P(BitwiseNotOperatorTestFluid, NotOperatorTest,
                        Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1),
                                Values(cv::Size(1280, 720),
                                       cv::Size(640, 480),
                                       cv::Size(128, 128)),
    /*init output matrices or not*/ testing::Bool(),
                                    Values(cv::compile_args(CORE_FLUID))));
}