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.

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

ROCm 6.0.2 #35998

Draft
wants to merge 38 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
4d2d536
profiles/desc: add gfx940/gfx941/gfx942 amdgpu targets for hip-6.0.x
AngryLoki Mar 19, 2024
3397209
rocm.eclass: add targets for rocm-6.0.x release
AngryLoki Mar 19, 2024
8a29c63
dev-libs/half: move half.hpp from /usr/include to /usr/include/half
AngryLoki Mar 21, 2024
6f0005b
dev-util/hip: fix manifest and add extend-isa-compatibility-check pat…
AngryLoki Mar 19, 2024
aea7136
dev-util/hipcc: use more precise dependencies
AngryLoki Mar 23, 2024
53c6200
dev-build/rocm-cmake: add 6.0.2
AngryLoki Mar 16, 2024
5660318
dev-libs/rocm-comgr: add extend-isa-compatibility-check patch for 6.0.0
AngryLoki Mar 17, 2024
bea658f
dev-libs/rocr-runtime: update extend-isa-compatibility-check patch fo…
AngryLoki Mar 17, 2024
8786ac2
dev-libs/rocr-runtime: update rocr-runtime-5.7.1-musl patch to fix bu…
AngryLoki Mar 24, 2024
85c2c35
dev-libs/rocm-device-libs: add llvm-18 compatibility patch
AngryLoki Mar 17, 2024
1d9eadf
dev-util/rocm-smi: add 6.0.2
AngryLoki Mar 17, 2024
e5ccb43
dev-util/hipify-clang: add 6.0.2
AngryLoki Mar 17, 2024
ab1cf7d
dev-libs/rccl: add 6.0.2
AngryLoki Mar 17, 2024
139fc1f
dev-util/Tensile: add 6.0.2
AngryLoki Mar 17, 2024
4b49e72
sci-libs/composable-kernel: add 6.0.2
AngryLoki Mar 19, 2024
d46ab2d
dev-util/roctracer: add 6.0.2
AngryLoki Mar 17, 2024
8205107
sci-libs/rocPRIM: add 6.0.2
AngryLoki Mar 18, 2024
bc4f151
sci-libs/rocSPARSE: add 6.0.2
AngryLoki Mar 18, 2024
7516041
sci-libs/rocSOLVER: add 6.0.2
AngryLoki Mar 18, 2024
4ecc7d8
sci-libs/rocRAND: add 6.0.2
AngryLoki Mar 18, 2024
78f038e
sci-libs/rocThrust: add 6.0.2
AngryLoki Mar 18, 2024
c211ca9
sci-libs/rocWMMA: add 6.0.2
AngryLoki Mar 18, 2024
9ea4b81
sci-libs/hipBLAS: add 6.0.2
AngryLoki Mar 18, 2024
d22368c
sci-libs/hipRAND: add 6.0.2
AngryLoki Mar 18, 2024
b509d9e
sci-libs/rocFFT: add 6.0.2
AngryLoki Mar 18, 2024
4e5a744
sci-libs/hipFFT: add 6.0.2
AngryLoki Mar 18, 2024
9176f7c
sci-libs/hipCUB: add 6.0.2
AngryLoki Mar 18, 2024
68cf250
sci-libs/miopen: add 6.0.2
AngryLoki Mar 19, 2024
8e76507
sci-libs/rocBLAS: add 6.0.2
AngryLoki Mar 19, 2024
a83e30a
sci-libs/hipSPARSE: add 6.0.2
AngryLoki Mar 20, 2024
fa2f029
sci-libs/hipSOLVER: add 6.0.2
AngryLoki Mar 20, 2024
f1fd51a
sci-libs/caffe2: limit rocm libs to 5.7*. 6.0 will be only in >=caffe…
AngryLoki Mar 20, 2024
403c9f8
dev-util/rocminfo: Fix "SyntaxWarning: invalid escape sequence" with …
AngryLoki Mar 24, 2024
f0b61a0
dev-libs/rocm-device-libs: fix tests
AngryLoki Mar 26, 2024
82fb897
profiles: unmask ROCm-6
AngryLoki Mar 19, 2024
1e3930d
dev-libs/hipother: new package, add 6.0.2
AngryLoki Mar 20, 2024
ccea2d3
sci-libs/rpp: new package, add 6.0.2
AngryLoki Mar 20, 2024
febb857
dev-libs/rocdbgapi: new package, add 5.7.1, 6.0.2
AngryLoki Mar 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions dev-build/rocm-cmake/Manifest
@@ -1 +1,2 @@
DIST rocm-cmake-5.7.1.tar.gz 50940 BLAKE2B f3a36cedfc15af69819b576bf8f8bdfe7b49e5dd1d4db57f707295f14a8d64904745f454fc211b28adfde369c82cb42a061c05b6675679e11a3946f6ebfea6d5 SHA512 1265ed8e23a04f9cff57b43f815e8fbbb1a3f200bc040e01ceaa92c322088c9ef04da795b09d732c6466dc9a3fefc505b8b474d3f18f55cff491758aa53a6e6b
DIST rocm-cmake-6.0.2.tar.gz 83207 BLAKE2B b103ad9337560ed657066ca6c5d29f0e0c870122bfb626356dd726baf685e7342e78a804f32b6a9101028fbca12024743df3e3e03a4718d3fcc08df6b253e64d SHA512 d5aa320e6be83f68f21ea5810e8f581701d1af321a3967e86c2573c3660002e330191bdff3a5654b1bafb964142c7ce547abce287ffb3ec76586ddef5412d8c0
6 changes: 5 additions & 1 deletion dev-build/rocm-cmake/metadata.xml
Expand Up @@ -9,7 +9,11 @@
<email>candrews@gentoo.org</email>
<name>Craig Andrews</name>
</maintainer>
<maintainer type="person">
<email>lockalsash@gmail.com</email>
<name>Sv. Lockal</name>
</maintainer>
<upstream>
<remote-id type="github">RadeonOpenCompute/rocm-cmake</remote-id>
<remote-id type="github">ROCm/rocm-cmake</remote-id>
</upstream>
</pkgmetadata>
31 changes: 31 additions & 0 deletions dev-build/rocm-cmake/rocm-cmake-6.0.2.ebuild
@@ -0,0 +1,31 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

inherit cmake

if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/ROCm/rocm-cmake.git"
inherit git-r3
else
SRC_URI="https://github.com/ROCm/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
S="${WORKDIR}/rocm-cmake-rocm-${PV}"
fi

DESCRIPTION="Radeon Open Compute CMake Modules"
HOMEPAGE="https://github.com/ROCm/rocm-cmake"
LICENSE="MIT"
SLOT="0/$(ver_cut 1-2)"
RESTRICT="test"

PATCHES=(
"${FILESDIR}"/${PN}-5.0.2-license.patch
)

src_prepare() {
sed -e "/ROCM_INSTALL_LIBDIR/s:lib:$(get_libdir):" \
-i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
cmake_src_prepare
}
17 changes: 17 additions & 0 deletions dev-libs/half/half-1.12.0-r1.ebuild
@@ -0,0 +1,17 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

DESCRIPTION="Half-precision floating-point library"
HOMEPAGE="https://github.com/ROCm/half"
SRC_URI="https://github.com/ROCm/half/archive/${PV}.tar.gz -> ${P}.tar.gz"

LICENSE="MIT"
KEYWORDS="~amd64"
SLOT="0/$(ver_cut 1)"

src_install() {
insinto /usr/include/half
doins include/half.hpp
}
17 changes: 0 additions & 17 deletions dev-libs/half/half-1.12.0.ebuild

This file was deleted.

7 changes: 7 additions & 0 deletions dev-libs/half/metadata.xml
Expand Up @@ -12,4 +12,11 @@
<email>xgreenlandforwyy@gmail.com</email>
<name>Yiyang Wu</name>
</maintainer>
<maintainer type="person">
<email>lockalsash@gmail.com</email>
<name>Sv. Lockal</name>
</maintainer>
<upstream>
<remote-id type="github">ROCm/half</remote-id>
</upstream>
</pkgmetadata>
1 change: 1 addition & 0 deletions dev-libs/hipother/Manifest
@@ -0,0 +1 @@
DIST hipother-6.0.2.tar.gz 32097 BLAKE2B a7db210120391186e2dca150463c5303be2b34df8fc08c42467620df4cfe4c78fd678a774cad104eca8901c14fbcfacf004ef8acc498a1dd514fd413ac388994 SHA512 ba7d02d129c6f4000c387f8c036be72adbaa6639bca8537a48319a86e6756ac8894a7d943ba873dbca67e267fd481b45580a9e234cf7000ebf76749b99b69489
19 changes: 19 additions & 0 deletions dev-libs/hipother/hipother-6.0.2.ebuild
@@ -0,0 +1,19 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

DESCRIPTION="ROCclr runtime implementation for non-AMD HIP platforms, like NVIDIA"
HOMEPAGE="https://github.com/ROCm/hipother"
SRC_URI="https://github.com/ROCm/hipother/archive/refs/tags/rocm-${PV}.tar.gz -> ${P}.tar.gz"

LICENSE="MIT"
KEYWORDS="~amd64"
SLOT="0/$(ver_cut 1)"

S="${WORKDIR}/hipother-rocm-${PV}"

src_install() {
insinto /usr/include
doins -r hipnv/include/hip
}
14 changes: 14 additions & 0 deletions dev-libs/hipother/metadata.xml
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
</maintainer>
<maintainer type="person">
<email>lockalsash@gmail.com</email>
<name>Sv. Lockal</name>
</maintainer>
<upstream>
<remote-id type="github">ROCm/hipother</remote-id>
</upstream>
</pkgmetadata>
1 change: 1 addition & 0 deletions dev-libs/rccl/Manifest
@@ -1,2 +1,3 @@
DIST rccl-5.1.3.tar.gz 908274 BLAKE2B 46bff7b6e3d60d5884ccd7e19c54b2f47f90a337a8fdc6dca1a3cfee147e3652e1f912642cc134d4a82bf8daabd9f1391edff139d0517ab1078bd3d9650481d7 SHA512 20deb27c7ef3e6b6b73409950ac0d51286b4634f7002ce36a9a02cdd1d5b1f2db51f6decf773af83364c94f58cc96837da25299f5f5494fc15d8559a1b3c7fcc
DIST rccl-5.7.1.tar.gz 1425561 BLAKE2B 852c111ad806d5c99f48b3c65c8cf37315c68b969f9544bfa14c1faf1d5557edcc57cdc21705ced6ded4a0288d42b1076e65fb67b3f89b4fa78cfba9d317b23e SHA512 5913b8ff67fa787714713b7d5b571374898be740d56c77db9f04fe7a3e6ca74023fa930a3494d8a6f984ac9e68ee318343835e110049d08700fe773376618af4
DIST rccl-6.0.2.tar.gz 1555913 BLAKE2B ec0b8c88479f975a9292fef42bc8eb95c62cb0e74d15804d24a886fd9d5a4491404fe89c79d4a8cbdbeba5d0bac9ed2d3e68ac90c898cf85f3ead090da1d2e3a SHA512 8c4a33135f2c0de56e0b08f185898cf9acdd26065a7db014a43634447f3d4bb1d8c7b3e0a1f560c720d366ac1227327aa3fc7836e5725af2b0f1f213b7ccfbe0
15 changes: 15 additions & 0 deletions dev-libs/rccl/files/rccl-6.0.2-fix-version-check.patch
@@ -0,0 +1,15 @@
There is no /usr/.info/version file in Gentoo
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,10 +120,7 @@ execute_process(
message(STATUS "hipcc version: ${hipcc_version_string}")

## Check for ROCm version
-execute_process(
- COMMAND bash "-c" "cat ${ROCM_PATH}/.info/version"
- OUTPUT_VARIABLE rocm_version_string
-)
+set(rocm_version_string "@rocm_version@")
string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" rocm_version_matches ${rocm_version_string})
if (rocm_version_matches)
set(ROCM_MAJOR_VERSION ${CMAKE_MATCH_1})
6 changes: 5 additions & 1 deletion dev-libs/rccl/metadata.xml
Expand Up @@ -13,7 +13,11 @@
<email>gentoo@holzke.net</email>
<name>Wilfried Holzke</name>
</maintainer>
<maintainer type="person">
<email>lockalsash@gmail.com</email>
<name>Sv. Lockal</name>
</maintainer>
<upstream>
<remote-id type="github">ROCm-Developer-Tools/rccl</remote-id>
<remote-id type="github">ROCm/rccl</remote-id>
</upstream>
</pkgmetadata>
3 changes: 2 additions & 1 deletion dev-libs/rccl/rccl-5.7.1.ebuild
Expand Up @@ -66,7 +66,8 @@ src_configure() {
}

src_test() {
CHECK_AMDGPU
check_amdgpu
cd "${BUILD_DIR}" || die
LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests
}

Expand Down
69 changes: 69 additions & 0 deletions dev-libs/rccl/rccl-6.0.2.ebuild
@@ -0,0 +1,69 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

ROCM_VERSION=${PV}

inherit cmake edo rocm flag-o-matic

DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
HOMEPAGE="https://github.com/ROCm/rccl"
SRC_URI="https://github.com/ROCm/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"

LICENSE="BSD"
KEYWORDS="~amd64"
SLOT="0/$(ver_cut 1-2)"
IUSE="test"

RDEPEND="
=dev-util/hip-6*
dev-util/rocm-smi:${SLOT}"
DEPEND="${RDEPEND}
sys-libs/binutils-libs"
BDEPEND="
>=dev-build/cmake-3.22
>=dev-build/rocm-cmake-5.7.1
dev-util/hipify-clang:${SLOT}
test? ( dev-cpp/gtest )"

RESTRICT="!test? ( test )"
S="${WORKDIR}/rccl-rocm-${PV}"

PATCHES=(
"${FILESDIR}/${PN}-6.0.2-fix-version-check.patch"
)

src_prepare() {
cmake_src_prepare

# https://reviews.llvm.org/D69582 - clang does not support parallel jobs
sed 's/-parallel-jobs=[0-9][0-9]//g' -i CMakeLists.txt || die

# https://github.com/ROCm/rccl/issues/958 - fix AMDGPU_TARGETS
sed '/set(AMDGPU_TARGETS/s/ FORCE//' -i CMakeLists.txt || die

# complete fix-version-check patch
sed "s/@rocm_version@/${PV}/" -i CMakeLists.txt || die
}

src_configure() {
# https://github.com/llvm/llvm-project/issues/71711 - fix issue of clang
append-ldflags -Wl,-z,noexecstack

local mycmakeargs=(
-DCMAKE_SKIP_RPATH=ON
-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
-DBUILD_TESTS=$(usex test ON OFF)
-DROCM_SYMLINK_LIBS=OFF
-Wno-dev
)

CXX=hipcc cmake_src_configure
}

src_test() {
check_amdgpu
cd "${BUILD_DIR}" || die
LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests
}
2 changes: 2 additions & 0 deletions dev-libs/rocdbgapi/Manifest
@@ -0,0 +1,2 @@
DIST rocdbgapi-5.7.1.tar.gz 251913 BLAKE2B 96dc859937fdde75a3d68368b29efdd14711e256c7d3c60cd40b128e9a0c066f108c02f7d47d9d64d7ca485e85e9d56d48cac6c67088fc3fbafe44d1d23a7ce2 SHA512 e30cf6062b07ced7de1660398cd84d104e632907cfaf9bc05d29289a81a977c2272b69ff0810db201675f9d7e8476b4451c988ad9da0a13eee01fffdde839d26
DIST rocdbgapi-6.0.2.tar.gz 254188 BLAKE2B 63158aec3eb8245bf38a3e5af6f18c2b5b85b01c61696e842a14a1211367bd387a112e23d273ba38721e65479bc03d9350c4ce05a66c811392374c5567d8b87c SHA512 68a682f7cff57178fe777005c965f2b03128bf0de9439a7bc247c75c4466ff48b6fa1c8005c3fb6568acf5977ceae28cc1ea99ec5d6735249433de8632afec25
15 changes: 15 additions & 0 deletions dev-libs/rocdbgapi/metadata.xml
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lockalsash@gmail.com</email>
<name>Sv. Lockal</name>
</maintainer>
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<upstream>
<remote-id type="github">ROCm/ROCdbgapi</remote-id>
</upstream>
</pkgmetadata>
60 changes: 60 additions & 0 deletions dev-libs/rocdbgapi/rocdbgapi-5.7.1.ebuild
@@ -0,0 +1,60 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

inherit cmake

DESCRIPTION="AMD Debugger API"
HOMEPAGE="https://github.com/ROCm/ROCdbgapi"
SRC_URI="https://github.com/ROCm/ROCdbgapi/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"

LICENSE="MIT"
KEYWORDS="~amd64"
SLOT="0/$(ver_cut 1-2)"

IUSE="doc"

BDEPEND="
doc? (
app-text/doxygen[dot]
virtual/latex-base
dev-texlive/texlive-latexextra
dev-texlive/texlive-plaingeneric
)
"
RDEPEND="
dev-libs/rocm-comgr:${SLOT}
dev-libs/rocr-runtime:${SLOT}
"
DEPEND="${RDEPEND}"

S="${WORKDIR}/ROCdbgapi-rocm-${PV}"

src_prepare() {
sed -e "s/-Werror//" \
-e "s/if(DOXYGEN_FOUND)/if(WITH_DOCS AND DOXYGEN_FOUND)/" \
-e "s:\${CMAKE_INSTALL_DATADIR}/html/amd-dbgapi:\${CMAKE_INSTALL_DOCDIR}/html:" \
-i CMakeLists.txt || die
cmake_src_prepare
}

src_configure() {
local mycmakeargs=(
-DWITH_DOCS=$(usex doc ON OFF)
-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
)
cmake_src_configure
}

src_compile() {
cmake_src_compile
use doc && cmake_src_compile doc
}

src_install() {
cmake_src_install

# remove unneeded copy
rm -r "${ED}/usr/share/doc/${PF}-asan" || die
}
60 changes: 60 additions & 0 deletions dev-libs/rocdbgapi/rocdbgapi-6.0.2.ebuild
@@ -0,0 +1,60 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

inherit cmake

DESCRIPTION="AMD Debugger API"
HOMEPAGE="https://github.com/ROCm/ROCdbgapi"
SRC_URI="https://github.com/ROCm/ROCdbgapi/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"

LICENSE="MIT"
KEYWORDS="~amd64"
SLOT="0/$(ver_cut 1-2)"

IUSE="doc"

BDEPEND="
doc? (
app-text/doxygen[dot]
virtual/latex-base
dev-texlive/texlive-latexextra
dev-texlive/texlive-plaingeneric
)
"
RDEPEND="
dev-libs/rocm-comgr:${SLOT}
dev-libs/rocr-runtime:${SLOT}
"
DEPEND="${RDEPEND}"

S="${WORKDIR}/ROCdbgapi-rocm-${PV}"

src_prepare() {
sed -e "s/-Werror//" \
-e "s/if(DOXYGEN_FOUND)/if(WITH_DOCS AND DOXYGEN_FOUND)/" \
-e "s:\${CMAKE_INSTALL_DATADIR}/html/amd-dbgapi:\${CMAKE_INSTALL_DOCDIR}/html:" \
-i CMakeLists.txt || die
cmake_src_prepare
}

src_configure() {
local mycmakeargs=(
-DWITH_DOCS=$(usex doc ON OFF)
-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
)
cmake_src_configure
}

src_compile() {
cmake_src_compile
use doc && cmake_src_compile doc
}

src_install() {
cmake_src_install

# remove unneeded copy
rm -r "${ED}/usr/share/doc/${PF}-asan" || die
}