Merge branch 'packaging'

CMakeLists.txt

@@ -10,9 +10,20 @@ if( NOT MSVC_IDE AND NOT CMAKE_BUILD_TYPE )
     set( CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." )
 endif()
 
-project(migraphlib)
+# Default installation path
+if(WIN32)
+    set(CMAKE_INSTALL_PREFIX "/opt/rocm/x86_64-w64-mingw32" CACHE PATH "")
+else()
+    set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE PATH "")
+endif()
+
+project(migraph)
 find_package(ROCM REQUIRED)
 
+include(ROCMSetupVersion)
+
+rocm_setup_version(VERSION 0.1)
+
 option( BUILD_SHARED_LIBS "Build as a shared library" ON )
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@@ -119,6 +130,15 @@ rocm_enable_cppcheck(
 
 enable_testing()
 
+include(ROCMCreatePackage)
+rocm_create_package(
+    NAME MIGraph
+    DESCRIPTION "AMD's graph optimizer"
+    MAINTAINER "Paul Fultz II <paul.fultz@amd.com>"
+    LDCONFIG
+    DEPENDS miopen-hip rocblas hip_hcc
+)
+
 add_subdirectory(src)
 add_subdirectory(doc)
 add_subdirectory(test)

src/CMakeLists.txt

 
+include(ROCMInstallTargets)
+include(ROCMPackageConfigHelpers)
+
 add_library(migraph 
     auto_contiguous.cpp
     common_subexpression_elimination.cpp
@@ -19,20 +22,30 @@ add_library(migraph
     opt/memory_coloring_impl.cpp
 )
 rocm_clang_tidy_check(migraph)
-target_include_directories(migraph PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+rocm_install_targets(
+  TARGETS migraph
+  INCLUDE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
 
 find_path(HALF_INCLUDE_DIR half.hpp)
-target_include_directories(migraph SYSTEM PUBLIC ${HALF_INCLUDE_DIR})
+# TODO: Fix the incorrect path
+target_include_directories(migraph SYSTEM PUBLIC $<BUILD_INTERFACE:${HALF_INCLUDE_DIR}>)
+
+set(PACKAGE_DEPENDS)
 
 add_subdirectory(onnx)
 add_subdirectory(targets/cpu)
 if(MIGRAPH_ENABLE_GPU)
+list(APPEND PACKAGE_DEPENDS MIOpen rocblas)
 add_subdirectory(targets/gpu)
 endif()
 
-#install (TARGETS migraph
-#   LIBRARY DESTINATION /opt/rocm/lib)
-
-#install (DIRECTORY include/migraph DESTINATION /opt/rocm/include)
+rocm_export_targets(
+  TARGETS migraph::migraph
+  NAMESPACE migraph::
+  DEPENDS
+    ${PACKAGE_DEPENDS}
+)
  
 

src/onnx/CMakeLists.txt

@@ -8,10 +8,15 @@ target_link_libraries(onnx-proto PRIVATE ${PROTOBUF_LIBRARY})
 set_target_properties(onnx-proto PROPERTIES POSITION_INDEPENDENT_CODE On)
 
 add_library(migraph_onnx onnx.cpp)
+set_target_properties(migraph_onnx PROPERTIES EXPORT_NAME onnx)
 rocm_clang_tidy_check(migraph_onnx)
 target_link_libraries(migraph_onnx PRIVATE onnx-proto)
 target_link_libraries(migraph_onnx PUBLIC migraph)
 
+rocm_install_targets(
+  TARGETS migraph_onnx
+)
+
 add_executable(read_onnx read_onnx.cpp)
 rocm_clang_tidy_check(read_onnx)
 target_link_libraries(read_onnx migraph_onnx)

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
+)