(4.x) Merge 3.4 #21535
Merged
(4.x) Merge 3.4 #21535
Conversation
This file contains 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
- Add special case handling when submodule has the same name as parent - `PyDict_SetItemString` doesn't steal reference, so reference count should be explicitly decremented to transfer object life-time ownership - Add sanity checks for module registration input
- avoid missing of necessary library dependencies
…es-initialization-fix
clang-cl defines both __clang__ and _MSC_VER, yet uses `#pragma GCC` to disable certain diagnostics. At the time `-Wreturn-type-c-linkage` was reported by clang-cl. This PR fixes this behavior by reordering defines.
Left shift of negative values is undefined.
hwcap should actually be long.
- improve compatibility with further compiler versions - warnings are not errors by default
…es-refcounter-fix
* Fix wrong MSAN errors. Because Fortran is called in Lapack, MSAN does not think the memory has been written even though it is the case. MSAN does no support well cross-language memory analysis. * Make a dedicated check.
alalek
commented
Jan 28, 2022
| @@ -1619,7 +1654,7 @@ void ONNXImporter::parseGRU(LayerParams& layerParams, const opencv_onnx::NodePro | |||
| layerParams.type = "Reshape"; | |||
| layerParams.set("dim", DictValue::arrayInt(&gruShape[0], gruShape.size())); | |||
| node_proto.set_input(0, gruParams.name); // redirect input to GRU | |||
| node_proto.set_output(0, layerParams.name); // keep origin GRU's name | |||
| node_proto.set_output(0, output_name); // keep origin GRU's name | |||
There was a problem hiding this comment.
Fixed to support changes from #21490
- fixed ONNX importer
- ONNX output is 1 tensor per defined output instead of N tensors from outputs of "output" layer
|
👍 |
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.
#21349 from alalek:cmake_link_no_undefined
#21429 from alalek:dnn_api_explicit_const_3.4#21478 from VadimLevin:dev/vlevin/pysubmodules-initialization-fix#21483 from alalek:cmake_highgui_opengl_update_3.4
#21490 from rogday:optional_outputs
#21497 from alalek:fix_build_gcc12_3.4#21499 from sturkmen72:update_documentation
#21501 from sturkmen72:update_samples
#21505 from georgthegreat:patch-1
#21506 from alalek:core_fp_denormals
#21512 from vrabaud:3.4_ub_drawing
#21514 from pkubaj:patch-1
#21517 from alalek:cmake_dont_force_werror
#21521 from alalek:dnn_ignore_denormals
#21525 from VadimLevin:dev/vlevin/pysubmodules-refcounter-fix#21527 from vrabaud:3.4_msan
#21540 from alalek:dnn_support_outputs_registration_3.4
Previous "Merge 3.4": #21480
Blocked by changes from #21490. More fixes are required. Done #21540