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
9e865197
Commit
9e865197
authored
Aug 15, 2019
by
Paul
Browse files
Formatting
parent
e5f07268
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
10 deletions
+13
-10
src/onnx/onnx.cpp
src/onnx/onnx.cpp
+12
-9
src/targets/gpu/device/include/migraphx/gpu/device/reduce.hpp
...targets/gpu/device/include/migraphx/gpu/device/reduce.hpp
+1
-1
No files found.
src/onnx/onnx.cpp
View file @
9e865197
...
@@ -1011,9 +1011,10 @@ struct onnx_parser
...
@@ -1011,9 +1011,10 @@ struct onnx_parser
}
}
std
::
vector
<
operation
>
vec_actv_funcs
(
vec_names
.
size
());
std
::
vector
<
operation
>
vec_actv_funcs
(
vec_names
.
size
());
std
::
transform
(
vec_names
.
begin
(),
vec_names
.
end
(),
vec_actv_funcs
.
begin
(),
[
&
](
const
auto
&
fn
)
{
std
::
transform
(
vec_names
.
begin
(),
return
map_actv_funcs
[
fn
];
vec_names
.
end
(),
});
vec_actv_funcs
.
begin
(),
[
&
](
const
auto
&
fn
)
{
return
map_actv_funcs
[
fn
];
});
// To be added later
// To be added later
float
clip
=
0.0
;
float
clip
=
0.0
;
...
@@ -1127,9 +1128,10 @@ struct onnx_parser
...
@@ -1127,9 +1128,10 @@ struct onnx_parser
}
}
std
::
vector
<
operation
>
vec_actv_funcs
(
vec_names
.
size
());
std
::
vector
<
operation
>
vec_actv_funcs
(
vec_names
.
size
());
std
::
transform
(
vec_names
.
begin
(),
vec_names
.
end
(),
vec_actv_funcs
.
begin
(),
[
&
](
const
auto
&
name
)
{
std
::
transform
(
vec_names
.
begin
(),
return
map_actv_funcs
[
name
];
vec_names
.
end
(),
});
vec_actv_funcs
.
begin
(),
[
&
](
const
auto
&
name
)
{
return
map_actv_funcs
[
name
];
});
float
clip
=
0.0
;
float
clip
=
0.0
;
if
(
contains
(
attributes
,
"clip"
))
if
(
contains
(
attributes
,
"clip"
))
...
@@ -1299,9 +1301,10 @@ struct onnx_parser
...
@@ -1299,9 +1301,10 @@ struct onnx_parser
}
}
std
::
vector
<
operation
>
vec_actv_funcs
(
vec_names
.
size
());
std
::
vector
<
operation
>
vec_actv_funcs
(
vec_names
.
size
());
std
::
transform
(
vec_names
.
begin
(),
vec_names
.
end
(),
vec_actv_funcs
.
begin
(),
[
&
](
const
auto
&
name
)
{
std
::
transform
(
vec_names
.
begin
(),
return
map_actv_funcs
[
name
];
vec_names
.
end
(),
});
vec_actv_funcs
.
begin
(),
[
&
](
const
auto
&
name
)
{
return
map_actv_funcs
[
name
];
});
float
clip
=
0.0
;
float
clip
=
0.0
;
if
(
contains
(
attributes
,
"clip"
))
if
(
contains
(
attributes
,
"clip"
))
...
...
src/targets/gpu/device/include/migraphx/gpu/device/reduce.hpp
View file @
9e865197
...
@@ -155,7 +155,7 @@ __device__ void dpp_reduce(T& in, Op op)
...
@@ -155,7 +155,7 @@ __device__ void dpp_reduce(T& in, Op op)
__device__
inline
void
dpp_reduce
(
float
&
x
,
sum
)
__device__
inline
void
dpp_reduce
(
float
&
x
,
sum
)
{
{
#if defined
(MIGRAPHX_USE_CLANG_TIDY) || defined(CPPCHECK)
#if defined(MIGRAPHX_USE_CLANG_TIDY) || defined(CPPCHECK)
x
=
1
;
x
=
1
;
#else
#else
__asm__
volatile
(
"s_nop 4
\n
"
__asm__
volatile
(
"s_nop 4
\n
"
...
...
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