Alexander Alekhin
65552bf403
dnn: fix build with Vulkan
2019-07-01 17:54:40 +03:00
Alexander Alekhin
6fdce865b8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-29 17:27:48 +00:00
Alexander Alekhin
25d62cc929
Merge pull request #14931 from dkurt:fix_dnn_js_sample_v4
2019-06-29 17:26:31 +00:00
Alexander Alekhin
93ef27aeba
Merge pull request #14920 from StefanBruens:fix_arm_on_aarch64_detection
2019-06-29 17:17:16 +00:00
Dmitry Kurtaev
a04ab2298b
Fix JS sample of dnn
2019-06-29 19:21:14 +03:00
Alexander Alekhin
453466eb1a
Merge pull request #14885 from anton-potapov:common_flow_explanatory_test_cases
2019-06-28 16:52:03 +00:00
Alexander Alekhin
49805f976a
Merge pull request #14923 from andrey-golubev:imgproc_tests_update_clean
2019-06-28 16:01:32 +00:00
Andrey Golubev
1666195984
Merge pull request #14922 from andrey-golubev:operators_tests_update_clean
...
G-API: Align operators tests to new test model (#14922 )
* Align operators tests to new test model
* Change init function in NotOperatorTest
2019-06-28 17:59:52 +03:00
Anton Potapov
3d345ca4c4
Async API for GAPI
...
- explanatory test cases for common usage models
2019-06-28 17:40:00 +03:00
atalaman
8dd596b7ba
Merge pull request #14892 from TolyaTalamanov:at/parameterized-render-tests
...
G-API: Parameterized render tests (#14892 )
* Init commit
* Add mat size as test parameter
* Add test for text render
* Add test for rect render
* Add tests for line and circle
* Remove old render tests
* Init output mats
* Remove methods input arguments
* Add comment about data loss in BGR2NV12 conversion
* Add edge test cases
* Replace default color for out mats black -> white
2019-06-28 17:11:03 +03:00
Stefan Brüns
e10c01047c
Fix detection of 32bit ARM builds on Aarch64
...
It is perfectly possible to compile ARM binaries on Aarch64. Generalize
the code to no only swap X86 with X86_64, but also ARM and AARCH64.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2019-06-28 14:17:30 +02:00
Andrey Golubev
719912e46e
Align imgproc tests to new model
2019-06-28 14:31:50 +03:00
Andrey Golubev
75c567b6ab
Merge pull request #14757 from andrey-golubev:core_tests_update
...
G-API: Introduce new approach to write accuracy tests (#14757 )
* G-API: Introduce new common accuracy test fixture
* Enable Range<> to Seq<> implicit conversion
* Fix shadowing parameters
* Update license headers
* Rename ALIGNED_TYPE to SAME_TYPE
* Move MkRange to tests
* Fix TODO(agolubev) in test instantiations
* Squash simple fixture declarations in one line
* Remove unused line
* Fix Windows issues with macro expansion
* Choose between 1 or 2 matrix initialization
* Redesign common class behavior
Use "views" for GetParam() provided by GTest
base class instead of doing segregation
(with copy!) of common and specific parameters:
request common or specific parameter directly
by index from GetParam()-returned parameters
* Refine user-level API and usage of new test model
* Fix -fpermissive errors
* Remove unnecessary init calls
* Replace GCompileArgs member variable with func ptr
* Rename initMatsRandN to make its behavior explicit
Rename initMatsRandN to initMatrixRandN to eliminate confusion:
initMatsRandN only initialized first matrix (similarly to
initMatrixRandU)
* Fix common of initNothing
* Update copyright dates in missed files
* Add check for specific parameters
* Fix coment stlye
2019-06-28 13:07:41 +03:00
Alexander Alekhin
8937e8756e
Merge pull request #14918 from alalek:dnn_ie_compilation
2019-06-27 21:34:41 +00:00
Alexander Alekhin
a743de0e24
dnn: adjust compilation options
2019-06-27 17:37:31 +03:00
Alexander Alekhin
c531e275cc
Merge pull request #14914 from Nuzhny007:3.4
2019-06-27 14:22:15 +00:00
Alexander Alekhin
e59c6caee5
Merge pull request #14905 from savuor:fix/inst_region_unique
2019-06-27 10:16:59 +00:00
Alexander Alekhin
54fc60eb37
Merge pull request #14881 from dkurt:dnn_ie_num_threads
2019-06-27 10:14:24 +00:00
Nuzhny007
031e57b359
Fixed names conflict with dldt
2019-06-27 13:13:48 +03:00
Dmitry Kurtaev
96a2f80bf2
Limit number of threads in CPU plugin of IE by OpenCV's getNumThreads
2019-06-27 12:09:00 +03:00
Rostislav Vasilikhin
f2f600f807
fixed multi instrumentations
2019-06-27 01:17:26 +03:00
Alexander Alekhin
b95e93c20a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-26 20:19:04 +00:00
Alexander Alekhin
24790e4061
Merge pull request #14899 from alalek:dnn_fix_bnll_layer
...
* dnn: fix BNLLLayer implementation
details: https://github.com/BVLC/caffe/blame/1.0/src/caffe/layers/bnll_layer.cpp#L17
* dnn: enable OCV/OpenCL BNLL layer
2019-06-26 23:04:26 +03:00
Alexander Alekhin
c251915198
Merge pull request #14895 from alalek:dnn_ie_extensions_path
2019-06-26 20:03:57 +00:00
Alexander Alekhin
4112866821
Merge pull request #14886 from alalek:fix_grabcut_kmeans_call_14879
2019-06-26 20:03:04 +00:00
Apoorv Goel
5b521bb778
Merge pull request #14898 from UnderscoreAsterisk:flann-warnings-and-4376
...
Keep a local copy of `features` from `flann::GenericIndex ` constructor (#14898 )
* Fix warnings on Windows
* Fix #4376
2019-06-26 19:35:11 +03:00
Alexander Alekhin
3cfd8cc1fe
Merge pull request #14900 from opencv:dnn_fix_js_sample_v3
2019-06-26 15:54:46 +00:00
Dmitry Kurtaev
411ca87a86
Remove extra ")"
2019-06-26 17:27:56 +03:00
Alexander Alekhin
2172544bb7
Merge pull request #14890 from alalek:dnn_consistent_protobuf_readers
2019-06-26 14:13:03 +00:00
Alexander Alekhin
df7049d465
Merge pull request #14889 from alalek:issue_14863
2019-06-26 14:10:14 +00:00
Alexander Alekhin
01a41d86bc
Merge pull request #14775 from cudawarped:master
2019-06-26 13:35:21 +00:00
Alexander Alekhin
0a461e7922
Merge pull request #13252 from take1014:filter2d_13179
2019-06-26 13:34:10 +00:00
James Bowley
daa308f81c
Update obsolete flag in Intel video decoder.
...
Old flag resulted in software implementation being selected when the Intel decoder is not the primary adapter.
2019-06-26 12:32:20 +03:00
Alexander Alekhin
333e51b217
dnn: configure plugin path for InferenceEngine
2019-06-26 06:41:01 +00:00
Alexander Alekhin
8fd87033ef
Merge pull request #14869 from alalek:samples_msvs2019_support
2019-06-25 22:07:02 +00:00
Alexander Alekhin
44d146af9a
Merge pull request #14814 from alalek:dnn_skip_test_tags
2019-06-25 22:00:25 +00:00
Alexander Alekhin
f3e9eb3371
dnn: both protobuf readers have similar behavior
...
- ReadProtoFromTextFile
- ReadProtoFromTextBuffer
2019-06-25 18:03:04 +03:00
Alexander Alekhin
63e4b35c19
Merge pull request #14849 from thangktran:thangktran/feature/fillPoly_and_fillConvexPoly_js_binding
2019-06-25 15:01:12 +00:00
Alexander Alekhin
e8a703a71d
core(intrin): v_load_low() workaround for aarch64+clang
2019-06-25 17:29:04 +03:00
Alexander Alekhin
9b9e04a061
Merge pull request #14875 from Legoless:master
2019-06-25 10:53:49 +00:00
Alexander Alekhin
4a6888ccf6
imgproc: fix kmeans() call from grabCut()
2019-06-25 13:42:04 +03:00
Dal Rupnik
e755c66418
[ #14873 ] Fix code signing issue in Try Compile script
2019-06-25 10:02:54 +02:00
Alexander Alekhin
b58b2c5ae8
Merge pull request #14878 from JoeHowse:4.1.0-patches
2019-06-24 18:29:30 +00:00
Alexander Alekhin
e8ff5cac1d
Merge pull request #14876 from dkurt:fix_js_face_recognition_v2
2019-06-24 18:29:05 +00:00
atalaman
de60600126
Merge pull request #14820 from TolyaTalamanov:at/circle_and_line
...
G-API: Implement line and circle draw operations (#14820 )
* Implement line and circle draw operations
* Fix comments to review
2019-06-24 17:37:32 +03:00
Dmitry Kurtaev
d17d3b66aa
Fix face recognition JS sample
2019-06-24 16:41:37 +03:00
Alexander Alekhin
f4ca2c8e72
Merge pull request #14874 from alalek:videoio_fix_gstreamer_plugin_build
2019-06-24 12:37:53 +00:00
Maksim Shabunin
46205a7235
videoio: fix GStreamer plugin build
2019-06-24 13:56:43 +03:00
Feng Chen
5620306c70
Merge pull request #14845 from vonchenplus:ocv_mirrorpad
...
* tensorflow support mirror pad
* revert macro define
* revert macro define
* reduce code duplication
* revert macro define
2019-06-24 12:27:42 +03:00
Alexander Alekhin
894f208de3
dnn(test): replace SkipTestException with tags
2019-06-23 13:12:23 +00:00