Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
dlib
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
钟尚武
dlib
Commits
29f56b12
Commit
29f56b12
authored
Dec 08, 2015
by
Davis King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made the affine_transform functions consistent.
parent
76786430
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
cpu_dlib.cpp
dlib/dnn/cpu_dlib.cpp
+2
-2
cpu_dlib.h
dlib/dnn/cpu_dlib.h
+1
-1
cuda_dlib.cu
dlib/dnn/cuda_dlib.cu
+2
-2
cuda_dlib.h
dlib/dnn/cuda_dlib.h
+1
-1
tensor_tools.cpp
dlib/dnn/tensor_tools.cpp
+1
-1
tensor_tools.h
dlib/dnn/tensor_tools.h
+2
-2
No files found.
dlib/dnn/cpu_dlib.cpp
View file @
29f56b12
...
...
@@ -102,12 +102,13 @@ namespace dlib
// -----------------------------------------------------------------------------------
void
affine_transform
(
resizable_
tensor
&
dest
,
tensor
&
dest
,
const
tensor
&
src
,
const
tensor
&
A
,
const
tensor
&
B
)
{
DLIB_CASSERT
(
have_same_dimensions
(
dest
,
src
),
""
);
DLIB_CASSERT
(
((
A
.
num_samples
()
==
1
&&
B
.
num_samples
()
==
1
)
||
(
A
.
num_samples
()
==
src
.
num_samples
()
&&
B
.
num_samples
()
==
src
.
num_samples
()))
&&
...
...
@@ -115,7 +116,6 @@ namespace dlib
A
.
nc
()
==
B
.
nc
()
&&
B
.
nc
()
==
src
.
nc
()
&&
A
.
k
()
==
B
.
k
()
&&
B
.
k
()
==
src
.
k
(),
""
);
dest
.
copy_size
(
src
);
auto
d
=
dest
.
host
();
auto
s
=
src
.
host
();
const
auto
a
=
A
.
host
();
...
...
dlib/dnn/cpu_dlib.h
View file @
29f56b12
...
...
@@ -58,7 +58,7 @@ namespace dlib
// -----------------------------------------------------------------------------------
void
affine_transform
(
resizable_
tensor
&
dest
,
tensor
&
dest
,
const
tensor
&
src
,
const
tensor
&
A
,
const
tensor
&
B
...
...
dlib/dnn/cuda_dlib.cu
View file @
29f56b12
...
...
@@ -160,12 +160,13 @@ namespace dlib
}
void affine_transform(
resizable_
tensor& dest,
tensor& dest,
const tensor& src,
const tensor& A,
const tensor& B
)
{
DLIB_CASSERT(have_same_dimensions(dest, src),"");
DLIB_CASSERT(
((A.num_samples()==1 && B.num_samples()==1) ||
(A.num_samples()==src.num_samples() && B.num_samples()==src.num_samples())) &&
...
...
@@ -173,7 +174,6 @@ namespace dlib
A.nc()==B.nc() && B.nc()==src.nc() &&
A.k() ==B.k() && B.k()==src.k(),"");
dest.copy_size(src);
if (A.num_samples() == 1)
{
_cuda_affine_transform3<<<512,512>>>(dest.device(), src.device(), src.size(), A.device(), B.device(), A.size());
...
...
dlib/dnn/cuda_dlib.h
View file @
29f56b12
...
...
@@ -68,7 +68,7 @@ namespace dlib
// -----------------------------------------------------------------------------------
void
affine_transform
(
resizable_
tensor
&
dest
,
tensor
&
dest
,
const
tensor
&
src
,
const
tensor
&
A
,
const
tensor
&
B
...
...
dlib/dnn/tensor_tools.cpp
View file @
29f56b12
...
...
@@ -179,7 +179,7 @@ namespace dlib { namespace tt
// ----------------------------------------------------------------------------------------
void
affine_transform
(
resizable_
tensor
&
dest
,
tensor
&
dest
,
const
tensor
&
src
,
const
tensor
&
A
,
const
tensor
&
B
...
...
dlib/dnn/tensor_tools.h
View file @
29f56b12
...
...
@@ -175,13 +175,14 @@ namespace dlib { namespace tt
// ----------------------------------------------------------------------------------------
void
affine_transform
(
resizable_
tensor
&
dest
,
tensor
&
dest
,
const
tensor
&
src
,
const
tensor
&
A
,
const
tensor
&
B
);
/*!
requires
- have_same_dimensions(dest,src) == true
- if (A.num_samples() == 1) then
- B.num_samples() == 1
- else
...
...
@@ -191,7 +192,6 @@ namespace dlib { namespace tt
- A.nc() == B.nc() == src.nc()
- A.k() == B.k() == src.k()
ensures
- have_same_dimensions(#dest,src) == true
- if (A.num_samples() == 1) then
- #dest == A*src + B
(done for each sample in src)
...
...
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