Skip to content

Merge 3.4#18042

Merged
alalek merged 35 commits intoopencv:masterfrom
alalek:merge-3.4
Aug 6, 2020
Merged

Merge 3.4#18042
alalek merged 35 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Aug 5, 2020

#17478 from tomoaki0705:dropOldCC
#17742 from SoheibKadi/DetectionOutput_layer_doc
#17885 from alalek:dnn_ocl_slice_update
#17907 from Yosshi999:gsoc_asift-py2cpp
#17957 from AnnaPetrovicheva:ap/update-logo
#17967 from l-bat:non_const_weights_for_conv
#17977 from paroj:hervec
#17983 from Windfisch:Windfisch-patch-jpeg2000
#17987 from mshabunin:fix-xcode-carotene
#17998 from dkurt:dnn_fix_ngraph
#18008 from gsmatos:document-patchnans
#18012 from sturkmen72:update_doc_and_sample
#18016 from pemmanuelviel:pev--cleaner-hierarchical-clustering
#18017 from danielenricocahall:add-relu-to-darknet
#18018 from danielenricocahall:add-compose-panorama-python-binding
#18019 from pemmanuelviel:pev--multiple-kmeans-trees
#18027 from dkurt:dnn_backport_ngraph
#18036 from alalek:backport_17858

Previous "Merge 3.4": #17970

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.3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.4.0:16.04
#buildworker:Custom=linux-1
#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.3.0
build_image:Custom Mac=openvino-2020.4.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.3.0
build_image:Custom Win=openvino-2020.4.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

SoheibKadi and others added 30 commits July 4, 2020 06:37
  * keep it possible to build for old CC
  * make sure old generations don't come up for the choice
  * remove related version check of old one
libjasper has recently changed `jas_matrix_get` from a macro to an inline function
(389951d071 in https://github.com/jasper-software/jasper), causing the build to fail.
* calib3d: calibrateHandEye - allow using Rodrigues vectors for rotation

* calib3d: calibrateHandEye - test rvec representation
fix tests

    pick 54039c2 add python binding and tests for composePanorama
* Implement ASIFT in C++

* '>>' should be '> >' within a nested template

* add a sample for asift usage

* bugfix empty keypoints cause crash

* simpler initialization for mask

* suppress the number of lines

* correct tex document

* type casting

* add descriptorsize for asift

* smaller testdata for asift

* more smaller test data

* add OpenCV short license header
DNN: OpenCL/slice update

* dnn(ocl/slice): make slice kernel VTune friendly

- more unique names
- inline code of copy functions

* dnn(ocl/slice): prefer to spawn more work groups

- even in case with 1D copy
- perf improvement up to 2x of kernel time (due to changed configuration 128x1x1 => 128x32x1)

* dnn(ocl/slice): cache kernel exec info
…_doc

Adding comment from source code to DetectionOutputLayer class documentation
* Supported convolution with non-const weights

* Fix opencl blobs

* Update tests
…ns-trees

* Possibility to set more than one tree for the hierarchical KMeans (default is still 1 tree).

This particularly improves NN retrieval results with binary vectors, allowing better quality
compared to LSH for similar processing time when speed is the criterium.

* Add explanations on the FLANN's hierarchical KMeans for binary data.
add relu option

add relu as activation option in darknet

simplify the setParams if-else ladder

add relu as activation option in darknet

correct activation_param type

format

format

add relu as activation option in darknet

spacing

spacing

add relu as activation option in darknet
alalek and others added 4 commits August 4, 2020 16:17
… in MobileSSD networks

* hopefully, eliminated compile warnings, errors, as well as failure in one test

* * fixed a few typos
* decreased buffer size in some cases
* added more optimal im2row branch in the case of 1x1 convolutions
* tuned fastConv to reduce the number of passes over arrays

backport of commit 77b01de
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Aug 6, 2020

👍

@alalek alalek merged commit fa25faa into opencv:master Aug 6, 2020
@alalek alalek mentioned this pull request Aug 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.