Add support for PGL v0.6.0 #118328

bartus · 2024-02-15T15:29:44+01:00

bartus commented

2024-02-15 15:29:44 +01:00

OpenPGL:0.6.0 introduces some minor rework for configuration that break 0.5.0 API.

PGLFieldArguments replaced with FieldConfig
Initialize maxSamplesPerLeaf to default value 32k

OpenPGL:0.6.0 non braking changes bugfixes and optimizations:

Spatial structure (Kd-tree) build is now multithreaded.
Kd-tree switched to use cache-friendlier TreeLets.
Field fixed some non-deterministic behavior when spatial cache does not receive any training data during a training iteration due to a large number of training iterations.
Removed legacy/broken support for OpenMP threading.
Fixed build problems on (non-Mac) ARM systems.

https://github.com/OpenPathGuidingLibrary/openpgl/releases/tag/v0.6.0

OpenPGL:0.6.0 introduces some minor rework for configuration that break 0.5.0 API. * `PGLFieldArguments` replaced with `FieldConfig` * Initialize `maxSamplesPerLeaf` to default value 32k OpenPGL:0.6.0 non braking changes bugfixes and optimizations: * Spatial structure (Kd-tree) build is now multithreaded. * Kd-tree switched to use cache-friendlier TreeLets. * Field fixed some non-deterministic behavior when spatial cache does not receive any training data during a training iteration due to a large number of training iterations. * Removed legacy/broken support for OpenMP threading. * Fixed build problems on (non-Mac) ARM systems. https://github.com/OpenPathGuidingLibrary/openpgl/releases/tag/v0.6.0

Iliya Katushenock added this to the Platforms, Builds Tests & Devices project 2024-02-15 15:30:35 +01:00

Brecht Van Lommel modified the project from Platforms, Builds Tests & Devices to Render & Cycles

2024-02-15 16:30:18 +01:00

Brecht Van Lommel commented

2024-02-15 16:30:41 +01:00

@blender-bot build linux

Brecht Van Lommel requested changes 2024-02-15 16:33:33 +01:00

Brecht Van Lommel left a comment

Can you add some #ifdefs to make it build with both versions?

That makes coordinating the upgrade simpler and less disruptive.

Can you add some #ifdefs to make it build with both versions? That makes coordinating the upgrade simpler and less disruptive.

bartus force-pushed pgl6 from ef0c787a7f to 7de03f4ad6

2024-02-15 22:08:14 +01:00

Compare

bartus commented

2024-02-15 22:18:01 +01:00

Done, regards to https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/issues/7#note_163172

Brecht Van Lommel requested review from Sebastian Herholz 2024-02-15 23:04:30 +01:00

Sebastian-Herholz reviewed 2024-02-16 10:05:04 +01:00

intern/cycles/integrator/path_trace.cpp Outdated

						
				@ -1294,0 +1300,4 @@

				              PGL_SPATIAL_STRUCTURE_TYPE::PGL_SPATIAL_STRUCTURE_KDTREE,

				              PGL_DIRECTIONAL_DISTRIBUTION_TYPE::PGL_DIRECTIONAL_DISTRIBUTION_PARALLAX_AWARE_VMM,

				              guiding_params.deterministic,

				              3200);

Sebastian-Herholz commented

2024-02-16 10:05:04 +01:00

I would remove the 3200 so that the default parameter from Open PGL is used.

this is the wrong value anyway (it should be 32000 instead of 3200)
being able to set is is more for a debug purpose and should only be done in special cases
Explicitly setting this value generates the problem that the default parameter is overwritten. If Open PGL decides that another value is more robust and preferable this would not work in Blender/Cycles

I would remove the 3200 so that the default parameter from Open PGL is used. 1. this is the wrong value anyway (it should be 32000 instead of 3200) 2. being able to set is is more for a debug purpose and should only be done in special cases 3. Explicitly setting this value generates the problem that the default parameter is overwritten. If Open PGL decides that another value is more robust and preferable this would not work in Blender/Cycles

bartus commented

2024-02-16 23:14:02 +01:00

Fixed

bartus marked this conversation as resolved

Sebastian-Herholz commented

2024-02-16 10:23:49 +01:00

@bartus thanks for taking the time to update the Open PGL version (I just pushed).
This saves me the time of doing it myself. ;)

The path looks OK accept the explicit setting of the maxSamplesPerLeafNode parameter.
Note, you set the value to 3200 instead of 32000.

@bartus thanks for taking the time to update the Open PGL version (I just pushed). This saves me the time of doing it myself. ;) The path looks OK accept the explicit setting of the `maxSamplesPerLeafNode` parameter. Note, you set the value to 3200 instead of 32000.

bartus changed title from ~~Update PGL to v0.6.0~~ to Add support for Update PGL to v0.6.0

2024-02-16 14:35:58 +01:00

bartus force-pushed pgl6 from 7de03f4ad6 to ea857f80df

2024-02-16 22:51:36 +01:00

Compare

bartus commented

2024-02-16 22:52:04 +01:00

@Sebastian-Herholz Shouldn't changes in the build env be delayed, if the init code is fenced with #ifdefs and works with both versions?

bartus changed title from ~~Add support for Update PGL to v0.6.0~~ to Add support for PGL to v0.6.0

2024-02-19 09:50:48 +01:00

bartus changed title from ~~Add support for PGL to v0.6.0~~ to Add support for PGL v0.6.0

2024-02-19 09:51:09 +01:00

Brecht Van Lommel approved these changes 2024-02-19 12:27:18 +01:00

Brecht Van Lommel commented

2024-02-19 12:30:27 +01:00

I'll put the source code changes in the 4.1 release branch, so that Linux distributions can use it.

For the official release, the build environment changes will go to main for 4.2.

I'll put the source code changes in the 4.1 release branch, so that Linux distributions can use it. For the official release, the build environment changes will go to main for 4.2.

👍 1

Brecht Van Lommel referenced this issue from a commit

2024-02-19 13:18:16 +01:00

Cycles: Add support for OpenPGL 0.6.0

Brecht Van Lommel added 1 commit 2024-02-19 13:21:27 +01:00

c2d68d97d8 Merge branch 'main' into HEAD

Brecht Van Lommel added 1 commit 2024-02-19 13:26:57 +01:00

37fbd53855 Keep 0.5.0 as min version

Brecht Van Lommel referenced this pull request

2024-02-19 13:27:58 +01:00

Library changes for Blender 4.2 #118455

Brecht Van Lommel merged commit 791aeeff9a into main