RPP - Updates (#1257)

* RPP -updates

* codeowners - added

* Codeowners - updates

* Package - Dependencies

.github/CODEOWNERS

@@ -0,0 +1,8 @@
+# Documentation files
+docs/* @saadrahim @LisaDelaney @kiritigowda @rrawther
+*.md  @saadrahim @LisaDelaney @kiritigowda @rrawther
+*.rst  @saadrahim @LisaDelaney
+# Header directory
+library/include/*  @saadrahim @LisaDelaney @kiritigowda @rrawther
+# Source code
+@kiritigowda @rrawther

CHANGELOG.md

@@ -24,7 +24,7 @@ Documentation for MIVisionX is available at
   * PyBind11
   * RapidJSON
 * Setup Updates
-* RPP Version - 1.4.0
+* RPP - Use package install
 * Dockerfiles: Updates & bugfix
 
 ### Fixes
@@ -44,10 +44,10 @@ Documentation for MIVisionX is available at
 * MIGraphX - `2.7.0.50700-63`
 * Protobuf - [V3.12.4](https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.4)
 * OpenCV - [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.0)
-* RPP - [1.4.0](https://github.com/ROCm/rpp/releases/tag/1.4.0)
+* RPP - [1.5.0]
 * FFMPEG - [n4.4.2](https://github.com/FFmpeg/FFmpeg/releases/tag/n4.4.2)
 * Dependencies for all preceding packages
-* MIVisionX setup script - `V2.5.6`
+* MIVisionX setup script - `V2.6.0`
 
 ### Known issues
 

CMakeLists.txt

@@ -207,9 +207,9 @@ endif()
 set(MIVISIONX_DEBIAN_PACKAGE_LIST  "half, rpp, rocblas, miopen-hip, migraphx, ffmpeg")
 set(MIVISIONX_RPM_PACKAGE_LIST     "half, rpp, rocblas, miopen-hip, migraphx")
 # Set the dev dependent packages
-set(MIVISIONX_DEBIAN_DEV_PACKAGE_LIST  "rocblas-dev, miopen-hip-dev, migraphx-dev, libavcodec-dev, libavformat-dev, libavutil-dev")
+set(MIVISIONX_DEBIAN_DEV_PACKAGE_LIST  "rpp-dev, rocblas-dev, miopen-hip-dev, migraphx-dev, libavcodec-dev, libavformat-dev, libavutil-dev")
 # TBD - Some RPM packages need Fusion Packages - ffmpeg, libavcodec-devel, libavformat-devel, libavutil-devel, libswscale-devel
-set(MIVISIONX_RPM_DEV_PACKAGE_LIST  "rocblas-devel, miopen-hip-devel, migraphx-devel")
+set(MIVISIONX_RPM_DEV_PACKAGE_LIST  "rpp-devel, rocblas-devel, miopen-hip-devel, migraphx-devel")
 
 # '%{?dist}' breaks manual builds on debian systems due to empty Provides
 execute_process(

MIVisionX-setup.py

@@ -30,7 +30,7 @@
 __author__ = "Kiriti Nagesh Gowda"
 __copyright__ = "Copyright 2018 - 2023, AMD ROCm MIVisionX"
 __license__ = "MIT"
-__version__ = "2.5.8"
+__version__ = "2.6.0"
 __maintainer__ = "Kiriti Nagesh Gowda"
 __email__ = "[email protected]"
 __status__ = "Shipping"
@@ -43,8 +43,6 @@
                     help='OpenCV Version - optional (default:4.6.0)')
 parser.add_argument('--protobuf',  	type=str, default='3.12.4',
                     help='ProtoBuf Version - optional (default:3.12.4)')
-parser.add_argument('--rpp',   		type=str, default='1.4.0',
-                    help='RPP Version - optional (default:1.4.0)')
 parser.add_argument('--pybind11',   type=str, default='v2.10.4',
                     help='PyBind11 Version - optional (default:v2.10.4)')
 parser.add_argument('--ffmpeg',    	type=str, default='ON',
@@ -68,7 +66,6 @@
 setupDir = args.directory
 opencvVersion = args.opencv
 ProtoBufVersion = args.protobuf
-rppVersion = args.rpp
 pybind11Version = args.pybind11
 ffmpegInstall = args.ffmpeg.upper()
 neuralNetInstall = args.neural_net.upper()
@@ -228,10 +225,12 @@
 
     if rocalInstall == 'ON':
         # RPP
-        if os.path.exists(deps_dir+'/rpp/build-'+backend):
-            os.system('sudo -v')
-            os.system('(cd '+deps_dir+'/rpp/build-'+backend+'; sudo ' +
-                      linuxFlag+' make install -j8)')
+        if "Ubuntu" in platfromInfo:
+            os.system('sudo '+linuxFlag+' '+linuxSystemInstall +
+                          ' '+linuxSystemInstall_check+' install -y rpp rpp-dev')
+        else:
+            os.system('sudo '+linuxFlag+' '+linuxSystemInstall +
+                          ' '+linuxSystemInstall_check+' install -y rpp rpp-devel')
 
     if ffmpegInstall == 'ON':
         # FFMPEG
@@ -438,8 +437,12 @@
                   ' -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_STATIC=FALSE -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib ..; make -j 4; sudo make install )')
         # RPP
         os.system('sudo -v')
-        os.system('(cd '+deps_dir+'; git clone -b '+rppVersion+' https://github.com/ROCm/rpp.git; cd rpp; mkdir build-'+backend+'; cd build-'+backend+'; ' +
-                  linuxCMake+' -DBACKEND='+backend+' -DCMAKE_INSTALL_PREFIX='+ROCM_PATH+' ../; make -j4; sudo make install)')
+        if "Ubuntu" in platfromInfo:
+            os.system('sudo '+linuxFlag+' '+linuxSystemInstall +
+                      ' '+linuxSystemInstall_check+' install -y rpp rpp-dev')
+        else:
+            os.system('sudo '+linuxFlag+' '+linuxSystemInstall +
+                      ' '+linuxSystemInstall_check+' install -y rpp rpp-devel')
         # RapidJSON
         os.system('sudo -v')
         os.system('(cd '+deps_dir+'; git clone https://github.com/Tencent/rapidjson.git; cd rapidjson; mkdir build; cd build; ' +

README.md

@@ -202,7 +202,6 @@ For the convenience of the developer, we provide the setup script `MIVisionX-set
   python MIVisionX-setup.py --directory [setup directory - optional (default:~/)]
                             --opencv    [OpenCV Version - optional (default:4.6.0)]
                             --protobuf  [ProtoBuf Version - optional (default:3.12.4)]
-                            --rpp       [RPP Version - optional (default:1.0.0)]
                             --pybind11  [PyBind11 Version - optional (default:v2.10.4)]
                             --ffmpeg    [FFMPEG V4.4.2 Installation - optional (default:ON) [options:ON/OFF]]
                             --rocal     [MIVisionX rocAL Dependency Install - optional (default:ON) [options:ON/OFF]]
@@ -440,10 +439,10 @@ Review all notable [changes](CHANGELOG.md#changelog) with the latest release
 * migraphx - `2.7.0.50700-63`
 * Protobuf - [V3.12.4](https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.4)
 * OpenCV - [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.0)
-* RPP - [1.4.0](https://github.com/ROCm/rpp/releases/tag/1.4.0)
+* RPP - [1.5.0]
 * FFMPEG - [n4.4.2](https://github.com/FFmpeg/FFmpeg/releases/tag/n4.4.2)
 * Dependencies for all the above packages
-* MIVisionX Setup Script - `V2.5.7`
+* MIVisionX Setup Script - `V2.6.0`
 
 ### Known issues