Skip to content

Commit

Permalink
Test Suite - updates (#428)
Browse files Browse the repository at this point in the history
* Test Suite - updates

* Changelog - Updates

* Readme - Fix

* CMakeList - cleanup

* Version - update

* Version - Add note

* Readme - updates

* Readme - Updates

* Readme - Fix add ldconfig
  • Loading branch information
kiritigowda authored Aug 13, 2024
1 parent c8baab2 commit d905a4b
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 59 deletions.
20 changes: 19 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,25 @@

Full documentation for RPP is available at [https://rocm.docs.amd.com/projects/rpp/en/latest](https://rocm.docs.amd.com/projects/rpp/en/latest)

## (Unreleased) RPP 1.8.0
## RPP 1.9.0 (Unreleased)

### Changes

* Test - Prerequisites Updates

### Tested configurations

* Linux distribution
* Ubuntu - `20.04` / `22.04`
* CentOS - `7`
* RHEL - `8`/`9`
* ROCm: rocm-core - `6.2.0.60200-66`
* Clang - Version `5.0.1`+
* CMake - Version `3.16.3`+
* IEEE 754-based half-precision floating-point library - Version `1.12.0`


## RPP 1.8.0 for ROCm 6.3.0

### Changes

Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ endif()
set(CMAKE_CXX_STANDARD 17)

# RPP Version
set(VERSION "1.8.0")
set(VERSION "1.9.0")

# Set Project Version and Language
project(rpp VERSION ${VERSION} LANGUAGES CXX)
Expand Down Expand Up @@ -247,9 +247,9 @@ if("${BACKEND}" STREQUAL "HIP")
# To use RPP_BACKEND_HIP
add_definitions(-DRPP_BACKEND_HIP=${RPP_BACKEND_HIP})
if (EXISTS ${ROCM_PATH}/llvm/bin/clang++)
set(COMPILER_FOR_HIP ${ROCM_PATH}/llvm/bin/clang++)
set(COMPILER_FOR_HIP ${ROCM_PATH}/llvm/bin/clang++)
else()
set(COMPILER_FOR_HIP ${CMAKE_CXX_COMPILER})
set(COMPILER_FOR_HIP ${CMAKE_CXX_COMPILER})
endif()
include_directories(${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR})
link_directories(${HIP_PATH}/${CMAKE_INSTALL_LIBDIR})
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ The installer will copy
* Documents folder into `/opt/rocm/share/doc/rpp`

>[!NOTE]
> [Test suite prerequisites](utilities/test_suite/README.md) install is required to run tests
> [Test suite prerequisites](utilities/test_suite#prerequisites) install is required to run tests
### Verify with rpp-test package

Expand Down Expand Up @@ -206,5 +206,8 @@ All notable changes for each release are added to our [changelog](CHANGELOG.md).
* Ubuntu - `20.04` / `22.04`
* RedHat - `8` / `9`
* SLES - `15-SP5`
* ROCm: rocm-core - `6.1.0.60100-64`
* ROCm: rocm-core - `6.2.0.60200-66`
* CMake - Version `3.16.3`+
* Clang - Version `5.0.1`+
* half - IEEE 754-based half-precision floating-point library - Version `1.12.0` / package V`1.12.0.60200`
* OpenCV - [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.0)
3 changes: 2 additions & 1 deletion include/rpp_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ SOFTWARE.
#ifdef __cplusplus
extern "C" {
#endif
// NOTE: Match the version with CMakelists.txt version
#define RPP_VERSION_MAJOR 1
#define RPP_VERSION_MINOR 8
#define RPP_VERSION_MINOR 9
#define RPP_VERSION_PATCH 0
#ifdef __cplusplus
}
Expand Down
82 changes: 30 additions & 52 deletions utilities/test_suite/README.md
Original file line number Diff line number Diff line change
@@ -1,49 +1,18 @@
# AMD ROCm Performance Primitives (RPP) Test Suite
# RPP Test Suite

This repository contains four test suites for the AMD ROCm Performance Primitives (RPP) library: for image/voxel/audio/miscellaneous augmentations processing. These test suites can be used to validate the functionality and performance of the AMD ROCm Performance Primitives (RPP) image/voxel/audio/miscellaneous functionalities.
This repository contains four test suites for the RPP library: `image`/`voxel`/`audio`/`miscellaneous` augmentations processing. These test suites can be used to validate the functionality and performance of the RPP `image`/`voxel`/`audio`/`miscellaneous` augmentation functionalities.

## Test suite prerequisites
## Prerequisites

* OpenCV `3.4.0`/`4.5.5`

* Install OpenCV prerequisites:

```bash
sudo apt-get update
sudo -S apt-get -y --allow-unauthenticated install build-essential libgtk2.0-dev libavcodec-dev libavformat-dev libswscale-dev python-dev python-numpy
sudo -S apt-get -y --allow-unauthenticated install libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev unzip wget
```

* Download OpenCV `3.4.0` /`4.5.5`:

```bash
wget https://github.com/opencv/opencv/archive/3.4.0.zip
unzip 3.4.0.zip
cd opencv-3.4.0/
```

OR

```bash
wget https://github.com/opencv/opencv/archive/4.5.5.zip
unzip 4.5.5.zip
cd opencv-4.5.5/
```

* Install OpenCV:

```bash
mkdir build
cd build
cmake -D WITH_GTK=ON -D WITH_JPEG=ON -D BUILD_JPEG=ON -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 ..
sudo -S make -j128 <Or other number of threads to use>
sudo -S make install
sudo -S ldconfig
```

* Install TurboJpeg:
* OpenCV Version `3.X`/`4.X`
```shell
sudo apt install libopencv-dev
```

```bash
* [Turbo JPEG](https://libjpeg-turbo.org/)
* Source: `https://github.com/libjpeg-turbo/libjpeg-turbo.git`
* Tag: [3.0.2](https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/3.0.2)
```shell
sudo apt-get install nasm
sudo apt-get install wget
git clone -b 3.0.2 https://github.com/libjpeg-turbo/libjpeg-turbo.git
Expand All @@ -59,37 +28,46 @@ This repository contains four test suites for the AMD ROCm Performance Primitive
make -j$nproc
sudo make install
```
* Libsndfile installation
```
sudo apt-get update

* Libsndfile
```shell
sudo apt-get install libsndfile1-dev
```

* Imagemagick
```
```shell
sudo apt-get install imagemagick
```

* Nifti-Imaging nifti_clib
```
git clone git@github.com:NIFTI-Imaging/nifti_clib.git
* Nifti-Imaging - [nifti_clib](https://github.com/NIFTI-Imaging/nifti_clib)
```shell
git clone https://github.com/NIFTI-Imaging/nifti_clib.git
cd nifti_clib
mkdir build
cd build
cmake ..
sudo make -j$nproc install
```

* Openpyxl
* Python3 and Python3 PIP
```shell
sudo apt install python3-dev python3-pip
```

* Python: Openpyxl
```shell
pip install openpyxl
```

* Pandas
```
* Python: Pandas
```shell
pip install pandas
```

>[!NOTE]
> * All package installs are shown with the `apt` package manager. Use the appropriate package manager for your operating system.
> * Run `sudo ldconfig` to configure dynamic run-time bindings
## Rpp Image Test Suite
The image test suite can be executed under 2 backend scenarios - (HOST/HIP):
- HOST backend - (On a CPU with HOST backend)
Expand Down

0 comments on commit d905a4b

Please sign in to comment.