RPP Version - Update to 1.0.0 (#1058)

* RPP Version - Update to 1.0.0

* RPP - Lib Name Updates

CHANGELOG.md

@@ -6,7 +6,7 @@
 
 [MIVisionX Documentation](https://gpuopen-professionalcompute-libraries.github.io/MIVisionX/)
 
-## MIVisionX 2.4.0 (unreleased)
+## MIVisionX 2.4.0
 
 ### Added
 
@@ -39,7 +39,7 @@
 * migraphx - `2.4.0.50400-72`
 * 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 - [0.99](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/0.99)
+* RPP - [1.0.0](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/1.0.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.3.10`

MIVisionX-setup.py

@@ -43,8 +43,8 @@
                     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='0.99',
-                    help='RPP Version - optional (default:0.99)')
+parser.add_argument('--rpp',   		type=str, default='1.0.0',
+                    help='RPP Version - optional (default:1.0.0)')
 parser.add_argument('--ffmpeg',    	type=str, default='ON',
                     help='FFMPEG V4.4.2 Installation - optional (default:ON) [options:ON/OFF]')
 parser.add_argument('--neural_net',	type=str, default='ON',

README.md

@@ -186,7 +186,7 @@ For the convenience of the developer, we here provide the setup script which wil
   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:0.99)]
+                            --rpp       [RPP Version - optional (default:1.0.0)]
                             --ffmpeg    [FFMPEG V4.4.2 Installation - optional (default:ON) [options:ON/OFF]]
                             --rocal     [MIVisionX rocAL Dependency Install - optional (default:ON) [options:ON/OFF]]
                             --neural_net[MIVisionX Neural Net Dependency Install - optional (default:ON) [options:ON/OFF]]
@@ -446,7 +446,7 @@ Review all notable [changes](CHANGELOG.md#changelog) with the latest release
 * migraphx - `2.5.0.50500-21`
 * 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 - [0.99](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/0.99)
+* RPP - [1.0.0](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/1.0.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.4.2`

amd_openvx/cmake/FindAMDRPP.cmake

@@ -35,7 +35,7 @@ find_path(AMDRPP_INCLUDE_DIRS
 mark_as_advanced(AMDRPP_INCLUDE_DIRS)
 
 find_library(AMDRPP_LIBRARIES
-    NAMES amd_rpp
+    NAMES rpp
     HINTS
     $ENV{AMDRPP_PATH}/lib
     $ENV{AMDRPP_PATH}/lib64
@@ -48,7 +48,7 @@ find_library(AMDRPP_LIBRARIES
 mark_as_advanced(AMDRPP_LIBRARIES)
 
 find_path(AMDRPP_LIBRARIES_DIRS
-    NAMES amd_rpp
+    NAMES rpp
     HINTS
     $ENV{AMDRPP_PATH}/lib
     $ENV{AMDRPP_PATH}/lib64
@@ -83,5 +83,5 @@ else()
     if(AMDRPP_FIND_REQUIRED)
         message(FATAL_ERROR "{Red}FindAMDRPP -- NOT FOUND${ColourReset}")
     endif()
-    message( "-- ${Yellow}NOTE: FindAMDRPP failed to find -- amd_rpp${ColourReset}" )
+    message( "-- ${Yellow}NOTE: FindAMDRPP failed to find -- rpp${ColourReset}" )
 endif()

amd_openvx_extensions/CMakeLists.txt

@@ -158,7 +158,7 @@ elseif(AMDRPP_FOUND AND "${BACKEND}" STREQUAL "CPU")
     add_subdirectory(amd_rpp)
     message("-- ${Green}AMD ROCm Performance Primitives -- amd_rpp module added with CPU only backend support${ColourReset}")
 else()
-    message("-- ${Red}WARNING: AMDRPP Not Found -- amd_rpp module excluded${ColourReset}")
+    message("-- ${Red}WARNING:AMD RPP Not Found -- OpenVX Extension amd_rpp module excluded${ColourReset}")
 endif()
 
 if(OpenCV_FOUND)

docker/archive/mivisionx-opencl-on-ubuntu20.dockerfile

@@ -39,7 +39,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.99  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 1.0.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=OCL ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd

docker/linux/mivisionx-on-rhel-8.dockerfile

@@ -31,7 +31,7 @@ RUN yum -y install sqlite-devel libtool && yum -y groupinstall 'Development Tool
     sudo ./b2 install threading=multi link=static --with-system --with-filesystem
 RUN git clone -b v3.21.9 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
-RUN git clone -b 0.99 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+RUN git clone -b 1.0.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace

docker/linux/mivisionx-on-rhel-9.dockerfile

@@ -31,7 +31,7 @@ RUN yum -y install sqlite-devel libtool && yum -y groupinstall 'Development Tool
     sudo ./b2 install threading=multi link=static --with-system --with-filesystem
 RUN git clone -b v3.21.9 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
-RUN git clone -b 0.99 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+RUN git clone -b 1.0.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace

docker/linux/mivisionx-on-sles-15.dockerfile

@@ -25,7 +25,7 @@ RUN zypper -n install sqlite-devel libtool && zypper -n install -t pattern devel
     sudo ./b2 install threading=multi link=static --with-system --with-filesystem
 RUN git clone -b v3.21.9 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
-RUN git clone -b 0.99 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+RUN git clone -b 1.0.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace

docker/mivisionx-on-ubuntu20.dockerfile

@@ -43,7 +43,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.99  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 1.0.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd

docker/mivisionx-on-ubuntu22.dockerfile

@@ -51,7 +51,7 @@ RUN apt-get -y install sqlite3 libsqlite3-dev libtool build-essential && \
     sudo ./b2 install threading=multi link=static --with-system --with-filesystem
 RUN git clone -b v3.21.9 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
-RUN git clone -b 0.99  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+RUN git clone -b 1.0.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace

docker/pytorch/mivisionx-with-pytorch-with-mesa.dockerfile

@@ -50,7 +50,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.99  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 1.0.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd

docker/pytorch/mivisionx-with-pytorch.dockerfile

@@ -36,7 +36,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.99  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 1.0.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd

docker/tensorflow/mivisionx-with-tensorflow.dockerfile

@@ -41,7 +41,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.99 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 1.0.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd

docker/ubuntu20/level-5.dockerfile

@@ -43,7 +43,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.99 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 1.0.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd

docker/ubuntu22/level-5.dockerfile

@@ -51,7 +51,7 @@ RUN apt-get -y install sqlite3 libsqlite3-dev libtool build-essential && \
     sudo ./b2 install threading=multi link=static --with-system --with-filesystem
 RUN git clone -b v3.21.9 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
-RUN git clone -b 0.99  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+RUN git clone -b 1.0.0  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace

rocAL/rocAL/CMakeLists.txt

@@ -120,9 +120,11 @@ if(NOT Threads_FOUND)
 endif()
 
 if(${BUILD_ROCAL})
-    # AMD OpenVX & RPP
-    include_directories(${AMDRPP_INCLUDE_DIRS})
+    # AMD OpenVX & VX_RPP
     set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} openvx vx_rpp)
+    # AMD RPP
+    include_directories(${AMDRPP_INCLUDE_DIRS})
+    set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${AMDRPP_LIBRARIES})
     # OpenMP
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")

rocAL/rocAL_pybind/CMakeLists.txt

@@ -95,15 +95,15 @@ endif()
 if(${BUILD_ROCAL_PYBIND})
 
     link_directories(${ROCM_PATH}/lib)
-
+    include_directories(${AMDRPP_INCLUDE_DIRS})
     include_directories(../rocAL/include/api/
                         third_party_lib/
                         ../../amd_openvx/openvx/include/)
 
     add_subdirectory(third_party_lib/pybind11)
 
     pybind11_add_module(rocal_pybind rocal_pybind.cpp)
-    target_link_libraries(rocal_pybind PRIVATE rocal  vx_rpp amd_rpp)
+    target_link_libraries(rocal_pybind PRIVATE ${AMDRPP_LIBRARIES} vx_rpp rocal)
     message("-- ${White}rocal_pybind -- CMAKE_CXX_FLAGS:${CMAKE_CXX_FLAGS}${ColourReset}")
     install(TARGETS rocal_pybind DESTINATION lib)
     message("-- ${Green}ROCm Augmentation Library Python Binding - rocal_pybind module added ${ColourReset}")