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
b1e097b3
Commit
b1e097b3
authored
Sep 13, 2018
by
mei-ye
Browse files
merge with master
parent
e40a8f31
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
15 deletions
+15
-15
CMakeLists.txt
CMakeLists.txt
+1
-1
src/CMakeLists.txt
src/CMakeLists.txt
+3
-3
src/include/migraph/operators.hpp
src/include/migraph/operators.hpp
+1
-1
src/targets/cpu/CMakeLists.txt
src/targets/cpu/CMakeLists.txt
+3
-3
src/targets/gpu/CMakeLists.txt
src/targets/gpu/CMakeLists.txt
+6
-6
src/targets/gpu/include/migraph/gpu/context.hpp
src/targets/gpu/include/migraph/gpu/context.hpp
+1
-1
No files found.
CMakeLists.txt
View file @
b1e097b3
...
...
@@ -18,7 +18,7 @@ else()
set
(
MIGRAPH_ENABLE_GPU Off CACHE BOOL
""
)
endif
()
add_compile_options
(
-std=c++14
-g -O0
)
add_compile_options
(
-std=c++14
)
list
(
APPEND CMAKE_MODULE_PATH
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake
)
include
(
EnableCompilerWarnings
)
...
...
src/CMakeLists.txt
View file @
b1e097b3
...
...
@@ -22,9 +22,9 @@ if(MIGRAPH_ENABLE_GPU)
add_subdirectory
(
targets/gpu
)
endif
()
install
(
TARGETS migraph
LIBRARY DESTINATION /opt/rocm/lib
)
#
install (TARGETS migraph
#
LIBRARY DESTINATION /opt/rocm/lib)
install
(
DIRECTORY include/migraph DESTINATION /opt/rocm/include
)
#
install (DIRECTORY include/migraph DESTINATION /opt/rocm/include)
src/include/migraph/operators.hpp
View file @
b1e097b3
...
...
@@ -538,7 +538,7 @@ struct load
{
shape
s
;
std
::
size_t
offset
=
0
;
std
::
string
name
()
const
{
return
"load
:
"
;
}
std
::
string
name
()
const
{
return
"load"
;
}
shape
compute_shape
(
const
std
::
vector
<
shape
>&
inputs
)
const
{
check_shapes
{
inputs
}.
has
(
1
);
...
...
src/targets/cpu/CMakeLists.txt
View file @
b1e097b3
...
...
@@ -14,7 +14,7 @@ target_include_directories(migraph_cpu PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_
target_include_directories
(
migraph_cpu PRIVATE
${
BLAZE_INCLUDE
}
)
target_compile_definitions
(
migraph_cpu PRIVATE -DBLAZE_USE_CPP_THREADS
)
install
(
TARGETS migraph_cpu
LIBRARY DESTINATION /opt/rocm/lib
)
install
(
DIRECTORY include/migraph DESTINATION /opt/rocm/include
)
#
install (TARGETS migraph_cpu
#
LIBRARY DESTINATION /opt/rocm/lib)
#
install (DIRECTORY include/migraph DESTINATION /opt/rocm/include)
src/targets/gpu/CMakeLists.txt
View file @
b1e097b3
...
...
@@ -34,11 +34,11 @@ rocm_clang_tidy_check(migraph_gpu)
target_link_libraries
(
migraph_gpu migraph MIOpen migraph_device roc::rocblas
)
target_include_directories
(
migraph_gpu PUBLIC $<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/include>
)
install
(
TARGETS migraph_gpu
LIBRARY DESTINATION /opt/rocm/lib
)
install
(
DIRECTORY include/migraph DESTINATION /opt/rocm/include
)
#
install (TARGETS migraph_gpu
#
LIBRARY DESTINATION /opt/rocm/lib)
#
install (DIRECTORY include/migraph DESTINATION /opt/rocm/include)
install
(
TARGETS migraph_device
LIBRARY DESTINATION /opt/rocm/lib
)
install
(
DIRECTORY include/migraph DESTINATION /opt/rocm/include
)
#
install (TARGETS migraph_device
#
LIBRARY DESTINATION /opt/rocm/lib)
#
install (DIRECTORY include/migraph DESTINATION /opt/rocm/include)
src/targets/gpu/include/migraph/gpu/context.hpp
View file @
b1e097b3
...
...
@@ -6,9 +6,9 @@
#include <migraph/gpu/hip.hpp>
#include <unordered_map>
namespace
migraph
{
namespace
gpu
{
using
parameter_map
=
std
::
unordered_map
<
std
::
string
,
argument
>
;
struct
context
{
...
...
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