Merge branch 'master' of https://github.com/ROCmSoftwarePlatform/MIGraph into lrn

src/program.cpp

@@ -366,7 +366,8 @@ argument program::eval(std::unordered_map<std::string, argument> params) const
         auto& ctx = this->impl->ctx;
         return generic_eval(*this, this->impl->ctx, std::move(params), [&](auto& ins, auto f) {
             ctx.finish();
-            std::cout << "Run instruction: " << ins->name() << std::endl;
+            std::cout << "Run instruction: ";
+            this->debug_print(ins);
             return f();
         });
     }
@@ -473,8 +474,8 @@ void program::perf_report(std::ostream& os, std::size_t n, parameter_map params)
        << ", " << std::round(calculate_overhead_percent) << "%" << std::endl;
 }
 
-void program::debug_print() { std::cout << *this << std::endl; }
-void program::debug_print(instruction_ref ins)
+void program::debug_print() const { std::cout << *this << std::endl; }
+void program::debug_print(instruction_ref ins) const
 {
     std::stringstream ss;
     print_program(ss, *this, [&](auto x, auto&& names) {
@@ -485,7 +486,7 @@ void program::debug_print(instruction_ref ins)
         }
     });
 }
-void program::debug_print(const std::vector<instruction_ref>& inss)
+void program::debug_print(const std::vector<instruction_ref>& inss) const
 {
     for(auto ins : inss)
         debug_print(ins);

src/targets/cpu/CMakeLists.txt

@@ -4,17 +4,19 @@ add_library(migraph_cpu
     lowering.cpp
     gemm.cpp
 )
+set_target_properties(migraph_cpu PROPERTIES EXPORT_NAME cpu)
 
 find_path(BLAZE_INCLUDE blaze/Blaze.h)
 find_package(Threads)
 
 rocm_clang_tidy_check(migraph_cpu)
 target_link_libraries(migraph_cpu migraph Threads::Threads)
-target_include_directories(migraph_cpu PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
 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)
+rocm_install_targets(
+  TARGETS migraph_cpu
+  INCLUDE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
 

src/targets/gpu/CMakeLists.txt

@@ -17,6 +17,7 @@ add_library(migraph_device
     device/mul.cpp
     device/concat.cpp
 )
+set_target_properties(migraph_device PROPERTIES EXPORT_NAME device)
 rocm_clang_tidy_check(migraph_device)
 target_link_libraries(migraph_device migraph hip::device)
 target_include_directories(migraph_device PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
@@ -42,15 +43,14 @@ add_library(migraph_gpu
     write_literals.cpp
     rocblas.cpp
 )
+set_target_properties(migraph_gpu PROPERTIES EXPORT_NAME gpu)
 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>)
+target_link_libraries(migraph_gpu PUBLIC migraph MIOpen roc::rocblas)
+target_link_libraries(migraph_gpu PRIVATE migraph_device)
 
-#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)
+rocm_install_targets(
+  TARGETS migraph_gpu migraph_device
+  INCLUDE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+)