diff --git a/graphics/oidn/Makefile b/graphics/oidn/Makefile
index df95fcbc19b8..0d430cfaecd6 100644
--- a/graphics/oidn/Makefile
+++ b/graphics/oidn/Makefile
@@ -1,77 +1,76 @@
 PORTNAME=	oidn
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.1
+DISTVERSION=	2.5.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://freebsd.org/:weights # bogus URL to make the framework happy, the fetch uses Git URL below
 DISTFILES=	${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX}:weights
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Intel(R) Open Image Denoise library
 WWW=		https://www.openimagedenoise.org/ \
 		https://github.com/RenderKit/oidn
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	Intel(R) MKL-DNN supports x86 64 bit platforms only (oidn contains a custom version of mkl-dnn, see math/mkl-dnn), and ISPC has a limited availability
 
 FETCH_DEPENDS=	ca_root_nss>0:security/ca_root_nss \
 		git:devel/git \
 		git-lfs:devel/git-lfs
 BUILD_DEPENDS=	ispc>=1.14.1:devel/ispc
 LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 USES=		cmake:noninja compiler:c++14-lang python:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	RenderKit
-GH_TUPLE=	OpenImageDenoise:mkl-dnn:9bea36e:m/external/mkl-dnn \
-		ROCmSoftwarePlatform:composable_kernel:c79bf11:composable_kernel/external/composable_kernel \
-		NVIDIA:cutlass:afa1772:cutlass/external/cutlass
+GH_TUPLE=	ROCmSoftwarePlatform:composable_kernel:3e6d21a:composable_kernel/external/composable_kernel \
+		NVIDIA:cutlass:d55f6be:cutlass/external/cutlass
 
 CMAKE_ARGS=	-DTBB_ROOT:STRING=${LOCALBASE} -DTBB_INCLUDE_DIR:STRING=${LOCALBASE}/include -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD}
 
 PLIST_SUB=	VER="${PORTVERSION}"
 
 OPTIONS_DEFINE=			APPS DOCS OPENIMAGEIO
 OPTIONS_DEFAULT=		APPS OPENIMAGEIO
 OPTIONS_SUB=			yes
 
 APPS_DESC=			Build example and test apps
 APPS_CMAKE_BOOL=		OIDN_APPS
 
 DOCSDIR=			share/doc/OpenImageDenoise
 
 OPENIMAGEIO_DESC=		Build with OpenImageIO for image formats support
 OPENIMAGEIO_CMAKE_BOOL=		OIDN_APPS_OPENIMAGEIO
 OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
 OPENIMAGEIO_IMPLIES=		APPS # OpenImageIO is only used by apps and examples
 
 WEIGHTS_GIT_URL=	https://github.com/RenderKit/oidn-weights.git
 WEIGHTS_GIT_HASH=	28883d1769d5930e13cf7f1676dd852bd81ed9e7
 
 pre-fetch:
 	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX}" ]; then \
 		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
 		cd ${DISTDIR}/${DIST_SUBDIR} && \
 		${ECHO} "==> Fetching the oidn/weights subproject with large LFS files" && \
 		( \
 			${MKDIR} ${WRKDIR}; \
 			HOME=${WRKDIR}; \
 			git config --global filter.lfs.smudge "git-lfs smudge -- %f" && \
 			GIT_CLONE_PROTECTION_ACTIVE=false git clone -nq ${WEIGHTS_GIT_URL} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} && \
 			(cd ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} && git reset -q --hard ${WEIGHTS_GIT_HASH} && ${RM} -r .git) && \
 			${RM} -r ${WRKDIR} \
 		) && \
 		${FIND} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
 		${FIND} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} -print0 | LC_ALL=C ${SORT} -z | \
 		${TAR} czf ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
 		${RM} -r ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}; \
 	fi
 
 post-extract:
 	@cd ${WRKSRC} && ${RMDIR} weights && ${LN} -s ${WRKDIR}/${PORTNAME}-weights-${WEIGHTS_GIT_HASH} weights
 
 .include <bsd.port.mk>
diff --git a/graphics/oidn/distinfo b/graphics/oidn/distinfo
index 2035635a9e3d..bd72fd024f36 100644
--- a/graphics/oidn/distinfo
+++ b/graphics/oidn/distinfo
@@ -1,11 +1,9 @@
-TIMESTAMP = 1768922284
+TIMESTAMP = 1780472466
 SHA256 (oidn-weights-28883d1769d5930e13cf7f1676dd852bd81ed9e7.tar.gz) = 90726b544f6e8b86a8bc4756e7c0b3da7530d4bab9dd671f2689001b4f9801f7
 SIZE (oidn-weights-28883d1769d5930e13cf7f1676dd852bd81ed9e7.tar.gz) = 46880514
-SHA256 (RenderKit-oidn-v2.4.1_GH0.tar.gz) = bab9197187a8754cdc0293475a00b7be6a0e967a0da73d6cc86697969cfb0a7e
-SIZE (RenderKit-oidn-v2.4.1_GH0.tar.gz) = 3633448
-SHA256 (OpenImageDenoise-mkl-dnn-9bea36e_GH0.tar.gz) = b4626c0cf65e64ec16d93f8af7941bccd62385da5ea16fd81de5d26b7cb10f71
-SIZE (OpenImageDenoise-mkl-dnn-9bea36e_GH0.tar.gz) = 7191010
-SHA256 (ROCmSoftwarePlatform-composable_kernel-c79bf11_GH0.tar.gz) = 11e0685c33e802f9d02d8afc43becc750ca25207c4b2cf2c9c656ff0035ebbaa
-SIZE (ROCmSoftwarePlatform-composable_kernel-c79bf11_GH0.tar.gz) = 4573215
-SHA256 (NVIDIA-cutlass-afa1772_GH0.tar.gz) = bdae80cbeb0ea4c67dd204ff825aacf3084add8399d8c194aada361351961221
-SIZE (NVIDIA-cutlass-afa1772_GH0.tar.gz) = 31020739
+SHA256 (RenderKit-oidn-v2.5.0_GH0.tar.gz) = 3657f1536be599f2cf531543b5472e4fd7226ab1259a9e6bf0d512b9b36441b1
+SIZE (RenderKit-oidn-v2.5.0_GH0.tar.gz) = 3657894
+SHA256 (ROCmSoftwarePlatform-composable_kernel-3e6d21a_GH0.tar.gz) = e10466f2a464f39bd61c2a436acff25b51be72eb5d5ba0ae8c894d606693db36
+SIZE (ROCmSoftwarePlatform-composable_kernel-3e6d21a_GH0.tar.gz) = 4636914
+SHA256 (NVIDIA-cutlass-d55f6be_GH0.tar.gz) = 4b0b204590a2cf7dc39139e4deaf1ea29a55eef5afe5a815b16b642e77ede24e
+SIZE (NVIDIA-cutlass-d55f6be_GH0.tar.gz) = 33856758