Dmitry Kurtaev
6aabd6cc7a
Remove cv::dnn::Importer
2017-12-18 18:08:28 +03:00
Vadim Pisarevsky
d3a124c820
Merge pull request #10339 from catree:add_doc_solvepnp_figure_desc
2017-12-18 09:13:06 +00:00
Vadim Pisarevsky
86cc4f3aa4
Merge pull request #10337 from dkurt:fix_pooling_layer
2017-12-18 09:11:54 +00:00
catree
fcb537bacd
Add a figure and some formulas to illustrate the PnP pose estimation principle.
2017-12-17 21:38:22 +01:00
Jiri Horner
3dbf392d48
fix build with intrinsics enabled
...
* since #10231 opencv with instrumentation does not build
2017-12-17 20:23:15 +01:00
Dmitry Kurtaev
2b43d4f477
Fix default pooling layer type
2017-12-17 16:46:40 +03:00
Alexander Alekhin
cac4a7e5b5
OpenCV version++
...
OpenCV 3.4.0-rc
2017-12-16 01:30:43 +03:00
Alexander Alekhin
3fddce67c6
experimental version++
2017-12-16 01:30:36 +03:00
Alexander Alekhin
361bb1197f
cmake: fix opencv_world build with contrib
2017-12-15 21:36:22 +00:00
Alexander Alekhin
70e1b4ddf0
Merge pull request #10319 from catree:move_SimulatedAnnealingSolver_Impl_cpp
...
Move SimulatedAnnealingSolver::Impl in cpp file
2017-12-15 23:06:48 +03:00
Rostislav Vasilikhin
bab86d65cb
Merge pull request #10258 from savuor:fix/kmeans_channels
...
* kmeans: number of channels in _centers fixed
* fixedType() is checked now
2017-12-15 21:48:48 +03:00
Alexander Alekhin
aef3019152
ml: fix SimulatedAnnealingSolver interface
2017-12-15 21:44:32 +03:00
Alexander Alekhin
28b19d6e3e
Merge pull request #10313 from alalek:rename_fix
...
Fix file names
2017-12-15 21:40:22 +03:00
Maksim Shabunin
1033f2b1bd
Fixed 3 issues found by static analysis
2017-12-15 17:29:26 +03:00
catree
0a439570a0
Move SimulatedAnnealingSolver::Impl in cpp file. Fix some typos.
2017-12-15 14:09:59 +01:00
Vadim Pisarevsky
62359f70ff
Merge pull request #10306 from dkurt:faster_rcnn
2017-12-15 12:23:53 +00:00
Alexander Alekhin
7d4a67f2a8
Merge pull request #10315 from alalek:issue_10147_debug
...
dnn: more debug information
2017-12-15 15:01:12 +03:00
Alexander Alekhin
d5f152494b
fix file names
2017-12-15 14:59:35 +03:00
Sayed Adel
1b8acd662f
core:ppc Fix several issues for VSX ( #10303 )
...
- fix conversion intrinsics compatibility with xlc
- implement odd-elements 2 to 4 conversion intrinsics
- improve implementation of universal intrinsic v_popcount
- rename FORCE_INLINE to VSX_FINLINE in vsx_utils.hpp
2017-12-15 14:03:46 +03:00
LaurentBerger
7ad308ea47
Simulated Annealing for ANN_MLP training method ( #10213 )
...
* Simulated Annealing for ANN_MLP training method
* EXPECT_LT
* just to test new data
* manage RNG
* Try again
* Just run buildbot with new data
* try to understand
* Test layer
* New data- new test
* Force RNG in backprop
* Use Impl to avoid virtual method
* reset all weights
* try to solve ABI
* retry
* ABI solved?
* till problem with dynamic_cast
* Something is wrong
* Solved?
* disable backprop test
* remove ANN_MLP_ANNEALImpl
* Disable weight in varmap
* Add example for SimulatedAnnealing
2017-12-15 13:57:39 +03:00
zhijackchen
6df8ac0342
Merge pull request #10283 from zhijackchen:exr_export
...
* Fix issue #10114
Convert table change
From:
CV_8U -> HALF
CV_8S -> HALF
CV_16U -> UINT
CV_16S -> UINT
CV_32S -> UINT
CV_32F -> FLOAT
To:
CV_8U -> HALF
CV_8S -> HALF
CV_16U -> UINT
CV_16S -> FLOAT
CV_32S -> FLOAT loss precision
CV_32F -> FLOAT
Signed integer can't be presented well with UINT. Even adjust bias, CV16S and CV32S will be confused when load from exr file.
Also fix CV_8S negative value incorrect bug
* EXR import and export
imread() from EXR returns CV_32F only
imwrite() accepts CV_32 cv::Mat only and stores FLOAT images by default. Add imwrite() flag to store in HALF format.
* fix compiling error
* clean up
* fix EXR import issues
2017-12-15 12:23:44 +03:00
Dmitry Kurtaev
08112f3821
Faster-RCNN models support
2017-12-15 12:16:21 +03:00
Vadim Pisarevsky
84535a60f2
Merge pull request #10307 from savuor:fix/expect_softfloat
2017-12-14 21:00:46 +00:00
Tomoaki Teshima
ca1a0a1108
core: remove raw SSE2/NEON implementation from convert.cpp ( #9831 )
...
* remove raw SSE2/NEON implementation from convert.cpp
* remove raw implementation from Cvt_SIMD
* remove raw implementation from cvtScale_SIMD
* remove raw implementation from cvtScaleAbs_SIMD
* remove duplicated implementation cvt_<float, short>
* remove duplicated implementation cvtScale_<short, short, float>
* add "from double" version of Cvt_SIMD
* modify the condition of test ConvertScaleAbs
* Update convert.cpp
fixed crash in cvtScaleAbs(8s=>8u)
* fixed compile error on Win32
* fixed several test failures because of accuracy loss in cvtScale(int=>int)
* fixed NEON implementation of v_cvt_f64(int=>double) intrinsic
* another attempt to fix test failures
* keep trying to fix the test failures and just introduced compile warnings
* fixed one remaining test (subtractScalar)
2017-12-15 00:00:35 +03:00
Rostislav Vasilikhin
7d18f49a49
SoftFloat tests: assert => expect
2017-12-14 21:03:25 +03:00
Alexander Alekhin
0da947e6b3
dnn: more debug information
2017-12-14 19:21:17 +03:00
Vadim Pisarevsky
d0d2faf551
Merge pull request #10294 from alalek:fix_copyToMask_dst_initialization
2017-12-14 11:05:09 +00:00
Vadim Pisarevsky
7b701fee60
Merge pull request #10302 from alalek:issue_10254
2017-12-13 17:31:40 +00:00
Vadim Pisarevsky
99183e98d3
Merge pull request #10293 from alalek:fix_persistence_with_deprecated_traits
2017-12-13 17:30:23 +00:00
Alexander Alekhin
c231472ad6
Merge pull request #10290 from tomoaki0705:fixVS2012Round
2017-12-13 15:30:21 +00:00
Alexander Alekhin
9930076dc5
core(test): avoid filename duplicates in tests
2017-12-13 18:21:55 +03:00
Tomoaki Teshima
ecb6bcf2e0
fix build error on Visual Studio 2012
...
* round doesn't exists in standard library of Visual Studio 2012
* apply the correct computation of ROI
2017-12-13 17:40:07 +03:00
Vitaly Tuzov
51cb56ef2c
Implementation of bit-exact resize. Internal calls to linear resize updated to use bit-exact version. ( #9468 )
2017-12-13 15:00:38 +03:00
Vadim Pisarevsky
84ee4d701a
Merge pull request #10297 from tomoaki0705:suppressOclWarning
2017-12-13 07:56:35 +00:00
Tomoaki Teshima
267c5a747b
suppress warnings on OpenCL build
...
* stop re-enabling the warning C4127
* disabling is done in CMakeLists.txt
2017-12-13 15:07:51 +09:00
Alexander Alekhin
62ed6cdc74
core: fix copyTo(with mask) dst initialization
2017-12-12 18:40:13 +03:00
Alexander Alekhin
ce20efb8e7
Merge pull request #9804 from woodychow:optimize_cveigen
2017-12-12 14:58:04 +00:00
Alexander Alekhin
825b14278e
core: fix persistence with deprecated traits
2017-12-12 17:07:36 +03:00
Alexander Alekhin
c0b6061a5e
core(test): Core_Eigen.vector_32 use relative norm
2017-12-12 15:07:31 +03:00
Alexander Alekhin
2324674dfb
core(test): update eps in testEigen<float>: 1e-6 => 1e-4
2017-12-12 15:07:31 +03:00
Alexander Alekhin
53b5afbba9
core(test): refactor Java Eigenvalues/PCA tests
2017-12-12 15:07:31 +03:00
Alexander Alekhin
d48d2d7fe2
core(test): refactor PCA test
...
- CV_L2 -> relative NORM_L2
- eigenEps: 1e-6 ==> 1e-4
- evalEps: 1e-6 ==> 1e-5
- evecEps: 1e-3 ==> 5e-3
- RNG seed: 12345
- drop non-informative legacy test code (ts->printf, etc)
2017-12-12 15:07:27 +03:00
Alexander Alekhin
b0bce60c16
Merge pull request #10284 from alalek:dnn_debug_error
2017-12-12 09:33:50 +00:00
Alexander Alekhin
eff42f6387
dnn: more debug info
2017-12-12 12:04:10 +03:00
Alexander Alekhin
5404930112
Merge pull request #9260 from Cartucho:add_python_signatures
2017-12-12 08:58:14 +00:00
Alexander Alekhin
e49febb70f
Merge pull request #10269 from terfendail:softdouble_round
2017-12-11 12:48:03 +00:00
Vadim Pisarevsky
7e680bd9ff
Merge pull request #10215 from dkurt:dnn_js
2017-12-11 12:47:52 +00:00
Vadim Pisarevsky
9fa505027a
Merge pull request #10263 from mshabunin:embedded-build
2017-12-11 12:42:45 +00:00
Vadim Pisarevsky
61c2f094b9
Merge pull request #10280 from alalek:python_cv2_to_cv
2017-12-11 12:39:00 +00:00
Vadim Pisarevsky
558b17dede
Merge pull request #10231 from alalek:ocl_refactor_program_api
2017-12-11 12:34:22 +00:00
