diff options
Diffstat (limited to 'media-libs/oidn')
| -rw-r--r-- | media-libs/oidn/Manifest | 1 | ||||
| -rw-r--r-- | media-libs/oidn/files/oidn-2.1.0-amdgpu-targets.patch | 46 |
2 files changed, 0 insertions, 47 deletions
diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest index 7ce6f2421431..0b9081b3ea06 100644 --- a/media-libs/oidn/Manifest +++ b/media-libs/oidn/Manifest @@ -1,4 +1,3 @@ -AUX oidn-2.1.0-amdgpu-targets.patch 2239 BLAKE2B 292b06c363157e42e43a03e237ed72d7d08cfb4cade8614908e5d5014c08cb6e77d936d3f33767c1c0a23bea5aa6df9a511381bf57dd7a23a236e1d689dd07ca SHA512 3fc3fc54cd1155c3142b04f75e5b038b347e4e84deab885a3ffed88b635df21a5d9148b0d7c9e1ca800c2a1826dffd9b99c1e2e9413e35687b97bf316ffd9373 AUX oidn-2.2.2-amdgpu-targets.patch 2300 BLAKE2B eaddfe6493394c65b6960450ed3b9f60b26165687862c7ab51f8c8a97ae723e8bc887f082ac3f892ddba78e056e40e85fa5806e2d89d5ec32f8e80c1b4f6d6f9 SHA512 43b026e64e6e1f23ab6eacea0f1205ba4fd08dee30a5ad6e0e53b914ef04b8cfef01ba5fc736f355d5592c883f2319d83ebb239f84fdf3acf0e1ae2ca5cd5ef1 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 diff --git a/media-libs/oidn/files/oidn-2.1.0-amdgpu-targets.patch b/media-libs/oidn/files/oidn-2.1.0-amdgpu-targets.patch deleted file mode 100644 index 90d3c17f38cc..000000000000 --- a/media-libs/oidn/files/oidn-2.1.0-amdgpu-targets.patch +++ /dev/null @@ -1,46 +0,0 @@ -Allow specifying AMDGPU_TARGETS with CMake flags. -Fix build when main compiler is set to GCC. ---- a/devices/CMakeLists.txt -+++ b/devices/CMakeLists.txt -@@ -123,6 +123,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" 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}) -@@ -137,7 +141,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} -@@ -149,6 +152,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: The HIP runtime has a bug that causes a crash if the kernels are not compiled for all - # targets detected in the system. As a workaround, we compile for more targets then we actually - # support to avoid the crash on systems with dedicated + integrated GPUs. --set(GPU_TARGETS "gfx1030,gfx1031,gfx1032,gfx1033,gfx1034,gfx1035,gfx1036,gfx1100,gfx1101,gfx1102,gfx1103" CACHE INTERNAL "") --set(AMDGPU_TARGETS ${GPU_TARGETS} CACHE INTERNAL "") -+set(GPU_TARGETS "gfx1030;gfx1031;gfx1032;gfx1033;gfx1034;gfx1035;gfx1036;gfx1100;gfx1101;gfx1102;gfx1103" CACHE STRING "") -+set(AMDGPU_TARGETS ${GPU_TARGETS} CACHE STRING "") - - # Find HIP - find_package(hip REQUIRED) |