AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates - Compiler & GFX ID (#77)

Browse Source 
* Compiler updates

* GFX - ID updates

* CMakeLists - Updates
This commit is contained in:
Kiriti Gowda
2024-11-19 11:47:05 -08:00
committed by GitHub
parent a861dc889f
commit 4e78bca06a
8 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+27 -1
View File
@@ -3,7 +3,33 @@
Documentation for rocJPEG is available at
[https://rocm.docs.amd.com/projects/rocJPEG/en/latest/](https://rocm.docs.amd.com/projects/rocJPEG/en/latest/)
## rocJPEG 0.6.0
## (Unreleased) rocJPEG 0.7.0
### Changed
* AMD Clang++ is now the default CXX compiler.
* `rocJPEG-setup.py` setup script updates to common package install: Setup no longer installs public compiler package.
### Removed
*
### Resolved issues
*
### Tested configurations
* Linux
* Ubuntu - `22.04` / `24.04`
* RHEL - `8` / `9`
* SLES - `15 SP5`
* ROCm: `6.3.0`
* libva-amdgpu-dev - `2.16.0`
* mesa-amdgpu-va-drivers - `1:24.3.0`
* rocJPEG Setup Script - `V2.3.0`
## rocJPEG 0.6.0 for ROCm 6.3.0
### Changes
CMakeLists.txt
+17 -18
View File
@@ -21,9 +21,23 @@
#
# ##############################################################################
cmake_minimum_required (VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
set(VERSION "0.6.0")
# ROCM Path
if(DEFINED ENV{ROCM_PATH})
set(ROCM_PATH $ENV{ROCM_PATH} CACHE PATH "Default ROCm installation path")
elseif(ROCM_PATH)
message("-- INFO:ROCM_PATH Set -- ${ROCM_PATH}")
else()
set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path")
endif()
# Set AMD Clang as default compiler
if (NOT DEFINED CMAKE_CXX_COMPILER)
set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++)
endif()
set(VERSION "0.7.0")
set(CMAKE_CXX_STANDARD 17)
# Set Project Version and Language
@@ -41,14 +55,6 @@ find_program(MAKE_NSIS_EXE makensis)
find_program(RPMBUILD_EXE rpmbuild)
find_program(DPKG_EXE dpkg)
# ROCM Path
if(DEFINED ENV{ROCM_PATH})
set(ROCM_PATH $ENV{ROCM_PATH} CACHE PATH "Default ROCm installation path")
elseif(ROCM_PATH)
message("-- INFO:ROCM_PATH Set -- ${ROCM_PATH}")
else()
set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path")
endif()
# avoid setting the default installation path to /usr/local
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX ${ROCM_PATH} CACHE PATH "rocJPEG default installation path" FORCE)
@@ -74,7 +80,6 @@ message("-- ${BoldBlue}rocJPEG Install Path -- ${CMAKE_INSTALL_PREFIX}${ColourRe
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH} ${ROCM_PATH}/hip)
set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++)
# rocJPEG Default Options
option(BUILD_WITH_AMD_ADVANCE "Build rocJPEG for advanced AMD GPU Architecture" OFF)
@@ -98,10 +103,7 @@ endif()
message("-- ${BoldBlue}rocJPEG Build Type -- ${CMAKE_BUILD_TYPE}${ColourReset}")
# Set supported GPU Targets
set(DEFAULT_GPU_TARGETS "gfx908;gfx90a;gfx942;gfx1030;gfx1031;gfx1032;gfx1100;gfx1101;gfx1102")
if (BUILD_WITH_AMD_ADVANCE)
set(DEFAULT_GPU_TARGETS ${DEFAULT_GPU_TARGETS} "gfx1200;gfx1201")
endif()
set(DEFAULT_GPU_TARGETS "gfx908;gfx90a;gfx942;gfx1030;gfx1031;gfx1032;gfx1100;gfx1101;gfx1102;gfx1200;gfx1201")
# Set AMD GPU_TARGETS
if((AMDGPU_TARGETS OR DEFINED ENV{AMDGPU_TARGETS}) AND (NOT GPU_TARGETS))
@@ -126,7 +128,6 @@ find_package(HIP QUIET)
find_package(Libva QUIET)
if(HIP_FOUND AND Libva_FOUND)
# HIP
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::device)
# LibVA
@@ -211,8 +212,6 @@ if(HIP_FOUND AND Libva_FOUND)
# Find Ubuntu 22.04 - Add libstdc++-12-dev package deps for Dev Package
file(READ "/etc/os-release" OS_RELEASE)
string(REGEX MATCH "22.04" UBUNTU_22_FOUND ${OS_RELEASE})
string(REGEX MATCH "SLES" SLES_FOUND ${OS_RELEASE})
string(REGEX MATCH "Mariner" MARINER_FOUND ${OS_RELEASE})
# Set the dependent packages
set(rocJPEG_DEBIAN_PACKAGE_LIST "rocm-hip-runtime, libva2-amdgpu, libva-amdgpu-drm2, libva-amdgpu-wayland2, libva-amdgpu-x11-2, mesa-amdgpu-va-drivers")
rocJPEG-setup.py
+5 -9
View File
@@ -29,16 +29,16 @@ else:
import subprocess
__copyright__ = "Copyright (c) 2024, AMD ROCm rocJPEG"
__version__ = "2.2.0"
__version__ = "2.3.0"
__email__ = "mivisionx.support@amd.com"
__status__ = "Shipping"
# error check calls
def ERROR_CHECK(call):
status = call
if(status != 0):
print('ERROR_CHECK failed with status:'+str(status))
def ERROR_CHECK(waitval):
if(waitval != 0): # return code and signal flags
print('ERROR_CHECK failed with status:'+str(waitval))
traceback.print_stack()
status = ((waitval >> 8) | waitval) & 255 # combine exit code and wait flags into single non-zero byte
exit(status)
# Arguments
@@ -153,11 +153,7 @@ if userName == 'root':
# source install - common package dependencies
commonPackages = [
'gcc',
'cmake',
'git',
'wget',
'unzip',
'pkg-config',
'rocm-hip-runtime'
]
samples/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@
# SOFTWARE.
#
# ##############################################################################
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
add_test(
NAME
samples/jpegDecode/CMakeLists.txt
+2 -2
View File
@@ -21,7 +21,7 @@
#
################################################################################
cmake_minimum_required (VERSION 3.0)
cmake_minimum_required (VERSION 3.10)
project(jpegdecode)
set(CMAKE_CXX_STANDARD 17)
@@ -36,7 +36,7 @@ endif()
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH})
set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++)
set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++)
find_package(HIP QUIET)
samples/jpegDecodeBatched/CMakeLists.txt
+2 -2
View File
@@ -21,7 +21,7 @@
#
################################################################################
cmake_minimum_required (VERSION 3.0)
cmake_minimum_required(VERSION 3.10)
project(jpegdecodebatched)
set(CMAKE_CXX_STANDARD 17)
@@ -36,7 +36,7 @@ endif()
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH})
set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++)
set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++)
find_package(HIP QUIET)
samples/jpegDecodeMultiThreads/CMakeLists.txt
+2 -2
View File
@@ -21,7 +21,7 @@
#
################################################################################
cmake_minimum_required (VERSION 3.0)
cmake_minimum_required(VERSION 3.10)
project(jpegdecodemultithreads)
set(CMAKE_CXX_STANDARD 17)
@@ -36,7 +36,7 @@ endif()
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH})
set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++)
set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++)
find_package(HIP QUIET)
test/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@
# SOFTWARE.
#
# ##############################################################################
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(ROCJPEG-test)