Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ROCm 6.2.X - Docs:Cherry pick #418

Merged
merged 32 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
95443ab
Package - Remove package provides field from RPM and DEB package (#380)
raramakr Jun 17, 2024
f388f6b
remove include file paths (#387)
randyh62 Jun 20, 2024
1f957c3
Docs - doxygen fix for docs not showing arithmetic, logical, audio gr…
r-abishek Jun 24, 2024
82e47f5
RPP Glitch on HOST and HIP (#357)
r-abishek Jun 24, 2024
5e5d891
Bugfix for Erase variant (#373)
r-abishek Jun 24, 2024
e3ec336
AUDIO_SUPPORT - Fix to exclude linking FFTS and add new flag (#378)
r-abishek Jun 24, 2024
dc12691
macOS - Build fix (#389)
r-abishek Jun 25, 2024
fcb479e
RPP Test Suite - Minor augmentation-group update (#383)
r-abishek Jun 26, 2024
185e0be
Docs - Bump rocm-docs-core[api_reference] from 1.4.0 to 1.4.1 in /doc…
dependabot[bot] Jun 28, 2024
3077458
RPP Tensor Transpose ND on HOST and HIP (#362)
r-abishek Jun 28, 2024
a60c76b
AMD Advanced - Build Flag (#394)
kiritigowda Jul 1, 2024
ae26692
Bump rocm-docs-core[api_reference] from 1.4.1 to 1.5.0 in /docs/sphin…
dependabot[bot] Jul 8, 2024
ca8dcd5
RPP Log Tensor on HOST and HIP (#372)
r-abishek Jul 10, 2024
c18749e
RPP Test suite - Display all cases for "--help" request (#379)
r-abishek Jul 10, 2024
554f051
adjustmentTensor - fix the datatype for HOST kernel (#397)
r-abishek Jul 10, 2024
017c1da
Fix header levels in changelog (#400)
samjwu Jul 19, 2024
8b4030f
Azure CI: Change branch triggers (#403)
amd-jmacaran Jul 22, 2024
e06464c
RPP Lens Correction - HOST and HIP (#382)
r-abishek Jul 22, 2024
ca9b335
RPP Jitter on HOST and HIP (#384)
r-abishek Jul 24, 2024
2a4373e
RPP Audio Support HIP - Non silent region (#395)
r-abishek Jul 24, 2024
2a13f48
RPP Test Suite - Replace fstrings and subprocess calls to support old…
r-abishek Jul 24, 2024
6e30d48
Doxyfile update - Add arithmetic and audio rppt groups (#404)
r-abishek Jul 24, 2024
9ef84bb
Docs - Bump rocm-docs-core[api_reference] from 1.5.0 to 1.5.1 in /doc…
dependabot[bot] Jul 24, 2024
b2a65ef
Add the ROCm version for each rpp release in the changelog (#409)
samjwu Jul 30, 2024
7c4b0e3
Docs - Fix broken images (#411)
randyh62 Aug 1, 2024
f7a495a
RPP Audio Support HIP - To Decibels (#398)
r-abishek Aug 1, 2024
5c3772a
RPP Audio Support HIP - Downmixing (#401)
r-abishek Aug 2, 2024
610a92b
Fix header levels in changelog (#400)
samjwu Jul 19, 2024
067db0b
Doxyfile update - Add arithmetic and audio rppt groups (#404)
r-abishek Jul 24, 2024
44e4b6f
Add the ROCm version for each rpp release in the changelog (#409)
samjwu Jul 30, 2024
ba4eb74
Docs - Fix broken images (#411)
randyh62 Aug 1, 2024
5b6ee25
Merge branch 'release/rocm-rel-6.2' into cherry-pick-rpp
randyh62 Aug 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -960,16 +960,16 @@ INPUT = README.md \
include/rppi_logical_operations.h \
include/rppi_morphological_transforms.h \
include/rppi_statistical_operations.h \
include/rppt_tensor_arithmetic_operations.h \
include/rppt_tensor_audio_augmentations.h \
include/rppt_tensor_color_augmentations.h \
include/rppt_tensor_data_exchange_operations.h \
include/rppt_tensor_effects_augmentations.h \
include/rppt_tensor_filter_augmentations.h \
include/rppt_tensor_geometric_augmentations.h \
include/rppt_tensor_logical_operations.h \
include/rppt_tensor_morphological_operations.h \
include/rppt_tensor_statistical_operations.h \
include/rppt_tensor_arithmetic_operations.h \
include/rppt_tensor_audio_augmentations.h \
include/rppt_tensor_logical_operations.h
include/rppt_tensor_statistical_operations.h


# This tag can be used to specify the character encoding of the source files
Expand Down Expand Up @@ -2381,7 +2381,7 @@ INCLUDE_FILE_PATTERNS =
# recursively expanded use the := operator instead of the = operator.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

PREDEFINED = GPU_SUPPORT RPP_BACKEND_HIP HIP_COMPILE
PREDEFINED = GPU_SUPPORT RPP_BACKEND_HIP HIP_COMPILE AUDIO_SUPPORT

# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
# tag can be used to specify a list of macro names that should be expanded. The
Expand Down
5 changes: 4 additions & 1 deletion .azuredevops/rocm-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ trigger:
batch: true
branches:
include:
- develop
- mainline
- master
paths:
exclude:
Expand All @@ -27,8 +29,9 @@ pr:
autoCancel: true
branches:
include:
- master
- develop
- mainline
- master
paths:
exclude:
- .github
Expand Down
32 changes: 16 additions & 16 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Changelog for RPP

Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/rpp/en/latest/).
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)

### RPP 1.8.0 (unreleased)
## (Unreleased) RPP 1.8.0

### Changes

Expand All @@ -25,7 +25,7 @@ Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/r
* CMake - Version `3.22.3`
* IEEE 754-based half-precision floating-point library - Version `1.12.0`

### RPP 1.5.0
### RPP 1.5.0 for ROCm 6.1.1

### Changes

Expand All @@ -42,7 +42,7 @@ Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/r
* CMake - Version `3.22.3`
* IEEE 754-based half-precision floating-point library - Version `1.12.0`

## RPP 1.4.0
## RPP 1.4.0 for ROCm 6.0.0

### Additions

Expand Down Expand Up @@ -76,7 +76,7 @@ Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/r
* CMake - Version `3.22.3`
* IEEE 754-based half-precision floating-point library - Version `1.12.0`

## RPP 1.3.0
## RPP 1.3.0 for ROCm 5.7.1

### Additions

Expand Down Expand Up @@ -106,7 +106,7 @@ Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/r
* Boost - Version `1.72`
* IEEE 754-based half-precision floating-point library - Version `1.12.0`

## RPP 1.2.0
## RPP 1.2.0 for ROCm 5.7.1

### Additions

Expand Down Expand Up @@ -137,7 +137,7 @@ Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/r
* Boost - Version `1.72`
* IEEE 754-based half-precision floating-point library - Version `1.12.0`

## RPP 1.1.0
## RPP 1.1.0 for ROCm 5.7.0

### Additions

Expand Down Expand Up @@ -172,7 +172,7 @@ Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/r
* SLES - the Clang package is missing in the latest updates, which means Clang must be manually
installed.

## RPP 1.0.0
## RPP 1.0.0 for ROCm 5.7.0

### Additions

Expand Down Expand Up @@ -212,7 +212,7 @@ Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/r
* SLES - the Clang package is missing in the latest updates, which means Clang must be manually
installed.

## RPP 0.99
## RPP 0.99 for ROCm 5.7.0

### Additions

Expand Down Expand Up @@ -241,7 +241,7 @@ Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/r
* Boost - Version `1.72`
* IEEE 754-based half-precision floating-point library - Version `1.12.0`

## RPP 0.98
## RPP 0.98 for ROCm 5.7.0

### Additions
* Dockers
Expand All @@ -251,11 +251,11 @@ Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/r

* Readme updates

#### Changes
### Changes

* CMakeList

#### Fixes
### Fixes

* Minor bugs and warnings

Expand All @@ -270,7 +270,7 @@ Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/r
* Boost - Version `1.72`
* IEEE 754-based half-precision floating-point library - Version `1.12.0`

## RPP 0.97
## RPP 0.97 for ROCm 5.7.0

### Additions

Expand Down Expand Up @@ -301,7 +301,7 @@ Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/r
* Boost - Version `1.72`
* IEEE 754-based half-precision floating-point library - Version `1.12.0`

## RPP 0.96
## RPP 0.96 for ROCm 5.7.0

### Additions

Expand Down Expand Up @@ -334,7 +334,7 @@ Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/r

* RPP is not supported on CentOS 7 and SLES SP2

## RPP 0.95
## RPP 0.95 for ROCm 5.7.0

### Additions

Expand Down Expand Up @@ -368,7 +368,7 @@ Full documentation for RPP is available at (https://rocm.docs.amd.com/projects/r

* ROCm reorganization: install updates no longer match ROCm specifications

## RPP 0.93
## RPP 0.93 for ROCm 5.7.0

### Additions

Expand Down
39 changes: 37 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)

# RPP Default Options
set(DEFAULT_BUILD_TYPE "Release")
### RPP_AUDIO_SUPPORT - default = ON, NOTE: support currently only on Ubuntu - user to set to OFF otherwise
option(RPP_AUDIO_SUPPORT "Build RPP with Audio Support" ON)
option(BUILD_WITH_AMD_ADVANCE "Build RPP for advanced AMD GPU Architecture" OFF)

# Set message options
if(NOT WIN32)
Expand All @@ -77,6 +80,7 @@ endif()
if(APPLE)
set(CMAKE_MACOSX_RPATH 1)
set(BACKEND "CPU")
set(RPP_AUDIO_SUPPORT OFF)
message("-- ${Magenta}Apple macOS Detected -- GPU Support turned OFF${ColourReset}")
endif()

Expand Down Expand Up @@ -134,9 +138,16 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
find_package(HALF REQUIRED)
include_directories(${HALF_INCLUDE_DIRS})

if (RPP_AUDIO_SUPPORT)
add_definitions(-DAUDIO_SUPPORT) # For compile flags in RPP
set(RPP_AUDIO_AUGMENTATIONS_SUPPORT 1) # For cmakedefine01 in rpp_audio_augmentations_support.h.in
endif()

message("-- ${Cyan}RPP Developer Options${ColourReset}")
message("-- ${Cyan} -D BACKEND=${BACKEND} [Select RPP Backend [options:CPU/OPENCL/HIP](default:HIP)]${ColourReset}")
message("-- ${Cyan} -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} [Select RPP build type [options:Debug/Release](default:Release)]${ColourReset}")
message("-- ${Cyan} -D RPP_AUDIO_SUPPORT=${RPP_AUDIO_SUPPORT} [Select RPP audio support [options:ON/OFF](default:ON)]${ColourReset}")
message("-- ${Cyan} -D BUILD_WITH_AMD_ADVANCE=${BUILD_WITH_AMD_ADVANCE} [Turn ON/OFF Build for AMD advanced GPUs(default:OFF)]${ColourReset}")

# OpenMP
find_package(OpenMP REQUIRED)
Expand Down Expand Up @@ -207,8 +218,23 @@ if("${BACKEND}" STREQUAL "HIP")
endif()

list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH} ${ROCM_PATH}/hip)

# Set supported GPU Targets
set(DEFAULT_AMDGPU_TARGETS "gfx908;gfx90a;gfx940;gfx941;gfx942;gfx1030;gfx1031;gfx1032;gfx1100;gfx1101;gfx1102")
set(AMDGPU_TARGETS "${DEFAULT_AMDGPU_TARGETS}" CACHE STRING "List of specific machine types for library to target")
if (BUILD_WITH_AMD_ADVANCE)
set(DEFAULT_AMDGPU_TARGETS ${DEFAULT_AMDGPU_TARGETS} "gfx1200;gfx1201")
endif()

# Set AMDGPU_TARGETS
if(DEFINED ENV{AMDGPU_TARGETS})
set(AMDGPU_TARGETS $ENV{AMDGPU_TARGETS} CACHE STRING "List of specific machine types for library to target")
elseif(AMDGPU_TARGETS)
message("-- ${White}${PROJECT_NAME} -- AMDGPU_TARGETS set with -D option${ColourReset}")
else()
set(AMDGPU_TARGETS "${DEFAULT_AMDGPU_TARGETS}" CACHE STRING "List of specific machine types for library to target")
endif()
message("-- ${White}${PROJECT_NAME} -- AMDGPU_TARGETS: ${AMDGPU_TARGETS}${ColourReset}")

find_package(HIP QUIET)
if(HIP_FOUND)
message("-- ${White}${PROJECT_NAME} -- Using HIP - Path:" ${HIP_PATH} "\tVersion:" ${HIP_VERSION} "\tCompiler:" ${HIP_COMPILER}${ColourReset})
Expand Down Expand Up @@ -273,6 +299,7 @@ if("${BACKEND}" STREQUAL "CPU")
endif()

configure_file("${PROJECT_SOURCE_DIR}/include/rpp_backend.h.in" "${PROJECT_BINARY_DIR}/include/rpp_backend.h")
configure_file("${PROJECT_SOURCE_DIR}/include/rpp_audio_augmentations_support.h.in" "${PROJECT_BINARY_DIR}/include/rpp_audio_augmentations_support.h")

# Enable SIMD for HOST code (in both OpenCL and HIP backends)
if(NOT DEFINED SIMD_ENABLE)
Expand All @@ -294,7 +321,12 @@ message("-- ${White}${PROJECT_NAME} -- Link Libraries: ${LINK_LIBRARY_LIST}${Col
target_link_libraries(${PROJECT_NAME} ${LINK_LIBRARY_LIST})
set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/libs/third_party/ffts/libffts.a)
if(RPP_AUDIO_SUPPORT)
target_link_libraries(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/libs/third_party/ffts/libffts.a)
message("-- ${Green}${PROJECT_NAME} set to build with RPP_AUDIO_SUPPORT${ColourReset}")
else()
message("-- ${Yellow}${PROJECT_NAME} set to build without RPP_AUDIO_SUPPORT${ColourReset}")
endif()
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})

target_include_directories(${PROJECT_NAME}
Expand Down Expand Up @@ -335,6 +367,9 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTA
install(FILES ${PROJECT_BINARY_DIR}/include/rpp_backend.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rpp
COMPONENT dev)
install(FILES ${PROJECT_BINARY_DIR}/include/rpp_audio_augmentations_support.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rpp
COMPONENT dev)

# install Test
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test COMPONENT test)
Expand Down
Binary file added docs/data/doxygenInputs/lens_img640x480.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions docs/doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -962,14 +962,16 @@ INPUT = ../../README.md \
../../include/rppi_logical_operations.h \
../../include/rppi_morphological_transforms.h \
../../include/rppi_statistical_operations.h \
../../include/rppt_tensor_arithmetic_operations.h \
../../include/rppt_tensor_audio_augmentations.h \
../../include/rppt_tensor_color_augmentations.h \
../../include/rppt_tensor_data_exchange_operations.h \
../../include/rppt_tensor_effects_augmentations.h \
../../include/rppt_tensor_filter_augmentations.h \
../../include/rppt_tensor_geometric_augmentations.h \
../../include/rppt_tensor_logical_operations.h \
../../include/rppt_tensor_morphological_operations.h \
../../include/rppt_tensor_statistical_operations.h \
../../include/rppt_tensor_logical_operations.h
../../include/rppt_tensor_statistical_operations.h


# This tag can be used to specify the character encoding of the source files
Expand Down Expand Up @@ -2381,7 +2383,7 @@ INCLUDE_FILE_PATTERNS =
# recursively expanded use the := operator instead of the = operator.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

PREDEFINED = GPU_SUPPORT RPP_BACKEND_HIP HIP_COMPILE
PREDEFINED = GPU_SUPPORT RPP_BACKEND_HIP HIP_COMPILE AUDIO_SUPPORT

# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
# tag can be used to specify a list of macro names that should be expanded. The
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/requirements.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rocm-docs-core[api_reference]==1.4.0
rocm-docs-core[api_reference]==1.5.1
2 changes: 1 addition & 1 deletion docs/sphinx/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ requests==2.28.2
# via
# pygithub
# sphinx
rocm-docs-core[api-reference]==1.4.0
rocm-docs-core[api-reference]==1.5.1
# via -r requirements.in
smmap==5.0.0
# via gitdb
Expand Down
6 changes: 6 additions & 0 deletions include/rpp_audio_augmentations_support.h.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef GUARD_RPP_AUDIO_AUGMENTATIONS_SUPPORT_H_IN
#define GUARD_RPP_AUDIO_AUGMENTATIONS_SUPPORT_H_IN

#cmakedefine01 RPP_AUDIO_AUGMENTATIONS_SUPPORT

#endif
21 changes: 20 additions & 1 deletion include/rppdefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ SOFTWARE.
const float ONE_OVER_6 = 1.0f / 6;
const float ONE_OVER_3 = 1.0f / 3;
const float ONE_OVER_255 = 1.0f / 255;
const uint MMS_MAX_SCRATCH_MEMORY = 76800000; // maximum scratch memory size (number of floats) needed for MMS buffer in RNNT training

/******************** RPP typedefs ********************/

Expand Down Expand Up @@ -136,7 +137,15 @@ typedef enum
/*! \brief src and dst layout mismatch \ingroup group_rppdefs */
RPP_ERROR_LAYOUT_MISMATCH = -18,
/*! \brief Number of channels is invalid. (Needs to adhere to function specification.) \ingroup group_rppdefs */
RPP_ERROR_INVALID_CHANNELS = -19
RPP_ERROR_INVALID_CHANNELS = -19,
/*! \brief Invalid output tile length (Needs to adhere to function specification.) \ingroup group_rppdefs */
RPP_ERROR_INVALID_OUTPUT_TILE_LENGTH = -20,
/*! \brief Shared memory size needed is beyond the bounds (Needs to adhere to function specification.) \ingroup group_rppdefs */
RPP_ERROR_OUT_OF_BOUND_SHARED_MEMORY_SIZE = -21,
/*! \brief Scratch memory size needed is beyond the bounds (Needs to adhere to function specification.) \ingroup group_rppdefs */
RPP_ERROR_OUT_OF_BOUND_SCRATCH_MEMORY_SIZE = -22,
/*! \brief Number of src dims is invalid. (Needs to adhere to function specification.) \ingroup group_rppdefs */
RPP_ERROR_INVALID_SRC_DIMS = -23
} RppStatus;

/*! \brief RPP rppStatus_t type enums
Expand Down Expand Up @@ -446,6 +455,16 @@ typedef struct

} RpptRoiLtrb;

/*! \brief RPPT Tensor Channel Offsets struct
* \ingroup group_rppdefs
*/
typedef struct
{
RppiPoint r;
RppiPoint g;
RppiPoint b;
} RpptChannelOffsets;

/*! \brief RPPT Tensor 3D ROI LTFRBB struct
* \ingroup group_rppdefs
*/
Expand Down
Loading