Skip to content

Merge 3.4#18274

Merged
alalek merged 12 commits intoopencv:masterfrom
alalek:merge-3.4
Sep 5, 2020
Merged

Merge 3.4#18274
alalek merged 12 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Sep 5, 2020

#18061 from danielenricocahall:fix-kd-tree
#18126 from danielenricocahall:add-oob-error-sample-weighting
#18234 from l-bat:onnx_reshape
#18246 from YashasSamaga:dnn-permute-fix-unwanted-ocl-init
#18255 from alalek:backport_18243
#18265 from alalek:fixup_17489

Previous "Merge 3.4": #18242

buildworker:Win64 OpenCL=windows-2
#buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
#build_image:Custom=javascript
buildworker:Custom=linux-4
build_image:Custom=javascript-simd:1.39.16
#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

YashasSamaga and others added 11 commits September 2, 2020 12:18
Fix KD Tree kNN Implementation

* Make KDTree mode in kNN functional

remove docs and revert change

Make KDTree mode in kNN functional

spacing

Make KDTree mode in kNN functional

fix window compilations warnings

Make KDTree mode in kNN functional

fix window compilations warnings

Make KDTree mode in kNN functional

casting

Make KDTree mode in kNN functional

formatting

Make KDTree mode in kNN functional

* test coding style
…-sample-weighting

Account for sample weights in calculating OOB Error

* account for sample weights in oob error calculation

* redefine oob error functions

* fix ABI compatibility
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Sep 5, 2020

👍

@alalek alalek merged commit 5c76f99 into opencv:master Sep 5, 2020
@alalek alalek mentioned this pull request Sep 19, 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.

5 participants