-
Notifications
You must be signed in to change notification settings - Fork 85
Adding changes for batchPD removal #1597
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
Open
SundarRajan98
wants to merge
41
commits into
ROCm:develop
Choose a base branch
from
SundarRajan28:batchpd_removal_changes
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+107
−25,776
Open
Changes from all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
153eb39
Add vx_rpp extensions for GaussianNoise, ShotNoise, Spatter, Log, Col…
SundarRajan28 f54061e
Add vx_rpp extensions for ChannelPermute, ColorToGreyscale, JpegCompr…
SundarRajan28 2d2cd2f
Add vx_rpp extensions for TensorSum, TensorMin, TensorMax, TensorMean…
SundarRajan28 32f8585
Minor change
SundarRajan28 65e812d
Add checks
SundarRajan28 39f7c2f
Adding changes for batchPD removal
SundarRajan28 2ffbd56
Merge remote-tracking branch 'origin/develop' into batchpd_removal_ch…
SundarRajan28 46c5fa1
Update vx_rpp version to 3.2.0
SundarRajan28 2285286
Merge remote-tracking branch 'origin' into new_augs_set1
SundarRajan28 4e33a55
Resolve review comments
SundarRajan28 cc22c10
Merge branch 'new_augs_set1' into new_augs_set2
SundarRajan28 46f503b
Merge branch 'new_augs_set2' into new_augs_set3
SundarRajan28 741a693
Merge branch 'develop' into batchpd_removal_changes
kiritigowda b344511
Merge branch 'develop' into new_augs_set1
kiritigowda 16ffa37
Merge branch 'develop' into new_augs_set2
kiritigowda 6dcab97
Change variable case
SundarRajan28 285b75a
Resolve review comments
SundarRajan28 801e90f
Fix build error
SundarRajan28 3f633cd
Update copyright year to 2026
SundarRajan28 0e4839f
Update copyright year to 2026
SundarRajan28 43a06c8
Update copyright year to 2026
SundarRajan28 217ff3f
Merge branch 'new_augs_set1' into new_augs_set2
SundarRajan28 192776f
Merge branch 'new_augs_set2' into new_augs_set3
SundarRajan28 876acd1
Update required rpp version
SundarRajan28 92e32bd
Update required rpp version
SundarRajan28 3beb29a
Update required rpp version
SundarRajan28 aaba609
Update rpp package version to 2.2.2
fiona-gladwin ad36a87
Update CMakeLists.txt
fiona-gladwin 014da94
Update rpp package version to 2.2.2
fiona-gladwin bf2ef3b
Merge remote-tracking branch 'origin/develop' into new_augs_set1
SundarRajan28 f7a8d76
Merge branch 'new_augs_set1' into new_augs_set2
SundarRajan28 28f8e67
Merge branch 'new_augs_set2' into new_augs_set3
SundarRajan28 b9c8203
Updating rpp version in CMake
SundarRajan28 794b796
Merge remote-tracking branch 'origin/develop' into batchpd_removal_ch…
SundarRajan28 920c41c
Merge branch 'develop' into new_augs_set2
LakshmiKumar23 e7a13b6
Merge branch 'new_augs_set2' into new_augs_set3
SundarRajan28 f73187a
Merge branch 'develop' into new_augs_set3
LakshmiKumar23 03cb189
Merge branch 'develop' into new_augs_set3
SundarRajan98 fb4a96b
Merge branch 'new_augs_set3' into batchpd_removal_changes
SundarRajan28 f76b596
Merge branch 'develop' into batchpd_removal_changes
kiritigowda bb5fa62
Merge remote-tracking branch 'origin/develop' into batchpd_removal_ch…
SundarRajan28 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,14 +31,14 @@ endif() | |
|
|
||
| # VX_RPP Version | ||
| # * must match with include/vx_ext_rpp_version.h | ||
| set(VERSION "3.1.7") | ||
| set(VERSION "3.2.0") | ||
|
|
||
| project(vx_rpp VERSION ${VERSION} LANGUAGES CXX) | ||
|
|
||
| list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) | ||
| list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake) | ||
|
|
||
| find_package(rpp 2.2.2 REQUIRED) | ||
| find_package(rpp 2.3.0 REQUIRED) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same as above |
||
|
|
||
| message("-- ${White}${PROJECT_NAME}: rpp found with find_package(rpp REQUIRED)${ColourReset}") | ||
| message("-- \t${White}rpp_INCLUDE_DIR -- ${rpp_INCLUDE_DIR}${ColourReset}") | ||
|
|
@@ -147,100 +147,6 @@ list(APPEND SOURCES | |
| source/internal_publishKernels.cpp | ||
| ) | ||
|
|
||
| set(RPP_LEGACY_SUPPORT_FOUND 0) | ||
| if(EXISTS ${rpp_INCLUDE_DIR}/rpp/rpp_legacy_support.h) | ||
| file(READ ${rpp_INCLUDE_DIR}/rpp/rpp_legacy_support.h RPP_LEGACY_SUPPORT_FILE) | ||
| string(REGEX MATCH "RPP_LEGACY_SUPPORT ([0-1]*)" _ ${RPP_LEGACY_SUPPORT_FILE}) | ||
| set(RPP_LEGACY_SUPPORT_FOUND ${CMAKE_MATCH_1}) | ||
| endif() | ||
|
|
||
| if(RPP_LEGACY_SUPPORT_FOUND) | ||
| list(APPEND SOURCES | ||
| source/image/AbsoluteDifferencebatchPD.cpp | ||
| source/image/AccumulatebatchPD.cpp | ||
| source/image/AccumulateSquaredbatchPD.cpp | ||
| source/image/AccumulateWeightedbatchPD.cpp | ||
| source/image/AddbatchPD.cpp | ||
| source/image/BitwiseANDbatchPD.cpp | ||
| source/image/BitwiseNOTbatchPD.cpp | ||
| source/image/BlendbatchPD.cpp | ||
| source/image/BlurbatchPD.cpp | ||
| source/image/BoxFilterbatchPD.cpp | ||
| source/image/BrightnessbatchPD.cpp | ||
| source/image/CannyEdgeDetector.cpp | ||
| source/image/ChannelCombinebatchPD.cpp | ||
| source/image/ChannelExtractbatchPD.cpp | ||
| source/image/ColorTemperaturebatchPD.cpp | ||
| source/image/ColorTwistbatchPD.cpp | ||
| source/image/ContrastbatchPD.cpp | ||
| source/image/CopybatchPD.cpp | ||
| source/image/CropMirrorNormalizePD.cpp | ||
| source/image/CropPD.cpp | ||
| source/image/CustomConvolutionbatchPD.cpp | ||
| source/image/DataObjectCopybatchPD.cpp | ||
| source/image/DilatebatchPD.cpp | ||
| source/image/ErodebatchPD.cpp | ||
| source/image/ExclusiveORbatchPD.cpp | ||
| source/image/ExposurebatchPD.cpp | ||
| source/image/FastCornerDetector.cpp | ||
| source/image/FisheyebatchPD.cpp | ||
| source/image/FlipbatchPD.cpp | ||
| source/image/FogbatchPD.cpp | ||
| source/image/GammaCorrectionbatchPD.cpp | ||
| source/image/GaussianFilterbatchPD.cpp | ||
| source/image/GaussianImagePyramidbatchPD.cpp | ||
| source/image/HarrisCornerDetector.cpp | ||
| source/image/Histogram.cpp | ||
| source/image/HistogramBalancebatchPD.cpp | ||
| source/image/HistogramEqualizebatchPD.cpp | ||
| source/image/HuebatchPD.cpp | ||
| source/image/InclusiveORbatchPD.cpp | ||
| source/image/JitterbatchPD.cpp | ||
| source/image/LaplacianImagePyramid.cpp | ||
| source/image/LensCorrectionbatchPD.cpp | ||
| source/image/LocalBinaryPatternbatchPD.cpp | ||
| source/image/LookUpTablebatchPD.cpp | ||
| source/image/MagnitudebatchPD.cpp | ||
| source/image/MaxbatchPD.cpp | ||
| source/image/MeanStddev.cpp | ||
| source/image/MedianFilterbatchPD.cpp | ||
| source/image/MinbatchPD.cpp | ||
| source/image/MinMaxLoc.cpp | ||
| source/image/MultiplybatchPD.cpp | ||
| source/image/NoisebatchPD.cpp | ||
| source/image/NonLinearFilterbatchPD.cpp | ||
| source/image/NonMaxSupressionbatchPD.cpp | ||
| source/image/NopbatchPD.cpp | ||
| source/image/PhasebatchPD.cpp | ||
| source/image/PixelatebatchPD.cpp | ||
| source/image/RainbatchPD.cpp | ||
| source/image/RandomCropLetterBoxbatchPD.cpp | ||
| source/image/RandomShadowbatchPD.cpp | ||
| source/image/Remap.cpp | ||
| source/image/ResizebatchPD.cpp | ||
| source/image/ResizeCropbatchPD.cpp | ||
| source/image/ResizeCropMirrorPD.cpp | ||
| source/image/ResizeMirrorNormalizeTensor.cpp | ||
| source/image/Resizetensor.cpp | ||
| source/image/RotatebatchPD.cpp | ||
| source/image/SaturationbatchPD.cpp | ||
| source/image/ScalebatchPD.cpp | ||
| source/image/SequenceRearrangebatchPD.cpp | ||
| source/image/SnowbatchPD.cpp | ||
| source/image/SobelbatchPD.cpp | ||
| source/image/SubtractbatchPD.cpp | ||
| source/image/TensorAdd.cpp | ||
| source/image/TensorLookup.cpp | ||
| source/image/TensorMatrixMultiply.cpp | ||
| source/image/TensorMultiply.cpp | ||
| source/image/TensorSubtract.cpp | ||
| source/image/ThresholdingbatchPD.cpp | ||
| source/image/VignettebatchPD.cpp | ||
| source/image/WarpAffinebatchPD.cpp | ||
| source/image/WarpPerspectivebatchPD.cpp | ||
| ) | ||
| endif() | ||
|
|
||
| if(GPU_SUPPORT AND "${BACKEND}" STREQUAL "OPENCL" AND OpenCL_FOUND) | ||
| message("-- ${Green}vx_rpp -- Building with OpenCL${ColourReset}") | ||
| set(ENABLE_OPENCL 1) | ||
|
|
@@ -290,15 +196,6 @@ else() | |
| message("-- ${Yellow}vx_rpp Audio Features Excluded${ColourReset}") | ||
| endif() | ||
|
|
||
| if(RPP_LEGACY_SUPPORT_FOUND) | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLEGACY_SUPPORT=1") | ||
| target_compile_definitions(vx_rpp PUBLIC RPP_LEGACY_SUPPORT=1) | ||
| message("-- ${White}vx_rpp BatchPD augmentations included${ColourReset}") | ||
| else() | ||
| target_compile_definitions(vx_rpp PUBLIC RPP_LEGACY_SUPPORT=0) | ||
| message("-- ${Yellow}vx_rpp BatchPD augmentations excluded${ColourReset}") | ||
| endif() | ||
|
|
||
| if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") | ||
| set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} OpenVX) | ||
| set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT") | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@SundarRajan28 please change this to match new rpp version
3.0