Skip to content

Merge 3.4#17351

Merged
alalek merged 15 commits intoopencv:masterfrom
alalek:merge-3.4
May 22, 2020
Merged

Merge 3.4#17351
alalek merged 15 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented May 22, 2020 •
edited
Loading

#16575 from l-bat:flownet2
#17295 from dkurt:dnn_fusion_ftz
#17325 from hunter-college-ossd-spr-2020:nav-links
#17331 from allnes:update_quirc
#17339 from hunter-college-ossd-spr-2020:pylint-note
#17343 from hunter-college-ossd-spr-2020:mac-install
#17345 from alalek:build_fix_mac_warnings

Previous "Merge 3.4": #17318

buildworker:iOS=macosx-1
buildworker:Win64 OpenCL=windows-2
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
build_image:Custom=javascript
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.1.0:16.04
#build_image:Custom=ubuntu-openvino-2020.2.0:16.04
#buildworker:Custom=linux-2
#build_image:Custom=ubuntu-vulkan:16.04
#buildworker:Custom=linux-4
#build_image:Custom=fedora:28
#build_image:Custom=ubuntu-cuda:16.04
#build_image:Custom=ubuntu-clang:18.04
#build_image:Custom=ubuntu:20.04
#buildworker:Custom=linux-1
#build_image:Custom=javascript-simd
#build_image:Custom=mips64el
#build_image:Custom Mac=openvino-2019r3.0
#build_image:Custom Mac=openvino-2020.2.0
build_image:Custom Mac=openvino-2020.2.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.1.0
build_image:Custom Win=openvino-2020.2.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules=dnn,python2,python3,java
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

dkurt and others added 14 commits May 15, 2020 23:44
@dkurt
Flush to zero Convolution denormal weights
68d59a2
@l-bat
Merge pull request opencv#16575 from l-bat:flownet2
d991c22 
Support FlowNet2 model

* Support DataAugmentation layer

* Fix warnings

* Fix comments

* Support Correlation layer

* TEST

* Support Correlation layer

* Supported Accum and FlowWarp layers

* Supported ChannelNorm layer

* Supported Resample with inputs.size() > 1

* Fixed comments

* Refactoring

* Added tests

* Add resample test

* Added asserts in resize layer

* Updated DataAugmentation layer

* Update convolution layer

* Refactoring

* Fix data augmentation layer

* Fix caffe importer

* Fix resize

* Switch to Mat ptr

* Remove useless resize type

* Used ResizeLayer in Accum

* Split ChannelNormLayer

* Delete duplicate assert

* Add sample

* Fix sample

* Added colormap
@dmallia17
Add next and previous navigation links to all tutorials
94d187e
Update version quirc
b7253e3
Resolve type conflict
735c31b
@alalek
Merge pull request opencv#17325 from hunter-college-ossd-spr-2020:nav…
cb82388 
…-links
@boubascript
add pylint install note
b624da2
@alalek
Merge pull request opencv#17339 from hunter-college-ossd-spr-2020:pyl…
d650b5c 
…int-note
@boubascript
add note on cmake brew install
0940c56
@alalek
Merge pull request opencv#17331 from allnes:update_quirc
01a8c9c
@alalek
build: fix warnings about TARGET_OS_MACCATALYST
98611ad
@alalek
Merge pull request opencv#17343 from hunter-college-ossd-spr-2020:mac…
17d15df 
…-install
@alalek
Merge pull request opencv#17345 from alalek:build_fix_mac_warnings
d4a9c73
@alalek
Merge pull request opencv#17295 from dkurt:dnn_fusion_ftz
a9b0305
This was referenced May 22, 2020
Merged
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented May 22, 2020

👍

@alalek alalek merged commit 21e28ad into opencv:master May 22, 2020
@alalek alalek mentioned this pull request May 28, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alalek alalek

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@alalek @dkurt @l-bat @dmallia17 @boubascript