Build and package - updates (#1451)

* CMakeLists - Upgrade cmake version required

* FFMPEG - Version 5.X not supported

* Setup - updates

* Docs - updates

* Package - Updates

* GFX ID - Updates

Author: kiritigowda

CHANGELOG.md

@@ -4,6 +4,22 @@
 
 The full documentation for MIVisionX is available at [https://rocm.docs.amd.com/projects/MIVisionX/en/latest/doxygen/html/index.html](https://rocm.docs.amd.com/projects/MIVisionX/en/latest/doxygen/html/index.html)
 
+##  (unreleased) MIVisionX 3.2.0
+
+### Changed
+
+* Setup: OpenCV package install for Ubuntu
+
+### Known issues
+
+* Installation on CentOS/RedHat/SLES requires the manual installation of the `FFMPEG` & `OpenCV` dev packages.
+* Hardware decode requires the ROCm `graphics` usecase.
+
+### Upcoming changes
+
+* Optimized audio augmentations support for VX_RPP
+
+
 ##  MIVisionX 3.1.0 for ROCm 6.3.0
 
 ### Changed

CMakeLists.txt

@@ -17,8 +17,8 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-cmake_minimum_required(VERSION 3.5)
-set(VERSION "3.1.0")
+cmake_minimum_required(VERSION 3.10)
+set(VERSION "3.2.0")
 
 # Set Project Version and Language
 project(mivisionx VERSION ${VERSION} LANGUAGES CXX)
@@ -136,10 +136,7 @@ endif()
 if("${BACKEND}" STREQUAL "HIP")
   set(LOOM OFF)
   # Set supported GPU Targets
-  set(DEFAULT_GPU_TARGETS "gfx908;gfx90a;gfx942;gfx1030;gfx1031;gfx1032;gfx1100;gfx1101;gfx1102")
-  if (BUILD_WITH_AMD_ADVANCE)
-      set(DEFAULT_GPU_TARGETS ${DEFAULT_GPU_TARGETS} "gfx1200;gfx1201")
-  endif()
+  set(DEFAULT_GPU_TARGETS "gfx908;gfx90a;gfx942;gfx1030;gfx1031;gfx1032;gfx1100;gfx1101;gfx1102;gfx1200;gfx1201")
 
   # Set AMD GPU_TARGETS
   if((AMDGPU_TARGETS OR DEFINED ENV{AMDGPU_TARGETS}) AND (NOT GPU_TARGETS))
@@ -229,8 +226,8 @@ endif()
 set(MIVISIONX_RUNTIME_PACKAGE_LIST  "rocm-hip-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, ffmpeg, libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev")
-# TBD - Some RPM packages need Fusion Packages - ffmpeg, libavcodec-devel, libavformat-devel, libavutil-devel, libswscale-devel
+set(MIVISIONX_DEBIAN_DEV_PACKAGE_LIST  "half, rocm-hip-runtime-dev, rpp-dev, rocblas-dev, miopen-hip-dev, migraphx-dev, libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev, libopencv-dev")
+# TBD - Some RPM packages need Fusion Packages - ffmpeg, 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")
 
 # Add rocDecode Deps - Exclude centos-7

MIVisionX-setup.py

@@ -30,24 +30,25 @@
 
 __copyright__ = "Copyright 2018 - 2024, AMD ROCm MIVisionX"
 __license__ = "MIT"
-__version__ = "3.7.0"
+__version__ = "3.8.0"
 __email__ = "[email protected]"
 __status__ = "Shipping"
 
+
 # error check calls
-def ERROR_CHECK(call):
-    status = call
-    if(status != 0):
-        print('ERROR_CHECK failed with status:'+str(status))
+def ERROR_CHECK(waitval):
+    if(waitval != 0): # return code and signal flags
+        print('ERROR_CHECK failed with status:'+str(waitval))
         traceback.print_stack()
+        status = ((waitval >> 8) | waitval) & 255 # combine exit code and wait flags into single non-zero byte
         exit(status)
 
 # Arguments
 parser = argparse.ArgumentParser()
 parser.add_argument('--directory', 	type=str, default='~/mivisionx-deps',
                     help='Setup home directory - optional (default:~/)')
 parser.add_argument('--opencv',    	type=str, default='4.6.0',
-                    help='OpenCV Version - optional (default:4.6.0)')
+                    help='OpenCV Version - optional (default for non Ubuntu OS:4.6.0)')
 parser.add_argument('--ffmpeg',    	type=str, default='OFF',
                     help='FFMPEG Installation - optional (default:OFF) [options:ON/OFF]')
 parser.add_argument('--neural_net',	type=str, default='ON',
@@ -233,9 +234,7 @@ def ERROR_CHECK(call):
 if "centos" in os_info_data and "VERSION_ID=7" in os_info_data:
     libpkgConfig = "pkgconfig"
 commonPackages = [
-    'gcc',
     'cmake',
-    'git',
     'wget',
     'unzip',
     str(libpkgConfig),
@@ -340,18 +339,7 @@ def ERROR_CHECK(call):
 ]
 
 opencvDebianPackages = [
-    'build-essential',
-    'pkg-config',
-    'libgtk2.0-dev',
-    'libavcodec-dev',
-    'libavformat-dev',
-    'libswscale-dev',
-    'libtbb-dev',
-    'libjpeg-dev',
-    'libpng-dev',
-    'libtiff-dev',
-    'libdc1394-dev',
-    'unzip'
+    'libopencv-dev'
 ]
 
 opencvRPMPackages = [
@@ -550,7 +538,7 @@ def ERROR_CHECK(call):
 
     # Install OpenCV -- TBD cleanup
     ERROR_CHECK(os.system('(cd '+deps_dir+'/build; mkdir OpenCV )'))
-    # Install pre-reqs
+    # Install
     ERROR_CHECK(os.system(sudoValidate))
     if "Ubuntu" in platfromInfo:
         for i in range(len(opencvDebianPackages)):
@@ -566,12 +554,12 @@ def ERROR_CHECK(call):
         for i in range(len(opencvRPMPackages)):
             ERROR_CHECK(os.system('sudo '+linuxFlag+' '+linuxSystemInstall +
                         ' '+linuxSystemInstall_check+' install -y '+ opencvRPMPackages[i]))
-    # OpenCV 4.6.0
-    # Get Source and install
-    ERROR_CHECK(os.system(
-        '(cd '+deps_dir+'; wget https://github.com/opencv/opencv/archive/'+opencvVersion+'.zip )'))
-    ERROR_CHECK(os.system('(cd '+deps_dir+'; unzip '+opencvVersion+'.zip )'))
-    ERROR_CHECK(os.system('(cd '+deps_dir+'/build/OpenCV; '+linuxCMake +
+        # OpenCV 4.6.0
+        # Get Source and install
+        ERROR_CHECK(os.system(
+            '(cd '+deps_dir+'; wget https://github.com/opencv/opencv/archive/'+opencvVersion+'.zip )'))
+        ERROR_CHECK(os.system('(cd '+deps_dir+'; unzip '+opencvVersion+'.zip )'))
+        ERROR_CHECK(os.system('(cd '+deps_dir+'/build/OpenCV; '+linuxCMake +
                         ' -D WITH_EIGEN=OFF \
                         -D WITH_GTK=ON \
                         -D WITH_JPEG=ON \
@@ -585,10 +573,10 @@ def ERROR_CHECK(call):
                         -D BUILD_LIST=core,features2d,highgui,imgcodecs,imgproc,photo,video,videoio  \
                         -D CMAKE_PLATFORM_NO_VERSIONED_SONAME=ON \
                         ../../opencv-'+opencvVersion+' )'))
-    ERROR_CHECK(os.system('(cd '+deps_dir+'/build/OpenCV; make -j$(nproc))'))
-    ERROR_CHECK(os.system(sudoValidate))
-    ERROR_CHECK(os.system('(cd '+deps_dir+'/build/OpenCV; sudo make install)'))
-    ERROR_CHECK(os.system('(cd '+deps_dir+'/build/OpenCV; sudo ldconfig)'))
+        ERROR_CHECK(os.system('(cd '+deps_dir+'/build/OpenCV; make -j$(nproc))'))
+        ERROR_CHECK(os.system(sudoValidate))
+        ERROR_CHECK(os.system('(cd '+deps_dir+'/build/OpenCV; sudo make install)'))
+        ERROR_CHECK(os.system('(cd '+deps_dir+'/build/OpenCV; sudo ldconfig)'))
 
     if developerInstall == 'ON':
         ERROR_CHECK(os.system(sudoValidate))

README.md

@@ -46,12 +46,6 @@ MIVisionX has several [applications](apps/README.md#applications) built on top o
 
 [Neural net model compiler and optimizer](model_compiler/README.md#neural-net-model-compiler--optimizer) converts pre-trained neural net models to MIVisionX runtime code for optimized inference.
 
-## rocAL
-
-The ROCm Augmentation Library - [rocAL](rocAL/README.md) is designed to efficiently decode and process images and videos from a variety of storage formats and modify them through a processing graph programmable by the user.
-
-rocAL is now available as an independent module at [https://github.com/ROCm/rocAL](https://github.com/ROCm/rocAL). rocAL is deprecated in MIVisionX.
-
 ## Toolkit
 
 [MIVisionX Toolkit](toolkit/README.md) is a comprehensive set of helpful tools for neural net creation, development, training, and deployment. The Toolkit provides useful tools to design, develop, quantize, prune, retrain, and infer your neural network work in any framework. The Toolkit has been designed to help you deploy your work on any AMD or 3rd party hardware, from embedded to servers.
@@ -76,19 +70,62 @@ MIVisionX toolkit provides tools for accomplishing your tasks throughout the who
 > [!IMPORTANT]
 > Some modules in MIVisionX can be built for `CPU ONLY`. To take advantage of `Advanced Features And Modules` we recommend using `AMD GPUs` or `AMD APUs`.
 
-### Operating System
+### Operating Systems
 
 #### Linux
-* Ubuntu - `20.04` / `22.04`
-* CentOS - `7`
+* Ubuntu - `22.04` / `24.04`
 * RedHat - `8` / `9`
 * SLES - `15-SP5`
 
 #### Windows
 * Windows `10` / `11`
 
 #### macOS
-* macOS - Ventura `13` / Sonoma `14`
+* macOS - Ventura `13` / Sonoma `14` / Sequoia `15`
+
+### Libraries
+* CMake - Version `3.10` and above
+  ```shell
+  sudo apt install cmake
+  ```
+* Half-precision floating-point(half) library - Version `1.12.0`
+  ```shell
+  sudo apt install half
+  ```
+* MIOpen
+  ```shell
+  sudo apt install miopen-hip-dev
+  ```
+* MIGraphX
+  ```shell
+  sudo apt install migraphx-dev
+  ```
+* RPP
+  ```shell
+  sudo apt install rpp-dev
+  ```
+* OpenCV - Version `3.X`/`4.X`
+  ```shell
+  sudo apt install libopencv-dev
+  ```
+* pkg-config
+  ```shell
+  sudo apt install pkg-config
+  ```
+* FFmpeg - Version `4.X`
+  ```shell
+  sudo apt install ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev
+  ```
+
+> [!IMPORTANT] 
+> * On `Ubuntu 22.04` - Additional package required: `libstdc++-12-dev`
+>
+>  ```shell
+>  sudo apt install libstdc++-12-dev
+>  ```
+
+>[!NOTE]
+> All package installs are shown with the `apt` package manager. Use the appropriate package manager for your operating system.
 
 ## Installation instructions
 
@@ -100,7 +137,8 @@ The installation process uses the following steps:
 
 * Install ROCm `6.1.0` or later with [amdgpu-install](https://rocm.docs.amd.com/projects/install-on-linux/en/latest/how-to/amdgpu-install.html) with `--usecase=rocm`
 
-* Use **either** [Package install](#package-install) **or** [Source install](#source-install) as described below.
+>[!IMPORTANT]
+> Use **either** [package install](#package-install) **or** [source install](#source-install) as described below.
 
 #### Package install
 
@@ -123,9 +161,8 @@ Install MIVisionX runtime, development, and test packages.
   ```
 
 > [!IMPORTANT]
->  * Package install supports `HIP` backend
->  * Package install requires `OpenCV V4.6` manual install
->  * `CentOS`/`RedHat`/`SLES` requires `FFMPEG Dev` package manual install
+>  * Package install supports `HIP` backend. For OpenCL backend build from source.
+>  * `CentOS`/`RedHat`/`SLES` requires `OpenCV` & `FFMPEG` development packages manually installed
 
 #### Source install
 
@@ -210,7 +247,7 @@ For your convenience, we provide the setup script, `MIVisionX-setup.py`, which i
 macOS [build instructions](https://github.com/ROCm/MIVisionX/wiki/macOS#macos-build-instructions)
 
 > [!IMPORTANT]
-> macOS only supports MIVisionX CPU backend
+> macOS only supports MIVisionX CPU backend on `x86` processors
 
 ## Verify installation
 
@@ -301,18 +338,17 @@ Review all notable [changes](CHANGELOG.md#changelog) with the latest release
 
 * Windows `10` / `11`
 * Linux distribution
-  + Ubuntu - `20.04` / `22.04`
-  + CentOS - `7`
+  + Ubuntu - `22.04` / `24.04`
   + RHEL - `8` / `9`
   + SLES - `15-SP5`
-* ROCm: rocm-core - `6.3.0.60300`
+* ROCm: `6.3.0`
 * RPP - `1.9.0.60300`
 * miopen-hip - `3.2.0.60300`
 * migraphx - `2.11.0.60300`
-* OpenCV - [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.0)
+* OpenCV - `4.6`
 * FFMPEG - [n4.4.2](https://github.com/FFmpeg/FFmpeg/releases/tag/n4.4.2)
 * Dependencies for all the above packages
-* MIVisionX Setup Script - `V3.7.0`
+* MIVisionX Setup Script - `V3.8.0`
 
 ### Known issues
 

amd_openvx/CMakeLists.txt

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project(amd_openvx)
 
 if(GPU_SUPPORT AND "${BACKEND}" STREQUAL "HIP")

amd_openvx/openvx/CMakeLists.txt

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 set(VERSION "1.3.0")
 project(openvx VERSION ${VERSION} LANGUAGES CXX)
 

amd_openvx/openvx/hipvx/CMakeLists.txt

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project(openvx_hip CXX)
 
 include_directories(${PROJECT_SOURCE_DIR}/../include ${PROJECT_SOURCE_DIR}/../ago ${PROJECT_SOURCE_DIR}/../api)

amd_openvx_extensions/CMakeLists.txt

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project(amd_openvx_extensions)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
@@ -76,8 +76,13 @@ endif()
 if(GPU_SUPPORT)
     find_package(FFmpeg QUIET)
     if(FFMPEG_FOUND)
-        add_subdirectory(amd_media)
-        message("-- ${Green}AMD OpenVX Media Extension -- amd_media module added${ColourReset}")
+        # TBD: FFMPEG multi-version support
+        if(_FFMPEG_AVCODEC_VERSION VERSION_LESS_EQUAL 58.134.100)
+            add_subdirectory(amd_media)
+            message("-- ${Green}AMD OpenVX Media Extension -- amd_media module added${ColourReset}")
+        else()
+            message("-- ${Red}WARNING: FFMPEG Version Not Supported -- amd_media module excluded${ColourReset}")
+        endif()
     else()
         message("-- ${Red}WARNING: FFMPEG Not Found -- amd_media module excluded${ColourReset}")
     endif(FFMPEG_FOUND)
@@ -94,7 +99,7 @@ if(GPU_SUPPORT)
         add_subdirectory(amd_custom)
         message("-- ${Green}AMD Custom Extension -- amd_custom module added${ColourReset}")
     else()
-      message("-- ${Red}WARNING: GPU Support OpenCL/HIP Not Found -- amd_openvx_extensions modules for GPU excluded${ColourReset}")
+        message("-- ${Red}WARNING: GPU Support OpenCL/HIP Not Found -- amd_openvx_extensions modules for GPU excluded${ColourReset}")
     endif()
 endif(GPU_SUPPORT)
 

amd_openvx_extensions/amd_custom/CMakeLists.txt

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 set(VERSION "1.0.1")
 project(vx_amd_custom VERSION ${VERSION} LANGUAGES CXX)
 

amd_openvx_extensions/amd_custom/custom_lib/CMakeLists.txt

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project(custom_lib)
 
 set(CMAKE_CXX_STANDARD 14)