Skip to content

(3.4) Conditional compilation for network reader#17633

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
alalek:backport_17616
Jun 23, 2020
Merged

(3.4) Conditional compilation for network reader#17633
opencv-pushbot merged 1 commit intoopencv:3.4from
alalek:backport_17616

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jun 23, 2020

backport #17616

force_builders=Custom,Custom Win,Custom Mac
build_image:Custom=ubuntu-openvino-2020.3.0:16.04
build_image:Custom Win=openvino-2020.2.0
build_image:Custom Mac=openvino-2020.1.0

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

buildworker:Custom=linux-1
# disabled due high memory usage: test_opencl:Custom=ON
test_opencl:Custom=ON
test_bigdata:Custom=1
test_filter:Custom=*OpenVINO*

@dkurt
Copy link
Copy Markdown
Member

dkurt commented Jun 23, 2020

@alalek , Can we also port #17622? I can open a PR

dkurt
dkurt approved these changes Jun 23, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@dkurt dkurt left a comment

Choose a reason for hiding this comment

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

👍

@opencv-pushbot opencv-pushbot merged commit 8cc8b0d into opencv:3.4 Jun 23, 2020
@alalek alalek mentioned this pull request Jun 23, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dkurt dkurt dkurt approved these changes

Assignees

@dkurt dkurt

Labels

category: build/install category: dnn port/backport done Label for maintainers. Authors of PR can ignore this

Projects

None yet

Milestone

3.4.11

Development

Successfully merging this pull request may close these issues.

4 participants

@alalek @dkurt @opencv-pushbot @ilya-lavrenov