Merged
Conversation
* Add a FLANN example showing how to search a query image in a dataset * Clean: remove warning * Replace dependency to boost::filesystem by calls to core/utils/filesystem * Wait for escape key to exit * Add an example of binary descriptors support * Add program options for saving and loading the flann structure * Fix warnings on Win64 * Fix warnings on 3.4 branch still relying on C++03 * Add ctor to img_info structure * Comments modification * * Demo file of FLANN moved and renamed * Fix distances type when using binary vectors in the FLANN example * Rename FLANN example file * Remove dependency of the flann example to opencv_contrib's SURF. * Remove mention of FLANN and other descriptors that aimed at giving hint on the other options * Cleaner program options management * Make waitKey usage minimal in FLANN example * Fix the conditions order * Use cv::Ptr
Improving DaSiamRPN tracker sample * changed layerBlobs in dnn.cpp and added DaSiamRPN tracker * Improving DaSiamRPN tracker sample * Docs fix * Removed outdated changes * Trying to reinitialize tracker without reloading models. Worked with LaSOT-based benchmark with reinit rate=250 frames * Trying to reverse changes * Moving the model in the constructor * Fixing some issues with names * Variable name changed * Reverse parser arguments changes
* Supported ReduceSum op * Skip test
…x-ocl dnn: add exhaustive fusion tests, enable more eltwise fusions * add eltwise fusion tests, enable more eltwise fusions * merge weighted eltwise tests with eltwise tests
in case of OPENCV_OPENCL_DEVICE=disabled
* Added ReduceSum to ONNX importer * Fix comments * Fix Mul
…n-scalar * improve Mat::operator=(Scalar) * touch * remove trailing whitespace * TEST: check if old code pass test or not * remove CV_Error * remove warning * fix: is -> Scalar * 1) Mat *mat -> Mat &mat 2) return bool, add output param * add comment
This was referenced Aug 14, 2020
Member
Author
|
👍 |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#17643 from pemmanuelviel:pev--new-flann-demo
#17976 from YashasSamaga:dnn-fusion-tests-fix-ocl
#17982 from nglee:dev_cudaGpuMatConvertToInplaceFix (test code moved to opencv_contrib)
#18033 from ieliz:dasiamrpn
#18048 from l-bat:onnx_torchvision
#18074 from pemmanuelviel:pev--kmeans-refactoring
#18077 from l-bat:reduce_sum
#18078 from l-bat:fix_matmul
#18080 from nhlsm:improve-mat-operator-assign-scalar
#18092 from alalek:ocl_fix_image_format
#18096 from l-bat:update_onnx_importer
Previous "Merge 3.4": #18042