Build: Upgrade OIDN to 2.3.0 final

This upgrades OIDN to the final 2.3.0 release.

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
Pull Request: https://projects.blender.org/blender/blender/pulls/123433

build_files/build_environment/cmake/versions.cmake

@@ -536,9 +536,9 @@ set(MATERIALX_HASH fad8f4e19305fb2ee920cbff638f3560)
 set(MATERIALX_HASH_TYPE MD5)
 set(MATERIALX_FILE materialx-v${MATERIALX_VERSION}.tar.gz)
 
-set(OIDN_VERSION 2.3.0-beta)
+set(OIDN_VERSION 2.3.0)
 set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz)
-set(OIDN_HASH 3bb6596964a17143ad089aa29d1e775d)
+set(OIDN_HASH 31a3d8b9168966a2fa93daa6becad586)
 set(OIDN_HASH_TYPE MD5)
 set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)
 

build_files/build_environment/patches/oidn.diff

@@ -1,28 +1,29 @@
-diff -Naur oidn-2.2.0/core/CMakeLists.txt external_openimagedenoise/core/CMakeLists.txt
---- oidn-2.2.0/core/CMakeLists.txt	2024-02-01 17:52:16 -0700
-+++ external_openimagedenoise/core/CMakeLists.txt	2024-02-03 12:41:34 -0700
-@@ -87,7 +87,7 @@
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 38f04e2..2b58ad6 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -95,6 +95,7 @@ set_target_properties(OpenImageDenoise_core PROPERTIES
+ )
  
- add_library(OpenImageDenoise_core ${OIDN_CORE_LIB_TYPE} ${OIDN_CORE_SOURCES} ${OIDN_RESOURCE_FILE})
- set_property(TARGET OpenImageDenoise_core PROPERTY VERSION ${PROJECT_VERSION})
--
+ target_compile_definitions(OpenImageDenoise_core PRIVATE OIDN_LIBRARY_NAME="${OIDN_LIBRARY_NAME}")
 +target_compile_definitions(OpenImageDenoise_core PRIVATE SHARED_POSTFIX=\"$<$<CONFIG:Debug>:$<TARGET_PROPERTY:OpenImageDenoise_core,DEBUG_POSTFIX>>\")
+ 
  target_link_libraries(OpenImageDenoise_core
    PUBLIC
-     OpenImageDenoise_common
-diff -Naur oidn-2.2.0/core/module.cpp external_openimagedenoise/core/module.cpp
---- oidn-2.2.0/core/module.cpp	2024-02-01 17:52:16 -0700
-+++ external_openimagedenoise/core/module.cpp	2024-02-03 12:41:34 -0700
-@@ -29,7 +29,7 @@
+diff --git a/core/module.cpp b/core/module.cpp
+index ba765be..19d67f8 100644
+--- a/core/module.cpp
++++ b/core/module.cpp
+@@ -29,7 +29,7 @@ OIDN_NAMESPACE_BEGIN
        return true; // module already loaded
  
      // Get the path of the module to load
--    std::string filename = "OpenImageDenoise_" + name;
-+    std::string filename = "OpenImageDenoise_" + name + SHARED_POSTFIX;
+-    std::string filename = OIDN_LIBRARY_NAME "_" + name;
++    std::string filename = OIDN_LIBRARY_NAME "_" + name + SHARED_POSTFIX;
    #if defined(_WIN32)
      filename += ".dll";
    #else
-@@ -37,7 +37,8 @@
+@@ -37,7 +37,8 @@ OIDN_NAMESPACE_BEGIN
                                     "." + toString(OIDN_VERSION_MINOR) +
                                     "." + toString(OIDN_VERSION_PATCH);
    #if defined(__APPLE__)
@@ -32,10 +33,11 @@ diff -Naur oidn-2.2.0/core/module.cpp external_openimagedenoise/core/module.cpp
    #else
      filename = "lib" + filename + ".so" + versionStr;
    #endif
-diff -Naur oidn-2.2.0/devices/CMakeLists.txt external_openimagedenoise/devices/CMakeLists.txt
---- oidn-2.2.0/devices/CMakeLists.txt	2024-02-01 17:52:16 -0700
-+++ external_openimagedenoise/devices/CMakeLists.txt	2024-02-03 13:10:31 -0700
-@@ -65,6 +65,7 @@
+diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt
+index 03937dc..8dcc236 100644
+--- a/devices/CMakeLists.txt
++++ b/devices/CMakeLists.txt
+@@ -66,6 +66,7 @@ if(OIDN_DEVICE_CUDA)
        -DOIDN_WARN_AS_ERRORS:BOOL=${OIDN_WARN_AS_ERRORS}
        -DOIDN_SANITIZER:STRING=${OIDN_SANITIZER}
        -DOIDN_DEVICE_CUDA_API:STRING=${OIDN_DEVICE_CUDA_API}
@@ -43,7 +45,7 @@ diff -Naur oidn-2.2.0/devices/CMakeLists.txt external_openimagedenoise/devices/C
      BUILD_ALWAYS TRUE
      DEPENDS
        OpenImageDenoise_core
-@@ -155,6 +156,8 @@
+@@ -157,6 +158,8 @@ 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}
@@ -53,7 +55,7 @@ diff -Naur oidn-2.2.0/devices/CMakeLists.txt external_openimagedenoise/devices/C
      DEPENDS
        OpenImageDenoise_core
 diff --git a/devices/hip/hip_device.cpp b/devices/hip/hip_device.cpp
-index ae14ced..a49e131 100644
+index 5842895..8272124 100644
 --- a/devices/hip/hip_device.cpp
 +++ b/devices/hip/hip_device.cpp
 @@ -93,10 +93,16 @@ OIDN_NAMESPACE_BEGIN
@@ -73,13 +75,3 @@ index ae14ced..a49e131 100644
      else
        return HIPArch::Unknown;
    }
---- a/devices/cpu/cpu_engine.h
-+++ b/devices/cpu/cpu_engine.h
-@@ -7,5 +7,7 @@
- #include "cpu_device.h"
- #include <queue>
- #include <condition_variable>
-+// BLENDER: needed for building on Linux.
-+#include <thread>
-
- OIDN_NAMESPACE_BEGIN