Merge branch 'develop' of https://github.com/GPUOpen-ProfessionalComp…

…ute-Libraries/MIVisionX into master

.jenkins/common.groovy

@@ -18,7 +18,7 @@ def runCompileCommand(platform, project, jobName, boolean debug=false, boolean s
     if (platform.jenkinsLabel.contains('centos')) {
         osInfo = 'cat /etc/os-release && uname -r'
         update = 'sudo yum -y --nogpgcheck update && sudo yum -y --nogpgcheck install zip && sudo alternatives --set python /usr/bin/python2'
-        installPackageDeps = 'python MIVisionX-setup.py --reinstall yes --ffmpeg yes'
+        installPackageDeps = 'python MIVisionX-setup.py --reinstall yes --ffmpeg yes --backend OCL'
         if (platform.jenkinsLabel.contains('centos7')) {
             update = 'echo scl enable devtoolset-7 bash | sudo tee /etc/profile.d/ree.sh && sudo chmod +x /etc/profile.d/ree.sh && . /etc/profile && scl enable devtoolset-7 bash && sudo yum -y --nogpgcheck install lcov zip && sudo yum -y --nogpgcheck update'
             cmake = 'cmake3'
@@ -33,12 +33,12 @@ def runCompileCommand(platform, project, jobName, boolean debug=false, boolean s
     else if (platform.jenkinsLabel.contains('sles')) {
         osInfo = 'cat /etc/os-release && uname -r'
         update = 'sudo zypper -n --no-gpg-checks install lcov zip && sudo zypper -n --no-gpg-checks update'
-        installPackageDeps = 'python MIVisionX-setup.py --reinstall yes --ffmpeg yes'
+        installPackageDeps = 'python MIVisionX-setup.py --reinstall yes --ffmpeg yes --backend OCL'
     }
     else if (platform.jenkinsLabel.contains('ubuntu')) {
         osInfo = 'cat /etc/lsb-release && uname -r'
         update = 'sudo apt-get -y --allow-unauthenticated update && sudo apt-get -y --allow-unauthenticated install lcov zip'
-        installPackageDeps = 'python MIVisionX-setup.py --reinstall yes --ffmpeg yes'
+        installPackageDeps = 'python MIVisionX-setup.py --reinstall yes --ffmpeg yes --backend OCL'
         if (platform.jenkinsLabel.contains('ubuntu18')) {
             codeCovFlags = '-D CMAKE_CXX_FLAGS="-fprofile-arcs -ftest-coverage"'
         }

.travis.yml

@@ -91,5 +91,4 @@ after_success:
 
 notifications:
   email:
-    - kiriti.nageshgowda@amd.com
-    - pavel.tcherniaev@amd.com
+    - mivisionx.support@amd.com

CHANGELOG.md

@@ -6,7 +6,47 @@
 
 [MIVisionX Documentation](https://gpuopen-professionalcompute-libraries.github.io/MIVisionX/)
 
-## MIVisionX 2.0.1 (unreleased)
+## MIVisionX 2.1.0 (Unreleased)
+
+### Added
+
+* `TBD`
+
+### Optimizations
+
+* Readme Updates
+
+### Changed
+
+* **Backend** - Default Backend set to `HIP`
+
+### Fixed
+
+* Minor bugs and warnings
+
+### Tested Configurations
+
+* Windows 10
+* Linux distribution
+  + Ubuntu - `18.04` / `20.04`
+  + CentOS - `7` / `8`
+  + SLES - `15-SP2`
+* ROCm: rocm-dev - `4.5.2.40502-164`
+* rocm-cmake - [rocm-4.2.0](https://github.com/RadeonOpenCompute/rocm-cmake/releases/tag/rocm-4.2.0)
+* MIOpenGEMM - [1.1.5](https://github.com/ROCmSoftwarePlatform/MIOpenGEMM/releases/tag/1.1.5)
+* MIOpen - [2.14.0](https://github.com/ROCmSoftwarePlatform/MIOpen/releases/tag/2.14.0)
+* Protobuf - [V3.12.0](https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.0)
+* OpenCV - [4.5.5](https://github.com/opencv/opencv/releases/tag/4.5.5)
+* RPP - [0.92](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/0.92)
+* FFMPEG - [n4.0.4](https://github.com/FFmpeg/FFmpeg/releases/tag/n4.0.4)
+* Dependencies for all the above packages
+* MIVisionX Setup Script - `V2.0.0`
+
+### Known issues
+
+* `TBD`
+
+## MIVisionX 2.0.1
 
 ### Added
 
@@ -18,6 +58,7 @@
 ### Optimizations
 
 * Code Cleanup
+* Readme Updates
 
 ### Changed
 
@@ -26,6 +67,8 @@
 ### Fixed
 
 * Minor bugs and warnings
+* Inference server application - OpenCL Backend
+* vxCreateThreshold Fix - Apps & Sample
 
 ### Tested Configurations
 

CMakeLists.txt

@@ -21,7 +21,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(MIVisionX)
-set(VERSION "2.0.1")
+set(VERSION "2.1.0")
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -54,7 +54,7 @@ message("-- ${BoldBlue}MIVisionX Version -- ${VERSION}${ColourReset}")
 message("-- ${BoldBlue}MIVisionX Install Path -- ${CMAKE_INSTALL_PREFIX}${ColourReset}")
 
 if(NOT DEFINED BACKEND)
-  set(BACKEND "OPENCL")   # set default backend to OPENCL
+  set(BACKEND "HIP")   # set default backend to HIP
 else()
   if("${BACKEND}" STREQUAL "OPENCL" OR "${BACKEND}" STREQUAL "OCL" OR "${BACKEND}" STREQUAL "OpenCL")
     set(BACKEND "OPENCL")
@@ -66,7 +66,7 @@ else()
   else()
     message("-- ${Red}Warning: MIVisionX backend option unknown -- ${BACKEND}${ColourReset}")
     message("-- ${Red}Warning: MIVisionX default backend will enforced${ColourReset}")
-    set(BACKEND "OPENCL")
+    set(BACKEND "HIP")
   endif()
 endif()
 message("-- ${BoldBlue}MIVisionX Backend set to -- ${BACKEND}${ColourReset}")
@@ -92,7 +92,7 @@ message("-- ${Cyan}     -D NEURAL_NET=OFF [Turn OFF Neural Net Modules (default:
 message("-- ${Cyan}     -D ROCAL=OFF [Turn OFF ROCAL Modules (default:ON)]${ColourReset}")
 message("-- ${Cyan}     -D LOOM=OFF [Turn OFF LOOM Modules (default:ON)]${ColourReset}")
 message("-- ${Cyan}     -D GPU_SUPPORT=OFF [Turn OFF GPU support (default:ON)]${ColourReset}")
-message("-- ${Cyan}     -D BACKEND=HIP [select HIP for GPU backend [options:CPU/OPENCL/HIP](default:OPENCL)]${ColourReset}")
+message("-- ${Cyan}     -D BACKEND=OPENCL [select OPENCL for GPU backend [options:CPU/OPENCL/HIP](default:HIP)]${ColourReset}")
 
 if(APPLE)
   set(CMAKE_MACOSX_RPATH 1)

MIVisionX-setup.py

@@ -30,17 +30,17 @@
 __author__ = "Kiriti Nagesh Gowda"
 __copyright__ = "Copyright 2018 - 2022, AMD ROCm MIVisionX"
 __license__ = "MIT"
-__version__ = "2.0.0"
+__version__ = "2.1.0"
 __maintainer__ = "Kiriti Nagesh Gowda"
-__email__ = "Kiriti.NageshGowda@amd.com"
+__email__ = "mivisionx.support@amd.com"
 __status__ = "Shipping"
 
 # 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='3.4.0',
-                    help='OpenCV Version - optional (default:3.4.0)')
+parser.add_argument('--opencv',    	type=str, default='4.5.5',
+                    help='OpenCV Version - optional (default:4.5.5)')
 parser.add_argument('--miopen',    	type=str, default='2.14.0',
                     help='MIOpen Version - optional (default:2.14.0)')
 parser.add_argument('--miopengemm',	type=str, default='1.1.5',
@@ -57,8 +57,8 @@
                     help='MIVisionX rocAL Dependency Install - optional (default:yes) [options:yes/no]')
 parser.add_argument('--reinstall', 	type=str, default='no',
                     help='Remove previous setup and reinstall - optional (default:no) [options:yes/no]')
-parser.add_argument('--backend', 	type=str, default='OCL',
-                    help='MIVisionX Dependency Backend - optional (default:OCL) [options:OCL/HIP]')
+parser.add_argument('--backend', 	type=str, default='HIP',
+                    help='MIVisionX Dependency Backend - optional (default:HIP) [options:OCL/HIP]')
 parser.add_argument('--rocm_path', 	type=str, default='/opt/rocm',
                     help='ROCm Installation Path - optional (default:/opt/rocm) - ROCm Installation Required')
 args = parser.parse_args()
@@ -399,7 +399,7 @@
                   ' install -t pattern devel_basis')
         os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
                   ' install gtk2-devel libjpeg-devel libpng-devel libtiff-devel libavc1394 wget unzip')
-    # OpenCV 3.4.0
+    # OpenCV 4.5.5
     os.system('(cd '+deps_dir+'/build/OpenCV; '+linuxCMake +
               ' -D WITH_OPENCL=OFF -D WITH_OPENCLAMDFFT=OFF -D WITH_OPENCLAMDBLAS=OFF -D WITH_VA_INTEL=OFF -D WITH_OPENCL_SVM=OFF  -D CMAKE_INSTALL_PREFIX=/usr/local ../../opencv-'+opencvVersion+' )')
     os.system('(cd '+deps_dir+'/build/OpenCV; make -j8 )')