(4.x) Merge 3.4 #21051
Merged
(4.x) Merge 3.4 #21051
Conversation
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
fix bug: wrong output dimension when "keep_dims" is false in pooling layer. * fix bug in max layer * code align * delete permute layer and add test case * add name assert * check other cases * remove c++11 features * style:add "const" remove assert * style:sanitize file names
1. Code uses PPC_FEATURE_HAS_VSX, but it's not checked similarly to PPC_FEATURE2_ARCH_3_00 and PPC_FEATURE2_ARCH_3_00 for availability. FreeBSD has those macros in machine/cpu.h, but I went with the way chosen for PPC_FEATURE2_ARCH_3_00 and PPC_FEATURE2_ARCH_3_00. Other than that, FreeBSD also has sys/auxv.h and that's where elf_aux_info() is defined. 2. getauxval() is actually Linux-only, but code checked for __unix__. It won't work on all UNIX, so change it back to __linux__. Add another code variant strictly for FreeBSD. 3. Update comment. This commit adds code for FreeBSD, but recently there appeared support for powerpc64 in OpenBSD.
…ointset Fix seg fault houghlinespointset * Clarify parameter doc for HoughLinesPointSet * Fix seg fault. * Add regression test. * Fix latex typo
* dnn(ocl4dnn): fix LRN layer accuracy problems - FP16 intermediate computation is not accurate and may provide NaN values * dnn(test): update tolerance for FP16
|
👍 |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
#20870 from pkubaj:master
#20904 from Crayon-new:fix_bug_in_maxLayer
#21005 from nikpappas:bug-samples-falsecolor-trackbar
#21025 from alalek:issue_21004
#21030 from tv3141:fix_seg_fault_houghlinespointset
Previous "Merge 3.4": #21013