Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gaoqiong
MIGraphX
Commits
c05e72e2
Commit
c05e72e2
authored
Nov 05, 2018
by
Shucai Xiao
Browse files
change the macro MIGRAPH_ININE_NS back to version_1 in .cpp files.
parent
d6d386f7
Changes
43
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
40 additions
and
40 deletions
+40
-40
src/auto_contiguous.cpp
src/auto_contiguous.cpp
+2
-2
src/common_subexpression_elimination.cpp
src/common_subexpression_elimination.cpp
+2
-2
src/constant_propagate.cpp
src/constant_propagate.cpp
+2
-2
src/dead_code_elimination.cpp
src/dead_code_elimination.cpp
+2
-2
src/eliminate_allocation.cpp
src/eliminate_allocation.cpp
+2
-2
src/eliminate_contiguous.cpp
src/eliminate_contiguous.cpp
+2
-2
src/env.cpp
src/env.cpp
+2
-2
src/fwd_conv_batchnorm_rewrite.cpp
src/fwd_conv_batchnorm_rewrite.cpp
+2
-2
src/generate.cpp
src/generate.cpp
+2
-2
src/instruction.cpp
src/instruction.cpp
+2
-2
src/onnx/onnx.cpp
src/onnx/onnx.cpp
+2
-2
src/opt/memory_coloring.cpp
src/opt/memory_coloring.cpp
+2
-2
src/opt/memory_coloring_impl.cpp
src/opt/memory_coloring_impl.cpp
+2
-2
src/program.cpp
src/program.cpp
+2
-2
src/shape.cpp
src/shape.cpp
+2
-2
src/simplify_algebra.cpp
src/simplify_algebra.cpp
+2
-2
src/simplify_reshapes.cpp
src/simplify_reshapes.cpp
+2
-2
src/targets/cpu/gemm.cpp
src/targets/cpu/gemm.cpp
+2
-2
src/targets/cpu/lowering.cpp
src/targets/cpu/lowering.cpp
+2
-2
src/targets/cpu/target.cpp
src/targets/cpu/target.cpp
+2
-2
No files found.
src/auto_contiguous.cpp
View file @
c05e72e2
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
#include <migraph/iterator_for.hpp>
#include <migraph/iterator_for.hpp>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
void
auto_contiguous
::
apply
(
program
&
p
)
const
void
auto_contiguous
::
apply
(
program
&
p
)
const
{
{
...
@@ -20,5 +20,5 @@ void auto_contiguous::apply(program& p) const
...
@@ -20,5 +20,5 @@ void auto_contiguous::apply(program& p) const
}
}
}
}
}
// namespace
MIGRAPH_INLINE_NS
}
//
inline
namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/common_subexpression_elimination.cpp
View file @
c05e72e2
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
#include <unordered_set>
#include <unordered_set>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
template
<
class
Range
>
template
<
class
Range
>
void
cse_range
(
program
&
p
,
Range
&&
r
)
void
cse_range
(
program
&
p
,
Range
&&
r
)
...
@@ -35,5 +35,5 @@ void cse_range(program& p, Range&& r)
...
@@ -35,5 +35,5 @@ void cse_range(program& p, Range&& r)
void
common_subexpression_elimination
::
apply
(
program
&
p
)
const
{
cse_range
(
p
,
iterator_for
(
p
));
}
void
common_subexpression_elimination
::
apply
(
program
&
p
)
const
{
cse_range
(
p
,
iterator_for
(
p
));
}
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/constant_propagate.cpp
View file @
c05e72e2
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
#include <migraph/literal.hpp>
#include <migraph/literal.hpp>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
struct
match_const_add
struct
match_const_add
{
{
...
@@ -26,5 +26,5 @@ struct match_const_add
...
@@ -26,5 +26,5 @@ struct match_const_add
void
constant_propagate
::
apply
(
program
&
p
)
const
{
match
::
find_matches
(
p
,
match_const_add
{});
}
void
constant_propagate
::
apply
(
program
&
p
)
const
{
match
::
find_matches
(
p
,
match_const_add
{});
}
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/dead_code_elimination.cpp
View file @
c05e72e2
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
#include <migraph/ranges.hpp>
#include <migraph/ranges.hpp>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
template
<
class
Range
,
class
Iterator
>
template
<
class
Range
,
class
Iterator
>
std
::
ptrdiff_t
bidistance
(
const
Range
&
r
,
Iterator
start
,
Iterator
last
)
std
::
ptrdiff_t
bidistance
(
const
Range
&
r
,
Iterator
start
,
Iterator
last
)
...
@@ -62,5 +62,5 @@ void dead_code_elimination::apply(program& p) const
...
@@ -62,5 +62,5 @@ void dead_code_elimination::apply(program& p) const
p
.
remove_instructions
(
std
::
next
(
last
),
p
.
end
());
p
.
remove_instructions
(
std
::
next
(
last
),
p
.
end
());
}
}
}
// namespace
MIGRAPH_INLINE_NS
}
//
inline
namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/eliminate_allocation.cpp
View file @
c05e72e2
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
#include <migraph/pass_config.hpp>
#include <migraph/pass_config.hpp>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
void
eliminate_allocation
::
apply
(
program
&
p
)
const
void
eliminate_allocation
::
apply
(
program
&
p
)
const
{
{
...
@@ -37,5 +37,5 @@ void eliminate_allocation::apply(program& p) const
...
@@ -37,5 +37,5 @@ void eliminate_allocation::apply(program& p) const
}
}
}
}
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/eliminate_contiguous.cpp
View file @
c05e72e2
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
#include <utility>
#include <utility>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
bool
try_compute_shape
(
const
operation
&
op
,
const
std
::
vector
<
instruction_ref
>&
args
)
bool
try_compute_shape
(
const
operation
&
op
,
const
std
::
vector
<
instruction_ref
>&
args
)
{
{
...
@@ -47,5 +47,5 @@ void eliminate_contiguous::apply(program& p) const
...
@@ -47,5 +47,5 @@ void eliminate_contiguous::apply(program& p) const
}
}
}
}
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/env.cpp
View file @
c05e72e2
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
#include <cstdlib>
#include <cstdlib>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
bool
enabled
(
const
char
*
name
)
bool
enabled
(
const
char
*
name
)
{
{
...
@@ -30,5 +30,5 @@ std::vector<std::string> env(const char* name)
...
@@ -30,5 +30,5 @@ std::vector<std::string> env(const char* name)
return
{{
p
}};
return
{{
p
}};
}
}
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/fwd_conv_batchnorm_rewrite.cpp
View file @
c05e72e2
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
#include <migraph/dfor.hpp>
#include <migraph/dfor.hpp>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
void
fwd_conv_batchnorm_rewrite
::
apply
(
program
&
p
)
const
void
fwd_conv_batchnorm_rewrite
::
apply
(
program
&
p
)
const
{
{
...
@@ -67,5 +67,5 @@ void fwd_conv_batchnorm_rewrite::apply(program& p) const
...
@@ -67,5 +67,5 @@ void fwd_conv_batchnorm_rewrite::apply(program& p) const
}
}
}
}
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/generate.cpp
View file @
c05e72e2
#include <migraph/generate.hpp>
#include <migraph/generate.hpp>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
argument
generate_argument
(
shape
s
,
unsigned
long
seed
)
argument
generate_argument
(
shape
s
,
unsigned
long
seed
)
{
{
...
@@ -31,5 +31,5 @@ literal abs(literal l)
...
@@ -31,5 +31,5 @@ literal abs(literal l)
return
transform
(
std
::
move
(
l
),
[](
auto
x
)
{
return
std
::
fabs
(
x
);
});
return
transform
(
std
::
move
(
l
),
[](
auto
x
)
{
return
std
::
fabs
(
x
);
});
}
}
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/instruction.cpp
View file @
c05e72e2
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
#include <migraph/erase.hpp>
#include <migraph/erase.hpp>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
instruction
::
instruction
(
operation
o
,
shape
r
,
std
::
vector
<
instruction_ref
>
args
)
instruction
::
instruction
(
operation
o
,
shape
r
,
std
::
vector
<
instruction_ref
>
args
)
:
op
(
std
::
move
(
o
)),
result
(
std
::
move
(
r
)),
arguments
(
std
::
move
(
args
))
:
op
(
std
::
move
(
o
)),
result
(
std
::
move
(
r
)),
arguments
(
std
::
move
(
args
))
...
@@ -183,5 +183,5 @@ shape compute_shape(const operation& op, const std::vector<instruction_ref>& arg
...
@@ -183,5 +183,5 @@ shape compute_shape(const operation& op, const std::vector<instruction_ref>& arg
return
op
.
compute_shape
(
compute_shapes
(
args
));
return
op
.
compute_shape
(
compute_shapes
(
args
));
}
}
}
// namespace
MIGRAPH_INLINE_NS
}
//
inline
namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/onnx/onnx.cpp
View file @
c05e72e2
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
#include <migraph/config.hpp>
#include <migraph/config.hpp>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
struct
unknown
struct
unknown
{
{
std
::
string
op
;
std
::
string
op
;
...
@@ -626,5 +626,5 @@ program parse_onnx(const std::string& name)
...
@@ -626,5 +626,5 @@ program parse_onnx(const std::string& name)
return
std
::
move
(
parser
.
prog
);
return
std
::
move
(
parser
.
prog
);
}
}
}
// namespace
MIGRAPH_INLINE_NS
}
//
inline
namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/opt/memory_coloring.cpp
View file @
c05e72e2
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
#include "memory_coloring_impl.hpp"
#include "memory_coloring_impl.hpp"
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
void
memory_coloring
::
apply
(
program
&
p
)
const
void
memory_coloring
::
apply
(
program
&
p
)
const
{
{
...
@@ -13,5 +13,5 @@ void memory_coloring::apply(program& p) const
...
@@ -13,5 +13,5 @@ void memory_coloring::apply(program& p) const
}
}
}
}
}
// namespace
MIGRAPH_INLINE_NS
}
//
inline
namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/opt/memory_coloring_impl.cpp
View file @
c05e72e2
#include "memory_coloring_impl.hpp"
#include "memory_coloring_impl.hpp"
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
void
memory_coloring_impl
::
run
()
void
memory_coloring_impl
::
run
()
{
{
...
@@ -358,5 +358,5 @@ void live_interval::dump()
...
@@ -358,5 +358,5 @@ void live_interval::dump()
#endif
#endif
}
// namespace
MIGRAPH_INLINE_NS
}
//
inline
namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/program.cpp
View file @
c05e72e2
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#include <utility>
#include <utility>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
MIGRAPH_DECLARE_ENV_VAR
(
MIGRAPH_TRACE_COMPILE
)
MIGRAPH_DECLARE_ENV_VAR
(
MIGRAPH_TRACE_COMPILE
)
MIGRAPH_DECLARE_ENV_VAR
(
MIGRAPH_TRACE_EVAL
)
MIGRAPH_DECLARE_ENV_VAR
(
MIGRAPH_TRACE_EVAL
)
...
@@ -500,5 +500,5 @@ std::ostream& operator<<(std::ostream& os, const program& p)
...
@@ -500,5 +500,5 @@ std::ostream& operator<<(std::ostream& os, const program& p)
return
os
;
return
os
;
}
}
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/shape.cpp
View file @
c05e72e2
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
#include <iostream>
#include <iostream>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
struct
shape_impl
struct
shape_impl
{
{
...
@@ -191,5 +191,5 @@ std::ostream& operator<<(std::ostream& os, const shape& x)
...
@@ -191,5 +191,5 @@ std::ostream& operator<<(std::ostream& os, const shape& x)
return
os
;
return
os
;
}
}
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/simplify_algebra.cpp
View file @
c05e72e2
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
#include <migraph/literal.hpp>
#include <migraph/literal.hpp>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
struct
find_add_lit_broadcast
struct
find_add_lit_broadcast
{
{
...
@@ -61,5 +61,5 @@ struct find_add_lit_broadcast
...
@@ -61,5 +61,5 @@ struct find_add_lit_broadcast
void
simplify_algebra
::
apply
(
program
&
p
)
const
{
match
::
find_matches
(
p
,
find_add_lit_broadcast
{});
}
void
simplify_algebra
::
apply
(
program
&
p
)
const
{
match
::
find_matches
(
p
,
find_add_lit_broadcast
{});
}
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/simplify_reshapes.cpp
View file @
c05e72e2
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
#include <unordered_set>
#include <unordered_set>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
bool
is_reshaper
(
const
std
::
string
&
name
)
bool
is_reshaper
(
const
std
::
string
&
name
)
{
{
...
@@ -60,5 +60,5 @@ void simplify_reshapes::apply(program& p) const
...
@@ -60,5 +60,5 @@ void simplify_reshapes::apply(program& p) const
}
}
}
}
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/targets/cpu/gemm.cpp
View file @
c05e72e2
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
#include <blaze/math/CustomMatrix.h>
#include <blaze/math/CustomMatrix.h>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
namespace
cpu
{
namespace
cpu
{
template
<
class
T
>
template
<
class
T
>
...
@@ -94,5 +94,5 @@ void migemm(
...
@@ -94,5 +94,5 @@ void migemm(
}
}
}
// namespace cpu
}
// namespace cpu
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/targets/cpu/lowering.cpp
View file @
c05e72e2
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
#include <utility>
#include <utility>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
namespace
cpu
{
namespace
cpu
{
template
<
typename
T
>
template
<
typename
T
>
...
@@ -658,5 +658,5 @@ struct cpu_apply
...
@@ -658,5 +658,5 @@ struct cpu_apply
void
lowering
::
apply
(
program
&
p
)
const
{
cpu_apply
{
&
p
}.
apply
();
}
void
lowering
::
apply
(
program
&
p
)
const
{
cpu_apply
{
&
p
}.
apply
();
}
}
// namespace cpu
}
// namespace cpu
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
src/targets/cpu/target.cpp
View file @
c05e72e2
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
#include <migraph/auto_contiguous.hpp>
#include <migraph/auto_contiguous.hpp>
namespace
migraph
{
namespace
migraph
{
inline
namespace
MIGRAPH_INLINE_NS
{
inline
namespace
version_1
{
namespace
cpu
{
namespace
cpu
{
std
::
string
target
::
name
()
const
{
return
"cpu"
;
}
std
::
string
target
::
name
()
const
{
return
"cpu"
;
}
...
@@ -15,5 +15,5 @@ std::vector<pass> target::get_passes(migraph::context&) const
...
@@ -15,5 +15,5 @@ std::vector<pass> target::get_passes(migraph::context&) const
}
}
}
// namespace cpu
}
// namespace cpu
}
// namespace
MIGRAPH_INLINE_NS
}
// namespace
version_1
}
// namespace migraph
}
// namespace migraph
Prev
1
2
3
Next
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