Skip to content

Commit 830c1f1

Browse files
authored
Packaging - HIP updates (#189)
[ROCm/rocjpeg commit: 768c026]
1 parent 24b9417 commit 830c1f1

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

projects/rocjpeg/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,19 +345,19 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
345345
string(REGEX MATCH "22.04" UBUNTU_22_FOUND ${OS_RELEASE})
346346

347347
# Set the dependent packages
348-
set(rocJPEG_DEBIAN_PACKAGE_LIST "rocm-hip-runtime, libva-drm2 (>= 2.16.0) | libva-amdgpu-drm2, mesa-amdgpu-va-drivers")
349-
set(rocJPEG_RPM_PACKAGE_LIST "rocm-hip-runtime, (libva >= 2.16.0 or libva-drm2 >= 2.16.0 or libva-amdgpu), mesa-amdgpu-va-drivers")
348+
set(rocJPEG_DEBIAN_PACKAGE_LIST "hip-runtime-amd, libva-drm2 (>= 2.16.0) | libva-amdgpu-drm2, mesa-amdgpu-va-drivers")
349+
set(rocJPEG_RPM_PACKAGE_LIST "hip-runtime-amd, (libva >= 2.16.0 or libva-drm2 >= 2.16.0 or libva-amdgpu), mesa-amdgpu-va-drivers")
350350
# Add rocprofiler-register dependencies
351351
if(ROCJPEG_ENABLE_ROCPROFILER_REGISTER)
352352
set(rocJPEG_DEBIAN_PACKAGE_LIST "${rocJPEG_DEBIAN_PACKAGE_LIST}, rocprofiler-register")
353353
set(rocJPEG_RPM_PACKAGE_LIST "${rocJPEG_RPM_PACKAGE_LIST}, rocprofiler-register")
354354
endif()
355355

356-
set(rocJPEG_DEBIAN_DEV_PACKAGE_LIST "rocm-hip-runtime-dev, libva-dev (>= 2.16.0) | libva-amdgpu-dev")
356+
set(rocJPEG_DEBIAN_DEV_PACKAGE_LIST "hip-dev, libva-dev (>= 2.16.0) | libva-amdgpu-dev")
357357
if(UBUNTU_22_FOUND)
358358
set(rocJPEG_DEBIAN_DEV_PACKAGE_LIST "${rocJPEG_DEBIAN_DEV_PACKAGE_LIST}, libstdc++-12-dev")
359359
endif()
360-
set(rocJPEG_RPM_DEV_PACKAGE_LIST "rocm-hip-runtime-devel, (libva-devel >= 2.16.0 or libva-amdgpu-devel)")
360+
set(rocJPEG_RPM_DEV_PACKAGE_LIST "hip-devel, (libva-devel >= 2.16.0 or libva-amdgpu-devel)")
361361

362362
# '%{?dist}' breaks manual builds on debian systems due to empty Provides
363363
execute_process(

projects/rocjpeg/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ rocJPEG is a high performance JPEG decode SDK for AMD GPUs. Using the rocJPEG AP
5757
> [!NOTE]
5858
> RPM Packages for `RHEL`/`SLES` - `libva-amdgpu mesa-amdgpu-va-drivers`
5959
60+
* HIP
61+
```shell
62+
sudo apt install hip-dev
63+
```
64+
6065
> [!IMPORTANT]
6166
> * Required compiler support
6267
> * C++17

projects/rocjpeg/rocJPEG-setup.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,17 +154,17 @@ def ERROR_CHECK(waitval):
154154
# source install - common package dependencies
155155
commonPackages = [
156156
'cmake',
157-
'rocm-hip-runtime'
157+
'hip-runtime-amd'
158158
]
159159

160160
# Debian packages
161161
coreDebianPackages = [
162162
'libva-dev',
163-
'rocm-hip-runtime-dev'
163+
'hip-dev'
164164
]
165165
coreDebianU22Packages = [
166166
'libva-amdgpu-dev',
167-
'rocm-hip-runtime-dev',
167+
'hip-dev',
168168
'libstdc++-12-dev'
169169
]
170170
runtimeDebianPackages = [
@@ -183,7 +183,7 @@ def ERROR_CHECK(waitval):
183183
if "VERSION_ID=7" in os_info_data or "VERSION_ID=8" in os_info_data:
184184
coreRPMPackages = [
185185
'libva-amdgpu-devel',
186-
'rocm-hip-runtime-devel'
186+
'hip-devel'
187187
]
188188
runtimeRPMPackages = [
189189
'libva-amdgpu',
@@ -193,7 +193,7 @@ def ERROR_CHECK(waitval):
193193
else:
194194
coreRPMPackages = [
195195
'libva-devel',
196-
'rocm-hip-runtime-devel'
196+
'hip-devel'
197197
]
198198
runtimeRPMPackages = [
199199
'libva',
@@ -203,7 +203,7 @@ def ERROR_CHECK(waitval):
203203
else:
204204
coreRPMPackages = [
205205
'libva-devel',
206-
'rocm-hip-runtime-devel'
206+
'hip-devel'
207207
]
208208
runtimeRPMPackages = [
209209
'libva-drm2',

0 commit comments

Comments
 (0)