From 6dcad14b0dc2491186628f59e37222e7f07f660e Mon Sep 17 00:00:00 2001 From: howetuft Date: Sat, 28 Dec 2024 13:04:24 +0100 Subject: [PATCH 1/2] oidn prefiltering --- .github/workflows/wheels.yml | 2 ++ scripts/patch_source_tree.sh | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 1f93cce9..ecd9b2a2 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -26,6 +26,8 @@ jobs: os: [ubuntu-latest, windows-latest, macos-13, macos-14] #python-minor: [ 12] #os: [ubuntu-latest] + #python-minor: [ 11] + #os: [windows-latest] exclude: - os: macos-14 python-minor: 8 diff --git a/scripts/patch_source_tree.sh b/scripts/patch_source_tree.sh index b2d2c9cc..ddf1a3ab 100644 --- a/scripts/patch_source_tree.sh +++ b/scripts/patch_source_tree.sh @@ -125,7 +125,8 @@ $SED -i 's/"luxcore\/pyluxcore\/blender_types.h"//g' src/luxcor echo "Oidn" replace_anywhere \ "oidn::DeviceRef device = oidn::newDevice(oidn::DeviceType::CPU);" \ - 'oidn::DeviceRef device = oidn::newDevice(oidn::DeviceType::CPU); + 'oidn::DeviceRef device = oidn::newDevice(); + printf("%p %p %p %p ", srcBuffer, dstBuffer, albedoBuffer, normalBuffer); const char* errorMessage2; if (device.getError(errorMessage2) != oidn::Error::None) throw std::runtime_error(errorMessage2); @@ -134,7 +135,9 @@ replace_anywhere \ snippet="void errorCallback(void* userPtr, oidn::Error error, const char* message) { throw std::runtime_error(message); } " $SED -i "37s/^/$snippet/" src/slg/film/imagepipeline/plugins/intel_oidn.cpp replace_anywhere "vector albedoBuffer;" "vector albedoBuffer(3 \* pixelCount);" -replace_anywhere "vector normalBuffer;" "vector normalBuffer(3 \* pixelCount);" +replace_anywhere "vector normalBuffer;" "vector normalBuffer(3 \* pixelCount), dummy1(3 \* pixelCount), dummy2(3 \* pixelCount); " +replace_anywhere "nullptr, nullptr, width, height, false);" "\&dummy1[0], \&dummy2[0], width, height, false);" +cat src/slg/film/imagepipeline/plugins/intel_oidn.cpp # TODO # Per platform From ad290b3e149fcf9bbe39b00f497001d42bf0188a Mon Sep 17 00:00:00 2001 From: howetuft Date: Sat, 28 Dec 2024 23:57:42 +0100 Subject: [PATCH 2/2] Bump version post10 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 69329b87..f662354a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = "scikit_build_core.build" [project] name = "pyluxcore" -version = "2.9a1.post10" +version = "2.9a1.post11" dependencies = [ "numpy >= 2; python_version > '3.8'", "numpy < 2; python_version <= '3.8'",