Skip to content

Commit e036f72

Browse files
Port G-API demos to API2.0 - background_subtraction_demo/cpp_gapi - enable test cases and check with the OpenCV fix
1 parent ccbfdf8 commit e036f72

File tree

2 files changed

+30
-22
lines changed

2 files changed

+30
-22
lines changed

.github/workflows/cpp_gapi-demos.yml

+13-11
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,25 @@ jobs:
2828
path: ${{ github.workspace }}/cache
2929
key: unused
3030
restore-keys: ubuntu20_2023.2.0.13089.cfd42bd2cb0-
31-
- if: ${{ !steps.cache.outputs.cache-hit }}
32-
uses: actions/checkout@v3
33-
with:
34-
repository: opencv/opencv
35-
path: cache/opencv
36-
- if: ${{ !steps.cache.outputs.cache-hit }}
37-
name: Compile OpenCV
31+
- name: Clone and checkout OpenCV
32+
run: |
33+
cd cache
34+
mkdir opencv-with-fix
35+
cd opencv-with-fix
36+
git clone https://github.com/DariaMityagina/opencv.git
37+
cd opencv
38+
git checkout icv/dm/add-media-frame-support-to-govbackend
39+
- name: Compile OpenCV
3840
run: |
39-
rm -rf cache/opencv/.git/ # Minimize cache
40-
mkdir cache/opencv/build
41-
cd cache/opencv/build
41+
cd cache
42+
mkdir opencv-with-fix/opencv/build
43+
cd opencv-with-fix/opencv/build
4244
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_INF_ENGINE=y -DOpenVINO_DIR=$GITHUB_WORKSPACE/ov/runtime/cmake/ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_LINKER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_C_LINKER_LAUNCHER=ccache -DBUILD_TESTS=y -DVIDEOIO_ENABLE_PLUGINS=y -DBUILD_PERF_TESTS=n -DBUILD_EXAMPLES=n -DBUILD_opencv_apps=y -DWITH_OPENCL=n -DWITH_OPENCLAMDBLAS=n -DWITH_GSTREAMER=n -DWITH_V4L=ON -DWITH_LIBV4L=ON -DWITH_OPENCLAMDFFT=n -DWITH_VA=n -DWITH_VA_INTEL=n -DWITH_PROTOBUF=n -DBUILD_PROTOBUF=n -DBUILD_JAVA=n -DBUILD_opencv_java_bindings_generator=n -DBUILD_opencv_python2=n -DBUILD_opencv_python3=n -DWITH_IMGCODEC_HDR=y -DWITH_IMGCODEC_SUNRASTER=y -DWITH_IMGCODEC_PXM=y -DWITH_IMGCODEC_PFM=y -DWITH_PNG=y -DWITH_TIFF=n -DWITH_WEBP=n -DWITH_OPENJPEG=n -DWITH_JASPER=n -DWITH_OPENEXR=n -DBUILD_opencv_dnn=n -DBUILD_opencv_features2d=n -DBUILD_opencv_flann=n -DWITH_TBB=n -DBUILD_INFO_SKIP_EXTRA_MODULES=n -DBUILD_JASPER=n -DBUILD_PNG=n -DBUILD_OPENEXR=n -DBUILD_WEBP=n -DBUILD_ZLIB=n -DWITH_CUDA=n -DWITH_EIGEN=n -DWITH_GPHOTO2=n -DOPENCV_GAPI_GSTREAMER=n -DWITH_LAPACK=n -DWITH_MATLAB=n -DWITH_MFX=n -DWITH_QUIRC=n -DWITH_VTK=n -DINSTALL_PDB=n -DINSTALL_TESTS=n -DINSTALL_C_EXAMPLES=n -DINSTALL_PYTHON_EXAMPLES=n -DOPENCV_GENERATE_SETUPVARS=n -DWITH_1394=n -DWITH_FFMPEG=y -DWITH_GTK_2_X=y -DBUILD_JPEG=y -DWITH_IPP=y -DENABLE_CONFIG_VERIFICATION=y -DBUILD_LIST=core,gapi,highgui,imgcodecs,imgproc,videoio,video ..
4345
cmake --build . -j $((`nproc`*2+2))
4446
- name: build_demos.sh
4547
run: |
4648
source ov/setupvars.sh
47-
OpenCV_DIR=$GITHUB_WORKSPACE/cache/opencv/build CMAKE_CXX_COMPILER_LAUNCHER=ccache CMAKE_CXX_LINKER_LAUNCHER=ccache ./demos/build_demos.sh --build_dir=build # TODO: add CMAKE_CXX_FLAGS=-Werror after background_subtraction_demo/cpp_gapi is updated to ov2.0
49+
OpenCV_DIR=$GITHUB_WORKSPACE/cache/opencv-with-fix/opencv/build CMAKE_CXX_COMPILER_LAUNCHER=ccache CMAKE_CXX_LINKER_LAUNCHER=ccache ./demos/build_demos.sh --build_dir=build # TODO: add CMAKE_CXX_FLAGS=-Werror after background_subtraction_demo/cpp_gapi is updated to ov2.0
4850
- uses: actions/setup-python@v4
4951
with:
5052
python-version: 3.11

demos/tests/cases.py

+17-11
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,21 @@ def single_option_cases(key, *args):
170170

171171

172172
DEMOS = [
173-
# CppDemo(name='background_subtraction_demo', device_keys=['-d'], implementation='cpp_gapi', test_cases=combine_cases(
174-
# TestCase(options={'--no_show': None, '-at': 'maskrcnn',
175-
# **MONITORS,
176-
# '-i': DataPatternArg('coco128-subset-480x640x3'),
177-
# }),
178-
# single_option_cases('-m',
179-
# ModelArg('instance-segmentation-person-0007'),
180-
# ModelArg('instance-segmentation-security-0091')),
181-
# )),
173+
CppDemo(name='background_subtraction_demo', device_keys=['-d'], implementation='cpp_gapi', test_cases=combine_cases(
174+
TestCase(options={'--no_show': None, '-at': 'maskrcnn',
175+
**MONITORS,
176+
}),
177+
# TODO: enable this case once E#111291 is fixed
178+
# single_option_cases('-m',
179+
# ModelArg('instance-segmentation-person-0007'),
180+
# ModelArg('instance-segmentation-security-0091')),
181+
single_option_cases('-m',
182+
ModelArg('instance-segmentation-person-0007')),
183+
single_option_cases(
184+
'-i',
185+
DataPatternArg('coco128-every-480x640x3'),
186+
str('video.mp4')),
187+
)),
182188

183189
CppDemo('classification_benchmark_demo', 'cpp_gapi', test_cases=combine_cases(
184190
single_option_cases(
@@ -267,8 +273,8 @@ def single_option_cases(key, *args):
267273
ModelArg('face-detection-retail-0004')),
268274
single_option_cases(
269275
'-i',
270-
str('video.mp4'),
271-
DataPatternArg('coco128-every-480x640x3')),
276+
DataPatternArg('coco128-every-480x640x3'),
277+
str('video.mp4')),
272278
)),
273279

274280
CppDemo(name='gesture_recognition_demo', implementation='cpp_gapi',

0 commit comments

Comments
 (0)