Skip to content

G-API: FIX OpenVINO build - Add CComPtr RAII replacement into G-API sample#20921

Merged
alalek merged 2 commits intoopencv:masterfrom
sivanov-work:atl_patch
Oct 21, 2021
Merged

G-API: FIX OpenVINO build - Add CComPtr RAII replacement into G-API sample#20921
alalek merged 2 commits intoopencv:masterfrom
sivanov-work:atl_patch

Conversation

@sivanov-work
Copy link
Copy Markdown
Contributor

@sivanov-work sivanov-work commented Oct 21, 2021 •
edited
Loading

Fix for OpenVINO specific build which was caused by #20738

Since ATL headers might not be available on specific MSVS Build Tools
we use simple CComPtr implementation like as ComPtrGuard
which is not supposed to be the full functional replacement of CComPtr
and it uses as RAII to make sure utilization is correct

ATTENTION: Added to samples only because entire lib looks correct

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

Build Configuration

force_builders=XCustom,Custom Win,Custom Mac
build_gapi_standalone:Linux x64=ade-0.1.1f
build_gapi_standalone:Win64=ade-0.1.1f
build_gapi_standalone:Mac=ade-0.1.1f
build_gapi_standalone:Linux x64 Debug=ade-0.1.1f

Xbuild_image:Custom=centos:7
Xbuildworker:Custom=linux-1
build_gapi_standalone:Custom=ade-0.1.1f

build_image:Custom=ubuntu-openvino-2021.3.0:20.04
build_image:Custom Win=openvino-2021.4.1
buildworker:Custom Win=windows-3
build_image:Custom Mac=openvino-2021.2.0

test_modules:Custom=gapi,python2,python3,java
test_modules:Custom Win=gapi,python2,python3,java
test_modules:Custom Mac=gapi,python2,python3,java

buildworker:Custom=linux-1
test_opencl:Custom=OFF
test_bigdata:Custom=1
test_filter:Custom=*

@sivanov-work sivanov-work mentioned this pull request Oct 21, 2021
Merged
6 tasks
@sivanov-work
Copy link
Copy Markdown
Contributor Author

sivanov-work commented Oct 21, 2021

@alalek looks like compilation for custom Win passed but there is a fail in set up Python2 environment

alalek
alalek reviewed Oct 21, 2021
View reviewed changes
modules/gapi/samples/onevpl_infer_single_roi.cpp
#define D3D11_NO_HELPERS
#define NOMINMAX
#include <cldnn/cldnn_config.hpp>
#include <atlbase.h>
Copy link
Copy Markdown
Member

@alalek alalek Oct 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is one more here: modules/gapi/src/streaming/onevpl/cfg_param_device_selector.cpp

alalek
alalek approved these changes Oct 21, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you 👍

@sivanov-work
Copy link
Copy Markdown
Contributor Author

sivanov-work commented Oct 21, 2021

it's my fault :)

@alalek alalek merged commit d376fe9 into opencv:master Oct 21, 2021
@alalek alalek mentioned this pull request Dec 30, 2021
Merged
@alalek alalek mentioned this pull request Feb 22, 2022
Merged
@sivanov-work sivanov-work deleted the atl_patch branch March 5, 2022 05:48
a-sajjad72 pushed a commit to a-sajjad72/opencv that referenced this pull request Mar 30, 2023
@sivanov-work
Merge pull request opencv#20921 from sivanov-work:atl_patch
2ba63c5 
G-API: FIX OpenVINO build - Add CComPtr RAII replacement into G-API sample

* Add CComPtr RAII replacement into G-API sample

* Remove completely `atlbase.h'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

@dmatveev dmatveev Awaiting requested review from dmatveev

Assignees

@alalek alalek

Labels

category: build/install category: g-api / gapi platform: win32

Projects

None yet

Milestone

4.5.5

Development

Successfully merging this pull request may close these issues.

2 participants

@sivanov-work @alalek