mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
d8dc8d856a
This commit updates all of the ROCm packages, including llvm-for-rocm, to the
latest version, 6.4.2. An exception is roct-thunk-interface which is
deprecated upstream, but unclear what the replacement is. It does build from
the last version, 6.2.4, which is what it is updated to here.
Several packages are now in the same repository as the ROCm LLVM fork, so they
share the same origin (repeated in (gnu packages rocm) from llvm-for-rocm
in (gnu packages llvm) as using package-source did not resolve).
* gnu/packages/llvm.scm (llvm-for-rocm): Update to 6.4.2. Inherit from
llvm-19.
[source]: Update URL.
[arguments]: Correct spacing of configure-flags.
* gnu/packages/patches/rocclr-5.6.0-enable-gfx800.patch,
gnu/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch: Update.
* gnu/packages/patches/rocm-bandwidth-test-5.5.0-fix-includes.patch,
gnu/packages/patches/rocm-comgr-3.1.0-dependencies.patch: Remove files.
* gnu/packages/rocm.scm (%rocm-version): Update to 6.4.2.
(%rocm-llvm-origin): New variable.
(rocm-cmake)[home-page]: Update.
(rocm-device-libs)[source]: Use %rocm-llvm-origin.
[arguments]: Add build-type. Add chdir phase.
[home-page]: Update.
(rocm-comgr)[source]: Use %rocm-llvm-origin. Remove patch.
[arguments]: Add build-type. Rename chdir phase to prepare-to build, setting
ROCM_PATH.
[inputs]: Move llvm-for-rocm from here ...
[native-inputs]: ... to here. Add python.
[home-page]: Update.
(roct-thunk-interface): Update to 6.2.4.
[source, home-page]: Update URL.
(rocr-runtime)[source]: Update URL.
[arguments]: Add build-type. Update and simplify add-rocm-device-lib-path
phase.
[inputs]: Change libelf to libelf-shared.
[home-page]: Update.
(rocclr-src): Remove variable.
(rocm-opencl-runtime)[home-page]: Update.
[source]{patches}: Add patch (that was in rocclr-src before).
[arguments]: Add build-type. Update configure-flags. Add no-os-release
phase.
(rocminfo)[source, home-page]: Update URL.
(rocm-bandwidth-test)[source]: Update URL. Remove patch.
[home-page]: Update.
* gnu/local.mk (dist_patch_DATA): Remove patches.
Change-Id: I2157255a9546110ac683c12c131a330402e2fd93
Signed-off-by: Danny Milosavljevic <dannym@friendly-machines.com>
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
Do not build and install clinfo.
|
|
|
|
diff --git a/opencl/CMakeLists.txt b/opencl/CMakeLists.txt
|
|
index 7b97cfdef..23eec15b2 100644
|
|
--- a/opencl/CMakeLists.txt
|
|
+++ b/opencl/CMakeLists.txt
|
|
@@ -33,7 +33,7 @@ if(BUILD_ICD)
|
|
add_subdirectory(khronos/icd)
|
|
endif()
|
|
add_subdirectory(amdocl)
|
|
-add_subdirectory(tools/clinfo)
|
|
+#add_subdirectory(tools/clinfo)
|
|
add_subdirectory(tools/cltrace)
|
|
if(BUILD_TESTS)
|
|
add_subdirectory(tests/ocltst)
|
|
diff --git a/opencl/packaging/CMakeLists.txt b/opencl/packaging/CMakeLists.txt
|
|
index 7d9e6366f..f8d08e0fc 100644
|
|
--- a/opencl/packaging/CMakeLists.txt
|
|
+++ b/opencl/packaging/CMakeLists.txt
|
|
@@ -16,7 +16,7 @@ endif()
|
|
set(CPACK_DEB_COMPONENT_INSTALL ON)
|
|
set(CPACK_RPM_COMPONENT_INSTALL ON)
|
|
|
|
-install(TARGETS clinfo DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT binary)
|
|
+#install(TARGETS clinfo DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT binary)
|
|
install(TARGETS amdocl DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT binary)
|
|
install(TARGETS amdocl DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT asan)
|
|
install(FILES ${opencl_SOURCE_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary)
|