ROCm package file/folder reorganization(SWDEV-291455) (ROCm#176)

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update VerifyCompiler.cmake

* Update install

* Update CMakeLists.txt

* Bin Path Reorg - Dep Change

CMakeLists.txt

@@ -34,7 +34,7 @@ project(hipcub LANGUAGES CXX)
 # CMake modules
 list(APPEND CMAKE_MODULE_PATH
   ${CMAKE_CURRENT_SOURCE_DIR}/cmake
-  ${HIP_PATH}/cmake /opt/rocm/hip/cmake # FindHIP.cmake
+  ${HIP_PATH}/cmake /opt/rocm/lib/cmake/hip # FindHIP.cmake
 )
 
 # Set a default build type if none was specified

cmake/VerifyCompiler.cmake

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-list(APPEND CMAKE_PREFIX_PATH /opt/rocm /opt/rocm/hip)
+list(APPEND CMAKE_PREFIX_PATH /opt/rocm)
 if(CMAKE_CXX_COMPILER MATCHES ".*/nvcc$" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     find_package(hip QUIET CONFIG PATHS /opt/rocm)
     if(NOT hip_FOUND)

hipcub/CMakeLists.txt

@@ -36,7 +36,7 @@ target_include_directories(hipcub
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/hipcub>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:hipcub/include/>
+    $<INSTALL_INTERFACE:include/>
 )
 
 if(HIP_COMPILER STREQUAL "hcc" OR HIP_COMPILER STREQUAL "clang")
@@ -70,13 +70,12 @@ set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
 # does not support header-only libraries (INTERFACE targets)
 rocm_install_targets(
   TARGETS hipcub
-  PREFIX hipcub
 )
-rocm_install(
+install(
   DIRECTORY
     "include/"
     "${PROJECT_BINARY_DIR}/hipcub/include/"
-  DESTINATION hipcub/include/
+  DESTINATION include
   FILES_MATCHING
   PATTERN "*.h"
   PATTERN "*.hpp"
@@ -89,17 +88,12 @@ include(ROCMExportTargetsHeaderOnly)
 if(HIP_COMPILER STREQUAL "hcc" OR HIP_COMPILER STREQUAL "clang")
   rocm_export_targets_header_only(
     TARGETS hip::hipcub
-    PREFIX hipcub
     DEPENDS PACKAGE rocprim
     NAMESPACE hip::
   )
 else()
   rocm_export_targets_header_only(
     TARGETS hip::hipcub
-    PREFIX hipcub
     NAMESPACE hip::
   )
 endif()
-
-# Create symlinks
-rocm_install_symlink_subdir(hipcub)

install

@@ -148,8 +148,8 @@ fi
 if [[ "${build_relocatable}" == true ]]; then
     CXX=$rocm_path/bin/${compiler} ${cmake_executable} \
         -DCMAKE_INSTALL_PREFIX=${rocm_path} \
-        -DCMAKE_PREFIX_PATH="${rocm_path} ${rocm_path}/hcc ${rocm_path}/hip" \
-        -DCMAKE_MODULE_PATH="${rocm_path}/hip/cmake" \
+        -DCMAKE_PREFIX_PATH="${rocm_path} ${rocm_path}/hcc" \
+        -DCMAKE_MODULE_PATH="${rocm_path}/lib/cmake/hip" \
         -Drocprim_DIR=${rocm_path}/rocprim \
         ${cmake_common_options} \
         ${build_tests} ${build_type} ../../. # or cmake-gui ../.

test/extra/CMakeLists.txt

@@ -29,7 +29,7 @@ project(hipCUB_package_install_test CXX)
 # CMake modules
 list(APPEND CMAKE_MODULE_PATH
   ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake
-  ${HIP_PATH}/cmake /opt/rocm/hip/cmake # FindHIP.cmake
+  ${HIP_PATH}/cmake /opt/rocm/lib/cmake/hip # FindHIP.cmake
 )
 
 # Detect compiler support for target ID

toolchain-linux.cmake

@@ -4,9 +4,9 @@
 #set(CMAKE_GENERATOR_PLATFORM x64)
 
 if (DEFINED ENV{ROCM_PATH})
-  set(rocm_bin "$ENV{ROCM_PATH}/hip/bin")
+  set(rocm_bin "$ENV{ROCM_PATH}/bin")
 else()
-  set(rocm_bin "/opt/rocm/hip/bin")
+  set(rocm_bin "/opt/rocm/bin")
 endif()