Commit b1e097b3 authored by mei-ye's avatar mei-ye
Browse files

merge with master

parent e40a8f31
...@@ -18,7 +18,7 @@ else() ...@@ -18,7 +18,7 @@ else()
set(MIGRAPH_ENABLE_GPU Off CACHE BOOL "") set(MIGRAPH_ENABLE_GPU Off CACHE BOOL "")
endif() 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) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
include(EnableCompilerWarnings) include(EnableCompilerWarnings)
......
...@@ -22,9 +22,9 @@ if(MIGRAPH_ENABLE_GPU) ...@@ -22,9 +22,9 @@ if(MIGRAPH_ENABLE_GPU)
add_subdirectory(targets/gpu) add_subdirectory(targets/gpu)
endif() endif()
install (TARGETS migraph #install (TARGETS migraph
LIBRARY DESTINATION /opt/rocm/lib) # LIBRARY DESTINATION /opt/rocm/lib)
install (DIRECTORY include/migraph DESTINATION /opt/rocm/include) #install (DIRECTORY include/migraph DESTINATION /opt/rocm/include)
...@@ -538,7 +538,7 @@ struct load ...@@ -538,7 +538,7 @@ struct load
{ {
shape s; shape s;
std::size_t offset = 0; 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 shape compute_shape(const std::vector<shape>& inputs) const
{ {
check_shapes{inputs}.has(1); check_shapes{inputs}.has(1);
......
...@@ -14,7 +14,7 @@ target_include_directories(migraph_cpu PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_ ...@@ -14,7 +14,7 @@ target_include_directories(migraph_cpu PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_
target_include_directories(migraph_cpu PRIVATE ${BLAZE_INCLUDE}) target_include_directories(migraph_cpu PRIVATE ${BLAZE_INCLUDE})
target_compile_definitions(migraph_cpu PRIVATE -DBLAZE_USE_CPP_THREADS) target_compile_definitions(migraph_cpu PRIVATE -DBLAZE_USE_CPP_THREADS)
install (TARGETS migraph_cpu #install (TARGETS migraph_cpu
LIBRARY DESTINATION /opt/rocm/lib) # LIBRARY DESTINATION /opt/rocm/lib)
install (DIRECTORY include/migraph DESTINATION /opt/rocm/include) #install (DIRECTORY include/migraph DESTINATION /opt/rocm/include)
...@@ -34,11 +34,11 @@ rocm_clang_tidy_check(migraph_gpu) ...@@ -34,11 +34,11 @@ rocm_clang_tidy_check(migraph_gpu)
target_link_libraries(migraph_gpu migraph MIOpen migraph_device roc::rocblas) target_link_libraries(migraph_gpu migraph MIOpen migraph_device roc::rocblas)
target_include_directories(migraph_gpu PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>) target_include_directories(migraph_gpu PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
install (TARGETS migraph_gpu #install (TARGETS migraph_gpu
LIBRARY DESTINATION /opt/rocm/lib) # LIBRARY DESTINATION /opt/rocm/lib)
install (DIRECTORY include/migraph DESTINATION /opt/rocm/include) #install (DIRECTORY include/migraph DESTINATION /opt/rocm/include)
install (TARGETS migraph_device #install (TARGETS migraph_device
LIBRARY DESTINATION /opt/rocm/lib) # LIBRARY DESTINATION /opt/rocm/lib)
install (DIRECTORY include/migraph DESTINATION /opt/rocm/include) #install (DIRECTORY include/migraph DESTINATION /opt/rocm/include)
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
#include <migraph/gpu/hip.hpp> #include <migraph/gpu/hip.hpp>
#include <unordered_map> #include <unordered_map>
namespace migraph { namespace migraph {
namespace gpu { namespace gpu {
using parameter_map = std::unordered_map<std::string, argument>; using parameter_map = std::unordered_map<std::string, argument>;
struct context struct context
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment