Merge branch 'meshSplit' into RB-10.4

Author: johnhaddon

.github/workflows/main.yml

@@ -154,12 +154,6 @@ jobs:
         echo CORTEX_DEPENDENCIES_HASH=`python config/installDependencies.py --archiveURL ${{ matrix.dependenciesURL }} --dependenciesDir ${{ env.CORTEX_BUILD_NAME }} --outputFormat "{archiveDigest}"` >> $GITHUB_ENV
       shell: bash
 
-    - name: Install 3Delight
-      run: |
-        python ./.github/workflows/main/installDelight.py
-        echo DELIGHT=$GITHUB_WORKSPACE/3delight >> $GITHUB_ENV
-      shell: bash
-
     - name: Cache
       uses: actions/cache@v3
       with:

.github/workflows/main/installDelight.py

@@ -9,8 +9,6 @@ build = "./" + os.environ.get( "CORTEX_BUILD_NAME" )
 
 INSTALL_PREFIX = build
 INSTALL_DOC_DIR = build + "/doc"
-INSTALL_RMANPROCEDURAL_NAME = build + "/build/renderMan/procedurals/iePython"
-INSTALL_RMANDISPLAY_NAME = build + "/renderMan/displayDrivers/ieDisplay"
 INSTALL_PYTHON_DIR = build + "/python"
 INSTALL_IECORE_OPS = ""
 
@@ -64,7 +62,6 @@ USD_LIB_PREFIX = "usd_"
 # Renderers
 # =========
 
-RMAN_ROOT = os.environ["DELIGHT"]
 APPLESEED_ROOT = deps + "/appleseed"
 APPLESEED_INCLUDE_PATH = deps + "/appleseed/include"
 APPLESEED_LIB_PATH = deps + "/appleseed/lib"

.github/workflows/main/options.posix

@@ -8,8 +8,6 @@ build = os.environ.get( "CORTEX_BUILD_NAME" )
 
 INSTALL_PREFIX = build
 INSTALL_DOC_DIR = build + "\\doc"
-INSTALL_RMANPROCEDURAL_NAME = build + "\\build\\renderMan\\procedurals\\iePython"
-INSTALL_RMANDISPLAY_NAME = build + "\\renderMan\\displayDrivers\\ieDisplay"
 INSTALL_PYTHON_DIR = build + "\\python"
 INSTALL_IECORE_OPS = ""
 
@@ -52,8 +50,6 @@ DOXYGEN = deps + "\\doxygen\\doxygen.exe"
 # Renderers
 # =========
 
-RMAN_ROOT = os.environ["DELIGHT"]
-
 APPLESEED_ROOT = deps + "\\appleseed"
 APPLESEED_INCLUDE_PATH = deps + "\\appleseed\\include"
 APPLESEED_LIB_PATH = deps + "\\appleseed\\lib"

.github/workflows/main/options.windows

@@ -339,14 +339,6 @@ o.Add(
 	"",
 )
 
-# Renderman options
-
-o.Add(
-	"RMAN_ROOT",
-	"The directory in which your RenderMan renderer is installed.",
-	"",
-)
-
 # Nuke options
 
 o.Add(
@@ -711,12 +703,6 @@ o.Add(
 	"$INSTALL_PREFIX/glsl",
 )
 
-o.Add(
-	"INSTALL_RMANDISPLAY_NAME",
-	"The name under which to install the renderman displays.",
-	"$INSTALL_PREFIX/rmanDisplays/$IECORE_NAME",
-)
-
 o.Add(
 	"INSTALL_MEL_DIR",
 	"The directory in which to install mel scripts.",
@@ -1123,10 +1109,13 @@ if env["PLATFORM"] != "win32" :
 
 	elif env["PLATFORM"]=="posix" :
 		if "g++" in os.path.basename( env["CXX"] ) and not "clang++" in os.path.basename( env["CXX"] ) :
-			gccVersion = subprocess.check_output( [ env["CXX"], "-dumpversion" ], env=env["ENV"], universal_newlines=True )
-			gccVersion = gccVersion.strip()
+			gccVersion = subprocess.check_output( [ env["CXX"], "-dumpversion" ], env=env["ENV"], universal_newlines=True ).strip()
+			if "." not in gccVersion :
+				# GCC 7 onwards requires `-dumpfullversion` to get minor/patch, but this
+				# flag does not exist on earlier GCCs, where minor/patch was provided by `-dumpversion`.
+				gccVersion = subprocess.check_output( [ env["CXX"], "-dumpfullversion" ], env=env["ENV"], universal_newlines=True ).strip()
 			gccVersion = [ int( v ) for v in gccVersion.split( "." ) ]
-			if gccVersion >= [ 5, 1 ] :
+			if gccVersion >= [ 5, 1 ] and gccVersion < [ 11, 2 ] :
 				env.Append( CXXFLAGS = [ "-D_GLIBCXX_USE_CXX11_ABI=0" ] )
 
 	env.Append( CXXFLAGS = [ "-std=$CXXSTD", "-fvisibility=hidden" ] )
@@ -2130,43 +2119,6 @@ if doConfigure :
 		NoCache( vdbTest )
 		vdbTestEnv.Alias( "testVDB", vdbTest )
 
-###########################################################################################
-# Build and install the renderman display driver
-###########################################################################################
-
-if doConfigure :
-
-	riDisplayDriverEnv = env.Clone( IECORE_NAME = "ieDisplay", SHLIBPREFIX="" )
-	riDisplayDriverEnv.Append( CXXFLAGS = [ systemIncludeArgument, "$RMAN_ROOT/include"	] )
-
-	c = configureSharedLibrary( riDisplayDriverEnv )
-	if not c.CheckCXXHeader( "ndspy.h" ) :
-
-		sys.stderr.write( "WARNING : ndspy.h not found - check RMAN_ROOT.\n" )
-		c.Finish()
-
-	else :
-
-		c.Finish()
-
-		# we can't append this before configuring, as then it gets built as
-		# part of the configure process
-		riDisplayDriverEnv.Append(
-			LIBS = [
-				os.path.basename( coreEnv.subst( "$INSTALL_LIB_NAME" ) ),
-				os.path.basename( imageEnv.subst( "$INSTALL_LIB_NAME" ) ),
-			]
-		)
-
-		riDisplayDriver = riDisplayDriverEnv.SharedLibrary( "src/rmanDisplays/ieDisplay/" + os.path.basename( riDisplayDriverEnv.subst( "$INSTALL_RMANDISPLAY_NAME" ) ), "src/rmanDisplays/ieDisplay/IEDisplay.cpp" )
-		riDisplayDriverInstall = riDisplayDriverEnv.Install( os.path.dirname( riDisplayDriverEnv.subst( "$INSTALL_RMANDISPLAY_NAME" ) ), riDisplayDriver )
-		riDisplayDriverEnv.NoCache( riDisplayDriverInstall )
-		riDisplayDriverEnv.AddPostAction( riDisplayDriverInstall, lambda target, source, env : makeLibSymLinks( riDisplayDriverEnv, libNameVar="INSTALL_RMANDISPLAY_NAME" ) )
-		riDisplayDriverEnv.Alias( "install", riDisplayDriverInstall )
-		riDisplayDriverEnv.Alias( "installRI", riDisplayDriverInstall )
-
-		Default( [ riDisplayDriver ] )
-
 ###########################################################################################
 # Build, install and test the optional CoreGL library and bindings
 ###########################################################################################

SConstruct

@@ -252,20 +252,6 @@ if targetApp :
 	else:
 		appPrefix = os.path.join( installPrefix, targetApp, targetAppMajorVersion )
 
-# find 3delight. we only build the 3delight stuff if the compiler we're building with is suitable.
-dlReg = None
-dlVersion = getOption( "DL_VERSION", os.environ.get( "DL_VERSION", None ) )
-try :
-	dlReg = IEEnv.registry["apps"]["3delight"][dlVersion][platform]
-	if dlReg["compiler"]==compiler :
-		RMAN_ROOT = dlReg["location"]
-		os.environ["DELIGHT_CONF"] = "/software/config/3delight"
-
-		# Add ribdepends location to path
-		os.environ["PATH"] = os.path.join( RMAN_ROOT, "bin" ) + ":" + os.environ["PATH"]
-except :
-	pass
-
 appleseedReg = None
 appleseedVersion = getOption( "APPLESEED_VERSION", os.environ.get("APPLESEED_VERSION", "") )
 try :
@@ -482,8 +468,6 @@ testLibs = [
 	os.path.join( pythonReg["location"], compiler, compilerVersion, "lib" ),
 	os.path.join( compilerReg["location"], "lib" ),
 ]
-if dlReg :
-	testLibs.append( dlReg["location"] + "/lib" )
 if appleseedReg :
 	testLibs.extend( [ APPLESEED_LIB_PATH, OSL_LIB_PATH, OIIO_LIB_PATH ] )
 TEST_LIBPATH = ":".join( testLibs )
@@ -500,29 +484,16 @@ if targetApp :
 	INSTALL_LIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 	INSTALL_PYTHONLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION-python$PYTHON_VERSION" )
 	INSTALL_PYTHON_DIR = os.path.join( appPrefix, "python" )
-	INSTALL_RMANLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 	INSTALL_APPLESEEDLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 	INSTALL_ALEMBICLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 	INSTALL_USDLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
-	# we don't want to build the renderman procedurals when we build apps, as otherwise they end
-	# up causing linking conflicts at rendertime. this is because the procedural would be linking to the
-	# boost version an app needs, whereas the other libraries are linking to the correct boost version for
-	# 3delight, so we just install the procedurals into a temp directory where they can't do any harm.
-	INSTALL_RMANPROCEDURAL_NAME = os.path.join( "tmp", os.environ['USER'], "unwantedRManProcedurals/$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
-	INSTALL_RMANDISPLAY_NAME = os.path.join( "tmp", os.environ['USER'], "unwantedRManDisplays/$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 	INSTALL_APPLESEEDOUTPUTDRIVER_NAME = os.path.join( "tmp", os.environ['USER'], "unwantedAppleseedDrivers/$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 else :
 	INSTALL_HEADER_DIR = os.path.join( basePrefix, "include" )
 	INSTALL_USD_RESOURCE_DIR = os.path.join( basePrefix, "resource" )
 	INSTALL_LIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 	INSTALL_PYTHONLIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION-python$PYTHON_VERSION" )
 	INSTALL_PYTHON_DIR = os.path.join( basePrefix, "python", pythonVersion, compiler, compilerVersion )
-	# We use basePrefix for IECoreRI, but dlPrefix for the renderman procedurals. See the note in
-	# the dlReg section for an explanation.
-	INSTALL_RMANLIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
-	if dlVersion:
-		INSTALL_RMANPROCEDURAL_NAME = os.path.join( basePrefix, "3delight", dlVersion, "procedurals", "python", "$PYTHON_VERSION", compiler, compilerVersion, "$IECORE_NAME" )
-		INSTALL_RMANDISPLAY_NAME = os.path.join( basePrefix, "3delight", dlVersion, "displayDrivers", compiler, compilerVersion, "$IECORE_NAME" )
 	INSTALL_APPLESEEDLIB_NAME = os.path.join( basePrefix, "appleseed", appleseedVersion, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 	INSTALL_APPLESEEDOUTPUTDRIVER_NAME = os.path.join( basePrefix, "appleseed", appleseedVersion, "plugins", compiler, compilerVersion, "$IECORE_NAME" )
 	INSTALL_ALEMBICLIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )

config/ie/options

@@ -113,7 +113,6 @@
 	os.path.join( "lib", "IECore*" ),
 	os.path.join( "python", "IECore*" ),
 	os.path.join( "resources", "IECore*" ),
-	"renderMan",
 	"procedurals",
 ] :
 	for f in glob.glob( os.path.join( args.dependenciesDir, pattern ) ) :

config/installDependencies.py

@@ -294,7 +294,7 @@ void SceneCacheData::loadSceneIntoCache( ConstSceneInterfacePtr scene )
 		spec.fields.push_back( FieldValuePair( SdfFieldKeys->TimeCodesPerSecond, m_fps ) );
 
 		// figure out start and end frame based on timeSamples in header
-		float minTime = Imath::limits<float>::max();
+		float minTime = std::numeric_limits<float>::max();
 		float maxTime = 0;
 		bool validTimeSampleRange = false;
 		if ( auto sampleTimesDir = m_sceneio->subdirectory( g_sampleTimes, IndexedIO::MissingBehaviour::NullIfMissing ) )

contrib/IECoreUSD/src/IECoreUSD/SceneCacheData.cpp

@@ -135,8 +135,8 @@ template<class BoundIterator>
 unsigned char BoundedKDTree<BoundIterator>::majorAxis( PermutationConstIterator permFirst, PermutationConstIterator permLast )
 {
 	BaseType min, max;
-	vecSetAll( min, Imath::limits<typename BaseType::BaseType>::max() );
-	vecSetAll( max, Imath::limits<typename BaseType::BaseType>::min() );
+	vecSetAll( min, std::numeric_limits<typename BaseType::BaseType>::max() );
+	vecSetAll( max, std::numeric_limits<typename BaseType::BaseType>::lowest() );
 
 	for( PermutationConstIterator it=permFirst; it!=permLast; it++ )
 	{

include/IECore/BoundedKDTree.inl

@@ -35,8 +35,6 @@
 #ifndef IE_CORE_BYTEORDER_H
 #define IE_CORE_BYTEORDER_H
 
-#include "OpenEXR/ImfInt64.h"
-
 #include "boost/static_assert.hpp"
 
 #include <stdint.h>
@@ -138,7 +136,7 @@ inline float reverseBytes<float>( const float &x )
 }
 
 template<>
-inline Imf::Int64 reverseBytes<Imf::Int64>( const Imf::Int64 &x )
+inline uint64_t reverseBytes<uint64_t>( const uint64_t &x )
 {
 	return ((x & 255) << 56) |
 			(((x >> 8) & 255) << 48) |
@@ -153,13 +151,13 @@ inline Imf::Int64 reverseBytes<Imf::Int64>( const Imf::Int64 &x )
 template<>
 inline double reverseBytes<double>( const double &x )
 {
-	BOOST_STATIC_ASSERT( sizeof(Imf::Int64) == sizeof(double) );
+	BOOST_STATIC_ASSERT( sizeof(uint64_t) == sizeof(double) );
 	union {
-		Imf::Int64 i;
+		uint64_t i;
 		double d;
 	} xx;
 	xx.d = x;
-	xx.i = 	reverseBytes<Imf::Int64>(xx.i);
+	xx.i = 	reverseBytes<uint64_t>(xx.i);
 	return xx.d;
 }