OpenMP - Updates (#1479)

* OpenMP - Updates * Update CHANGELOG.md Co-authored-by: spolifroni-amd <[email protected]> --------- Co-authored-by: spolifroni-amd <[email protected]>
ROCm · Jan 10, 2025 · fbb32ef · fbb32ef
1 parent 6a05f15
commit fbb32ef
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,8 @@ The full documentation for MIVisionX is available at [https://rocm.docs.amd.com/
 ### Changed
 
 * Setup: OpenCV package install for Ubuntu
-* AMD Clang is now the default CXX and C compiler.
+* AMD Clang is now the default CXX and C compiler
+* The version of OpenMP included in the ROCm LLVM project is now used instead of `libomp-dev/devel`
 
 ### Known issues
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -227,12 +227,12 @@ if(DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE})
 endif()
 
 # Set the dependent packages
-set(MIVISIONX_RUNTIME_PACKAGE_LIST  "rocm-hip-runtime, rpp, rocblas, miopen-hip, migraphx")
+set(MIVISIONX_RUNTIME_PACKAGE_LIST  "rocm-hip-runtime, openmp-extras-runtime, rpp, rocblas, miopen-hip, migraphx")
 
 # Set the dev dependent packages
-set(MIVISIONX_DEBIAN_DEV_PACKAGE_LIST  "half, rocm-hip-runtime-dev, rpp-dev, rocblas-dev, miopen-hip-dev, migraphx-dev, pkg-config, libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev, libopencv-dev, libomp-dev")
+set(MIVISIONX_DEBIAN_DEV_PACKAGE_LIST  "half, rocm-hip-runtime-dev, openmp-extras-dev, rpp-dev, rocblas-dev, miopen-hip-dev, migraphx-dev, pkg-config, libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev, libopencv-dev")
 # TBD - Some RPM packages need Fusion Packages - libavcodec-devel, libavformat-devel, libavutil-devel, libswscale-devel, libopencv
-set(MIVISIONX_RPM_DEV_PACKAGE_LIST  "half, rocm-hip-runtime-devel, rpp-devel, rocblas-devel, miopen-hip-devel, migraphx-devel, pkg-config, libomp-devel")
+set(MIVISIONX_RPM_DEV_PACKAGE_LIST  "half, rocm-hip-runtime-devel, openmp-extras-devel, rpp-devel, rocblas-devel, miopen-hip-devel, migraphx-devel, pkg-config")
 
 # Add OS specific dependencies
 if(EXISTS "/etc/os-release")

diff --git a/README.md b/README.md
@@ -113,10 +113,6 @@ MIVisionX toolkit provides tools for accomplishing your tasks throughout the who
   ```shell
   sudo apt install libopencv-dev
   ```
-* OpenMP
-  ```
-  sudo apt install libomp-dev
-  ```
 * pkg-config
   ```shell
   sudo apt install pkg-config
@@ -126,7 +122,12 @@ MIVisionX toolkit provides tools for accomplishing your tasks throughout the who
   sudo apt install ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev
   ```
 
-> [!IMPORTANT] 
+> [!IMPORTANT]
+> * Required compiler support
+>    * C++17
+>    * OpenMP
+>    * Threads
+>
 > * On `Ubuntu 22.04` - Additional package required: `libstdc++-12-dev`
 >
 >  ```shell

diff --git a/amd_openvx_extensions/amd_custom/CMakeLists.txt b/amd_openvx_extensions/amd_custom/CMakeLists.txt
@@ -55,11 +55,9 @@ endif()
 # OpenMP
 find_package(OpenMP QUIET)
 if(OpenMP_FOUND)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-    include_directories(${OpenMP_INCLUDE_DIRS})
-    set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} OpenMP::OpenMP_CXX)
-    message("-- ${White}${PROJECT_NAME} -- OpenMP Found${ColourReset}")
+    set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${OpenMP_CXX_LIBRARIES})
+    message("-- ${White}${PROJECT_NAME}: Using OpenMP -- \n\tOpenMP_CXX_FLAGS:${OpenMP_CXX_FLAGS}\n\tOpenMP_CXX_LIBRARIES:${OpenMP_CXX_LIBRARIES}${ColourReset}")
 else()
     message("-- ${Yellow}WARNING: ${PROJECT_NAME} -- OpenMP Not FOUND${ColourReset}")
 endif()

diff --git a/docs/install/installation.rst b/docs/install/installation.rst
@@ -48,7 +48,6 @@ Libraries
 * MIOpen
 * MIGraphX
 * RPP
-* OpenMP
 * pkg-config
 * OpenCV - Version 3.X or 4.X
 * FFmpeg - Version 4.4.2 and above