Skip to content

Commit

Permalink
ROCm 6.2.1 - RC2:cherry-pick (#196)
Browse files Browse the repository at this point in the history
* Tensor Changes (#67)

* tensor changes

* Update Doxyfile

* test updates

* bug fixes

* bug fix

* adding image augemntation app changes

* Update rocAL-setup.py

rapidJSON Updates

---------

Co-authored-by: Kiriti Gowda <kiriti.nageshgowda@amd.com>

* rocAL Tensor generic ROI changes (#70)

* tensor changes

* Update Doxyfile

* test updates

* bug fixes

* bug fix

* adding image augemntation app changes

* Minor changes

* Add ROI structure

Add support to process multidimension ROI

* Add support to update multi dimension ROI

* Fix build issues wrt ROI struct

Add necessary ROI changes
Add Union for ROI
Add pybind changes to copy ROI

* Minor change

* Remove redundant code

* Minor change

* Minor changes

* Modify struct names

* Remove strides in ROI

* Change shape to end for ROICords

* Fix crop dims in ssd random crop

* Change ROI type to const in node.h

---------

Co-authored-by: LakshmiKumar23 <lakshmi.kumar@amd.com>
Co-authored-by: Sundar Rajan Vaithiyanathan <svaithiy@amd.com>

* rocAL - Tensor mask changes (#74)

* tensor changes

* Update Doxyfile

* test updates

* bug fixes

* bug fix

* adding image augemntation app changes

* Minor changes

* Add ROI structure

Add support to process multidimension ROI

* Add support to update multi dimension ROI

* Adding mask pipeline support for rocAL

* Fix build issues wrt ROI struct

Add necessary ROI changes
Add Union for ROI
Add pybind changes to copy ROI

* Fixing build issues

* Minor change

* Remove redundant code

* Minor change

* Minor changes

* Modify struct names

* Remove strides in ROI

* Change shape to end for ROICords

* Fix crop dims in ssd random crop

* Change ROI type to const in node.h

* Resolving review comments

* Resolving review comments

* Resolving review comments

* Formatting changes

* Resolving review comments

* Adding min_max scaling mode comment

* Removing unused vector in coco reader

---------

Co-authored-by: LakshmiKumar23 <lakshmi.kumar@amd.com>
Co-authored-by: fgladwin <fgladwin@amd.com>
Co-authored-by: SundarRajan28 <sundarrajan@multicorewareinc.com>

* rocAL Tensor Retinanet training support (#78)

* tensor changes

* Update Doxyfile

* test updates

* bug fixes

* bug fix

* adding image augemntation app changes

* Minor changes

* Add ROI structure

Add support to process multidimension ROI

* Add support to update multi dimension ROI

* Adding mask pipeline support for rocAL

* Fix build issues wrt ROI struct

Add necessary ROI changes
Add Union for ROI
Add pybind changes to copy ROI

* Fix build issue

* Add box IOU matcher changes

Add pybind changes for IOU matcher
Remove BoundingBoxCordf

* Fixing build issues

* Minor change

* Remove redundant code

* Minor change

* Minor changes

* Modify struct names

* Remove strides in ROI

* Change shape to end for ROICords

* Fix crop dims in ssd random crop

* Change ROI type to const in node.h

* Resolving review comments

* Resolving review comments

* Resolving review comments

* Formatting changes

* Resolving review comments

* Adding min_max scaling mode comment

* Removing unused vector in coco reader

* Improve code readability

Add appropriate comments

* Remove criteria argument in IOU matcher

* Add IOU matcher info struct

* Remove unused criteria variable

* Change anchors to a ptr in IOU matcher struct

* Minor change

---------

Co-authored-by: LakshmiKumar23 <lakshmi.kumar@amd.com>
Co-authored-by: SundarRajan28 <sundarrajan@multicorewareinc.com>
Co-authored-by: Sundar Rajan Vaithiyanathan <svaithiy@amd.com>

* rocAL Tensor - Fix Timers (#79)

* Fix timers in rocAL

Remove separate timers for image and video pipeline
Retain single timer for read, decode and process

* Minor change add line at EOF

* add support for gfx942 (#80)

* rocAL - External source reader (#83)

* tensor changes

* Update Doxyfile

* test updates

* bug fixes

* bug fix

* adding image augemntation app changes

* Minor changes

* Add ROI structure

Add support to process multidimension ROI

* Add support to update multi dimension ROI

* Fix build issues wrt ROI struct

Add necessary ROI changes
Add Union for ROI
Add pybind changes to copy ROI

* Minor change

* Remove redundant code

* Minor change

* Minor changes

* Modify struct names

* Adding external source reader support to rocAL

* ROCm Path - Options added (#73)

* ROCm Path - Options added

* Setup - use latest RPP

* Remove strides in ROI

* Change shape to end for ROICords

* Fix crop dims in ssd random crop

* Change ROI type to const in node.h

* set mem handle with label buffer

* change casting to c++ style

* Address review comments

* Remove external source label reader

* Minor changes

* Remove labels bool in loaders

* Minor changes

* Revert storage_type to type

* Minor changes

* Minor changes

* Combine all the test modes in pytorch.py

* Adding external source support to generic iterator

* Adding readme for external source python examples

* CMake Find - Half (#76)

* Find - Half

* Update rocAL-setup.py

Install rapidJSON package

* rocAL Setup - rapidJSON updates

* Change copyright year

* Resolving review comments

* Prerequisites - Boost Removal (#71)

* boost removal

* file cleanup

* gnu++17

* filesystem updated

* Update README.md

* Update filesystem.h

* include fix

* FindStdFilesystem

* minor fix

* modified .cmake

* modification on cmake

* minor fix

* code cleanup

* Multiple Inheritance in External Source Reader

* Add the commit the pass the ROI as xywh structure

* Increase the pqd

* Put all the examples in a single file

* Make minor changes from commit

* Del remaining examples

* Add changes for ROI

* Remove the rocAL external source folder

* Change the ROI struct of vectors to a vector of ROI structs and change the bool naming

* Add NONE to Mode and Resize the size of the ROIxywh vector in cpp unit test

* Remove the print statment

* Pass the vectors as reference

* Move the ExternalSourceMode to the right

* Add const to pass vectors by reference and add one to one mapping in the example file

* Some changes in the example file

* Changes in example file

* Minor changes in the test suite

* Remove nchw_to_nhwc conversions

* Fix warnings

* Bracket Spacing

* Removing boost includes and updating python example

* Resolving review comments

* Readme updates for external source tests

* Adding API changes for external source and set_mem_handle

* Reording the pybind for ROIxywh struct

---------

Co-authored-by: LakshmiKumar23 <lakshmi.kumar@amd.com>
Co-authored-by: fgladwin <fgladwin@amd.com>
Co-authored-by: Kiriti Gowda <kiritigowda@gmail.com>
Co-authored-by: SundarRajan98 <sundarrajan@multicorewareinc.com>
Co-authored-by: Hansel Yang <hansyang@amd.com>
Co-authored-by: Swetha B S <swetha@multicorewareinc.com>
Co-authored-by: root <root@ixt-sjc2-54.local.lan>
Co-authored-by: swetha097 <59434434+swetha097@users.noreply.github.com>

* add include (#90)

* Include Fix for CPU Backend (#93)

* turbojpeg library update for rocAL (#86)

* removed dependancy of libjpegturbo

* minor fix for the decoder python script

* fix broken link in setup.py

* add WITH_JPEG8 true building tjpeg

* fix for accuracy and convergence

* PyBind - accepts python version for dockers (#96)

* Update codeowners for docs (#100)

* TurboJpeg Cmake Fix (#97)

* CMakeLists - fix & updates (#108)

* PyBind - removing undefined functions (#107)

* Remove logo (#111)

* Remove logo

* Update README.md

* linting

* Update Doxyfile

* Update Doxyfile

* Docs - Cherry Pick (#116)

Co-authored-by: randyh62 <42045079+randyh62@users.noreply.github.com>

* Setup & Docker updates (#105)

* setup and docker updates

* docker updates

* rpp updates

* rpp updates

* rocal repo updates

* rocm repor link change

* setup - link update for repo

* cupy updates

* cupy updates

* build instructions update

* build updates

* build updates

* rocAL - Parameter changes (#109)

* Adding parameterVX changes

* Resolving review comments

* Adding API comments

* ResolvePR comments

* Resolve PR Comments

* Resolving review comments

* Fix name changes of the variable

* Resolving review comments

---------

Co-authored-by: Swetha B S <swetha@multicorewareinc.com>

* remove jpegint.h dependency from rocAL (#115)

* remove jpegint.h dependancy

* added libjpeg as dependancy for partial decoding

* remove competitor ref from Readme

* One hot encoded labels support (#113)

* cpp support for oneHotLabels

* Python changes for one hot encoding to remove cupy usage

* Resolve PR comments

* Resolve PR comments

* Resolve the PR comments

* Resolve the ingternal PR comments

* Resolve the PR comments

* Change to reinterpret_cast

* Merged CPU and GPU functionalities for one hot labels

* Add a special test case for one hot encoding

* Add one hot encoding as a arg

* Add Video flag for add node of Video loaders (#117)

* rocAL - Fix C++ tests (#119)

* Fixing issues with C++ unit tests

* Setting seed in master graph ctor and remove rocalSetSeed in cpp tests

* Major Clean Up & Reorg (#126)

* moving all Jupyter notebook examples to a new directory

* move tensorflow pets training example, rename file and update dockerfile and readme for the same

* rename toy training example

* moving all python tests to a separate directory

* renmaing cpp tests

* readme and link clean up

* move image_augmentation app with other cpp tests

* update docs

* fixes broken unit_test shell script for python

* output folder rename + adds readme to python tetss

* fix decoder.py

* external_source_reader.py fix

* external_source_reader.py readme update

* add readerme for basic test cpp

* dataloader cpp test update

* dataloader mutlithreaded updates

* tf dataloader cpp update

* cpp external source updates

* fixes path relative to image_augmentation app

* add missign images for apps

* readme update

* rocAL - Add pytorch training example (#121)

* Adding training example to rocAL

* Update readme

* Update readme command to use rocAL dataloader

* Update readme for ckpt removal instructions

* Resolving review comments

* Formatted and moved train script to docs

* Generic name change - To maintain a generic name instead of "image" (#114)

* channge image_info to sample_info to maintain a generic name for all the use-cases

* Resolve PR comments

* Change decoded_img_info to decoded_video_info

* Update master_graph.cpp

* Name change from sample to data

* Change from decoded_data_info to DecodedDataInfo

* Renaming crop_image_info to CropImageInfo

* Remove - actual_host_buffers - Unused

* Rename TimingDBG to TimingDbg

* Move the instances of DecodedDataInfo to its base class LoaderModule

* Fix a WRN msg in master_graph.cpp

* Remove a dangling comment

* Rename _circ_data_info to _circ_buff_data_info

* Minor Changes to rename

* Fix the last commit changes

---------

Co-authored-by: Swetha B S <swetha@multicorwareinc.com>
Co-authored-by: fiona-gladwin <fionagladwin@multicorewareinc.com>
Co-authored-by: Swetha B S <>

* Header file changes  (#129)

* includes full path for headers, removes individual directories under cmake

* remove unused files

* update README

* remove prefix for api since it will be public

---------

Co-authored-by: Kiriti Gowda <kiritigowda@gmail.com>

* Update index.rst

correct "Contributing to ROCm Docs" link

* rocAL V2.0.0 - Updates and fixes (#131)

* CI & Git - Updates

* Version Updates

* Docs - Updates

* Update CODEOWNERS

* Update Doxyfile

* Update Doxyfile

* Revert - Docs

* Version 2.0 - Updates

* Tests - Name change

* Readme - Upgrades

* CMakeLists - Add missing header install

* Tests - Fix for tensors

* Tests - Include Dirs fix

* Tests - Fix

* Tests - Fix name changes

* 2.0 - Fix

* Linting - Remove for develop

* Update CODEOWNERS

* Readme - Updates

* Python Version - User variable

* Test - Fix test name

* Updates

* PyBinding - Fix

* Fix - Setup.pu

* PyBind Setup - Updates

* PyBind - Fix option scope

* Linting - Add dev branch

* Changelog - Fix linting

* Linting -Fix

* PyBind - Wheel version update

* Tests - test fixes & cleanup (#132)

* fixes seg fault/ unnecessary pritns

* clean up

* linting fixes

* linting fixes

* linting fixes

* rocAL  - Setup updates (#135)

* rocAL  - Setup updates

* Validation fix

* Setup - Add Package installs

* Reinstall - Fix

* Setup - Updates

* Updates

* Setup - Fix find FFMPEG

* Install OpenCV with source

* Fix Linting

* Setup - RapidJSON Updates

* Remove RapidJSON Packages

* Setup - Reinstall msg

* Remove Updates

* Audio PR - rocAL Audio decoder support (#118)

* Audio Decoder PR 1

* channge image_info to sample_info to maintain a generic name for all the use-cases

* Change the copyright year from 2023 to 2024

* formatting the files

* Resolve PR comments

* Resolve PR comments

* Change decoded_img_info to decoded_video_info

* Change the file_path() function to virtual from pure virtual

* Minor change

* Minor changes

* Add the unit test file

* Revert "Add the unit test file"

This reverts commit e79cc06d3c9d167dc8d142d315b71a5bd5e86736.

* Introduce CMake for sndfile

Modify CMakeLists.txt for the same

* Resolve 1st set of PR commenst

* Remove commented code for last batch polices and unsued imports

* ROI related changes - change from xy to wh to use for samples and channels

* Fix seg fault with ROI

* Remove opencv usage from the unit test

* Resolve the PR comments

* Remove instances of the audio_*_time - use the existing variables from Timing struct

* Formatting changes in rocal_api_data_loader.cpp and add the opencl and hip conditions for audio loaders

* Resolve the internal PR comments

* Reformatting the file_source_reader.cpp

* Remove _input_path from audio_source_evaluator and audio_read_and_decode as it is unecessary

* Change the header formatting

* Changes in copy_data() for audio samples

* Initialize the status at the beginning

* Cmake related changes for audio

* Resolve PR comments

* Add condition check to eliminate any other file extensions other than a wav file / other image formats and call open_folder deom subfolder_reading() function

* Update audio_read_and_decode.cpp

* Revert file source reader changes

* Update master_graph.cpp

* Update tensor.cpp - Remove a commented line of code

* Introduce ROCAL_AUDIO flag

Introduce flag for audio code, to be disabled when sndfile not found

* Minor changes

* Minor changes

* Add output comparision for Audio outputs

* Minor changes

* Minor changes to unit test

* Remove max_frames and max_channels args

* Remove max_frames, max_channels and sample rate from unit test

* Minor change

* Add python script to run audio unittests

* Clean up C++ audio unit test

* Modify rocal audio unit test

Update README

* Minor change

* Minor change

* Minor variable name change

* Minor changes

Add wav extension in file reader
Add reader in unit test

* Update C++ unit test

* Name change from sample to data

* Change from decoded_data_info to DecodedDataInfo

* Remove audio_decoder_factory.cpp file

* Minor change

* Change variable name

* Update the struct variable name in audio files

* Minor changes

* Change ROCAL_DATA_PATH to exclude rocal_data

* Use Pascal case for function names in audio decoder

* Modify cmake to have SNDFILE in all capital

* Minor changes

* Add struct for audio info in AudioReadAndDecode

* Fix merge conflict

* Renaming crop_image_info to CropImageInfo

* Remove - actual_host_buffers - Unused

* Rename TimingDBG to TimingDbg

* Move the instances of DecodedDataInfo to its base class LoaderModule

* Fix a WRN msg in master_graph.cpp

* Remove a dangling comment

* Rename _circ_data_info to _circ_buff_data_info

* Add Glob to CMakeLists.txt

* Rename SndFileDecoder to GenericAudioDecoder

* Fix build issues

* Minor change

* Update audio unit test README

* Revert "Add Glob to CMakeLists.txt"

This reverts commit 47263d94393e9614a5cebcab6c11c804ac7152f8.

* Fix include headers for Audio files

* Fix copy data 2D

* Minor changes

* Pass decoded data info to load routine instead of separate vectors

* Update CHANGELOG.md

* Change swap_handle_time variable name in loader

* Formatting changes

Add comments

* Update doxygen comments

* Move file source reader from readers/image to readers folder

* Update README for audio test

* Minor fix

* Minor changes shard_count argument name

* Rename set and get functions of data_info to decoded_data_info

---------

Co-authored-by: root <root@ixt-sjc2-54.local.lan>
Co-authored-by: Swetha B S <swetha@multicorwareinc.com>
Co-authored-by: swetha097 <59434434+swetha097@users.noreply.github.com>
Co-authored-by: swetha097 <swetha@multicorewareinc.com>
Co-authored-by: Swetha B S <>
Co-authored-by: Rajy Rawther <Rajy.MeeyakhanRawther@amd.com>

* Update rocAL-setup.py (#138)

* Audio PR - rocAL Python changes for Audio Decoder (#120)

* Audio Decoder Python Changes

---------

Co-authored-by: root <root@ixt-sjc2-54.local.lan>
Co-authored-by: Swetha B S <swetha@multicorwareinc.com>
Co-authored-by: swetha097 <59434434+swetha097@users.noreply.github.com>
Co-authored-by: swetha097 <swetha@multicorewareinc.com>
Co-authored-by: Swetha B S <>
Co-authored-by: SundarRajan28 <sundarrajan@multicorewareinc.com>

* cupy fall back cpu (#137)

* Update CODEOWNERS

Fixed typo in the global owners definition.

* Docs: fix broken links (#141)

* Fix broken links and sphinx errors

* Make 'How to' heading consistent

* Add 6.1.0 link fix to develop (#143)

* Fix link to types.py

* Fix imagenet training link

* RocAL-setup.py - traceback

Find Failure

* Setup - add wheel install (#145)

* Setup - Updates (#146)

* Fixing cupy import issues (#148)

* Unit Test changes for new rocal data (#150)

* Adding unit test changes for new rocal data

* Adding changes for python unit tests

* Updating python unit tests with correct dims

* Introduce flag in CMake to enable Audio support (#149)

* Introduce CMake flag to enable Audio support

* Update README

* Adding last batch policy for image loaders (#140)

* Adding last batch policy to rocAL

* Adding fixed for last batch policy

* Reverting changes

* Removing commented code

* Resolving review comments

* Minor changes

* Resolving review comments

* Minor changes

* Added comments

* Add comments in the file_source_reader.cpp

* Update file_source_reader.cpp

* Minor changes

* Update comment

* Resolving review comments

* Moving last batch policy to readers

---------

Co-authored-by: SundarRajan28 <sundarrajan@multicorewareinc.com>
Co-authored-by: sbavasab <102275787+sbavasab@users.noreply.github.com>

* ROCm 6.2 updates (#152)

* ROCm - usecase rocm only

* BUILD_WITH_AMD_ADVANCE - Set by rocm version only

* Docker - updates

* Docker - updates

* Docker - Install rocDecode

* Docker - remove i386

* With rocDecode Deps no backward compati

* Changelog updates

* Docker updates (#151)

* docker updates

* clean up

* upgrade pip on docker

* poytest version upgrade for dockers

* upgrade packge versions protobuf, pybind and turbojpeg

* merge conflicts

* merge conflicts - remove rpp source build

* Readme - Updates (#153)

* Readme - Updates

* Setup - Cleanup

* CMakeLists - remove OBSOLETES

* Readme - updates

* Updates

* Docs - Update Read the Docs configuration to use Python 3.10 and latest rocm-docs-core (#158)

* Docs - Bump rocm-docs-core[api_reference] from 1.2.0 to 1.2.1 in /docs/sphinx (#159)

Bumps [rocm-docs-core[api_reference]](https://github.com/RadeonOpenCompute/rocm-docs-core) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases)
- [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/RadeonOpenCompute/rocm-docs-core/compare/v1.2.0...v1.2.1)

---
updated-dependencies:
- dependency-name: rocm-docs-core[api_reference]
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Audio - Version check  (#156)

* version check from MIVisionX vx_rpp for Audio

* check if version file exists

* check for vx_rpp version and sndfile before settign rocal_audio

* remove unnecessary find_pacakge

* check for sndfile only if vx_rpp supports audio

* Docs - Bump rocm-docs-core[api_reference] from 1.2.1 to 1.3.0 in /docs/sphinx (#163)

Bumps [rocm-docs-core[api_reference]](https://github.com/RadeonOpenCompute/rocm-docs-core) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/RadeonOpenCompute/rocm-docs-core/releases)
- [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/RadeonOpenCompute/rocm-docs-core/compare/v1.2.1...v1.3.0)

---
updated-dependencies:
- dependency-name: rocm-docs-core[api_reference]
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Setup - Updates (#164)

* Setup - Updates

* Setup - pip packages updates

* CMakeList - Add Protobuf deps

* Audio PR - Augmentation support [PreEmphasis Filter] (#122)

* Audio Decoder PR 1

* channge image_info to sample_info to maintain a generic name for all the use-cases

* Change the copyright year from 2023 to 2024

* formatting the files

* Resolve PR comments

* NWC

* Resolve PR comments

* Change decoded_img_info to decoded_video_info

* Change the file_path() function to virtual from pure virtual

* Minor change

* Minor changes

* Add the unit test file

* Revert "Add the unit test file"

This reverts commit e79cc06d3c9d167dc8d142d315b71a5bd5e86736.

* Fix the ROI api in python end

* Fix the ROI api in python end

* Remove the ROI change from pytorch.py

* Add Python Unit Test for Audio

* PreEmphasis Filter

* Add Preemp filter augmentations files

* Introduce CMake for sndfile

Modify CMakeLists.txt for the same

* Resolve 1st set of PR commenst

* Remove commented code for last batch polices and unsued imports

* ROI related changes - change from xy to wh to use for samples and channels

* Fix seg fault with ROI

* Remove opencv usage from the unit test

* Resolve the PR comments

* Remove instances of the audio_*_time - use the existing variables from Timing struct

* Formatting changes in rocal_api_data_loader.cpp and add the opencl and hip conditions for audio loaders

* Resolve the internal PR comments

* Reformatting the file_source_reader.cpp

* Remove _input_path from audio_source_evaluator and audio_read_and_decode as it is unecessary

* Change the header formatting

* Changes in copy_data() for audio samples

* Initialize the status at the beginning

* Resolve PR comments

* Resolving PR comments

* Resolve PR comments

* Remove the unused variables

* Resolve PR commensts

* Cmake related changes for audio

* Resolve PR comments

* Add condition check to eliminate any other file extensions other than a wav file / other image formats and call open_folder deom subfolder_reading() function

* Add basic testing for Audio to compare Bin files

* Update audio_read_and_decode.cpp

* Update rocAL_api_audio_unittest.py

* Revert file source reader changes

* Update master_graph.cpp

* Update tensor.cpp - Remove a commented line of code

* Rephrase

* Introduce ROCAL_AUDIO flag

Introduce flag for audio code, to be disabled when sndfile not found

* Minor changes

* Minor changes

* Add output comparision for Audio outputs

* Minor changes

* Add comment

* Minor changes to unit test

* Remove max_frames and max_channels args

* Remove max_frames, max_channels and sample rate from unit test

* Remove the NONE types

* Clean up unit test

* Clean up code in audio python unit test

* Introduce ROI in the unit test

* Minor change

* Format python unit test

* Add python script to run audio unittests

* Fix formatting issues - Minor changes

* Clean up C++ audio unit test

* Remove max frames and channels from decoder

* Minor changes

* Add Output comparison for python audio unittests

* Modify rocal audio unit test

Update README

* Minor change

* Resolve PR comments

* Minor changes - Modifying the names of the arguments

* Added a bried desc for the rocAL enum for border type

* Add a WRN statement in PreEmphasis Filter to only use FP32 dtype

* minor changes

* Change the borderType enum to int32 from uint32 dtype

* Minor changes

* Minor change

* Update README for audio unit test

* Parameters for rocALAudioIterator

* Minor change

* Remove the reset_tensor_roi() from the PreEmphasis augmentation making sure the src and dst roi points to the same location

* Del the Unit Test Files introduced earlier

* Add pre_emphasis function and gollden output comparison in audio unit tests

* minor change - add update val in create array

* Minor variable name change

* minor change

* Update unit test

* Minor change

* minor change

* Minor changes

Add wav extension in file reader
Add reader in unit test

* Minor change

* Add file reader to python audio unit test

* Update C++ unit test

* Update python audio unit test

* Remove the unused variable output - Resolve warnings in cpp unit test

* Remove the dst_roi arg passed to rpp

* Minor changes

Change borderType enum prefix

* Name change from sample to data

* Change from decoded_data_info to DecodedDataInfo

* Remove audio_decoder_factory.cpp file

* Minor change

* Change variable name

* Update the struct variable name in audio files

* Minor changes

* Change ROCAL_DATA_PATH to exclude rocal_data

* Update ROCAL_DATA_PATH to exclude rocal_data

* Use Pascal case for function names in audio decoder

* Modify cmake to have SNDFILE in all capital

* Minor changes

* Add struct for audio info in AudioReadAndDecode

* Fix merge conflict

* Renaming crop_image_info to CropImageInfo

* Remove - actual_host_buffers - Unused

* Rename TimingDBG to TimingDbg

* Move the instances of DecodedDataInfo to its base class LoaderModule

* Fix a WRN msg in master_graph.cpp

* Remove a dangling comment

* Rename _circ_data_info to _circ_buff_data_info

* Add Glob to CMakeLists.txt

* Rename SndFileDecoder to GenericAudioDecoder

* Fix build issues

* Minor change

* Update python API README.md for audio unit test

* Update audio unit test README

* Revert "Add Glob to CMakeLists.txt"

This reverts commit 47263d94393e9614a5cebcab6c11c804ac7152f8.

* Fix include headers for Audio files

* Fix copy data 2D

* Minor changes

* Pass decoded data info to load routine instead of separate vectors

* Update CHANGELOG.md

* Update CHANGELOG.md

* Change swap_handle_time variable name in loader

* Update the changelog.md

* Formatting changes

Add comments

* Update doxygen comments

* Move file source reader from readers/image to readers folder

* Update README and add doxygen description

* Update CMakeLists and README for audio test

* Update README for audio test

* Minor fix

* Fix merge from PR 2

* Minor changes shard_count argument name

* Rename set and get functions of data_info to decoded_data_info

* Revert empty line removed in CMakeLists.txt

* Removed prefix original for audio vectors

* Resolve PR comments

* Add @params to all args in pytorch.py

* Minor changes in unit test

* Minor changes

* Change ROCAL instaces to rocAL in pytorch.py

* Resolve the PR comments

* Minor changes in decoders.py - Modify the comment for shard_size

* Minor changes

* Address the PR comments

* Address Review comments

---------

Co-authored-by: root <root@ixt-sjc2-54.local.lan>
Co-authored-by: Swetha B S <swetha@multicorwareinc.com>
Co-authored-by: fiona-gladwin <fionagladwin@multicorewareinc.com>
Co-authored-by: Fiona-MCW <70996026+fiona-gladwin@users.noreply.github.com>
Co-authored-by: Swetha B S <>
Co-authored-by: SundarRajan28 <sundarrajan@multicorewareinc.com>
Co-authored-by: Kiriti Gowda <kiritigowda@gmail.com>

* Readme - Updates (#165)

* Bump rocm-docs-core[api_reference] from 1.3.0 to 1.4.0 in /docs/sphinx (#166)

Bumps [rocm-docs-core[api_reference]](https://github.com/ROCm/rocm-docs-core) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/ROCm/rocm-docs-core/releases)
- [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ROCm/rocm-docs-core/compare/v1.3.0...v1.4.0)

---
updated-dependencies:
- dependency-name: rocm-docs-core[api_reference]
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Audio PR - Adding support for file list reader (#123)

* Introduce CMake for sndfile

Modify CMakeLists.txt for the same

* Adding file list reader to audio python example

* Fixing reader import issue

* Resolve 1st set of PR commenst

* Remove commented code for last batch polices and unsued imports

* ROI related changes - change from xy to wh to use for samples and channels

* Fix seg fault with ROI

* Remove opencv usage from the unit test

* Resolve the PR comments

* Remove instances of the audio_*_time - use the existing variables from Timing struct

* Formatting changes in rocal_api_data_loader.cpp and add the opencl and hip conditions for audio loaders

* Updating python example

* Resolve the internal PR comments

* Reformatting the file_source_reader.cpp

* Remove _input_path from audio_source_evaluator and audio_read_and_decode as it is unecessary

* Change the header formatting

* Fixing issues with file list reader

* Changes in copy_data() for audio samples

* Initialize the status at the beginning

* Resolving review comments

* Resolve PR comments

* Resolving PR comments

* Resolve PR comments

* Remove the unused variables

* Resolve PR commensts

* Cmake related changes for audio

* Resolve PR comments

* Add condition check to eliminate any other file extensions other than a wav file / other image formats and call open_folder deom subfolder_reading() function

* Add basic testing for Audio to compare Bin files

* Removing storage_type from audio loader API

* Update audio_read_and_decode.cpp

* Update rocAL_api_audio_unittest.py

* Revert file source reader changes

* Update master_graph.cpp

* Update tensor.cpp - Remove a commented line of code

* Rephrase

* Introduce ROCAL_AUDIO flag

Introduce flag for audio code, to be disabled when sndfile not found

* Minor changes

* Minor changes

* Add output comparision for Audio outputs

* Minor changes

* Add comment

* Minor changes to unit test

* Remove max_frames and max_channels args

* Remove max_frames, max_channels and sample rate from unit test

* Remove the NONE types

* Clean up unit test

* Clean up code in audio python unit test

* Introduce ROI in the unit test

* Minor change

* Format python unit test

* Add python script to run audio unittests

* Fix formatting issues - Minor changes

* Clean up C++ audio unit test

* Remove max frames and channels from decoder

* Minor changes

* Add Output comparison for python audio unittests

* Modify rocal audio unit test

Update README

* Minor change

* Resolve PR comments

* Minor changes - Modifying the names of the arguments

* Initial commit for removing file list reader

* Added a bried desc for the rocAL enum for border type

* Add a WRN statement in PreEmphasis Filter to only use FP32 dtype

* minor changes

* Change the borderType enum to int32 from uint32 dtype

* Minor changes

* Minor change

* Update README for audio unit test

* Parameters for rocALAudioIterator

* Removing file list reader and metadata reader

* Minor change

* Remove the reset_tensor_roi() from the PreEmphasis augmentation making sure the src and dst roi points to the same location

* Del the Unit Test Files introduced earlier

* Changing python unittests for QA mode

* Resolving review comments

* Adding comment for file list case in file source reader

* Add pre_emphasis function and gollden output comparison in audio unit tests

* minor change - add update val in create array

* Minor variable name change

* minor change

* Update unit test

* Minor change

* minor change

* Resolving review comments

* Minor changes

Add wav extension in file reader
Add reader in unit test

* Minor change

* Add file reader to python audio unit test

* Update C++ unit test

* Update python audio unit test

* Remove the unused variable output - Resolve warnings in cpp unit test

* Remove the dst_roi arg passed to rpp

* Minor changes

Change borderType enum prefix

* Adding file list reader to C++ unit tests

* Fixing issues with C++ audio unit tests

* Resolving review comments

* Resolving review comments

* Updating audio unit tests for default file list path

* Minor changes

* Name change from sample to data

* Change from decoded_data_info to DecodedDataInfo

* Remove audio_decoder_factory.cpp file

* Minor change

* Change variable name

* Update the struct variable name in audio files

* Minor changes

* Change ROCAL_DATA_PATH to exclude rocal_data

* Update ROCAL_DATA_PATH to exclude rocal_data

* Use Pascal case for function names in audio decoder

* Modify cmake to have SNDFILE in all capital

* Minor changes

* Add struct for audio info in AudioReadAndDecode

* Fix merge conflict

* Renaming crop_image_info to CropImageInfo

* Remove - actual_host_buffers - Unused

* Rename TimingDBG to TimingDbg

* Move the instances of DecodedDataInfo to its base class LoaderModule

* Fix a WRN msg in master_graph.cpp

* Remove a dangling comment

* Rename _circ_data_info to _circ_buff_data_info

* Add Glob to CMakeLists.txt

* Rename SndFileDecoder to GenericAudioDecoder

* Fix build issues

* Minor change

* Update python API README.md for audio unit test

* Update audio unit test README

* Revert "Add Glob to CMakeLists.txt"

This reverts commit 47263d94393e9614a5cebcab6c11c804ac7152f8.

* Fix include headers for Audio files

* Fix copy data 2D

* Minor changes

* Pass decoded data info to load routine instead of separate vectors

* Update CHANGELOG.md

* Update CHANGELOG.md

* Change swap_handle_time variable name in loader

* Update the changelog.md

* Update CHANGELOG.md

* Formatting changes

Add comments

* Update doxygen comments

* Move file source reader from readers/image to readers folder

* Update README and add doxygen description

* Update CMakeLists and README for audio test

* Update README for audio test

* Minor fix

* Fix merge from PR 2

* Minor changes shard_count argument name

* Rename set and get functions of data_info to decoded_data_info

* Revert empty line removed in CMakeLists.txt

* Removed prefix original for audio vectors

* Resolve PR comments

* Add @params to all args in pytorch.py

* Minor changes in unit test

* Minor changes

* Change ROCAL instaces to rocAL in pytorch.py

* Resolve the PR comments

* Minor changes in decoders.py - Modify the comment for shard_size

* Minor changes

* Address the PR comments

* Address Review comments

* Resolving review comments

* Removing file_list_path from label_reader

---------

Co-authored-by: fiona-gladwin <fionagladwin@multicorewareinc.com>
Co-authored-by: SundarRajan28 <sundarrajan@multicorewareinc.com>
Co-authored-by: Swetha B S <swetha@multicorwareinc.com>
Co-authored-by: swetha097 <59434434+swetha097@users.noreply.github.com>
Co-authored-by: Fiona-MCW <70996026+fiona-gladwin@users.noreply.github.com>
Co-authored-by: swetha097 <swetha@multicorewareinc.com>
Co-authored-by: Swetha B S <>

* Audio PR - Augmentation support [ Spectrogram ] (#124)

* Add basic testing for Audio to compare Bin files

* Removing storage_type from audio loader API

* Update audio_read_and_decode.cpp

* Update rocAL_api_audio_unittest.py

* Revert file source reader changes

* Update master_graph.cpp

* Update tensor.cpp - Remove a commented line of code

* Rephrase

* Introduce ROCAL_AUDIO flag

Introduce flag for audio code, to be disabled when sndfile not found

* Minor changes

* Minor changes

* Add output comparision for Audio outputs

* Minor changes

* Add comment

* Minor changes to unit test

* Remove max_frames and max_channels args

* Remove max_frames, max_channels and sample rate from unit test

* Remove the NONE types

* Clean up unit test

* Clean up code in audio python unit test

* Introduce ROI in the unit test

* Minor change

* Format python unit test

* Add python script to run audio unittests

* Fix formatting issues - Minor changes

* Clean up C++ audio unit test

* Remove max frames and channels from decoder

* Minor changes

* Add Output comparison for python audio unittests

* Modify rocal audio unit test

Update README

* Minor change

* Remove NSR

* Resolve PR comments

* Minor changes - Modifying the names of the arguments

* Initial commit for removing file list reader

* Added a bried desc for the rocAL enum for border type

* Add a WRN statement in PreEmphasis Filter to only use FP32 dtype

* minor changes

* Change the borderType enum to int32 from uint32 dtype

* Minor changes

* Minor change

* Update README for audio unit test

* Parameters for rocALAudioIterator

* Removing file list reader and metadata reader

* Minor change

* Remove the reset_tensor_roi() from the PreEmphasis augmentation making sure the src and dst roi points to the same location

* Del the Unit Test Files introduced earlier

* Changing python unittests for QA mode

* Resolving review comments

* Adding comment for file list case in file source reader

* Add pre_emphasis function and gollden output comparison in audio unit tests

* minor change - add update val in create array

* Minor variable name change

* Minor additions in the .h file

* minor change

* Formatting Changes

* Update unit test

* Minor change

* minor change

* Resolving review comments

* Minor changes

Add wav extension in file reader
Add reader in unit test

* Minor change

* Add file reader to python audio unit test

* Formatting , review comments resolution and change enum dtype to int32 instead of uint32

* Update C++ unit test

* Update python audio unit test

* Remove the unused variable output - Resolve warnings in cpp unit test

* Remove the dst_roi arg passed to rpp

* Minor changes

Change borderType enum prefix

* Adding file list reader to C++ unit tests

* Fixing issues with C++ audio unit tests

* Remove the reset_tensor_roi calls

* Resolving review comments

* Resolve some PR comments

* Minor changes

* Change the dims[0] and dims[1] positioning for Spectrogram

* Resolving review comments

* Resolving PR comments

* Updating audio unit tests for default file list path

* Minor changes

* Minor Change

* Minor change

* Name change from sample to data

* Change from decoded_data_info to DecodedDataInfo

* Revert "Change the dims[0] and dims[1] positioning for Spectrogram"

This reverts commit d791b9ac77d662f1528088165d2cfdba721a2b4f.

* Remove audio_decoder_factory.cpp file

* Minor change

* Change variable name

* Add Spectrogram Case in unit tests

* Add spectrogram case in python unit tests

* Update the struct variable name in audio files

* Minor changes

* Change ROCAL_DATA_PATH to exclude rocal_data

* Update ROCAL_DATA_PATH to exclude rocal_data

* Use Pascal case for function names in audio decoder

* Fix review comments

* Modify cmake to have SNDFILE in all capital

* Minor changes

* Add struct for audio info in AudioReadAndDecode

* Fix merge conflict

* Renaming crop_image_info to CropImageInfo

* Remove - actual_host_buffers - Unused

* Rename TimingDBG to TimingDbg

* Move the instances of DecodedDataInfo to its base class LoaderModule

* Fix a WRN msg in master_graph.cpp

* Remove a dangling comment

* Rename _circ_data_info to _circ_buff_data_info

* Add Glob to CMakeLists.txt

* Rename SndFileDecoder to GenericAudioDecoder

* Fix build issues

* Minor change

* Update python API README.md for audio unit test

* Update audio unit test README

* Adding missed param in python unit tests

* Revert "Add Glob to CMakeLists.txt"

This reverts commit 47263d94393e9614a5cebcab6c11c804ac7152f8.

* Fix include headers for Audio files

* Fix copy data 2D

* Minor changes

* Pass decoded data info to load routine instead of separate vectors

* Update CHANGELOG.md

* Update CHANGELOG.md

* Change swap_handle_time variable name in loader

* Update the changelog.md

* Update ChangeLog.md

* Update CHANGELOG.md

* Formatting changes

Add comments

* Update doxygen comments

* Move file source reader from readers/image to readers folder

* Update README and add doxygen description

* Update CMakeLists and README for audio test

* Update README for audio test

* Minor fix

* Fix merge from PR 2

* Minor changes shard_count argument name

* Rename set and get functions of data_info to decoded_data_info

* Revert empty line removed in CMakeLists.txt

* Removed prefix original for audio vectors

* Resolve PR comments

* Add @params to all args in pytorch.py

* Fix build issue

* Minor changes in unit test

* Minor changes

* Change ROCAL instaces to rocAL in pytorch.py

* Resolve the PR comments

* Minor changes in decoders.py - Modify the comment for shard_size

* Minor changes

* Address the PR comments

* Address Review comments

* Introduce Audio layouts

* Add layout changes for spectrogram

* Fix the unit tests - c++ & python

* Minor fix

* Fix merge conflicts

* Minor changes

* Update README

---------

Co-authored-by: Swetha B S <swetha@multicorwareinc.com>
Co-authored-by: SundarRajan28 <sundarrajan@multicorewareinc.com>
Co-authored-by: fiona-gladwin <fionagladwin@multicorewareinc.com>
Co-authored-by: Fiona-MCW <70996026+fiona-gladwin@users.noreply.github.com>
Co-authored-by: Swetha B S <>

* Tests - Fix org used for linting (#167)

rocm-docs-core moved from RadeonOpenCompute to ROCm

* Audio PR - Augmentation support [ Downmix and ToDecibels ] (#125)

* Fix formatting issues - Minor changes

* Clean up C++ audio unit test

* Remove max frames and channels from decoder

* Minor changes

* Add Output comparison for python audio unittests

* Modify rocal audio unit test

Update README

* Minor change

* Remove NSR

* Resolve PR comments

* Minor changes - Modifying the names of the arguments

* Initial commit for removing file list reader

* Added a bried desc for the rocAL enum for border type

* Add a WRN statement in PreEmphasis Filter to only use FP32 dtype

* minor changes

* Change the borderType enum to int32 from uint32 dtype

* Minor changes

* Minor change

* Update README for audio unit test

* Parameters for rocALAudioIterator

* Removing file list reader and metadata reader

* Minor change

* Remove the reset_tensor_roi() from the PreEmphasis augmentation making sure the src and dst roi points to the same location

* Del the Unit Test Files introduced earlier

* Changing python unittests for QA mode

* Resolving review comments

* Adding comment for file list case in file source reader

* Add pre_emphasis function and gollden output comparison in audio unit tests

* minor change - add update val in create array

* Minor variable name change

* Minor additions in the .h file

* minor change

* Formatting Changes

* Update unit test

* Minor change

* minor change

* Resolving review comments

* Minor changes

Add wav extension in file reader
Add reader in unit test

* Minor change

* Add file reader to python audio unit test

* Add to_decibels augmentations to rocAL

* Formatting , review comments resolution and change enum dtype to int32 instead of uint32

* Update C++ unit test

* Update python audio unit test

* Remove the unused variable output - Resolve warnings in cpp unit test

* Remove the dst_roi arg passed to rpp

* Minor changes

Change borderType enum prefix

* Adding file list reader to C++ unit tests

* Fixing issues with C++ audio unit tests

* Adding test case for to_decibels and downmix

* Modifying python unittests

* Fixing spectogram test case

* Remove the reset_tensor_roi calls

* Resolving review comments

* Resolve some PR comments

* Minor changes

* Resolving review comments

* Change the dims[0] and dims[1] positioning for Spectrogram

* Resolving review comments

* Resolving review comments

* Resolving PR comments

* Updating audio unit tests for default file list path

* Minor changes

* Minor Change

* Minor change

* Name change from sample to data

* Change from decoded_data_info to DecodedDataInfo

* Revert "Change the dims[0] and dims[1] positioning for Spectrogram"

This reverts commit d791b9ac77d662f1528088165d2cfdba721a2b4f.

* Remove audio_decoder_factory.cpp file

* Minor change

* Change variable name

* Add Spectrogram Case in unit tests

* Add spectrogram case in python unit tests

* Update the struct variable name in audio files

* Fixing issues with downmix node output

* Adding ROI updation in downmix node

* Adding downmix test case for python unit tests

* Adding downmix and to_decibels test case in C++ tests

* Minor changes

* Change ROCAL_DATA_PATH to exclude rocal_data

* Update ROCAL_DATA_PATH to exclude rocal_data

* Use Pascal case for function names in audio decoder

* Add audio path for downmix test case

* Fix review comments

* Modify cmake to have SNDFILE in all capital

* Minor changes

* Add struct for audio info in AudioReadAndDecode

* Fix merge conflict

* Renaming crop_image_info to CropImageInfo

* Remove - actual_host_buffers - Unused

* Rename TimingDBG to TimingDbg

* Move the instances of DecodedDataInfo to its base class LoaderModule

* Fix a WRN msg in master_graph.cpp

* Remove a dangling comment

* Rename _circ_data_info to _circ_buff_data_info

* Add Glob to CMakeLists.txt

* Rename SndFileDecoder to GenericAudioDecoder

* Fix build issues

* Minor change

* Update python API README.md for audio unit test

* Update audio unit test README

* Adding missed param in python unit tests

* Revert "Add Glob to CMakeLists.txt"

This reverts commit 47263d94393e9614a5cebcab6c11c804ac7152f8.

* Fix include headers for Audio files

* Fix copy data 2D

* Minor changes

* Pass decoded data info to load routine instead of separate vectors

* Update CHANGELOG.md

* Update CHANGELOG.md

* Change swap_handle_time variable name in loader

* Update the changelog.md

* Update ChangeLog.md

* Update CHANGELOG.md

* Formatting changes

Add comments

* Update doxygen comments

* Move file source reader from readers/image to readers folder

* Update README and add doxygen description

* Update CMakeLists and README for audio test

* Update README for audio test

* Minor fix

* Fix merge from PR 2

* Minor changes shard_count argument name

* Rename set and get functions of data_info to decoded_data_info

* Revert empty line removed in CMakeLists.txt

* Removed prefix original for audio vectors

* Resolve PR comments

* Add @params to all args in pytorch.py

* Fix build issue

* Minor changes in unit test

* Minor changes

* Change ROCAL instaces to rocAL in pytorch.py

* Resolve the PR comments

* Minor changes in decoders.py - Modify the comment for shard_size

* Minor changes

* Address the PR comments

* Address Review comments

* Introduce Audio layouts

* Add layout changes for spectrogram

* Fix the unit tests - c++ & python

* Minor fix

* Adding changes for spec layout changes

* Fix merge conflicts

* Resolving review comments

---------

Co-authored-by: swetha097 <swetha@multicorewareinc.com>
Co-authored-by: fiona-gladwin <fionagladwin@multicorewareinc.com>
Co-authored-by: Swetha B S <swetha@multicorwareinc.com>
Co-authored-by: Fiona-MCW <70996026+fiona-gladwin@users.noreply.github.com>
Co-authored-by: SundarRajan28 <sundarrajan@multicorewareinc.com>
Co-authored-by: Swetha B S <>

* Audio PR - Augmentation support [ Resample, Operator overloading and Uniform + Normal Distribution nodes ] (#127)

* Removing file list reader and metadata reader

* Minor change

* Remove the reset_tensor_roi() from the PreEmphasis augmentation making sure the src and dst roi points to the same location

* Del the Unit Test Files introduced earlier

* Changing python unittests for QA mode

* Resolving review comments

* Adding comment for file list case in file source reader

* Add pre_emphasis function and gollden output comparison in audio unit tests

* minor change - add update val in create array

* Minor variable name change

* Minor additions in the .h file

* minor change

* Formatting Changes

* Update unit test

* Minor change

* minor change

* Resolving review comments

* Minor changes

Add wav extension in file reader
Add reader in unit test

* Minor change

* Add file reader to python audio unit test

* Add to_decibels augmentations to rocAL

* Formatting , review comments resolution and change enum dtype to int32 instead of uint32

* Update C++ unit test

* Update python audio unit test

* Remove the unused variable output - Resolve warnings in cpp unit test

* Remove the dst_roi arg passed to rpp

* Minor changes

Change borderType enum prefix

* Adding file list reader to C++ unit tests

* Fixing issues with C++ audio unit tests

* Adding test case for to_decibels and downmix

* Modifying python unittests

* Fixing spectogram test case

* Remove the reset_tensor_roi calls

* Resolving review comments

* Resolve some PR comments

* Minor changes

* Resolving review comments

* Change the dims[0] and dims[1] positioning for Spectrogram

* Resolving review comments

* Resolving review comments

* Resolving PR comments

* Updating audio unit tests for default file list path

* Minor changes

* Minor Change

* Minor change

* Name change from sample to data

* Change from decoded_data_info to DecodedDataInfo

* Revert "Change the dims[0] and dims[1] positioning for Spectrogram"

This reverts commit d791b9ac77d662f1528088165d2cfdba721a2b4f.

* Remove audio_decoder_factory.cpp file

* Minor change

* Change variable name

* Change copyright year and remove debug statements

* Add Spectrogram Case in unit tests

* Add spectrogram case in python unit tests

* Update the struct variable name in audio files

* Fixing issues with downmix node output

* Adding ROI updation in downmix node

* Adding downmix test case for python unit tests

* Adding downmix and to_decibels test case in C++ tests

* Minor changes

* Change ROCAL_DATA_PATH to exclude rocal_data

* Update ROCAL_DATA_PATH to exclude rocal_data

* Use Pascal case for function names in audio decoder

* Add resample test case and fixed issues

* Minor changes

* Adding latest changes to resample and distribution nodes

* Fixing ROI handle errors with distribution nodes

* Add audio path for downmix test case

* Resolving review comments

* Add resample and operator overloading test cases in test suite

* Resolving review comments

* Minor change

* Resolving review comments

* Fix review comments

* Modify cmake to have SNDFILE in all capital

* Adding set_seed in master_graph ctor

* fix output mismatch for Tensor add Tensor

* Minor changes

* Add struct for audio info in AudioReadAndDecode

* Fix merge conflict

* Renaming crop_image_info to CropImageInfo

* Remove - actual_host_buffers - Unused

* Rename TimingDBG to TimingDbg

* Move the instances of DecodedDataInfo to its base class LoaderModule

* Fix a WRN msg in master_graph.cpp

* Remove a dangling comment

* Rename _circ_data_info to _circ_buff_data_info

* Add Glob to CMakeLists.txt

* Rename SndFileDecoder to GenericAudioDecoder

* Fix build issues

* Minor change

* Update python API README.md for audio unit test

* Update audio unit test README

* Adding missed param in python unit tests

* Revert "Add Glob to CMakeLists.txt"

This reverts commit 47263d94393e9614a5cebcab6c11c804ac7152f8.

* Fix include headers for Audio files

* Fix copy data 2D

* Minor changes

* Pass decoded data info to load routine instead of separate vectors

* Update CHANGELOG.md

* Update CHANGELOG.md

* Change swap_handle_time variable name in loader

* Update the changelog.md

* Update ChangeLog.md

* Update CHANGELOG.md

* Formatting changes

Add comments

* Update doxygen comments

* Move file source reader from readers/image to readers folder

* Update README and add doxygen description

* Update CMakeLists and README for audio test

* Update README for audio test

* Minor fix

* Fix merge from PR 2

* Minor changes shard_count argument name

* Rename set and get functions of data_info to decoded_data_info

* Revert empty line removed in CMakeLists.txt

* Removed prefix original for audio vectors

* Resolve PR comments

* Add @params to all args in pytorch.py

* Fix build issue

* Minor changes in unit test

* Minor changes

* Change ROCAL instaces to rocAL in pytorch.py

* Resolve the PR comments

* Minor changes in decoders.py - Modify the comment for shard_size

* Minor changes

* Address the PR comments

* Address Review comments

* Introduce Audio layouts

* Add layout changes for spectrogram

* Fix the unit tests - c++ & python

* Minor fix

* Adding changes for spec layout changes

* Fix merge conflicts

* Fix merge conflicts

* Minor changes

* Remove dtype warnings

* Resolving review comments

---------

Co-authored-by: Swetha B S <swetha@multicorewareinc.com>
Co-authored-by: SundarRajan28 <sundarrajan@multicorewareinc.com>
Co-authored-by: Fiona-MCW <70996026+fiona-gladwin@users.noreply.github.com>
Co-authored-by: Swetha B S <>
Co-authored-by: fiona-gladwin <fionagladwin@multicorewareinc.com>

* CentOS 7 - Support (#170)

* Setup - CentOS 7 Updates

* Setup - Fix

* CMakeLists - CentOS 7 Package updates

* CMake3 Install on setup

* Setup - Updates

* Updates - Readme & JPEG

* CI - Enable external CI pipeline triggers (#171)

* SLES 15 SP5 - support updates (#172)

* SLES - Package updates

* SLES - Updates

* Setup - Updates

* rocAL Setup - Cleanup

* SLES - OpenCV Package

* Audio PR - Augmentation support [ NonSilentRegionDetection and Slice ] (#128)

* Modifying python unittests

* Fixing spectogram test case

* Remove the reset_tensor_roi calls

* Resolving review comments

* Resolve some PR comments

* Minor changes

* Resolving review comments

* Change the dims[0] and dims[1] positioning for Spectrogram

* Resolving review comments

* Resolving review comments

* Resolving PR comments

* Updating audio unit tests for default file list path

* Minor changes

* Minor Change

* Minor change

* Name change from sample to data

* Change from decoded_data_info to DecodedDataInfo

* Revert "Change the dims[0] and dims[1] positioning for Spectrogram"

This reverts commit d791b9ac77d662f1528088165d2cfdba721a2b4f.

* Remove audio_decoder_factory.cpp file

* Minor change

* Change variable name

* Change copyright year and remove debug statements

* Add Spectrogram Case in unit tests

* Add spectrogram case in python unit tests

* Update the struct variable name in audio files

* Fixing issues with downmix node output

* Adding ROI updation in downmix node

* Adding downmix test case for python unit tests

* Adding downmix and to_decibels test case in C++ tests

* Minor changes

* Change ROCAL_DATA_PATH to exclude rocal_data

* Update ROCAL_DATA_PATH to exclude rocal_data

* Use Pascal case for function names in audio decoder

* Adding mel filter bank augmentation support in rocAL

* Add resample test case and fixed issues

* NWC - NSR + Slice

* Minor changes

* Minor changes

* Adding latest changes to resample and distribution nodes

* Add test suite changes for NSR

* Fixing ROI handle errors with distribution nodes

* Resolve issue with Slice Node

* Add audio path for downmix test case

* Add NSR and Slice in python unit tests

* Resolving review comments

* Add resample and operator overloading test cases in test suite

* Resolving review comments

* Minor change

* Resolving review comments

* Fix review comments

* Modify cmake to have SNDFILE in all capital

* Fix Slice

* Add NSR and slice in audio test suite

* Fix NSR and Slice output issue

* Resolving review comments

* Adding set_seed in master_graph ctor

* Change Name NonSilentRegion to NonSilentRegionDetection

* fix output mismatch for Tensor add Tensor

* Remove nD tensor layouts

* Minor changes

* Add struct for audio info in AudioReadAndDecode

* Fix merge conflict

* Clean up - node_slice.cpp

* Resolve PR comments - 1

* Remove unused variables, add comments, format merge commit

* Resolve internal PR comments

* Changes in node_slice.cpp

* Change Enum fom UINT TO INT type

* Minor change

* Fornat

* Fix pybind issue for normalize

* Changes in node_slice.cpp to move the fill_values to create_node from update_node

* Add _vx to scalar variables in the nsr

* Moving normalize to effects augmentations folder

* Renaming crop_image_info to CropImageInfo

* Remove - actual_host_buffers - Unused

* Rename TimingDBG to TimingDbg

* Move the instances of DecodedDataInfo to its base class LoaderModule

* Fix a WRN msg in master_graph.cpp

* Remove a dangling comment

* Rename _circ_data_info to _circ_buff_data_info

* Adding changes to normalize node

* Add Glob to CMakeLists.txt

* Rename SndFileDecoder to GenericAudioDecoder

* Fix build issues

* Minor change

* Update python API README.md for audio unit test

* Update audio unit test README

* Add debug and changes to normalize node and test case

* Minor fixes for MFB

* Add Normalize and MFB test cases in C++ tests

* Revert "Merge remote-tracking branch 'swe_fork/swbs/audio/pr7' into swbs/audio/pr9"

This reverts commit e480f982957e644d0b452dc372ecfcf5352e899b, reversing
changes made to e5e9ad2e07fbfd4625c08d1e4a7663776051c23d.

* Fix cpp unit test

* Adding missed param in python unit tests

* Revert "Add Glob to CMakeLists.txt"

This reverts commit 47263d94393e9614a5cebcab6c11c804ac7152f8.

* Fix include headers for Audio files

* Fix copy data 2D

* Minor changes

* Pass decoded data info to load routine instead of separate vectors

* Update CHANGELOG.md

* Update CHANGELOG.md

* Change swap_handle_time variable name in loader

* Update the changelog.md

* Update ChangeLog.md

* Update ChangeLog.md

* Update CHANGELOG.md

* Formatting changes

Add comments

* Update doxygen comments

* Move file source reader from readers/image to readers folder

* Update README and add doxygen description

* Update CMakeLists and README for audio test

* Update README for audio test

* Minor fix

* Fix merge from PR 2

* Minor changes shard_count argument name

* Rename set and get functions of data_info to decoded_data_info

* Revert empty line removed in CMakeLists.txt

* Removed prefix original for audio vectors

* Resolve PR comments

* Add @params to all args in pytorch.py

* Fix build issue

* Minor changes in unit test

* Minor changes

* Change ROCAL instaces to rocAL in pytorch.py

* Resolve the PR comments

* Minor changes in decoders.py - Modify the comment for shard_size

* Minor changes

* Address the PR comments

* Address Review comments

* Introduce Audio layouts

* Add layout changes for spectrogram

* Fix the unit tests - c++ & python

* Minor fix

* Adding changes for spec layout changes

* Update node_slice.cpp

* Update node_slice.h

* Resolving review comments

---------

Co-authored-by: SundarRajan28 <sundarrajan@multicorewareinc.com>
Co-authored-by: Swetha B S <>
Co-authored-by: Fiona-MCW <70996026+fiona-gladwin@users.noreply.github.com>
Co-authored-by: fiona-gladwin <fionagladwin@multicorewareinc.com>
Co-authored-by: Lakshmi Kumar <lakshmi.kumar@amd.com>

* Docs - Bump rocm-docs-core[api_reference] from 1.4.0 to 1.4.1 in /docs/sphinx (#173)

Bumps [rocm-docs-core[api_reference]](https://github.com/ROCm/rocm-docs-core) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/ROCm/rocm-docs-core/releases)
- [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ROCm/rocm-docs-core/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: rocm-docs-core[api_reference]
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kiriti Gowda <kiritigowda@gmail.com>

* CMakeLists - AMDGPU_TARGETS Updates (#174)

* Bump rocm-docs-core[api_reference] from 1.4.1 to 1.5.0 in /docs/sphinx (#178)

Bumps [rocm-docs-core[api_reference]](https://github.com/ROCm/rocm-docs-core) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/ROCm/rocm-docs-core/releases)
- [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ROCm/rocm-docs-core/compare/v1.4.1...v1.5.0)

---
updated-dependencies:
- dependency-name: rocm-docs-core[api_reference]
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Docs - Update documentation link (#175)

Co-authored-by: Kiriti Gowda <kiritigowda@gmail.com>

* Audio PR - Augmentation support [ Mel-Filter Bank and Normalize ] (#130)

* Name change from sample to data

* Change from decoded_data_info to DecodedDataInfo

* Revert "Change the dims[0] and dims[1] positioning for Spectrogram"

This reverts commit d791b9ac77d662f1528088165d2cfdba721a2b4f.

* Remove audio_decoder_factory.cpp file

* Minor change

* Change variable name

* Change copyright year and remove debug statements

* Add Spectrogram Case in unit tests

* Add spectrogram case in python unit tests

* Update the struct variable name in audio files

* Fixing issues with downmix node output

* Adding ROI updation in downmix node

* Adding downmix test case for python unit tests

* Adding downmix and to_decibels test case in C++ tests

* Minor changes

* Change ROCAL_DATA_PATH to exclude rocal_data

* Update ROCAL_DATA_PATH to exclude rocal_data

* Use Pascal case for function names in audio decoder

* Adding mel filter bank augmentation support in rocAL

* Add resample test case and fixed issues

* NWC - NSR + Slice

* Minor changes

* Minor changes

* Adding l…
  • Loading branch information
25 people authored Aug 20, 2024
1 parent 6c331ce commit 02ed9bc
Show file tree
Hide file tree
Showing 471 changed files with 35,425 additions and 23,728 deletions.
44 changes: 44 additions & 0 deletions .azuredevops/rocm-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
resources:
repositories:
- repository: pipelines_repo
type: github
endpoint: ROCm
name: ROCm/ROCm

variables:
- group: common
- template: /.azuredevops/variables-global.yml@pipelines_repo

trigger:
batch: true
branches:
include:
- develop
paths:
exclude:
- .github
- .jenkins
- docs
- '.*.y*ml'
- '*.md'
- copyright.txt
- LICENSE.txt

pr:
autoCancel: true
branches:
include:
- develop
paths:
exclude:
- .github
- .jenkins
- docs
- '.*.y*ml'
- '*.md'
- copyright.txt
- LICENSE.txt
drafts: false

jobs:
- template: ${{ variables.CI_COMPONENT_PATH }}/rocAL.yml@pipelines_repo
4 changes: 2 additions & 2 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Linting

on:
push:
branches: [develop, main]
branches: [master, develop]
pull_request:
branches: [develop, main]
branches: [master, develop]

jobs:
call-workflow-passing-data:
Expand Down
102 changes: 85 additions & 17 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,107 @@
<p align="center"><img width="70%" src="docs/data/rocAL_logo.png" /></p>

# Changelog

rocAL documentation is available at
[https://rocm.docs.amd.com/projects/rocAL/en/latest/](https://rocm.docs.amd.com/projects/rocAL/en/latest/)
## Online Documentation

[rocAL Documentation](https://github.com/ROCm/rocAL)

## rocAL 1.0.0 (unreleased)
## rocAL 2.0.0 (unreleased)

### Additions
### Added

*
* Packages - dev & tests
* Support for audio loader and decoder, which uses libsndfile library to decode wav files
* C++ rocAL audio unit test and python script to run and compare the outputs
* Python support for audio decoders
* Pytorch iterator for Audio
* Python audio unit test, and support to verify outputs
* rocDecode for HW decode
* Support for Audio augmentation - PreEmphasis filter
* Support for reading from file lists in file reader
* Support for Audio augmentation - Spectrogram
* Support for Audio augmentation - ToDecibels
* Support for downmixing audio channels during decoding
* Support for Audio augmentation - Resample
* Support for TensorTensorAdd and TensorScalarMultiply operations
* Support for Uniform and Normal distribution nodes
* Support for Audio augmentation - NonSilentRegionDetection
* Support for generic augmentation - Slice
* Support for generic augmentation - Normalize
* Support for Audio augmentation - MelFilterBank

### Optimizations

*
* Tests
* Setup Script
* CentOS 7 support
* SLES 15 SP5 support

### Changes
### Changed

* Removed CuPy from `setup.py`
* Image to tensor updates
* ROCm install - use case graphics removed

### Fixes
### Fixed

*
* Tests & readme

### Tested configurations
### Tested Configurations

* Linux distribution
+ Ubuntu - `20.04` / `22.04`
* ROCm: rocm-core - `5.4.0.50400-72`
* Ubuntu - `20.04` / `22.04`
* CentOS - `7`
* RedHat - `8` / `9`
* SLES - `15-SP5`
* ROCm: rocm-core - `6.1.0.60100-64`
* RPP - `rpp` & `rpp-dev`/`rpp-devel`
* MIVisionX - `mivisionx` & `mivisionx-dev`/`mivisionx-devel`
* rocDecode - `rocdecode` & `rocdecode-dev`/`rocdecode-devel`
* Protobuf - `libprotobuf-dev`/`protobuf-devel`
* RapidJSON - `https://github.com/Tencent/rapidjson`
* Turbo JPEG - [Version 3.0.2](https://libjpeg-turbo.org/)
* PyBind11 - [v2.11.1](https://github.com/pybind/pybind11)
* FFMPEG - `ffmpeg 4` dev package
* OpenCV - `libopencv` / [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.0)
* libsndfile - [1.0.31](https://github.com/libsndfile/libsndfile/releases/tag/1.0.31)
* rocAL Setup Script - `V2.5.0`
* Dependencies for all the above packages

### Known issues

* Requires custom deps install

## rocAL 1.0.0

### Added

* rocAL Tests

### Optimizations

* Image augmentations

### Changed

* Deps

### Fixed

* minor issues

### Tested Configurations

* Linux distribution
* Ubuntu - `20.04` / `22.04`
* ROCm: rocm-core - `6.0.60002-1`
* 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 - [1.4.0](https://github.com/ROCms/rpp/releases/tag/1.4.0)
* FFMPEG - [n4.4.2](https://github.com/FFmpeg/FFmpeg/releases/tag/n4.4.2)
* RPP - `rpp` & `rpp-dev`/`rpp-devel`
* MIVisionX - `mivisionx` & `mivisionx-dev`/`mivisionx-devel`
* MIVisionX - [master](https://github.com/ROCm/MIVisionX)
* Dependencies for all the above packages
* rocAL Setup Script - `V1.1.0`
* rocAL Setup Script - `V1.0.2`

### Known issues

*
* Requires custom version of libturbo-JPEG
57 changes: 35 additions & 22 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
cmake_minimum_required(VERSION 3.5)
set(VERSION "1.0.0")
set(VERSION "2.0.0")

# Set Project Version and Language
project(rocal VERSION ${VERSION} LANGUAGES CXX)
Expand Down Expand Up @@ -51,7 +51,8 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
option(ENHANCED_MESSAGE "rocAL Enhanced Message Option" ON)
option(GPU_SUPPORT "Build rocAL with GPU Support" ON)
option(BUILD_PYPACKAGE "Build rocAL Python Package" ON)
option(BUILD_WITH_AMD_ADVANCE "Build rocAL with Advanced GPU support" OFF)
option(PYTHON_VERSION_SUGGESTED "Python version to build rocal" "")
option(BUILD_WITH_AMD_ADVANCE "Build rocAL for advanced AMD GPU Architecture" OFF)

set(DEFAULT_BUILD_TYPE "Release")

Expand Down Expand Up @@ -117,13 +118,8 @@ else()
endif()
message("-- ${BoldBlue}rocAL Build Type -- ${CMAKE_BUILD_TYPE}${ColourReset}")

message("-- ${Cyan}rocAL Developer Options${ColourReset}")
message("-- ${Cyan} -D GPU_SUPPORT=${GPU_SUPPORT} [Turn ON/OFF GPU support (default:ON)]${ColourReset}")
message("-- ${Cyan} -D BACKEND=${BACKEND} [Select rocAL Backend [options:CPU/OPENCL/HIP](default:HIP)]${ColourReset}")
message("-- ${Cyan} -D BUILD_PYPACKAGE=${BUILD_PYPACKAGE} [rocAL Python Package(default:ON)]${ColourReset}")
message("-- ${Cyan} -D BUILD_WITH_AMD_ADVANCE=${BUILD_WITH_AMD_ADVANCE} [rocAL support for advanced GPU(default:OFF)]${ColourReset}")

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH} ${ROCM_PATH}/hip)
find_package(HALF QUIET)

if(HALF_FOUND)
Expand All @@ -134,20 +130,31 @@ else()
message("-- ${Blue}rocAL Built with float16 Support OFF${ColourReset}")
endif()

message("-- ${Cyan}rocAL Developer Options${ColourReset}")
message("-- ${Cyan} -D GPU_SUPPORT=${GPU_SUPPORT} [Turn ON/OFF GPU support (default:ON)]${ColourReset}")
message("-- ${Cyan} -D BACKEND=${BACKEND} [Select rocAL Backend [options:CPU/OPENCL/HIP](default:HIP)]${ColourReset}")
message("-- ${Cyan} -D BUILD_PYPACKAGE=${BUILD_PYPACKAGE} [rocAL Python Package(default:ON)]${ColourReset}")
message("-- ${Cyan} -D PYTHON_VERSION_SUGGESTED=${PYTHON_VERSION_SUGGESTED} [User provided python version to use for rocAL Python Bindings(default:System Version)]${ColourReset}")
message("-- ${Cyan} -D BUILD_WITH_AMD_ADVANCE=${BUILD_WITH_AMD_ADVANCE} [Turn ON/OFF Build for AMD advanced GPUs(default:OFF)]${ColourReset}")

add_subdirectory(rocAL)
add_subdirectory(rocAL_pybind)
if(BUILD_PYPACKAGE)
add_subdirectory(rocAL_pybind)
else()
message("-- ${Cyan}rocAL Python Module turned OFF by user option -D BUILD_PYPACKAGE=OFF ${ColourReset}")
endif()

# install rocAL docs -- {ROCM_PATH}/${CMAKE_INSTALL_DATADIR}/doc/rocal/
install(FILES docs/README.md DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/rocal COMPONENT runtime)

# test package
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test COMPONENT test)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test COMPONENT test)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/cpp_api_tests/ DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test COMPONENT test)
# CTest - Needs RPP Installed
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/cpp_api/ DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test COMPONENT test)
# CTest - Needs rocAL Installed
enable_testing()
include(CTest)
add_subdirectory(tests/cpp_api_tests)
add_subdirectory(tests/cpp_api)

# set package information
set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
Expand Down Expand Up @@ -180,8 +187,6 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-asan COMPONENT asan)
install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT runtime)
install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-dev COMPONENT dev)
install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-test COMPONENT test)

if(DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
set(CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
Expand All @@ -194,8 +199,20 @@ endif()
set(ROCAL_DEBIAN_PACKAGE_LIST "rpp, mivisionx")
set(ROCAL_RPM_PACKAGE_LIST "rpp, mivisionx")
# Set the dev dependent packages
set(ROCAL_DEBIAN_DEV_PACKAGE_LIST "rpp-dev, mivisionx-dev, liblmdb-dev")
set(ROCAL_RPM_DEV_PACKAGE_LIST "rpp-devel, mivisionx-devel, lmdb-devel")
set(ROCAL_DEBIAN_DEV_PACKAGE_LIST "rpp-dev, mivisionx-dev, liblmdb-dev, libprotobuf-dev")
set(ROCAL_RPM_DEV_PACKAGE_LIST "rpp-devel, mivisionx-devel, lmdb-devel, protobuf-devel")

# Add rocDecode Deps for HW Decode - Exclude centos-7
if (EXISTS "/etc/os-release")
file(READ "/etc/os-release" OS_RELEASE)
string(REGEX MATCH "CentOS-7" CENTOS_7_FOUND ${OS_RELEASE})
if(NOT CENTOS_7_FOUND)
set(ROCAL_DEBIAN_PACKAGE_LIST "${ROCAL_DEBIAN_PACKAGE_LIST}, rocdecode")
set(ROCAL_RPM_PACKAGE_LIST "${ROCAL_RPM_PACKAGE_LIST}, rocdecode")
set(ROCAL_DEBIAN_DEV_PACKAGE_LIST "${ROCAL_DEBIAN_DEV_PACKAGE_LIST}, rocdecode-dev")
set(ROCAL_RPM_DEV_PACKAGE_LIST "${ROCAL_RPM_DEV_PACKAGE_LIST}, rocdecode-devel")
endif()
endif()

# '%{?dist}' breaks manual builds on debian systems due to empty Provides
execute_process(
Expand Down Expand Up @@ -231,21 +248,17 @@ set(CPACK_RPM_COMPONENT_INSTALL ON)
set(CPACK_RPM_RUNTIME_PACKAGE_NAME "${PROJECT_NAME}")
set(CPACK_RPM_RUNTIME_PACKAGE_REQUIRES "rocm-core, ${ROCAL_RPM_PACKAGE_LIST}")
set(CPACK_RPM_RUNTIME_PACKAGE_PROVIDES "${PROJECT_NAME}")
set(CPACK_RPM_RUNTIME_PACKAGE_OBSOLETES "${PROJECT_NAME}")
set(CPACK_RPM_DEV_PACKAGE_NAME "${PROJECT_NAME}-devel")
set(CPACK_RPM_DEV_PACKAGE_REQUIRES "rocm-core, ${CPACK_RPM_RUNTIME_PACKAGE_NAME}, ${ROCAL_RPM_DEV_PACKAGE_LIST}")
set(CPACK_RPM_DEV_PACKAGE_PROVIDES "${PROJECT_NAME}-devel")
set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "${PROJECT_NAME}-devel")
# RPM package - specific variable for ASAN
set(CPACK_RPM_ASAN_PACKAGE_NAME "${PROJECT_NAME}-asan" )
set(CPACK_RPM_ASAN_PACKAGE_REQUIRES "rocm-core-asan, ${ROCAL_RPM_PACKAGE_LIST}" )
set(CPACK_RPM_ASAN_PACKAGE_PROVIDES "${PROJECT_NAME}-asan")
set(CPACK_RPM_ASAN_PACKAGE_OBSOLETES "${PROJECT_NAME}-asan")
# RPM package specific variable for ASAN
set(CPACK_RPM_TEST_PACKAGE_NAME "${PROJECT_NAME}-test" )
set(CPACK_RPM_TEST_PACKAGE_REQUIRES "rocm-core, ${CPACK_RPM_DEV_PACKAGE_NAME}" )
set(CPACK_RPM_TEST_PACKAGE_PROVIDES "${PROJECT_NAME}-test")
set(CPACK_RPM_TEST_PACKAGE_OBSOLETES "${PROJECT_NAME}-test")

if(NOT ROCM_DEP_ROCMCORE)
string(REGEX REPLACE ",? ?rocm-core," "" CPACK_RPM_RUNTIME_PACKAGE_REQUIRES ${CPACK_RPM_RUNTIME_PACKAGE_REQUIRES})
Expand All @@ -271,10 +284,10 @@ set(CPACK_DEBIAN_PACKAGE_RELEASE "local")
set(CPACK_RPM_PACKAGE_RELEASE "local")

if(DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
set(CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
set(CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
endif()
if(DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE})
set(CPACK_RPM_PACKAGE_RELEASE $ENV{CPACK_RPM_PACKAGE_RELEASE})
set(CPACK_RPM_PACKAGE_RELEASE $ENV{CPACK_RPM_PACKAGE_RELEASE})
endif()

if(APPLE)
Expand Down
Loading

0 comments on commit 02ed9bc

Please sign in to comment.