Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
9065f08c
Commit
9065f08c
authored
Dec 12, 2015
by
Davis King
Browse files
removed cruft
parent
a4c5983a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
0 additions
and
75 deletions
+0
-75
dlib/dnn/cpu_dlib.cpp
dlib/dnn/cpu_dlib.cpp
+0
-14
dlib/dnn/cpu_dlib.h
dlib/dnn/cpu_dlib.h
+0
-5
dlib/dnn/cuda_dlib.cu
dlib/dnn/cuda_dlib.cu
+0
-19
dlib/dnn/cuda_dlib.h
dlib/dnn/cuda_dlib.h
+0
-5
dlib/dnn/tensor_tools.cpp
dlib/dnn/tensor_tools.cpp
+0
-16
dlib/dnn/tensor_tools.h
dlib/dnn/tensor_tools.h
+0
-16
No files found.
dlib/dnn/cpu_dlib.cpp
View file @
9065f08c
...
@@ -12,20 +12,6 @@ namespace dlib
...
@@ -12,20 +12,6 @@ namespace dlib
namespace
cpu
namespace
cpu
{
{
// -----------------------------------------------------------------------------------
void
multiply
(
tensor
&
dest
,
const
tensor
&
src
)
{
DLIB_CASSERT
(
dest
.
size
()
==
src
.
size
(),
""
);
const
auto
d
=
dest
.
host
();
const
auto
s
=
src
.
host
();
for
(
size_t
i
=
0
;
i
<
src
.
size
();
++
i
)
d
[
i
]
*=
s
[
i
];
}
// -----------------------------------------------------------------------------------
// -----------------------------------------------------------------------------------
void
multiply
(
void
multiply
(
...
...
dlib/dnn/cpu_dlib.h
View file @
9065f08c
...
@@ -15,11 +15,6 @@ namespace dlib
...
@@ -15,11 +15,6 @@ namespace dlib
// -----------------------------------------------------------------------------------
// -----------------------------------------------------------------------------------
void
multiply
(
tensor
&
dest
,
const
tensor
&
src
);
void
multiply
(
void
multiply
(
tensor
&
dest
,
tensor
&
dest
,
const
tensor
&
src1
,
const
tensor
&
src1
,
...
...
dlib/dnn/cuda_dlib.cu
View file @
9065f08c
...
@@ -27,25 +27,6 @@ namespace dlib
...
@@ -27,25 +27,6 @@ namespace dlib
return
dev
;
return
dev
;
}
}
// -----------------------------------------------------------------------------------
__global__
void
_cuda_multiply
(
float
*
d
,
const
float
*
s
,
size_t
n
)
{
for
(
auto
i
:
grid_stride_range
(
0
,
n
))
{
d
[
i
]
*=
s
[
i
];
}
}
void
multiply
(
tensor
&
dest
,
const
tensor
&
src
)
{
DLIB_CASSERT
(
dest
.
size
()
==
src
.
size
(),
""
);
_cuda_multiply
<<<
512
,
512
>>>
(
dest
.
device
(),
src
.
device
(),
src
.
size
());
}
// -----------------------------------------------------------------------------------
// -----------------------------------------------------------------------------------
__global__
void
_cuda_multiply1
(
float
*
d
,
const
float
*
s1
,
const
float
*
s2
,
size_t
n
)
__global__
void
_cuda_multiply1
(
float
*
d
,
const
float
*
s1
,
const
float
*
s2
,
size_t
n
)
...
...
dlib/dnn/cuda_dlib.h
View file @
9065f08c
...
@@ -24,11 +24,6 @@ namespace dlib
...
@@ -24,11 +24,6 @@ namespace dlib
// -----------------------------------------------------------------------------------
// -----------------------------------------------------------------------------------
void
multiply
(
tensor
&
dest
,
const
tensor
&
src
);
void
multiply
(
void
multiply
(
tensor
&
dest
,
tensor
&
dest
,
const
tensor
&
src1
,
const
tensor
&
src1
,
...
...
dlib/dnn/tensor_tools.cpp
View file @
9065f08c
...
@@ -92,22 +92,6 @@ namespace dlib { namespace tt
...
@@ -92,22 +92,6 @@ namespace dlib { namespace tt
}
}
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
void
multiply
(
tensor
&
dest
,
const
tensor
&
src
)
{
DLIB_CASSERT
(
have_same_dimensions
(
dest
,
src
)
==
true
,
""
);
#ifdef DLIB_USE_CUDA
cuda
::
multiply
(
dest
,
src
);
#else
cpu
::
multiply
(
dest
,
src
);
#endif
}
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
void
multiply
(
void
multiply
(
...
...
dlib/dnn/tensor_tools.h
View file @
9065f08c
...
@@ -90,22 +90,6 @@ namespace dlib { namespace tt
...
@@ -90,22 +90,6 @@ namespace dlib { namespace tt
#endif
#endif
};
};
// ----------------------------------------------------------------------------------------
// TODO, delete this function
void
multiply
(
tensor
&
dest
,
const
tensor
&
src
);
/*!
requires
- have_same_dimensions(dest,src) == true
ensures
- #dest == dest*src
That is, for all valid i:
#dest.host()[i] == dest.host()[i]*src.host()[i]
!*/
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
void
multiply
(
void
multiply
(
...
...
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