Enhance CMAKE install instructions with std install location/destinat…

…ion (#85) * Enhancement - usage of package name flags commonly across for getting unique folder name * Enhancements - updating libexec/pkg usage, avoid sbin * CMAKE Format Update * Python Format Update * Revert "Enhancement - usage of package name flags commonly across for getting unique folder name" This reverts commit 2dcd1ac5f22ab90112d90648e4b5dab5c54bc639. * REview Comments - Revert PACKAGE_NAME usage * Review Comments - Update source folders accordingly to new cmake install locations
ROCm · Jan 22, 2025 · 6bb60bf · 6bb60bf
1 parent 89cfb53
commit 6bb60bf
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 21 deletions.
diff --git a/cmake/Modules/rocprofiler-sdk-custom-compilation.cmake b/cmake/Modules/rocprofiler-sdk-custom-compilation.cmake
@@ -23,7 +23,7 @@ function(rocprofiler_sdk_custom_compilation)
         NAMES rocprofiler-sdk-launch-compiler
         HINTS ${rocprofiler-sdk_ROOT_DIR} ${PROJECT_BINARY_DIR} ${CMAKE_BINARY_DIR}
         PATHS ${rocprofiler-sdk_ROOT_DIR} ${PROJECT_BINARY_DIR} ${CMAKE_BINARY_DIR}
-        PATH_SUFFIXES sbin)
+        PATH_SUFFIXES libexec/rocprofiler-sdk)
 
     if(NOT COMP_COMPILER)
         message(

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -9,5 +9,4 @@ add_subdirectory(include)
 add_subdirectory(lib)
 add_subdirectory(libexec)
 add_subdirectory(bin)
-add_subdirectory(sbin)
 add_subdirectory(docs)
diff --git a/source/bin/rocprofv3.py b/source/bin/rocprofv3.py
@@ -703,7 +703,9 @@ def _write_env_value():
     ROCPROF_KOKKOSP_LIBRARY = (
         f"{ROCM_DIR}/lib/rocprofiler-sdk/librocprofiler-sdk-tool-kokkosp.so"
     )
-    ROCPROF_LIST_AVAIL_TOOL_LIBRARY = f"{ROCM_DIR}/libexec/librocprofv3-list-avail.so"
+    ROCPROF_LIST_AVAIL_TOOL_LIBRARY = (
+        f"{ROCM_DIR}/libexec/rocprofiler-sdk/librocprofv3-list-avail.so"
+    )
 
     prepend_preload = [itr for itr in args.preload if itr]
     append_preload = [

diff --git a/source/libexec/CMakeLists.txt b/source/libexec/CMakeLists.txt
@@ -2,4 +2,4 @@
 #
 #
 
-add_subdirectory(rocprofiler-avail)
+add_subdirectory(rocprofiler-sdk)
diff --git a/source/libexec/rocprofiler-sdk/CMakeLists.txt b/source/libexec/rocprofiler-sdk/CMakeLists.txt
@@ -0,0 +1,6 @@
+#
+#
+#
+
+add_subdirectory(rocprofiler-avail)
+add_subdirectory(rocprofiler-sdk-launch-compiler)
diff --git a/.../libexec/rocprofiler-avail/CMakeLists.txt → ...iler-sdk/rocprofiler-avail/CMakeLists.txt b/.../libexec/rocprofiler-avail/CMakeLists.txt → ...iler-sdk/rocprofiler-avail/CMakeLists.txt
@@ -13,14 +13,15 @@ target_link_libraries(
 
 set_target_properties(
     rocprofv3-list-avail
-    PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBEXECDIR}
+    PROPERTIES LIBRARY_OUTPUT_DIRECTORY
+               ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBEXECDIR}/rocprofiler-sdk
                SOVERSION ${PROJECT_VERSION_MAJOR}
                VERSION ${PROJECT_VERSION}
                BUILD_RPATH "\$ORIGIN:\$ORIGIN/.."
                INSTALL_RPATH "\$ORIGIN:\$ORIGIN/..")
 
 install(
     TARGETS rocprofv3-list-avail
-    DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
+    DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/rocprofiler-sdk
     COMPONENT tools
     EXPORT rocprofiler-sdk-tool-targets)
diff --git a/...xec/rocprofiler-avail/rocprofv3_avail.cpp → ...sdk/rocprofiler-avail/rocprofv3_avail.cpp b/...xec/rocprofiler-avail/rocprofv3_avail.cpp → ...sdk/rocprofiler-avail/rocprofv3_avail.cpp
diff --git a/source/libexec/rocprofiler-sdk/rocprofiler-sdk-launch-compiler/CMakeLists.txt b/source/libexec/rocprofiler-sdk/rocprofiler-sdk-launch-compiler/CMakeLists.txt
@@ -0,0 +1,16 @@
+#
+#
+#
+
+configure_file(
+    rocprofiler-sdk-launch-compiler.sh
+    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBEXECDIR}/rocprofiler-sdk/rocprofiler-sdk-launch-compiler
+    COPYONLY)
+
+install(
+    FILES
+        ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBEXECDIR}/rocprofiler-sdk/rocprofiler-sdk-launch-compiler
+    DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/rocprofiler-sdk
+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ
+                WORLD_EXECUTE
+    COMPONENT tools)
diff --git a/...e/sbin/rocprofiler-sdk-launch-compiler.sh → ...mpiler/rocprofiler-sdk-launch-compiler.sh b/...e/sbin/rocprofiler-sdk-launch-compiler.sh → ...mpiler/rocprofiler-sdk-launch-compiler.sh
diff --git a/source/sbin/CMakeLists.txt b/source/sbin/CMakeLists.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ @@
     #
     #
-    add_subdirectory(rocprofiler-avail)
+    add_subdirectory(rocprofiler-sdk)