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.

Sign up for GitHub

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

Jump to bottom

Color Temperature fixes #224

Merged
merged 7 commits into from
Jan 29, 2024
Merged

Color Temperature fixes #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c99321f
Use reinterpret_cast instead of static_cast
snehaa8 Jan 22, 2024
e4123c4
Combine templated functions to support all datatypes into one
snehaa8 Jan 22, 2024
d9b269d
Fix i8 datatype
snehaa8 Jan 23, 2024
e3983a0
Cleanup
snehaa8 Jan 23, 2024
3019c8b
Merge branch 'develop' of https://github.com/ROCm/rpp into sn/color_t…
snehaa8 Jan 29, 2024
c700bf4
Fix PLN3 variant outputs
snehaa8 Jan 29, 2024
88ab397
Merge branch 'ar/opt_color_temperature' into sn/color_temp_tensor
snehaa8 Jan 29, 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
5 changes: 3 additions & 2 deletions .jenkins/common.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ def runCompileCommand(platform, project, jobName, boolean debug=false, boolean s
cmake -DBACKEND=${backend} ${buildTypeArg} ../..
make -j\$(nproc)
sudo make install
make test ARGS="-VV"
sudo make package
ldd -v /opt/rocm/lib/librpp.so
"""

platform.runCommand(this, command)
Expand All @@ -54,7 +54,8 @@ def runTestCommand (platform, project) {

def command = """#!/usr/bin/env bash
set -x
ldd -v /opt/rocm/lib/librpp.so
cd ${project.paths.project_build_prefix}/build/release
make test ARGS="-VV"
"""

platform.runCommand(this, command)
Expand Down
18 changes: 13 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ else()
set(WINE_CMD)
endif()

message("-- ${Cyan}RPP Developer Options${ColourReset}")
message("-- ${Cyan} -D BUILD_WITH_AMD_ADVANCE=${BUILD_WITH_AMD_ADVANCE} [Turn ON/OFF Build for AMD advanced GPUs(default:OFF)]${ColourReset}")
message("-- ${Yellow} NOTE: For ROCm Version 6.0.0+ Use -D BUILD_WITH_AMD_ADVANCE=ON to support MI300+${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}")

# CMake checks and setups
if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
message(FATAL_ERROR "${Red}${PROJECT_NAME} -- In-source builds are not allowed. Invoke cmake from build directory${ColourReset}")
Expand Down Expand Up @@ -359,15 +365,17 @@ set(CPACK_PACKAGE_LICENSE "MIT")
set(CPACK_PACKAGE_CONTACT "mivisionx support <mivisionx.support@amd.com>")
set(CPACK_PACKAGE_VENDOR "AMD ROCm")
set(CPACK_PACKAGE_GROUP "Development/Tools")
set(CPACK_PACKAGE_HOMEPAGE "https://gpuopen-professionalcompute-libraries.github.io/rpp/")
set(CPACK_PACKAGE_HOMEPAGE "https://github.com/ROCm/rpp")

if(DEFINED ENV{ROCM_LIBPATCH_VERSION})
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}.$ENV{ROCM_LIBPATCH_VERSION}")
endif()

# Set the dependent packages
set(RPP_DEBIAN_PACKAGE_LIST "half")
set(RPP_RPM_PACKAGE_LIST "half")
set(RPP_DEBIAN_PACKAGE_LIST "rocm-hip-runtime, half")
set(RPP_RPM_PACKAGE_LIST "rocm-hip-runtime, half")
set(RPP_DEBIAN_DEV_PACKAGE_LIST "rocm-hip-runtime-dev")
set(RPP_RPM_DEV_PACKAGE_LIST "rocm-hip-runtime-devel")

# package release
set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
Expand Down Expand Up @@ -400,7 +408,7 @@ set(CPACK_DEB_COMPONENT_INSTALL ON)
set(CPACK_DEBIAN_RUNTIME_PACKAGE_NAME "${PROJECT_NAME}")
set(CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS "rocm-core, ${RPP_DEBIAN_PACKAGE_LIST}")
set(CPACK_DEBIAN_DEV_PACKAGE_NAME "${PROJECT_NAME}-dev")
set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "rocm-core, ${PROJECT_NAME}")
set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "rocm-core, ${PROJECT_NAME}, ${RPP_DEBIAN_DEV_PACKAGE_LIST}")
set(CPACK_DEBIAN_TEST_PACKAGE_NAME "${PROJECT_NAME}-test")
set(CPACK_DEBIAN_TEST_PACKAGE_DEPENDS "rocm-core, ${PROJECT_NAME}-dev")
set(CPACK_DEBIAN_PACKAGE_LICENSE "MIT" )
Expand All @@ -414,7 +422,7 @@ set(CPACK_RPM_RUNTIME_PACKAGE_REQUIRES "rocm-core, ${RPP_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, ${PROJECT_NAME}")
set(CPACK_RPM_DEV_PACKAGE_REQUIRES "rocm-core, ${PROJECT_NAME}, ${RPP_RPM_DEV_PACKAGE_LIST}")
set(CPACK_RPM_DEV_PACKAGE_PROVIDES "${PROJECT_NAME}-devel")
set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "${PROJECT_NAME}-devel")
set(CPACK_RPM_TEST_PACKAGE_NAME "${PROJECT_NAME}-test")
Expand Down
Loading