AMD RPP - updates for ROCm Re-Org (#919)

* RPP - Updates

* rocAL - Fix Flag

* CMakeList & Setup - Updates

CHANGELOG.md

@@ -37,10 +37,10 @@
 * migraphx - `2.1.0.50101-48`
 * Protobuf - [V3.12.4](https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.4)
 * OpenCV - [4.5.5](https://github.com/opencv/opencv/releases/tag/4.5.5)
-* RPP - [0.95](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/0.95)
+* RPP - [0.96](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/0.96)
 * 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.5`
+* MIVisionX Setup Script - `V2.3.6`
 
 ### Known issues
 

CMakeLists.txt

@@ -88,8 +88,8 @@ else()
     set(BACKEND "CPU")
     set(GPU_SUPPORT OFF)
   else()
-    message("-- ${Red}Warning: MIVisionX backend option unknown -- ${BACKEND}${ColourReset}")
-    message("-- ${Red}Warning: MIVisionX default backend will enforced${ColourReset}")
+    message("-- ${Red}Warning: MIVisionX backend option: ${BACKEND} -- unknown${ColourReset}")
+    message("-- ${Red}Warning: MIVisionX default backend will be enforced${ColourReset}")
     set(BACKEND "HIP")
   endif()
 endif()
@@ -101,9 +101,11 @@ if(NOT CMAKE_BUILD_TYPE)
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
 endif()
 if(CMAKE_BUILD_TYPE MATCHES Debug)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g")
+  # -O0  -- Don't Optimize output file; -g -- generate debugging information; -Og -- Optimize for debugging experience rather than speed or size.
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -Og")
 else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG")
+  # -O3 -- Optimize output file; -DNDEBUG -- turn off asserts.
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG")
 endif()
 message("-- ${BoldBlue}MIVisionX Build Type -- ${CMAKE_BUILD_TYPE}${ColourReset}")
 

MIVisionX-setup.py

@@ -30,7 +30,7 @@
 __author__ = "Kiriti Nagesh Gowda"
 __copyright__ = "Copyright 2018 - 2022, AMD ROCm MIVisionX"
 __license__ = "MIT"
-__version__ = "2.3.5"
+__version__ = "2.3.6"
 __maintainer__ = "Kiriti Nagesh Gowda"
 __email__ = "[email protected]"
 __status__ = "Shipping"
@@ -43,8 +43,8 @@
                     help='OpenCV Version - optional (default:4.5.5)')
 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.95',
-                    help='RPP Version - optional (default:0.95)')
+parser.add_argument('--rpp',   		type=str, default='0.96',
+                    help='RPP Version - optional (default:0.96)')
 parser.add_argument('--ffmpeg',    	type=str, default='no',
                     help='FFMPEG V4.4.2 Installation - optional (default:no) [options:yes/no]')
 parser.add_argument('--neural_net',	type=str, default='yes',
@@ -390,8 +390,6 @@
             # RPP
             # Remove Previous Install - RPP
             os.system('sudo -v')
-            if os.path.exists(ROCM_PATH+'/rpp'):
-                os.system('sudo rm -rf '+ROCM_PATH+'/rpp')
             os.system('(cd '+deps_dir+'; git clone -b '+rppVersion+' https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git; cd rpp; mkdir build-'+backend+'; cd build-'+backend+'; ' +
                       linuxCMake+' -DBACKEND='+backend+' ../; make -j4; sudo make install)')
 

README.md

@@ -181,7 +181,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.5.5)]
                             --protobuf  [ProtoBuf Version - optional (default:3.12.4)]
-                            --rpp       [RPP Version - optional (default:0.91)]
+                            --rpp       [RPP Version - optional (default:0.96)]
                             --ffmpeg    [FFMPEG V4.4.2 Installation - optional (default:no) [options:yes/no]]
                             --rocal     [MIVisionX rocAL Dependency Install - optional (default:yes) [options:yes/no]]
                             --neural_net[MIVisionX Neural Net Dependency Install - optional (default:yes) [options:yes/no]]
@@ -440,10 +440,10 @@ Review all notable [changes](CHANGELOG.md#changelog) with the latest release
 * migraphx - `2.1.0.50101-48`
 * Protobuf - [V3.12.4](https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.4)
 * OpenCV - [4.5.5](https://github.com/opencv/opencv/releases/tag/4.5.5)
-* RPP - [0.95](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/0.95)
+* RPP - [0.96](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/0.96)
 * 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.5`
+* MIVisionX Setup Script - `V2.3.6`
 
 ### Known issues
 

amd_openvx/cmake/FindAMDRPP.cmake

@@ -27,23 +27,23 @@ find_path(AMDRPP_INCLUDE_DIRS
     NAMES rpp.h
     PATHS
     /usr/include
-    ${ROCM_PATH}/rpp/include
+    ${ROCM_PATH}/include/rpp
 )
 mark_as_advanced( AMDRPP_INCLUDE_DIRS )
 
 find_library( AMDRPP_LIBRARIES
     NAMES amd_rpp
     PATHS
     /usr/lib
-    ${ROCM_PATH}/rpp/lib
+    ${ROCM_PATH}/lib
 )
 mark_as_advanced( AMDRPP_LIBRARIES_DIR )
 
 find_path(AMDRPP_LIBRARIES_DIR
     NAMES libamd_rpp.so
     PATHS
     /usr/lib
-    ${ROCM_PATH}/rpp/lib
+    ${ROCM_PATH}/lib
 )
 
 include( FindPackageHandleStandardArgs )

amd_openvx_extensions/CMakeLists.txt

@@ -136,14 +136,14 @@ if(AMDRPP_FOUND AND GPU_SUPPORT)
     #find the RPP backend type
     set(RPP_BACKEND_OPENCL_FOUND 0)
     set(RPP_BACKEND_HIP_FOUND 0)
-    if(EXISTS ${ROCM_PATH}/rpp/include/rpp_backend.h)
-        file(READ ${ROCM_PATH}/rpp/include/rpp_backend.h RPP_BACKEND_FILE)
+    if(EXISTS ${ROCM_PATH}/include/rpp/rpp_backend.h)
+        file(READ ${ROCM_PATH}/include/rpp/rpp_backend.h RPP_BACKEND_FILE)
         string(REGEX MATCH "RPP_BACKEND_OPENCL ([0-9]*)" _ ${RPP_BACKEND_FILE})
         set(RPP_BACKEND_OPENCL_FOUND ${CMAKE_MATCH_1})
         string(REGEX MATCH "RPP_BACKEND_HIP ([0-9]*)" _ ${RPP_BACKEND_FILE})
         set(RPP_BACKEND_HIP_FOUND ${CMAKE_MATCH_1})
     else()
-        message("-- ${Red}WARNING: ${ROCM_PATH}/rpp/include/rpp_backend.h file Not Found. please run the setup script to install latest RPP package ${ColourReset}")
+        message("-- ${Red}WARNING: ${ROCM_PATH}/include/rpp/rpp_backend.h file Not Found. please run the setup script to install latest RPP package ${ColourReset}")
     endif()
 
     if ("${BACKEND}" STREQUAL "OPENCL" AND OpenCL_FOUND)

amd_openvx_extensions/amd_media/CMakeLists.txt

@@ -96,6 +96,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
 else()
+    # -Wno-deprecated-declarations -- Do not warn about uses of functions, variables, and types marked as deprecated by using the deprecated attribute. 
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations -msse4.2 -std=gnu++14")
 endif()
 

amd_openvx_extensions/amd_opencv/CMakeLists.txt

@@ -122,6 +122,7 @@ if(WIN32)
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
 else()
 	target_link_libraries(vx_opencv openvx)
+	# -fdata-sections -- Place data items into their own section.
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -std=gnu++14")
 endif()
 

amd_openvx_extensions/amd_rpp/CMakeLists.txt

@@ -154,6 +154,7 @@ elseif (GPU_SUPPORT AND "${BACKEND}" STREQUAL "HIP" AND HIP_FOUND)
     add_library(vx_rpp SHARED ${SOURCES})
     set_target_properties(openvx PROPERTIES LINKER_LANGUAGE CXX)
     set_target_properties(openvx PROPERTIES POSITION_INDEPENDENT_CODE ON)
+    # TBD -- CHECK to FIX
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGPU_SUPPORT=1 -DRPP_BACKEND_HIP=1") # Currently used by rpp. To be removed.
     target_link_libraries(vx_rpp amd_rpp boost_filesystem boost_system ${HIP_LIBRARY})
 else()

apps/cloud_inference/server_app/CMakeLists.txt

@@ -64,6 +64,7 @@ add_executable(${PROJECT_NAME} ${My_Source_Files})
 
 # Link Libraries & Set CXX Flags
 target_link_libraries(${PROJECT_NAME} vx_nn openvx pthread dl)
+# -mf16c -- Support F16C built-in functions and code generation.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -mf16c -std=gnu++14")
 
 # Link OpenCL/HIP

apps/image_augmentation/CMakeLists.txt

@@ -73,6 +73,7 @@ else()
 endif()
 
 # Link Libraries & Set CXX Flags
+# -mf16c -- Support F16C built-in functions and code generation.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mf16c -Wall ")
 target_link_libraries(${PROJECT_NAME} rocal ${OpenCV_LIBRARIES} )
 

apps/image_augmentation/README.md

@@ -17,7 +17,6 @@ This application demonstrates the basic usage of rocAL's C API to load JPEG imag
 
 ``` 
  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/rpp/lib
  mkdir build
  cd build
  cmake ../

apps/mivisionx_openvx_classifier/CMakeLists.txt

@@ -53,6 +53,7 @@ add_executable(${PROJECT_NAME} source/classifier.cpp)
 
 # Link Libraries & Set CXX Flags
 target_link_libraries(${PROJECT_NAME} openvx vx_nn caffeModels pthread)
+# -mf16c -- Support F16C built-in functions and code generation.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -mf16c -std=gnu++14")
 
 # OpenCV 3/4 Support

apps/mivisionx_validation_tool/README.md

@@ -51,7 +51,7 @@ Pre-trained models in [ONNX](https://onnx.ai/), [NNEF](https://www.khronos.org/n
 
 ``` 
 	export PATH=$PATH:/opt/rocm/bin
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 ```
 
 **NOTE:**
@@ -89,7 +89,7 @@ sudo docker run -it --device=/dev/kfd --device=/dev/dri --cap-add=SYS_RAWIO --de
 
 ``` 
 export PATH=$PATH:/opt/rocm/bin
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 runvx /opt/rocm/share/mivisionx/samples/gdf/canny.gdf
 ```
 
@@ -200,7 +200,7 @@ usage: python mivisionx_validation_tool.py
     ``` 
 	cd ~/sample-1/MIVisionX-validation-tool/
 	export PATH=$PATH:/opt/rocm/bin
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 	python mivisionx_validation_tool.py -h
     ```
 
@@ -245,7 +245,7 @@ usage: python mivisionx_validation_tool.py
     ``` 
 	cd ~/sample-2/MIVisionX-validation-tool/
 	export PATH=$PATH:/opt/rocm/bin
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 	python mivisionx_validation_tool.py -h
     ```
 
@@ -291,7 +291,7 @@ usage: python mivisionx_validation_tool.py
     ``` 
 	cd ~/sample-3/MIVisionX-validation-tool/
 	export PATH=$PATH:/opt/rocm/bin
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 	python mivisionx_validation_tool.py -h
     ```
 

docker/mivisionx-on-ubuntu18.dockerfile

@@ -39,7 +39,7 @@ RUN apt-get -y install wget autoconf automake libbz2-dev libssl-dev python-dev p
         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.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  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-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.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  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-opencl-on-ubuntu18.dockerfile

@@ -39,7 +39,7 @@ RUN apt-get -y install wget autoconf automake libbz2-dev libssl-dev python-dev p
         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.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  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/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.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  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/pytorch/mivisionx-with-pytorch.dockerfile

@@ -40,7 +40,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.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  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/ubuntu18/level-5.dockerfile

@@ -39,7 +39,7 @@ RUN apt-get -y install wget autoconf automake libbz2-dev libssl-dev python-dev p
         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.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  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/ubuntu20/level-5.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.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  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/zenDNN/zenDNN-HIP.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.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  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