git: 09bd6cdd8658 - main - graphics/oidn: Update 1.4.3 → 2.0.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Thu, 25 May 2023 19:37:38 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=09bd6cdd8658d23a7b3f1a60ea14118be030750d

commit 09bd6cdd8658d23a7b3f1a60ea14118be030750d
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-05-25 19:37:16 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-05-25 19:37:32 +0000

    graphics/oidn: Update 1.4.3 → 2.0.0
    
    Reported by:    portscout
---
 graphics/oidn/Makefile                             |  9 +++++----
 graphics/oidn/distinfo                             | 18 ++++++++++-------
 .../oidn/files/patch-cmake_oidn__install.cmake     | 18 -----------------
 ...tch-common_thread.cpp => patch-core_thread.cpp} | 18 ++++++++---------
 .../{patch-common_thread.h => patch-core_thread.h} | 23 ++++++++++------------
 graphics/oidn/pkg-plist                            | 12 ++++++++++-
 6 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/graphics/oidn/Makefile b/graphics/oidn/Makefile
index e18972589138..2098e2c26871 100644
--- a/graphics/oidn/Makefile
+++ b/graphics/oidn/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	oidn
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.3
-PORTREVISION=	6
+DISTVERSION=	2.0.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
@@ -26,7 +25,9 @@ USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenImageDenoise
-GH_TUPLE=	OpenImageDenoise:mkl-dnn:f53274c:m/mkl-dnn
+GH_TUPLE=	OpenImageDenoise:mkl-dnn:9bea36e:m/external/mkl-dnn \
+		ROCmSoftwarePlatform:composable_kernel:e85178b:composable_kernel/external/composable_kernel \
+		NVIDIA:cutlass:66d9cdd:cutlass/external/cutlass
 
 CMAKE_ARGS=	-DTBB_ROOT:STRING=${LOCALBASE} -DTBB_INCLUDE_DIR:STRING=${LOCALBASE}/include -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD}
 
@@ -47,7 +48,7 @@ OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
 OPENIMAGEIO_IMPLIES=		APPS # OpenImageIO is only used by apps and examples
 
 WEIGHTS_GIT_URL=	https://github.com/OpenImageDenoise/oidn-weights.git
-WEIGHTS_GIT_HASH=	a34b7641349c5a79e46a617d61709c35df5d6c28
+WEIGHTS_GIT_HASH=	4322c25e25a05584f65da1a4be5cef40a4b2e90b
 
 pre-fetch:
 	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX}" ]; then \
diff --git a/graphics/oidn/distinfo b/graphics/oidn/distinfo
index 20404abed134..0bbbbe2c0d70 100644
--- a/graphics/oidn/distinfo
+++ b/graphics/oidn/distinfo
@@ -1,7 +1,11 @@
-TIMESTAMP = 1645045861
-SHA256 (oidn-weights-a34b7641349c5a79e46a617d61709c35df5d6c28.tar.gz) = e52c689a0fdcade16936d2b417590dbc565340bc641e3e2f858e02492dbe3ee6
-SIZE (oidn-weights-a34b7641349c5a79e46a617d61709c35df5d6c28.tar.gz) = 41124636
-SHA256 (OpenImageDenoise-oidn-v1.4.3_GH0.tar.gz) = 37941f260af212183579efb6b1e07e4075e3ab9cbd63120afd007e62367efef6
-SIZE (OpenImageDenoise-oidn-v1.4.3_GH0.tar.gz) = 3433667
-SHA256 (OpenImageDenoise-mkl-dnn-f53274c_GH0.tar.gz) = 735ba210cfbca8c893dd97ef6b79c1b73a3d6289d99cdb5ede663f630ee4efc9
-SIZE (OpenImageDenoise-mkl-dnn-f53274c_GH0.tar.gz) = 9535954
+TIMESTAMP = 1685034213
+SHA256 (oidn-weights-4322c25e25a05584f65da1a4be5cef40a4b2e90b.tar.gz) = ea9bd87ea429b0e64cc1ba62875ad5c4882e476224f594f4f559f60b59e3b770
+SIZE (oidn-weights-4322c25e25a05584f65da1a4be5cef40a4b2e90b.tar.gz) = 20605602
+SHA256 (OpenImageDenoise-oidn-v2.0.0_GH0.tar.gz) = 81eea9c36b446183ba67f8cb8e435bcc33b5b55fd83bbad67615c219560ee4a7
+SIZE (OpenImageDenoise-oidn-v2.0.0_GH0.tar.gz) = 3580694
+SHA256 (OpenImageDenoise-mkl-dnn-9bea36e_GH0.tar.gz) = b4626c0cf65e64ec16d93f8af7941bccd62385da5ea16fd81de5d26b7cb10f71
+SIZE (OpenImageDenoise-mkl-dnn-9bea36e_GH0.tar.gz) = 7191010
+SHA256 (ROCmSoftwarePlatform-composable_kernel-e85178b_GH0.tar.gz) = b870ae0dcac8083a239814fff673a83ddd5abfc477b4320af08a2232cd42849c
+SIZE (ROCmSoftwarePlatform-composable_kernel-e85178b_GH0.tar.gz) = 2153311
+SHA256 (NVIDIA-cutlass-66d9cdd_GH0.tar.gz) = 8ab91c8930ad48a4012410b234c743a4df0cf270e60c52b80466da740b6c31a6
+SIZE (NVIDIA-cutlass-66d9cdd_GH0.tar.gz) = 15495942
diff --git a/graphics/oidn/files/patch-cmake_oidn__install.cmake b/graphics/oidn/files/patch-cmake_oidn__install.cmake
deleted file mode 100644
index a1f931003ba3..000000000000
--- a/graphics/oidn/files/patch-cmake_oidn__install.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
---- cmake/oidn_install.cmake.orig	2020-09-11 17:36:51 UTC
-+++ cmake/oidn_install.cmake
-@@ -31,6 +31,7 @@ install(DIRECTORY include/OpenImageDenoise
- ## Install documentation
- ## -----------------------------------------------------------------------------
- 
-+if (FALSE)
- install(
-   FILES
-     ${PROJECT_SOURCE_DIR}/README.md
-@@ -43,6 +44,7 @@ install(
-   DESTINATION ${CMAKE_INSTALL_DOCDIR}
-   COMPONENT lib
- )
-+endif()
- 
- ## -----------------------------------------------------------------------------
- ## Install dependencies: TBB
diff --git a/graphics/oidn/files/patch-common_thread.cpp b/graphics/oidn/files/patch-core_thread.cpp
similarity index 82%
rename from graphics/oidn/files/patch-common_thread.cpp
rename to graphics/oidn/files/patch-core_thread.cpp
index 8237988992ca..52360dbd8228 100644
--- a/graphics/oidn/files/patch-common_thread.cpp
+++ b/graphics/oidn/files/patch-core_thread.cpp
@@ -1,7 +1,7 @@
---- common/thread.cpp.orig	2020-09-11 17:36:51 UTC
-+++ common/thread.cpp
+--- core/thread.cpp.orig	2023-05-24 17:03:47 UTC
++++ core/thread.cpp
 @@ -1,6 +1,8 @@
- // Copyright 2009-2020 Intel Corporation
+ // Copyright 2009 Intel Corporation
  // SPDX-License-Identifier: Apache-2.0
  
 +#include <pthread_np.h>
@@ -9,16 +9,16 @@
  #if defined(_MSC_VER)
    #pragma warning (disable : 4146) // unary minus operator applied to unsigned type, result still unsigned
  #endif
-@@ -120,7 +122,7 @@ namespace oidn {
+@@ -120,7 +122,7 @@ OIDN_NAMESPACE_BEGIN
        OIDN_WARNING("SetThreadGroupAffinity failed");
    }
  
 -#elif defined(__linux__)
 +#elif defined(__linux__) || defined(__FreeBSD__)
  
-   // ---------------------------------------------------------------------------
+   // -----------------------------------------------------------------------------------------------
    // ThreadAffinity: Linux
-@@ -165,7 +167,7 @@ namespace oidn {
+@@ -165,7 +167,7 @@ OIDN_NAMESPACE_BEGIN
  
      for (size_t i = 0; i < threadIds.size(); ++i)
      {
@@ -27,7 +27,7 @@
        CPU_ZERO(&affinity);
        CPU_SET(threadIds[i], &affinity);
  
-@@ -182,7 +184,7 @@ namespace oidn {
+@@ -182,7 +184,7 @@ OIDN_NAMESPACE_BEGIN
      const pthread_t thread = pthread_self();
  
      // Save the current affinity
@@ -36,7 +36,7 @@
      {
        OIDN_WARNING("pthread_getaffinity_np failed");
        oldAffinities[threadIndex] = affinities[threadIndex];
-@@ -190,7 +192,7 @@ namespace oidn {
+@@ -190,7 +192,7 @@ OIDN_NAMESPACE_BEGIN
      }
  
      // Set the new affinity
@@ -45,7 +45,7 @@
        OIDN_WARNING("pthread_setaffinity_np failed");
    }
  
-@@ -202,7 +204,7 @@ namespace oidn {
+@@ -202,7 +204,7 @@ OIDN_NAMESPACE_BEGIN
      const pthread_t thread = pthread_self();
  
      // Restore the original affinity
diff --git a/graphics/oidn/files/patch-common_thread.h b/graphics/oidn/files/patch-core_thread.h
similarity index 55%
rename from graphics/oidn/files/patch-common_thread.h
rename to graphics/oidn/files/patch-core_thread.h
index b43fefae056f..826c204631e7 100644
--- a/graphics/oidn/files/patch-common_thread.h
+++ b/graphics/oidn/files/patch-core_thread.h
@@ -1,25 +1,22 @@
---- common/thread.h.orig	2020-09-11 17:36:51 UTC
-+++ common/thread.h
-@@ -130,8 +130,10 @@ namespace oidn {
-     void restore(int threadIndex);
+--- core/thread.h.orig	2023-05-24 17:03:47 UTC
++++ core/thread.h
+@@ -130,7 +130,7 @@ OIDN_NAMESPACE_BEGIN
+     std::vector<GROUP_AFFINITY> oldAffinities; // original thread affinities
    };
  
 -#elif defined(__linux__)
 +#elif defined(__linux__) || defined(__FreeBSD__)
  
-+#include <sys/cpuset.h>
-+
-   // ---------------------------------------------------------------------------
+   // -----------------------------------------------------------------------------------------------
    // ThreadAffinity: Linux
-   // ---------------------------------------------------------------------------
-@@ -139,8 +141,8 @@ namespace oidn {
-   class ThreadAffinity : public Verbose
-   {
+@@ -153,8 +153,8 @@ OIDN_NAMESPACE_BEGIN
+     void restore(int threadIndex);
+ 
    private:
 -    std::vector<cpu_set_t> affinities;    // thread affinities
 -    std::vector<cpu_set_t> oldAffinities; // original thread affinities
 +    std::vector<cpuset_t> affinities;    // thread affinities
 +    std::vector<cpuset_t> oldAffinities; // original thread affinities
+   };
  
-   public:
-     ThreadAffinity(int numThreadsPerCore = INT_MAX, int verbose = 0);
+ #elif defined(__APPLE__)
diff --git a/graphics/oidn/pkg-plist b/graphics/oidn/pkg-plist
index 440734b55f7d..e37adb5d91b1 100644
--- a/graphics/oidn/pkg-plist
+++ b/graphics/oidn/pkg-plist
@@ -8,5 +8,15 @@ lib/cmake/OpenImageDenoise-%%VER%%/OpenImageDenoiseConfig-%%CMAKE_BUILD_TYPE%%.c
 lib/cmake/OpenImageDenoise-%%VER%%/OpenImageDenoiseConfig.cmake
 lib/cmake/OpenImageDenoise-%%VER%%/OpenImageDenoiseConfigVersion.cmake
 lib/libOpenImageDenoise.so
-lib/libOpenImageDenoise.so.1
+lib/libOpenImageDenoise.so.2
 lib/libOpenImageDenoise.so.%%VER%%
+lib/libOpenImageDenoise_core.so.%%VER%%
+lib/libOpenImageDenoise_device_cpu.so.%%VER%%
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/readme.pdf
+%%PORTDOCS%%%%DOCSDIR%%/third-party-programs-DPCPP.txt
+%%PORTDOCS%%%%DOCSDIR%%/third-party-programs-oneDNN.txt
+%%PORTDOCS%%%%DOCSDIR%%/third-party-programs-oneTBB.txt
+%%PORTDOCS%%%%DOCSDIR%%/third-party-programs.txt