summaryrefslogtreecommitdiff
path: root/media-libs/oidn
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/oidn')
-rw-r--r--media-libs/oidn/Manifest9
-rw-r--r--media-libs/oidn/files/oidn-2.3.3-amdgpu-targets.patch46
-rw-r--r--media-libs/oidn/oidn-2.2.2.ebuild109
-rw-r--r--media-libs/oidn/oidn-2.3.2-r1.ebuild (renamed from media-libs/oidn/oidn-2.3.2.ebuild)9
-rw-r--r--media-libs/oidn/oidn-2.3.3.ebuild (renamed from media-libs/oidn/oidn-2.3.0.ebuild)65
5 files changed, 98 insertions, 140 deletions
diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
index 0b9081b3ea06..dafe668ab25a 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -2,10 +2,9 @@ AUX oidn-2.2.2-amdgpu-targets.patch 2300 BLAKE2B eaddfe6493394c65b6960450ed3b9f6
AUX oidn-2.3.1-composable-kernel-api.patch 1371 BLAKE2B 85fd261657ff2d3ba290d887c9c4ed013fb224d3a8563d088afba9fb909a82776eec97b99e811bb53df4e9d328cba23283991ae0fa8afcf0040389b1a132ac75 SHA512 5ee7e106983c47ef1d345768ca0fd6dca274395672d75e12f61a9ac676c91f86d6094d048847a95e8023a68c6658654f0476ee9fbf6da8cfc145d76a20dd5e3c
AUX oidn-2.3.1-hip-clang-19.patch 851 BLAKE2B a98fc830c3ccafb41d7746f9e1603576d5b58a05ac92e733d520e5faaff4a3afd1105046292f505cdecf7802b8e771c1bd2cbf220a971d70d15575297012f311 SHA512 bb87078e1303378715ca26511887e51934c5b95a568b2eeb3fed8e56e62d871347635ca1017c6b77cd1d85ed813f6125794dfccd8debafcf01061f3c952e14ce
AUX oidn-2.3.1-system-composable-kernel.patch 13109 BLAKE2B c041f68e617edab26d835afe85ed45272199cdcbacce522f0f07b53d410afb34087531520654bda0c1f58de7813a8f82c434eb5f4497bb52ea0d89a6dd49e17f SHA512 5ad872bfc8d83a291880cd8808af97b3eabdb76dc30a60d47f85d94d7188c018e63fd8a19a844e79ea5dfe6143ce6a5e4cc4fbe96eb9f5bba2afa47cf13f5556
-DIST oidn-2.2.2.tar.gz 49006605 BLAKE2B e3d32cc2112ded280e642c5d69fb2ef14db59df4f5224bff79e82ede207899c9dbfa43dc663ad9ccc15a6497e363df0b91b43660729962c410b7ec75ac1b3465 SHA512 eca18e9e22a40bc1381e75985e5f5e79f48cc6d168a2a703e54540967646487d347db290459e9a612d8ab4924e8d3c83d84664fd5318cca4f17745da1e47cf50
-DIST oidn-2.3.0.tar.gz 75300547 BLAKE2B 88a5922b4db63c48ab69047dca8d1077205a6d7a2112971badb0cd35e0b770017f5cdcc95d2ef07016fe2e990e3e5806ac6a0800b67086b958948c542f0dff6f SHA512 4f68ce3b0da37e1861090d60d7cd823046f325c45a8e2c3f4098eb3b4f7ec676d2acbb9c138ff60a9f83188dd0dcbaba42106aad96beafc5e65045c77c00f2f8
+AUX oidn-2.3.3-amdgpu-targets.patch 2348 BLAKE2B e52a3c55845404af44a70357da221f585de34a314d0af1b4a142e7f617b7a4c55dc61bdbfdf8a66d335ad20f1c9ed291b707db224b802dbb54af7b4f67729898 SHA512 ca72a01d2841992eb254f3f179de55a6f3c6ed6bb240387d8fd2a04bc32e1b429aa1808b552042c9beb32b47f4e7706249c45c9525dad236d1ee0414dfd7d126
DIST oidn-2.3.2.tar.gz 75315672 BLAKE2B d271a296ee8f72493ad109e1e13dc8142f8e27ed878e08dc9baa7fc04e936ef8604bedf7fa65df278758f2c12c9e66cd517aab16b422b2b99d68aff6c7e56587 SHA512 bba24f712bdd9f35a4e2f60a0b86b1b48eac40bf40a898cd8c2a7571e52f5d0b0055fcd8b6647a9ff062e2680ded63b66aa916a5a4b428de114c0a218f7783ea
-EBUILD oidn-2.2.2.ebuild 2277 BLAKE2B c9140389f08f3999910370bf7f9cd7565619d2700bfc85f057faa2c1cbe6d81c37c2344b9b8ec7ad52e342c3ff57e2d1e1e721fe75afc43918bdb2725e80254c SHA512 6f7262dcacdf3df56ce830a54d6e7b736bf4d92c2944c413fb60e09cd33bde52865d51ead411ce212eeb4e358b3b15b3d1e151c613a68c0070b4a91ae9cd57e6
-EBUILD oidn-2.3.0.ebuild 2277 BLAKE2B 6a27a507d881e6f6f33b0e8a8d4f9d2d9aa83a1e091675e7c1aa86749581dea4e0476b33b25431adc75e8ebd106456429190644a79dd70395b74c1d338ca3407 SHA512 db8527cec3d16e5e67b49e80d7ff0bfcd9f23223efa1e917e6b004e839f42ba80b307885243e14b43991bec42475f6ccc22e5b969078c1c9457d2901675293a1
-EBUILD oidn-2.3.2.ebuild 3118 BLAKE2B d97dbe4c05922ea40361182a664f61d6bedbd6144d266bb3b78191b4232def127bda1a6a942b3f3516be36e4ebea00efdb8b91f6ca9a4bb202822650d6ff6b46 SHA512 fbcb790d5461815e133e63f46433fe6c30cb90980513f9175edacd298a6a70efab1ea9b57dc073760cf99ed4c2b9c471ffba8823ef3bd4f3853149172882f1de
+DIST oidn-2.3.3.tar.gz 93308113 BLAKE2B 85d86d121f385dceb1a5ba93ce1fc3f99a7f1295c4736ac4b79f84da205429c187d3d255b5b2f314919a315d915bfe1e946801b75e6a4b02e9e0b1b281f687dd SHA512 0d05f751d6d793c0e825548feb586a58a7bba7ef8a8002db993aec7a31a6bcae6fe3d98c0ea4040d2378edc619220fa07dc6d43d08a9371f1e6e9e45eae19906
+EBUILD oidn-2.3.2-r1.ebuild 3149 BLAKE2B 053ee4312630e8bed4a6d3c1b102e0ec2f77db981cdb6e4c4b5407e0df8e6d2dd505ede2e88410389310b7de4ba80af72f2bb1441353d190f5a2f82a72a542a2 SHA512 ce29ac8121328847fef5fb2e03be63a09af8709a37293c5c3d27e02fe9309b26f9f3dc018b6ad0589621561cfcd4ee172d1a601295e567cdf18aebbff4164286
+EBUILD oidn-2.3.3.ebuild 2568 BLAKE2B d6960c6445f3a963056f288faea0e746cd2ff77d7d05ff8cac96c146a0d0f108eddab6573030a73ec4e45d529d8e0a7e9d5e26de993c5c4a75dfb9f69c252d53 SHA512 17016bf7552520c2bae8a4088a069e42692e3644dcf360f6517795f6a94490a2da34c0d9872c9468e724f9139a0b9f6e88b4fd5c48d5aa850920040e28efde84
MISC metadata.xml 913 BLAKE2B 8eebbe3fb0269abec40f764dd4358e738e0eda923a1667ee77004942ae469cfd9d8775f15c914c15528c4ef00c8e0a5a7db48ba0262388ff8383ebd74b920cbd SHA512 628d398616363b8d79de8c069d7975d635bec54dffa3d5ef01226299ac33bf6255a6fb823bcf38e5ab9fec56276a63de9bffed0b4395b661aa3a8256d71138e4
diff --git a/media-libs/oidn/files/oidn-2.3.3-amdgpu-targets.patch b/media-libs/oidn/files/oidn-2.3.3-amdgpu-targets.patch
new file mode 100644
index 000000000000..fccc07d267df
--- /dev/null
+++ b/media-libs/oidn/files/oidn-2.3.3-amdgpu-targets.patch
@@ -0,0 +1,46 @@
+Allow specifying AMDGPU_TARGETS with CMake flags.
+Fix build when main compiler is set to GCC.
+--- a/devices/CMakeLists.txt
++++ b/devices/CMakeLists.txt
+@@ -129,6 +129,10 @@ if(OIDN_DEVICE_HIP)
+ )
+ mark_as_advanced(OIDN_DEVICE_HIP_COMPILER)
+
++ set(AMDGPU_TARGETS "gfx1030;gfx1031;gfx1032;gfx1033;gfx1034;gfx1035;gfx1036;gfx1100;gfx1101;gfx1102;gfx1103,gfx1200,gfx1201" CACHE STRING "AMD GPU targets to compile for")
++ mark_as_advanced(AMDGPU_TARGETS)
++ message(STATUS "AMD targets: ${AMDGPU_TARGETS}")
++
+ # Add ROCm to CMAKE_PREFIX_PATH
+ set(_hip_prefix_path CMAKE_PREFIX_PATH)
+ list(APPEND _hip_prefix_path ${ROCM_PATH}/hip ${ROCM_PATH})
+@@ -143,7 +147,6 @@ if(OIDN_DEVICE_HIP)
+ CMAKE_CACHE_ARGS
+ -DCMAKE_PREFIX_PATH:STRING=${_hip_prefix_path_str}
+ -DCMAKE_CXX_COMPILER:FILEPATH=${OIDN_DEVICE_HIP_COMPILER}
+- -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE}
+ -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+ -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/hip/preinstall
+ -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR}
+@@ -155,6 +158,9 @@ if(OIDN_DEVICE_HIP)
+ -DOIDN_API_NAMESPACE:STRING=${OIDN_API_NAMESPACE}
+ -DOIDN_WARN_AS_ERRORS:BOOL=${OIDN_WARN_AS_ERRORS}
+ -DOIDN_SANITIZER:STRING=${OIDN_SANITIZER}
++ -DGPU_TARGETS:STRING=${AMDGPU_TARGETS}
++ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
++ -G "${CMAKE_GENERATOR}"
+ BUILD_ALWAYS TRUE
+ DEPENDS
+ OpenImageDenoise_core
+--- a/devices/hip/CMakeLists.txt
++++ b/devices/hip/CMakeLists.txt
+@@ -25,8 +25,8 @@ include(oidn_common_external)
+ # FIXME: Older versions of the HIP runtime have a bug which may cause a crash if the kernels are
+ # not compiled for all targets detected in the system (it seems mostly APUs/integrated GPUs).
+ # As a workaround, we compile for more targets then we actually support to avoid this crash.
+-set(GPU_TARGETS "gfx902,gfx909,gfx90c,gfx1030,gfx1031,gfx1032,gfx1033,gfx1034,gfx1035,gfx1036,gfx1100,gfx1101,gfx1102,gfx1103,gfx1200,gfx1201" CACHE INTERNAL "")
+-set(AMDGPU_TARGETS ${GPU_TARGETS} CACHE INTERNAL "")
++set(GPU_TARGETS "gfx902,gfx909,gfx90c,gfx1030,gfx1031,gfx1032,gfx1033,gfx1034,gfx1035,gfx1036,gfx1100,gfx1101,gfx1102,gfx1103,gfx1200,gfx1201" CACHE STRING "")
++set(AMDGPU_TARGETS ${GPU_TARGETS} CACHE STRING "")
+
+ # Find HIP
+ find_package(hip REQUIRED)
diff --git a/media-libs/oidn/oidn-2.2.2.ebuild b/media-libs/oidn/oidn-2.2.2.ebuild
deleted file mode 100644
index 748ea3565f9e..000000000000
--- a/media-libs/oidn/oidn-2.2.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-LLVM_COMPAT=( {15..18} )
-ROCM_VERSION=5.7
-
-inherit cuda cmake python-single-r1 llvm-r1 rocm
-
-DESCRIPTION="Intel(R) Open Image Denoise library"
-HOMEPAGE="https://www.openimagedenoise.org/"
-
-if [[ ${PV} = *9999 ]]; then
- EGIT_REPO_URI="https://github.com/OpenImageDenoise/oidn.git"
- EGIT_BRANCH="master"
- inherit git-r3
-else
- SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- test? ( apps )
-"
-IUSE="apps cuda hip openimageio test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-cpp/tbb:=
- dev-lang/ispc
- cuda? ( dev-util/nvidia-cuda-toolkit )
- hip? ( dev-util/hip )
- openimageio? ( media-libs/openimageio:= )
-"
-DEPEND="${RDEPEND}
- $(llvm_gen_dep '
- llvm-core/clang:${LLVM_SLOT}=
- llvm-core/llvm:${LLVM_SLOT}=
- ')
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.2.2-amdgpu-targets.patch"
-)
-
-src_prepare() {
- if use cuda; then
- cuda_src_prepare
- addpredict "/proc/self/task/"
- fi
-
- if use hip; then
- # https://bugs.gentoo.org/930391
- sed "/-Wno-unused-result/s:): --rocm-path=${EPREFIX}/usr/lib):" \
- -i devices/hip/CMakeLists.txt || die
- fi
-
- sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DOIDN_APPS="$(usex apps)"
-
- -DOIDN_DEVICE_CPU="yes"
- -DOIDN_DEVICE_CUDA="$(usex cuda)"
- -DOIDN_DEVICE_HIP="$(usex hip)"
- # -DOIDN_DEVICE_SYCL="$(usex sycl)"
- )
-
- if use apps; then
- mycmakeargs+=( -DOIDN_APPS_OPENIMAGEIO="$(usex openimageio)" )
- fi
-
- if use cuda; then
- export CUDAHOSTCXX="$(cuda_gccdir)"
- fi
-
- if use hip; then
- mycmakeargs+=(
- -DROCM_PATH="${EPREFIX}/usr"
- -DOIDN_DEVICE_HIP_COMPILER="$(get_llvm_prefix)/bin/clang++" # use HIPHOSTCOMPILER
- -DAMDGPU_TARGETS="$(get_amdgpu_flags)"
- )
- fi
-
- cmake_src_configure
-}
-
-src_test() {
- "${BUILD_DIR}"/oidnTest || die "There were test faliures!"
-}
-
-src_install() {
- cmake_src_install
-
- if use hip || use cuda ; then
- # remove garbage in /var/tmp left by subprojects
- rm -rf "${ED}"/var || die
- fi
-}
diff --git a/media-libs/oidn/oidn-2.3.2.ebuild b/media-libs/oidn/oidn-2.3.2-r1.ebuild
index c8e068d4a987..a496d628d9d7 100644
--- a/media-libs/oidn/oidn-2.3.2.ebuild
+++ b/media-libs/oidn/oidn-2.3.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
ROCM_VERSION=6.3
inherit cmake cuda python-any-r1 rocm
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/RenderKit/${PN}/releases/download/v${PV}/${P}.src.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 -arm ~arm64 -ppc ~ppc64 -x86" # 64-bit-only
+ KEYWORDS="amd64 -arm ~arm64 -ppc ~ppc64 -x86" # 64-bit-only
fi
LICENSE="Apache-2.0"
@@ -33,7 +33,10 @@ RDEPEND="
dev-cpp/tbb:=
dev-lang/ispc
cuda? ( dev-util/nvidia-cuda-toolkit:= )
- hip? ( dev-util/hip:= )
+ hip? (
+ dev-util/hip:=
+ sci-libs/composable-kernel
+ )
openimageio? ( media-libs/openimageio:= )
"
DEPEND="${RDEPEND}"
diff --git a/media-libs/oidn/oidn-2.3.0.ebuild b/media-libs/oidn/oidn-2.3.3.ebuild
index 7df9eab58658..2d2a7b05dcdf 100644
--- a/media-libs/oidn/oidn-2.3.0.ebuild
+++ b/media-libs/oidn/oidn-2.3.3.ebuild
@@ -3,64 +3,68 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
-LLVM_COMPAT=( {15..18} )
-ROCM_VERSION=5.7
+PYTHON_COMPAT=( python3_{11..13} )
+ROCM_VERSION=6.3
+CUDA_DEVICE_TARGETS=1
-inherit cmake cuda llvm-r1 python-any-r1 rocm
+inherit cmake cuda python-any-r1 rocm
DESCRIPTION="Intel® Open Image Denoise library"
HOMEPAGE="https://www.openimagedenoise.org https://github.com/RenderKit/oidn"
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/RenderKit/oidn.git"
EGIT_BRANCH="master"
+ EGIT_LFS="1"
inherit git-r3
else
SRC_URI="https://github.com/RenderKit/${PN}/releases/download/v${PV}/${P}.src.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 -arm ~arm64 -ppc ~ppc64 -x86" # 64-bit-only
fi
LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="0/${PV}"
+IUSE="apps cuda hip openimageio test"
REQUIRED_USE="
test? ( apps )
"
-IUSE="apps cuda hip openimageio test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-cpp/tbb:=
dev-lang/ispc
- cuda? ( dev-util/nvidia-cuda-toolkit )
- hip? ( dev-util/hip )
+ cuda? (
+ dev-util/nvidia-cuda-toolkit:=
+ dev-libs/cutlass
+ )
+ hip? (
+ dev-util/hip:=
+ sci-libs/composable-kernel
+ )
openimageio? ( media-libs/openimageio:= )
"
-DEPEND="${RDEPEND}
- $(llvm_gen_dep '
- llvm-core/clang:${LLVM_SLOT}=
- llvm-core/llvm:${LLVM_SLOT}=
- ')
-"
+DEPEND="${RDEPEND}"
BDEPEND="${PYTHON_DEPS}"
PATCHES=(
- "${FILESDIR}/${PN}-2.2.2-amdgpu-targets.patch"
+ "${FILESDIR}/${PN}-2.3.3-amdgpu-targets.patch"
)
src_prepare() {
if use cuda; then
cuda_src_prepare
- addpredict "/proc/self/task/"
fi
if use hip; then
# https://bugs.gentoo.org/930391
- sed "/-Wno-unused-result/s:): --rocm-path=${EPREFIX}/usr/lib):" \
+ sed "/-Wno-unused-result/s:): --rocm-path=${EPREFIX}/usr):" \
-i devices/hip/CMakeLists.txt || die
fi
- sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die
+ # do not fortify source -- bug 895018
+ sed -e "s/-D_FORTIFY_SOURCE=2//g" -i {cmake/oidn_platform,external/mkl-dnn/cmake/SDL}.cmake || die
+
+ rm -r external/{composable_kernel,cutlass,mkl-dnn} || die
cmake_src_prepare
}
@@ -69,6 +73,7 @@ src_configure() {
local mycmakeargs=(
-DOIDN_APPS="$(usex apps)"
+ -DOIDN_LIBRARY_VERSIONED="yes"
-DOIDN_DEVICE_CPU="yes"
-DOIDN_DEVICE_CUDA="$(usex cuda)"
-DOIDN_DEVICE_HIP="$(usex hip)"
@@ -86,7 +91,7 @@ src_configure() {
if use hip; then
mycmakeargs+=(
-DROCM_PATH="${EPREFIX}/usr"
- -DOIDN_DEVICE_HIP_COMPILER="$(get_llvm_prefix)/bin/clang++" # use HIPHOSTCOMPILER
+ -DOIDN_DEVICE_HIP_COMPILER="${ESYSROOT}/usr/bin/hipcc" # use HIPHOSTCOMPILER
-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
)
fi
@@ -94,8 +99,22 @@ src_configure() {
cmake_src_configure
}
+src_compile() {
+ if use cuda; then
+ addpredict /dev/char/
+ cuda_add_sandbox
+ fi
+
+ cmake_src_compile
+}
+
src_test() {
- "${BUILD_DIR}"/oidnTest || die "There were test faliures!"
+ if use cuda; then
+ addpredict /dev/char/
+ cuda_add_sandbox
+ fi
+
+ "${BUILD_DIR}"/oidnTest || die "There were test failures!"
}
src_install() {
@@ -103,6 +122,6 @@ src_install() {
if use hip || use cuda ; then
# remove garbage in /var/tmp left by subprojects
- rm -rf "${ED}"/var || die
+ rm -r "${ED}"/var || die
fi
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 00:16:18 +0000