ROCm 5.3 package reorg.

SWDEV-287861 - This splits openmp-extras package into runtime and development
with the help of additional patches in various openmp-extras repos

Change-Id: Ifafa1363724a7d442007cbc2b1da9092a54d0adc

Author: estewart08

openmp/CMakeLists.txt

@@ -1,5 +1,12 @@
 cmake_minimum_required(VERSION 3.13.4)
 
+if(${ENABLE_DEVEL_PACKAGE})
+  set(DEVEL_PACKAGE "devel/")
+endif()
+if(${ENABLE_RUN_PACKAGE})
+  set(RUN_PACKAGE "runtime/")
+endif()
+
 # Add cmake directory to search for custom cmake functions.
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 

openmp/docs/CMakeLists.txt

@@ -85,7 +85,7 @@ if (LLVM_ENABLE_DOXYGEN)
 
   if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
     install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doxygen/html
-      DESTINATION docs/html)
+      DESTINATION ${DEVEL_PACKAGE}docs/html)
   endif()
 endif()
 endif()

openmp/libompd/gdb-plugin/CMakeLists.txt

@@ -37,4 +37,4 @@ add_custom_target(ompd_gdb_plugin ALL
                   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/python-module/loadompd.py
                   COMMENT "Building the OMPD GDB plugin")
 
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python-module/ompd  DESTINATION ${OPENMP_INSTALL_LIBDIR})
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python-module/ompd  DESTINATION "${DEVEL_PACKAGE}/${OPENMP_INSTALL_LIBDIR}")

openmp/libompd/src/CMakeLists.txt

@@ -56,6 +56,6 @@ if(${LIBOMP_USE_HWLOC})
 endif()
 
 INSTALL( TARGETS ompd
-        LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR}
-        ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}
-        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" )
+        LIBRARY DESTINATION ${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}
+        RUNTIME DESTINATION "${DEVEL_PACKAGE}${CMAKE_INSTALL_BINDIR}" )

openmp/libomptarget/DeviceRTL/CMakeLists.txt

@@ -302,7 +302,7 @@ function(compileDeviceRTLLibrary target_cpu target_name)
   add_dependencies("omptarget.devicertl.${target_name}" "${bclib_target_name}")
 
   # Install bitcode library under the lib destination folder.
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${bclib_name} DESTINATION "${OPENMP_INSTALL_LIBDIR}")
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${bclib_name} DESTINATION "${DEVEL_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
 endfunction()
 
 # Generate a Bitcode library for all the compute capabilities the user requested

openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt

@@ -277,5 +277,5 @@ set(libname "omptarget-amdgcn")
 foreach(mcpu ${amdgpu_mcpus})
   set(bc_libname lib${libname}-${mcpu}.bc)
   build_bc_library(${mcpu} ${bc_libname})
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${bc_libname} DESTINATION "${OPENMP_INSTALL_LIBDIR}")
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${bc_libname} DESTINATION "${DEVEL_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
 endforeach()

openmp/libomptarget/deviceRTLs/nvptx/CMakeLists.txt

@@ -248,7 +248,7 @@ foreach(sm ${nvptx_sm_list})
                     ${LIBOMPTARGET_LIBRARY_DIR})
 
   # Install bitcode library under the lib destination folder.
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${bclib_name} DESTINATION "${OPENMP_INSTALL_LIBDIR}")
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${bclib_name} DESTINATION "${DEVEL_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
 endforeach()
 
 # Test will be enabled if the building machine supports CUDA

openmp/libomptarget/hostrpc/CMakeLists.txt

@@ -111,4 +111,4 @@ endforeach()
 
 #set(triple "nvptx-nvidia-cuda")
 # Since libomptarget includes hostrpc, we only need to install hostrpc headers
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/hostrpc.h" DESTINATION include)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/hostrpc.h" DESTINATION ${DEVEL_PACKAGE}include)

openmp/libomptarget/plugins/CMakeLists.txt

@@ -35,7 +35,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tmachine}$")
 
       # Install plugin under the lib destination folder.
       install(TARGETS "omptarget.rtl.${tmachine_libname}"
-        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
+        LIBRARY DESTINATION "${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
 
       target_include_directories( "omptarget.rtl.${tmachine_libname}" PRIVATE
         ${LIBOMPTARGET_INCLUDE_DIR}

openmp/libomptarget/plugins/amdgpu/CMakeLists.txt

@@ -77,7 +77,7 @@ add_dependencies(omptarget.rtl.amdgpu omptarget.devicertl.amdgpu)
 
 # Install plugin under the lib destination folder.
 # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug
-install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "lib${OPENMP_LIBDIR_SUFFIX}")
+install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${RUN_PACKAGE}lib${OPENMP_LIBDIR_SUFFIX}")
 set_property(TARGET omptarget.rtl.amdgpu PROPERTY INSTALL_RPATH_USE_LINK_PATH ON)
 
 if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")

openmp/libomptarget/plugins/cuda/CMakeLists.txt

@@ -51,7 +51,7 @@ endif()
 add_dependencies(omptarget.rtl.cuda omptarget.devicertl.nvptx)
 
 # Install plugin under the lib destination folder.
-install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
+install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
 
 target_include_directories(omptarget.rtl.cuda PRIVATE
   ${LIBOMPTARGET_INCLUDE_DIR}

openmp/libomptarget/src/CMakeLists.txt

@@ -58,4 +58,4 @@ target_link_libraries(omptarget PRIVATE
 
 # Install libomptarget under the lib destination folder.
 install(TARGETS omptarget LIBRARY COMPONENT omptarget
-  DESTINATION "${OPENMP_INSTALL_LIBDIR}")
+  DESTINATION "${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}")

openmp/runtime/src/CMakeLists.txt

@@ -371,33 +371,33 @@ if(WIN32)
   endforeach()
 else()
 
-  install(TARGETS omp ${LIBOMP_INSTALL_KIND} DESTINATION "${OPENMP_INSTALL_LIBDIR}")
+  install(TARGETS omp ${LIBOMP_INSTALL_KIND} DESTINATION "${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
 
   if(${LIBOMP_INSTALL_ALIASES})
     # Create aliases (symlinks) of the library for backwards compatibility
     set(LIBOMP_ALIASES "libgomp;libiomp5")
     foreach(alias IN LISTS LIBOMP_ALIASES)
       install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"${LIBOMP_LIB_FILE}\"
         \"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY
-        \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENMP_INSTALL_LIBDIR}\")")
+        \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}\")")
     endforeach()
   endif()
 endif()
 install(
   FILES
   ${CMAKE_CURRENT_BINARY_DIR}/omp.h
-  DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH}
+  DESTINATION ${DEVEL_PACKAGE}${LIBOMP_HEADERS_INSTALL_PATH}
 )
 if(${LIBOMP_OMPT_SUPPORT})
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omp-tools.h DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH})
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omp-tools.h DESTINATION ${DEVEL_PACKAGE}${LIBOMP_HEADERS_INSTALL_PATH})
   # install under legacy name ompt.h
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omp-tools.h DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH} RENAME ompt.h)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omp-tools.h DESTINATION ${DEVEL_PACKAGE}${LIBOMP_HEADERS_INSTALL_PATH} RENAME ompt.h)
 endif()
 if(${LIBOMP_FORTRAN_MODULES})
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/omp_lib.h
     ${CMAKE_CURRENT_BINARY_DIR}/omp_lib.mod
     ${CMAKE_CURRENT_BINARY_DIR}/omp_lib_kinds.mod
-    DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH}
+    DESTINATION ${DEVEL_PACKAGE}${LIBOMP_HEADERS_INSTALL_PATH}
   )
 endif()

openmp/tools/Modules/CMakeLists.txt

@@ -12,4 +12,4 @@
 
 
 install(FILES "FindOpenMPTarget.cmake"
-              DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp")
+              DESTINATION "${DEVEL_PACKAGE}${OPENMP_INSTALL_LIBDIR}/cmake/openmp")

openmp/tools/archer/CMakeLists.txt

@@ -15,8 +15,8 @@ if(LIBOMP_OMPT_SUPPORT)
   add_library(archer_static STATIC ompt-tsan.cpp)
 
   install(TARGETS archer archer_static
-    LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR})
+    LIBRARY DESTINATION ${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR})
 
   add_subdirectory(tests)
 endif()

openmp/tools/multiplex/CMakeLists.txt

@@ -4,7 +4,7 @@ if(LIBOMP_OMPT_SUPPORT)
   add_library(ompt-multiplex INTERFACE)
   target_include_directories(ompt-multiplex INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
-  install(FILES ompt-multiplex.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  install(FILES ompt-multiplex.h DESTINATION "${DEVEL_PACKAGE}${CMAKE_INSTALL_INCLUDEDIR}")
 
   add_subdirectory(tests)
 endif()