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
gaoqiong
MIGraphX
Commits
877b8c44
Commit
877b8c44
authored
Jun 18, 2019
by
Khalique
Browse files
formatting
parent
4f5024b7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
49 deletions
+48
-49
src/include/migraphx/op/convolution.hpp
src/include/migraphx/op/convolution.hpp
+19
-18
src/include/migraphx/op/pooling.hpp
src/include/migraphx/op/pooling.hpp
+19
-17
src/targets/gpu/device/pad.cpp
src/targets/gpu/device/pad.cpp
+10
-14
No files found.
src/include/migraphx/op/convolution.hpp
View file @
877b8c44
...
@@ -83,7 +83,8 @@ struct convolution
...
@@ -83,7 +83,8 @@ struct convolution
// static_cast<std::size_t>(std::ceil(
// static_cast<std::size_t>(std::ceil(
// static_cast<double>(input.lens()[2] - weights.lens()[2] + 1) / stride[0])),
// static_cast<double>(input.lens()[2] - weights.lens()[2] + 1) / stride[0])),
// static_cast<std::size_t>(std::ceil(
// static_cast<std::size_t>(std::ceil(
// static_cast<double>(input.lens()[3] - weights.lens()[3] + 1) / stride[1]))}};
// static_cast<double>(input.lens()[3] - weights.lens()[3] + 1) /
// stride[1]))}};
// }
// }
// else
// else
// {
// {
...
...
src/include/migraphx/op/pooling.hpp
View file @
877b8c44
...
@@ -56,13 +56,13 @@ struct pooling
...
@@ -56,13 +56,13 @@ struct pooling
input
.
lens
()[
1
],
input
.
lens
()[
1
],
std
::
size_t
(
std
::
max
<
std
::
ptrdiff_t
>
(
std
::
size_t
(
std
::
max
<
std
::
ptrdiff_t
>
(
1
,
1
,
floor_divide
<
std
::
ptrdiff_t
>
(
floor_divide
<
std
::
ptrdiff_t
>
(
input
.
lens
()[
2
]
+
2
*
padding
[
0
]
-
lengths
[
0
],
input
.
lens
()[
2
]
+
2
*
padding
[
0
]
-
lengths
[
0
],
stride
[
0
])
+
stride
[
0
])
+
1
)),
1
)),
std
::
size_t
(
std
::
max
<
std
::
ptrdiff_t
>
(
std
::
size_t
(
std
::
max
<
std
::
ptrdiff_t
>
(
1
,
1
,
floor_divide
<
std
::
ptrdiff_t
>
(
floor_divide
<
std
::
ptrdiff_t
>
(
input
.
lens
()[
3
]
+
2
*
padding
[
1
]
-
lengths
[
1
],
input
.
lens
()[
3
]
+
2
*
padding
[
1
]
-
lengths
[
1
],
stride
[
1
])
+
stride
[
1
])
+
1
)),
1
)),
}};
}};
// }
// }
...
@@ -83,10 +83,12 @@ struct pooling
...
@@ -83,10 +83,12 @@ struct pooling
// input.lens()[1],
// input.lens()[1],
// std::size_t(std::max<std::ptrdiff_t>(
// std::size_t(std::max<std::ptrdiff_t>(
// 1,
// 1,
// floor_divide<std::ptrdiff_t>(input.lens()[2] - lengths[0], stride[0]) + 1)),
// floor_divide<std::ptrdiff_t>(input.lens()[2] - lengths[0], stride[0]) +
// 1)),
// std::size_t(std::max<std::ptrdiff_t>(
// std::size_t(std::max<std::ptrdiff_t>(
// 1,
// 1,
// floor_divide<std::ptrdiff_t>(input.lens()[3] - lengths[1], stride[1]) + 1)),
// floor_divide<std::ptrdiff_t>(input.lens()[3] - lengths[1], stride[1]) +
// 1)),
// }};
// }};
// }
// }
// else
// else
...
...
src/targets/gpu/device/pad.cpp
View file @
877b8c44
...
@@ -15,16 +15,14 @@ argument
...
@@ -15,16 +15,14 @@ argument
pad
(
hipStream_t
stream
,
argument
result
,
argument
arg1
,
float
value
,
std
::
vector
<
std
::
int64_t
>
pads
)
pad
(
hipStream_t
stream
,
argument
result
,
argument
arg1
,
float
value
,
std
::
vector
<
std
::
int64_t
>
pads
)
{
{
std
::
size_t
nelements
=
arg1
.
get_shape
().
elements
();
std
::
size_t
nelements
=
arg1
.
get_shape
().
elements
();
if
(
float_equal
(
value
,
std
::
numeric_limits
<
float
>::
lowest
()))
if
(
float_equal
(
value
,
std
::
numeric_limits
<
float
>::
lowest
()))
{
{
visit_all
(
result
)([
&
](
auto
output
)
{
visit_all
(
result
)([
&
](
auto
output
)
{
auto
*
outptr
=
device_cast
(
output
.
data
());
auto
*
outptr
=
device_cast
(
output
.
data
());
auto
val
=
device_cast
(
std
::
numeric_limits
<
typename
auto
val
=
decltype
(
output
)
::
value_type
>::
lowest
());
device_cast
(
std
::
numeric_limits
<
typename
decltype
(
output
)
::
value_type
>::
lowest
());
gs_launch
(
stream
,
nelements
)([
=
](
auto
i
)
{
gs_launch
(
stream
,
nelements
)([
=
](
auto
i
)
{
outptr
[
i
]
=
val
;
});
outptr
[
i
]
=
val
;
});
});
});
}
}
...
@@ -32,9 +30,7 @@ pad(hipStream_t stream, argument result, argument arg1, float value, std::vector
...
@@ -32,9 +30,7 @@ pad(hipStream_t stream, argument result, argument arg1, float value, std::vector
{
{
visit_all
(
result
)([
&
](
auto
output
)
{
visit_all
(
result
)([
&
](
auto
output
)
{
auto
*
outptr
=
device_cast
(
output
.
data
());
auto
*
outptr
=
device_cast
(
output
.
data
());
gs_launch
(
stream
,
nelements
)([
=
](
auto
i
)
{
gs_launch
(
stream
,
nelements
)([
=
](
auto
i
)
{
outptr
[
i
]
=
value
;
});
outptr
[
i
]
=
value
;
});
});
});
}
}
...
...
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