Merge branch 'RB-10.4' into main

Author: johnhaddon

.github/workflows/main.yml

@@ -30,55 +30,45 @@ jobs:
         # and then use `include` to define their settings.
 
         name: [
-          linux-python2,
-          linux-python2-debug,
           linux-python3,
+          linux-python3-debug,
           windows-python3,
           windows-python3-debug
         ]
 
         include:
 
-          - name: linux-python2
+          - name: linux-python3
             os: ubuntu-20.04
             buildType: RELEASE
             containerImage: ghcr.io/gafferhq/build/build:2.0.0
             options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.1.0/gafferDependencies-5.1.0-Python2-linux.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-linux.tar.gz
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
             publish: true
 
-          - name: linux-python2-debug
+          - name: linux-python3-debug
             os: ubuntu-20.04
             buildType: DEBUG
             containerImage: ghcr.io/gafferhq/build/build:2.0.0
             options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.1.0/gafferDependencies-5.1.0-Python2-linux.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-linux.tar.gz
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
             publish: false
 
-          - name: linux-python3
-            os: ubuntu-20.04
-            buildType: RELEASE
-            containerImage: ghcr.io/gafferhq/build/build:2.0.0
-            options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.1.0/gafferDependencies-5.1.0-Python3-linux.tar.gz
-            tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
-            publish: true
-
           - name: windows-python3
             os: windows-2019
             buildType: RELEASE
             options: .github/workflows/main/options.windows
-            dependenciesURL: https://github.com/hypothetical-inc/gafferDependencies/releases/download/6.2.1/gafferDependencies-6.2.1-Python3-windows.zip
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-windows.zip
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: true
 
           - name: windows-python3-debug
             os: windows-2019
             buildType: RELWITHDEBINFO
             options: .github/workflows/main/options.windows
-            dependenciesURL: https://github.com/hypothetical-inc/gafferDependencies/releases/download/6.2.1/gafferDependencies-6.2.1-Python3-windows.zip
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-windows.zip
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: false
 

Changes

@@ -1,11 +1,29 @@
-10.4.x.x (relative to 10.4.5.0)
+10.4.6.0 (relative to 10.4.5.0)
 ========
 
+Features
+--------
+
+- MeshAlgo : Added new MeshSplitter class, for efficient splitting meshes based on uniform primitive variables.
+- ImathHash : Added new header that defines `std::hash` for Imath types.
+
+Improvements
+------------
+
+- PointsPrimitive, Primitive : Accelerated bounds computation using `tbb::parallel_reduce`.
+- MeshAlgo : Improved performance of `segment()`.
+
 Fixes
 -----
 
 - ImageReader : Fixed compilation with versions of OIIO < 2.4.
 - USDScene : Invalid primitive variables are now skipped during loading, with a warning being emitted instead.
+- MeshAlgo : Fixed crease handling in `deleteFaces()`.
+
+Build
+-----
+
+- Updated CI builds to use GafferHQ/dependencies version `6.0.0`, making them suitable for use in Gaffer `1.2.x.x`.
 
 10.4.5.0 (relative to 10.4.4.0)
 ========

SConstruct

@@ -56,7 +56,7 @@ SConsignFile()
 
 ieCoreMilestoneVersion = 10 # for announcing major milestones - may contain all of the below
 ieCoreMajorVersion = 4 # backwards-incompatible changes
-ieCoreMinorVersion = 5 # new backwards-compatible features
+ieCoreMinorVersion = 6 # new backwards-compatible features
 ieCorePatchVersion = 0 # bug fixes
 ieCoreVersionSuffix = "" # used for alpha/beta releases. Example: "a1", "b2", etc.
 

src/IECoreScene/PointsPrimitive.cpp

@@ -40,6 +40,9 @@
 #include "IECore/MurmurHash.h"
 #include "IECore/SimpleTypedData.h"
 
+#include <tbb/parallel_reduce.h>
+#include <tbb/blocked_range.h>
+
 using namespace std;
 using namespace Imath;
 using namespace IECore;
@@ -193,26 +196,45 @@ Imath::Box3f PointsPrimitive::bound() const
 	// Compute the bounding box from the gathered data.
 
 	Box3f result;
-	for( size_t i = 0; i < count; ++i )
-	{
-		float r = constantWidth * *width / 2.0f;
-		width += widthStep;
-		if( aspectRatio )
-		{
-			// Type is patch - the diagonal will be
-			// longer than either the width or the
-			// height, so derive a new radius from that.
-			float hh = r; // half the height
-			if( *aspectRatio != 0.0f )
+	using RangeType = tbb::blocked_range< const V3f* >;
+	tbb::this_task_arena::isolate( [ =, & result ]{
+		tbb::task_group_context taskGroupContext( tbb::task_group_context::isolated );
+		result = tbb::parallel_reduce( RangeType( p, p + count, 1000 ), Imath::Box3f(),
+			[ = ]( const RangeType& range, const Imath::Box3f& value ) -> Imath::Box3f
 			{
-				hh /= *aspectRatio;
-			}
-			r = sqrtf( r * r + hh * hh );
-			aspectRatio += aspectRatioStep;
-		}
-		result.extendBy( Box3f( *p - V3f( r ), *p + V3f( r ) ) );
-		p++;
-	}
+				Imath::Box3f b( value );
+				const size_t offset = range.begin() - p;
+				const float* wIt = offset * widthStep + width;
+				const float* aIt = offset * aspectRatioStep + aspectRatio;
+				for( const V3f& pos : range )
+				{
+					float r = constantWidth * ( *wIt ) / 2.0f;
+					wIt += widthStep;
+					if( aspectRatio )
+					{
+						// Type is patch - the diagonal will be
+						// longer than either the width or the
+						// height, so derive a new radius from that.
+						float hh = r; // half the height
+						if( ( *aIt ) != 0.0f )
+						{
+							hh /= ( *aIt );
+						}
+						r = sqrtf( r * r + hh * hh );
+						aIt += aspectRatioStep;
+					}
+					b.extendBy( Box3f( pos - V3f( r ), pos + V3f( r ) ) );
+				}
+				return b;
+			},
+			[]( const Imath::Box3f& lhs, const Imath::Box3f& rhs ) -> Imath::Box3f
+			{
+				Imath::Box3f b( lhs );
+				b.extendBy( rhs );
+				return b;
+			},
+			taskGroupContext );
+	} );
 
 	return result;
 }

src/IECoreScene/Primitive.cpp

@@ -41,6 +41,9 @@
 
 #include "boost/algorithm/string.hpp"
 
+#include <tbb/parallel_reduce.h>
+#include <tbb/blocked_range.h>
+
 #include <cassert>
 
 using namespace IECore;
@@ -78,10 +81,27 @@ Imath::Box3f Primitive::bound() const
 		if( p )
 		{
 			const vector<V3f> &pp = p->readable();
-			for( size_t i=0; i<pp.size(); i++ )
-			{
-				result.extendBy( pp[i] );
-			}
+			using RangeType = tbb::blocked_range< const V3f* >;
+			tbb::this_task_arena::isolate( [ & result, & pp ]{
+				tbb::task_group_context taskGroupContext( tbb::task_group_context::isolated );
+				result = tbb::parallel_reduce( RangeType( pp.data(), pp.data() + pp.size(), 1000 ), Imath::Box3f(),
+					[]( const RangeType& range, const Imath::Box3f& value ) -> Imath::Box3f
+					{
+						Imath::Box3f b( value );
+						for( const V3f& pos : range )
+						{
+							b.extendBy( pos );
+						}
+						return b;
+					},
+					[]( const Imath::Box3f& lhs, const Imath::Box3f& rhs ) -> Imath::Box3f
+					{
+						Imath::Box3f b( lhs );
+						b.extendBy( rhs );
+						return b;
+					},
+					taskGroupContext );
+			} );
 		}
 	}
 	return result;