Skip to content

Merge 3.4#16406

Merged
alalek merged 40 commits intoopencv:masterfrom
alalek:merge-3.4
Jan 22, 2020
Merged

Merge 3.4#16406
alalek merged 40 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jan 22, 2020

#15488 from ChipKerchner:vectorizeMinMax2
#15929 from sturkmen72:patch-3
#16146 from pmur:reg_16137x2
#16273 from JulienMaille:wrapper_available_target
#16294 from h6197627:master
#16309 from ganesh-k13:bugfix/imdecode-resize
#16325 from alalek:core_simd_neon_fix_alignment_lut
#16353 from dkurt:uninitialized_value
#16354 from dkurt:dnn_ie_custom_cpu_layers
#16357 from dkurt:dnn_ie_reset_myriad
#16358 from ashishkrshrivastava:opencv-2
#16367 from dkurt:dnn_ie_ngraph_mvn
#16369 from kraj:gcc10
#16372 from alalek:backport_16350
#16377 from alalek:fix_16373
#16378 from alalek:dnn_getMemoryShapes_error_dump_blobs
#16385 from alalek:ts_update_optional_message
#16389 from alalek:core_fix_msa_build
#16391 from l-bat:ngraph_lrn
#16400 from alalek:issue_7001
#16408 from alalek:dnn_test_tolerance_myriad

Previous "Merge 3.4": #16346

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
#buildworker:Custom=linux-2
#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
buildworker:Custom=linux-1
#build_image:Custom=javascript-simd
#build_image:Custom=mips64el
build_image:Custom Mac=openvino-2019r3.0
build_image:Custom Win=openvino-2019r3.0
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

sturkmen72 and others added 30 commits November 17, 2019 21:25
Actually, we can do this in constant time. xofs always
contains same or increasing offset values. We can instead
find the most extreme value used and never attempt to load it.

Similarly, we can note for all dx >= 0 and dx < (dwidth - cn)
where xofs[dx] + cn < xofs[dwidth-cn] implies dx < (dwidth - cn).

Thus, we can use this to control our loop termination optimally.

This fixes opencv#16137 with little or no performance impact. I have
also added a debug check as a sanity check.
gcc 10+ has renamed this option, therefore check for gcc version before
deciding which name to use for opt parameter

Signed-off-by: Khem Raj <raj.khem@gmail.com>
…arget

* add a wrapper for getAvailableTargets

* add java wrapper on Target enum
Vectorize minMaxIdx functions

* Updated documentation and intrinsic tests for v_reduce

* Add other files back in from the forced push

* Prevent an constant overflow with v_reduce for int8 type

* Another alternative to fix constant overflow warning.

* Fix another compiler warning.

* Update comments and change comparison form to be consistent with other vectorized loops.

* Change return type of v_reduce_min & max for v_uint8 and v_uint16 to be same as lane type.

* Cast v_reduce functions to int to avoid overflow. Reduce number of parameters in MINMAXIDX_REDUCE macro.

* Restore cast type for v_reduce_min & max to LaneType
* Added flag handlers for imread and imdecode | Issue 16203

Undo imread change

Added Imread resize tests

Added imdecode flags check

Added imdecode tests for resize

Removed trailing whitespace

Removed IMREAD_IGNORE_ORIENTATION check

Added else condition

Removed IMREAD_IGNORE_ORIENTATION check in decode

Added HAVE_JPEG guards

Added static_cast for Win32

Added resize for non jpegs

Added tests for non jpeg resize case

Fixed resize value in assert

Changed tests to Value-Parameterized Tests

Changed tests to Value-Parameterized Tests | handled >> in cpp

Changed tests to Value-Parameterized Tests | removed trailing whitespace

* imgcodecs: update test
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jan 22, 2020

👍

@alalek alalek merged commit 3d14dd4 into opencv:master Jan 22, 2020
@alalek alalek mentioned this pull request Jan 28, 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.