Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
72c23e7b
Commit
72c23e7b
authored
Dec 05, 2011
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed most of test_core failures (except for SVD)
parent
77dda061
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
13 deletions
+14
-13
arithm.cpp
modules/core/src/arithm.cpp
+4
-4
lapack.cpp
modules/core/src/lapack.cpp
+3
-3
matmul.cpp
modules/core/src/matmul.cpp
+4
-3
stat.cpp
modules/core/src/stat.cpp
+2
-2
test_math.cpp
modules/core/test/test_math.cpp
+1
-1
No files found.
modules/core/src/arithm.cpp
View file @
72c23e7b
...
...
@@ -140,7 +140,7 @@ void vBinOp16(const T* src1, size_t step1, const T* src2, size_t step2,
r0
=
op16
(
r0
,
_mm_loadu_si128
((
const
__m128i
*
)(
src2
+
x
)));
r1
=
op16
(
r1
,
_mm_loadu_si128
((
const
__m128i
*
)(
src2
+
x
+
8
)));
_mm_storeu_si128
((
__m128i
*
)(
dst
+
x
),
r0
);
_mm_storeu_si128
((
__m128i
*
)(
dst
+
x
+
16
),
r1
);
_mm_storeu_si128
((
__m128i
*
)(
dst
+
x
+
8
),
r1
);
}
for
(
;
x
<=
sz
.
width
-
4
;
x
+=
4
)
{
...
...
@@ -194,7 +194,7 @@ void vBinOp32s(const int* src1, size_t step1, const int* src2, size_t step2,
r0
=
op32
(
r0
,
_mm_load_si128
((
const
__m128i
*
)(
src2
+
x
)));
r1
=
op32
(
r1
,
_mm_load_si128
((
const
__m128i
*
)(
src2
+
x
+
4
)));
_mm_store_si128
((
__m128i
*
)(
dst
+
x
),
r0
);
_mm_store_si128
((
__m128i
*
)(
dst
+
x
+
16
),
r1
);
_mm_store_si128
((
__m128i
*
)(
dst
+
x
+
4
),
r1
);
}
else
for
(
;
x
<=
sz
.
width
-
8
;
x
+=
8
)
...
...
@@ -204,7 +204,7 @@ void vBinOp32s(const int* src1, size_t step1, const int* src2, size_t step2,
r0
=
op32
(
r0
,
_mm_loadu_si128
((
const
__m128i
*
)(
src2
+
x
)));
r1
=
op32
(
r1
,
_mm_loadu_si128
((
const
__m128i
*
)(
src2
+
x
+
4
)));
_mm_storeu_si128
((
__m128i
*
)(
dst
+
x
),
r0
);
_mm_storeu_si128
((
__m128i
*
)(
dst
+
x
+
16
),
r1
);
_mm_storeu_si128
((
__m128i
*
)(
dst
+
x
+
4
),
r1
);
}
}
#endif
...
...
@@ -452,7 +452,7 @@ struct _VAbsDiff64f
struct
_VAnd8u
{
__m128i
operator
()(
const
__m128i
&
a
,
const
__m128i
&
b
)
const
{
return
_mm_and_si128
(
a
,
b
);
}};
struct
_VOr8u
{
__m128i
operator
()(
const
__m128i
&
a
,
const
__m128i
&
b
)
const
{
return
_mm_or_si128
(
a
,
b
);
}};
struct
_VXor8u
{
__m128i
operator
()(
const
__m128i
&
a
,
const
__m128i
&
b
)
const
{
return
_mm_xor_si128
(
a
,
b
);
}};
struct
_VNot8u
{
__m128i
operator
()(
const
__m128i
&
a
,
const
__m128i
&
)
const
{
return
_mm_
andnot_si128
(
_mm_setzero_si128
(
),
a
);
}};
struct
_VNot8u
{
__m128i
operator
()(
const
__m128i
&
a
,
const
__m128i
&
)
const
{
return
_mm_
xor_si128
(
_mm_set1_epi32
(
-
1
),
a
);
}};
#endif
...
...
modules/core/src/lapack.cpp
View file @
72c23e7b
...
...
@@ -547,12 +547,12 @@ JacobiSVDImpl_(_Tp* At, size_t astep, _Tp* _W, _Tp* Vt, size_t vstep, int m, int
for
(
i
=
0
;
i
<
n
;
i
++
)
{
for
(
k
=
0
,
s
=
0
;
k
<
m
;
k
++
)
for
(
k
=
0
,
s
d
=
0
;
k
<
m
;
k
++
)
{
_Tp
t
=
At
[
i
*
astep
+
k
];
s
+=
(
double
)
t
*
t
;
s
d
+=
(
double
)
t
*
t
;
}
W
[
i
]
=
s
;
W
[
i
]
=
s
d
;
if
(
Vt
)
{
...
...
modules/core/src/matmul.cpp
View file @
72c23e7b
...
...
@@ -2598,13 +2598,14 @@ static double dotProd_8u(const uchar* src1, const uchar* src2, int len)
#if CV_SSE2
if
(
USE_SSE2
)
{
int
j
,
len0
=
len
&
-
4
,
blockSize0
=
(
1
<<
1
5
),
blockSize
;
int
j
,
len0
=
len
&
-
4
,
blockSize0
=
(
1
<<
1
3
),
blockSize
;
__m128i
z
=
_mm_setzero_si128
();
while
(
i
<
len0
)
{
blockSize
=
std
::
min
(
len0
-
i
,
blockSize0
);
__m128i
s
=
_mm_setzero_si128
();
for
(
j
=
0
;
j
<=
blockSize
-
16
;
j
+=
16
)
j
=
0
;
for
(
;
j
<=
blockSize
-
16
;
j
+=
16
)
{
__m128i
b0
=
_mm_loadu_si128
((
const
__m128i
*
)(
src1
+
j
));
__m128i
b1
=
_mm_loadu_si128
((
const
__m128i
*
)(
src2
+
j
));
...
...
@@ -2614,7 +2615,7 @@ static double dotProd_8u(const uchar* src1, const uchar* src2, int len)
s1
=
_mm_unpacklo_epi8
(
b1
,
z
);
s3
=
_mm_unpackhi_epi8
(
b1
,
z
);
s0
=
_mm_madd_epi16
(
s0
,
s1
);
s
1
=
_mm_madd_epi16
(
s2
,
s3
);
s
2
=
_mm_madd_epi16
(
s2
,
s3
);
s
=
_mm_add_epi32
(
s
,
s0
);
s
=
_mm_add_epi32
(
s
,
s2
);
}
...
...
modules/core/src/stat.cpp
View file @
72c23e7b
...
...
@@ -850,9 +850,9 @@ float normL1_(const float* a, const float* b, int n)
if
(
USE_SSE2
)
{
float
CV_DECL_ALIGNED
(
16
)
buf
[
4
];
static
const
floa
t
CV_DECL_ALIGNED
(
16
)
absbuf
[
4
]
=
{
0x7fffffff
,
0x7fffffff
,
0x7fffffff
,
0x7fffffff
};
static
const
in
t
CV_DECL_ALIGNED
(
16
)
absbuf
[
4
]
=
{
0x7fffffff
,
0x7fffffff
,
0x7fffffff
,
0x7fffffff
};
__m128
d0
=
_mm_setzero_ps
(),
d1
=
_mm_setzero_ps
();
__m128
absmask
=
_mm_load_ps
(
absbuf
);
__m128
absmask
=
_mm_load_ps
(
(
const
float
*
)
absbuf
);
for
(
;
j
<=
n
-
8
;
j
+=
8
)
{
...
...
modules/core/test/test_math.cpp
View file @
72c23e7b
...
...
@@ -2153,7 +2153,7 @@ void Core_SVBkSbTest::prepare_to_validation( int )
CvMat
_w
=
w
,
_wdb
=
wdb
;
// use exactly the same threshold as in icvSVD... ,
// so the changes in the library and here should be synchronized.
double
threshold
=
cv
::
sum
(
w
)[
0
]
*
(
is_float
?
FLT_EPSILON
*
10
:
DBL_EPSILON
*
2
);
double
threshold
=
cv
::
sum
(
w
)[
0
]
*
(
DBL_EPSILON
*
2
);
//(
is_float ? FLT_EPSILON*10 : DBL_EPSILON*2);
wdb
=
Scalar
::
all
(
0
);
for
(
i
=
0
;
i
<
min_size
;
i
++
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment