upgpkg: moonray 1.3.0.0-0

Work on applying moonray patches

Signed-off-by: Caleb Maclennan <caleb@alerque.com>

5 files changed, 368 insertions, 707 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35da067affb6..cb45275fd1d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = moonray
 	pkgdesc = DreamWorks’ production MCRT renderer
-	pkgver = 1.1.0.0
+	pkgver = 1.3.0.0
 	pkgrel = 0
 	url = https://openmoonray.org
 	arch = x86_64
@@ -21,27 +21,29 @@ pkgbase = moonray
 	depends = optix
 	depends = python
 	optdepends = usd: hydra plugins and USD geometry objects
-	source = openmoonray::git+https://github.com/dreamworksanimation/openmoonray#tag=v1.1.0.0
-	source = openmoonray+arras+arras4_core::git+https://github.com/dreamworksanimation/arras4_core.git#commit=2157c5103156f652b0966f23e32b97597b7ff16f
-	source = openmoonray+arras+arras_render::git+https://github.com/dreamworksanimation/arras_render.git#commit=729c4039a72e2dacb810c17fd529eaa0308435f6
-	source = openmoonray+arras+distributed+arras4_node::git+https://github.com/dreamworksanimation/arras4_node.git#commit=b02183bcab92f52d3041c254922c24fe9fc39e54
-	source = openmoonray+arras+distributed+minicoord::git+https://github.com/dreamworksanimation/minicoord.git#commit=b80aee65186dc36a81c1a682a471456014c6c5ec
-	source = openmoonray+cmake_modules::git+https://github.com/dreamworksanimation/cmake_modules.git#commit=3ebea9665cadadf67a76387f21c0548dd82d1bac
-	source = openmoonray+moonray+hydra+hdMoonray::git+https://github.com/dreamworksanimation/hdMoonray.git#commit=8fc04a550a80e819cc17f48dccced7a976ab1ee7
-	source = openmoonray+moonray+hydra+moonray_sdr_plugins::git+https://github.com/dreamworksanimation/moonray_sdr_plugins.git#commit=01a274e5d14b0b8ba4a6d1b6cfaa5ca538e74938
-	source = openmoonray+moonray+mcrt_denoise::git+https://github.com/dreamworksanimation/mcrt_denoise.git#commit=710ca0bf75552b2f81e4a79f5ab614173a4c468c
-	source = openmoonray+moonray+moonray::git+https://github.com/dreamworksanimation/moonray.git#commit=ba155b14779586254212c6973421ac2e7fcb47e9
-	source = openmoonray+moonray+moonray_arras+mcrt_computation::git+https://github.com/dreamworksanimation/mcrt_computation.git#commit=2e778a66ae685c7df11d61278f6f159cb9efab65
-	source = openmoonray+moonray+moonray_arras+mcrt_dataio::git+https://github.com/dreamworksanimation/mcrt_dataio.git#commit=6c84f98dc6341d6d414228bc573c8d2b5d745240
-	source = openmoonray+moonray+moonray_arras+mcrt_messages::git+https://github.com/dreamworksanimation/mcrt_messages.git#commit=3e050e36e3db25433d27d7da75e34c5715e302d6
-	source = openmoonray+moonray+moonray_dcc_plugins::git+https://github.com/dreamworksanimation/moonray_dcc_plugins.git#commit=ce861215cf2c4fec77c8decdabd96755917ae742
-	source = openmoonray+moonray+moonray_gui::git+https://github.com/dreamworksanimation/moonray_gui.git#commit=606b411880cecab5a38392ee46a2edad7e652a7f
-	source = openmoonray+moonray+moonshine::git+https://github.com/dreamworksanimation/moonshine.git#commit=faa2940107c04676d4dd2537a8c60b62a2ec504b
-	source = openmoonray+moonray+moonshine_usd::git+https://github.com/dreamworksanimation/moonshine_usd.git#commit=efe09ee4b75d678005061d121cf832fc3f2d9a9a
-	source = openmoonray+moonray+render_profile_viewer::git+https://github.com/dreamworksanimation/render_profile_viewer.git#commit=44bb5d66aa5295cc1176823d04a12cc4cd009e76
-	source = openmoonray+moonray+scene_rdl2::git+https://github.com/dreamworksanimation/scene_rdl2.git#commit=fb0c969026b1e5a3c16cc75ee3ec9ff7df85ad98
+	source = openmoonray::git+https://github.com/dreamworksanimation/openmoonray#tag=openmoonray-1.3.0.0
+	source = openmoonray+arras+arras4_core::git+https://github.com/dreamworksanimation/arras4_core.git#commit=8e22420076dfb6e75429379196c874bd342611aa
+	source = openmoonray+arras+arras_render::git+https://github.com/dreamworksanimation/arras_render.git#commit=b706280daf059d39677f57a490362d9699c1100d
+	source = openmoonray+arras+distributed+arras4_node::git+https://github.com/dreamworksanimation/arras4_node.git#commit=bf57bb1f34b338eaf4bcacc49b714b1a5321ba0b
+	source = openmoonray+arras+distributed+minicoord::git+https://github.com/dreamworksanimation/minicoord.git#commit=2fe91917f731073cdfc91a8bb4935b87fafcf246
+	source = openmoonray+cmake_modules::git+https://github.com/dreamworksanimation/cmake_modules.git#commit=f50b73d1a4365479444c17cba530a897b54aeeb8
+	source = openmoonray+moonray+hydra+hdMoonray::git+https://github.com/dreamworksanimation/hdMoonray.git#commit=6de7142ecfbb54dede2606176307a3d26d6cd310
+	source = openmoonray+moonray+hydra+moonray_sdr_plugins::git+https://github.com/dreamworksanimation/moonray_sdr_plugins.git#commit=eabdcd2bddc529085e410192889f6b9080fad4f1
+	source = openmoonray+moonray+mcrt_denoise::git+https://github.com/dreamworksanimation/mcrt_denoise.git#commit=a27c59f398fdae1856e4de9718efdd1d8a958332
+	source = openmoonray+moonray+moonray::git+https://github.com/dreamworksanimation/moonray.git#commit=a84653d0622baa575542be642d80d968f97f2c6c
+	source = openmoonray+moonray+moonray_arras+mcrt_computation::git+https://github.com/dreamworksanimation/mcrt_computation.git#commit=b3190ce32008445b08b1e09a691a1b7540147ef5
+	source = openmoonray+moonray+moonray_arras+mcrt_dataio::git+https://github.com/dreamworksanimation/mcrt_dataio.git#commit=29411cc02786e2626c9afa34cac201aa5fda28ea
+	source = openmoonray+moonray+moonray_arras+mcrt_messages::git+https://github.com/dreamworksanimation/mcrt_messages.git#commit=41ec28cc7f0de6675fc57ab20ed65fec5457bfe5
+	source = openmoonray+moonray+moonray_dcc_plugins::git+https://github.com/dreamworksanimation/moonray_dcc_plugins.git#commit=e90ad4cdc4086c9e952e211d1570e0416af467c6
+	source = openmoonray+moonray+moonray_gui::git+https://github.com/dreamworksanimation/moonray_gui.git#commit=1f00f0bcdae8ca9b40d8923fdc3c17c1b787836e
+	source = openmoonray+moonray+moonshine::git+https://github.com/dreamworksanimation/moonshine.git#commit=963c933892f8d1dbb6a794834c72de06df88dd7e
+	source = openmoonray+moonray+moonshine_usd::git+https://github.com/dreamworksanimation/moonshine_usd.git#commit=1d850a4cdd40220e7ccd62157f360f2c36977b75
+	source = openmoonray+moonray+render_profile_viewer::git+https://github.com/dreamworksanimation/render_profile_viewer.git#commit=4c35f67ed99fbfb13f523de39278cb2e45d4bb61
+	source = openmoonray+moonray+scene_rdl2::git+https://github.com/dreamworksanimation/scene_rdl2.git#commit=69412c549b8d3c7d992a8471d7973b774e5cda89
+	source = jsoncpp.patch
 	source = moonray.patch
 	source = optix.patch
+	source = tbb.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -61,8 +63,10 @@ pkgbase = moonray
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = a16bdd73ee1abcc568da23db770af7ab2adc99bb117f24d6ab9a8d6f44008a15
-	sha256sums = 430856c068bb52957680d4bf77dee277c270ed326ac32632fd7af62d18ba699d
+	sha256sums = 87472adf9bbb20c254d2e615a1eb3df30fcc11b8ce784d3877b8e009a68ea6fc
+	sha256sums = 9ceeb88e20a377adbf2ab3f686f90131a7fef8b426acd2cd7ed6b57e7a8572e9
+	sha256sums = e3f9ff06fdcd19d64dc070cc6954626dc969e309440daa86d70e26a83d4c5e62
+	sha256sums = fc5ab6baac8d36ab7daf0dea2d25fc3b2e2fc607c4b0202161c0bcc1cf35f1f2
 
 pkgname = moonray
 
diff --git a/PKGBUILD b/PKGBUILD
index 1a793aa1da11..e982ca45123d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _tbbpkgminorver=2
 pkgbase=moonray
 pkgname=($pkgbase moonray-gui)
 _pkgname=openmoonray
-pkgver=1.1.0.0
+pkgver=1.3.0.0
 pkgrel=0
 pkgdesc='DreamWorks’ production MCRT renderer'
 arch=(x86_64)
@@ -30,27 +30,29 @@ makedepends=(boost
              qt5-base
              qt5-script)
 optdepends=('usd: hydra plugins and USD geometry objects')
-source=("$_pkgname::git+$_url/$_pkgname#tag=v$pkgver"
-        "$_pkgname+arras+arras4_core::git+$_url/arras4_core.git#commit=2157c5103156f652b0966f23e32b97597b7ff16f"
-        "$_pkgname+arras+arras_render::git+$_url/arras_render.git#commit=729c4039a72e2dacb810c17fd529eaa0308435f6"
-        "$_pkgname+arras+distributed+arras4_node::git+$_url/arras4_node.git#commit=b02183bcab92f52d3041c254922c24fe9fc39e54"
-        "$_pkgname+arras+distributed+minicoord::git+$_url/minicoord.git#commit=b80aee65186dc36a81c1a682a471456014c6c5ec"
-        "$_pkgname+cmake_modules::git+$_url/cmake_modules.git#commit=3ebea9665cadadf67a76387f21c0548dd82d1bac"
-        "$_pkgname+moonray+hydra+hdMoonray::git+$_url/hdMoonray.git#commit=8fc04a550a80e819cc17f48dccced7a976ab1ee7"
-        "$_pkgname+moonray+hydra+moonray_sdr_plugins::git+$_url/moonray_sdr_plugins.git#commit=01a274e5d14b0b8ba4a6d1b6cfaa5ca538e74938"
-        "$_pkgname+moonray+mcrt_denoise::git+$_url/mcrt_denoise.git#commit=710ca0bf75552b2f81e4a79f5ab614173a4c468c"
-        "$_pkgname+moonray+moonray::git+$_url/moonray.git#commit=ba155b14779586254212c6973421ac2e7fcb47e9"
-        "$_pkgname+moonray+moonray_arras+mcrt_computation::git+$_url/mcrt_computation.git#commit=2e778a66ae685c7df11d61278f6f159cb9efab65"
-        "$_pkgname+moonray+moonray_arras+mcrt_dataio::git+$_url/mcrt_dataio.git#commit=6c84f98dc6341d6d414228bc573c8d2b5d745240"
-        "$_pkgname+moonray+moonray_arras+mcrt_messages::git+$_url/mcrt_messages.git#commit=3e050e36e3db25433d27d7da75e34c5715e302d6"
-        "$_pkgname+moonray+moonray_dcc_plugins::git+$_url/moonray_dcc_plugins.git#commit=ce861215cf2c4fec77c8decdabd96755917ae742"
-        "$_pkgname+moonray+moonray_gui::git+$_url/moonray_gui.git#commit=606b411880cecab5a38392ee46a2edad7e652a7f"
-        "$_pkgname+moonray+moonshine::git+$_url/moonshine.git#commit=faa2940107c04676d4dd2537a8c60b62a2ec504b"
-        "$_pkgname+moonray+moonshine_usd::git+$_url/moonshine_usd.git#commit=efe09ee4b75d678005061d121cf832fc3f2d9a9a"
-        "$_pkgname+moonray+render_profile_viewer::git+$_url/render_profile_viewer.git#commit=44bb5d66aa5295cc1176823d04a12cc4cd009e76"
-        "$_pkgname+moonray+scene_rdl2::git+$_url/scene_rdl2.git#commit=fb0c969026b1e5a3c16cc75ee3ec9ff7df85ad98"
-        "moonray.patch"
-        "optix.patch")
+source=("$_pkgname::git+$_url/$_pkgname#tag=openmoonray-$pkgver"
+        "$_pkgname+arras+arras4_core::git+$_url/arras4_core.git#commit=8e22420076dfb6e75429379196c874bd342611aa"
+        "$_pkgname+arras+arras_render::git+$_url/arras_render.git#commit=b706280daf059d39677f57a490362d9699c1100d"
+        "$_pkgname+arras+distributed+arras4_node::git+$_url/arras4_node.git#commit=bf57bb1f34b338eaf4bcacc49b714b1a5321ba0b"
+        "$_pkgname+arras+distributed+minicoord::git+$_url/minicoord.git#commit=2fe91917f731073cdfc91a8bb4935b87fafcf246"
+        "$_pkgname+cmake_modules::git+$_url/cmake_modules.git#commit=f50b73d1a4365479444c17cba530a897b54aeeb8"
+        "$_pkgname+moonray+hydra+hdMoonray::git+$_url/hdMoonray.git#commit=6de7142ecfbb54dede2606176307a3d26d6cd310"
+        "$_pkgname+moonray+hydra+moonray_sdr_plugins::git+$_url/moonray_sdr_plugins.git#commit=eabdcd2bddc529085e410192889f6b9080fad4f1"
+        "$_pkgname+moonray+mcrt_denoise::git+$_url/mcrt_denoise.git#commit=a27c59f398fdae1856e4de9718efdd1d8a958332"
+        "$_pkgname+moonray+moonray::git+$_url/moonray.git#commit=a84653d0622baa575542be642d80d968f97f2c6c"
+        "$_pkgname+moonray+moonray_arras+mcrt_computation::git+$_url/mcrt_computation.git#commit=b3190ce32008445b08b1e09a691a1b7540147ef5"
+        "$_pkgname+moonray+moonray_arras+mcrt_dataio::git+$_url/mcrt_dataio.git#commit=29411cc02786e2626c9afa34cac201aa5fda28ea"
+        "$_pkgname+moonray+moonray_arras+mcrt_messages::git+$_url/mcrt_messages.git#commit=41ec28cc7f0de6675fc57ab20ed65fec5457bfe5"
+        "$_pkgname+moonray+moonray_dcc_plugins::git+$_url/moonray_dcc_plugins.git#commit=e90ad4cdc4086c9e952e211d1570e0416af467c6"
+        "$_pkgname+moonray+moonray_gui::git+$_url/moonray_gui.git#commit=1f00f0bcdae8ca9b40d8923fdc3c17c1b787836e"
+        "$_pkgname+moonray+moonshine::git+$_url/moonshine.git#commit=963c933892f8d1dbb6a794834c72de06df88dd7e"
+        "$_pkgname+moonray+moonshine_usd::git+$_url/moonshine_usd.git#commit=1d850a4cdd40220e7ccd62157f360f2c36977b75"
+        "$_pkgname+moonray+render_profile_viewer::git+$_url/render_profile_viewer.git#commit=4c35f67ed99fbfb13f523de39278cb2e45d4bb61"
+        "$_pkgname+moonray+scene_rdl2::git+$_url/scene_rdl2.git#commit=69412c549b8d3c7d992a8471d7973b774e5cda89"
+        jsoncpp.patch
+        moonray.patch
+        optix.patch
+        tbb.patch)
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
@@ -70,8 +72,10 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'a16bdd73ee1abcc568da23db770af7ab2adc99bb117f24d6ab9a8d6f44008a15'
-            '430856c068bb52957680d4bf77dee277c270ed326ac32632fd7af62d18ba699d')
+            '87472adf9bbb20c254d2e615a1eb3df30fcc11b8ce784d3877b8e009a68ea6fc'
+            '9ceeb88e20a377adbf2ab3f686f90131a7fef8b426acd2cd7ed6b57e7a8572e9'
+            'e3f9ff06fdcd19d64dc070cc6954626dc969e309440daa86d70e26a83d4c5e62'
+            'fc5ab6baac8d36ab7daf0dea2d25fc3b2e2fc607c4b0202161c0bcc1cf35f1f2')
 
 # git submodule status | cut -c2- | awk '{s=$2; gsub("/", "+", s); gsub(".*/", "", $2); print "\"$_pkgname+" s "::git+$_url/" $2 ".git#commit=" $1 "\"" }'
 
@@ -89,8 +93,10 @@ prepare() {
 	done
 	git -c protocol.file.allow=always submodule update
 # 	cp ../CMakePresets.json .
+	patch -Np1 -i "$srcdir/jsoncpp.patch"
 	patch -Np1 -i "$srcdir/moonray.patch"
-	patch -Np1 -i "$srcdir/optix.patch" -d moonray/mcrt_denoise/lib/denoiser
+	patch -Np1 -i "$srcdir/optix.patch"
+	patch -Np1 -i "$srcdir/tbb.patch"
 }
 
 build() {
@@ -98,7 +104,11 @@ build() {
 	export CC=clang
 	export CXX=clang++
 	mkdir -p build
-	CMAKE_PREFIX_PATH=/usr/lib/cmake/OpenImageIO:/opt/optix cmake -S openmoonray -B build
+	cmake \
+		-D CMAKE_PREFIX_PATH=/usr/lib/cmake/OpenImageIO:/opt/optix
+		-D CMAKE_CXX_STANDARD=17 \
+		-S openmoonray \
+		-B build
 	make -C build
 	make install -C build
 }
diff --git a/jsoncpp.patch b/jsoncpp.patch
new file mode 100644
index 000000000000..ba5527139f78
--- /dev/null
+++ b/jsoncpp.patch
@@ -0,0 +1,57 @@
+diff --git a/arras/distributed/arras4_node/cmd/node/router/SessionNodeMap.cc b/arras/distributed/arras4_node/cmd/node/router/SessionNodeMap.cc
+index 67c0e06..37b6626 100644
+--- a/arras/distributed/arras4_node/cmd/node/router/SessionNodeMap.cc
++++ b/arras/distributed/arras4_node/cmd/node/router/SessionNodeMap.cc
+@@ -21,7 +21,7 @@ SessionNodeMap::SessionNodeMap(api::ObjectConstRef aRoutingData)
+         info.port = static_cast<unsigned short>((*nodeIt)["tcp"].asInt());
+
+
+-        api::UUID nodeId(nodeIt.memberName());// memberName() is DEPRECATED in later jsoncpp versions
++        api::UUID nodeId(nodeIt.name());// memberName() is DEPRECATED in later jsoncpp versions
+         info.nodeId = nodeId;
+         mMap[nodeId] = info;
+
+@@ -45,7 +45,7 @@ SessionNodeMap::update(api::ObjectConstRef aRoutingData)
+     api::ObjectConstRef nodes = aRoutingData["nodes"];
+     for (api::ObjectConstIterator nodeIt = nodes.begin();
+          nodeIt != nodes.end(); ++nodeIt) {
+-        api::UUID nodeId(nodeIt.memberName());// memberName() is DEPRECATED in later jsoncpp versions
++        api::UUID nodeId(nodeIt.name());// memberName() is DEPRECATED in later jsoncpp versions
+         if (mMap.count(nodeId) == 0) {
+             NodeInfo info;
+             info.hostname = (*nodeIt)["host"].asString();
+diff --git a/arras/distributed/arras4_node/lib/session/SessionConfig.cc b/arras/distributed/arras4_node/lib/session/SessionConfig.cc
+index bd840ff..38efa39 100644
+--- a/arras/distributed/arras4_node/lib/session/SessionConfig.cc
++++ b/arras/distributed/arras4_node/lib/session/SessionConfig.cc
+@@ -80,7 +80,7 @@ SessionConfig::SessionConfig(api::ObjectConstRef desc,
+     for (api::ObjectConstIterator cIt = comps.begin();
+          cIt != comps.end(); ++cIt) {
+
+-        std::string compName = cIt.memberName();
++        std::string compName = cIt.name();
+         api::ObjectConstRef info = *cIt;
+
+         if (!info.isObject() ||
+diff --git a/arras/distributed/arras4_node/cmd/node/ArrasNode.cc b/arras/distributed/arras4_node/cmd/node/ArrasNode.cc
+index ed2b09a..98936d0 100644
+--- a/arras/distributed/arras4_node/cmd/node/ArrasNode.cc
++++ b/arras/distributed/arras4_node/cmd/node/ArrasNode.cc
+@@ -687,7 +687,7 @@ ArrasNode::updateTags(api::ObjectConstRef tags)
+         api::Object current = mNodeInfo["tags"];
+         for (auto it = tags.begin();
+              it != tags.end(); ++it) {
+-            current[it.memberName()] = *it;
++            current[it.name()] = *it;
+         }
+         std::string msg;
+         if (!validateTags(current, msg))
+@@ -741,7 +741,7 @@ ArrasNode::updateTagsProc(api::Object tags)
+     api::Object current = mNodeInfo["tags"];
+     for (api::ObjectIterator it = tags.begin();
+          it != tags.end(); ++it) {
+-        current[it.memberName()] = *it;
++        current[it.name()] = *it;
+     }
+
+     std::string msg;
diff --git a/moonray.patch b/moonray.patch
index 5a76ea7c1b85..ee9e5531f023 100644
--- a/moonray.patch
+++ b/moonray.patch
@@ -1,4 +1,3 @@
-Submodule arras/arras4_core contains modified content
 diff --git a/arras/arras4_core/arras4_client/lib/log_client/LogClient.cc b/arras/arras4_core/arras4_client/lib/log_client/LogClient.cc
 index b1aa0c7..90d171b 100644
 --- a/arras/arras4_core/arras4_client/lib/log_client/LogClient.cc
@@ -12,6 +11,65 @@ index b1aa0c7..90d171b 100644
 
                      const api::Object& item = *i;
                      if (objectIsLogRecord(item)) {
+diff --git a/arras/arras4_core/arras4_core_impl/lib/shared_impl/ThreadsafeQueue.h b/arras/arras4_core/arras4_core_impl/lib/shared_impl/ThreadsafeQueue.h
+index 39cdc64..24878dd 100644
+--- a/arras/arras4_core/arras4_core_impl/lib/shared_impl/ThreadsafeQueue.h
++++ b/arras/arras4_core/arras4_core_impl/lib/shared_impl/ThreadsafeQueue.h
+@@ -7,6 +7,7 @@
+ #include <mutex>
+ #include <condition_variable>
+ #include <queue>
++#include <string>
+
+ namespace arras4 {
+     namespace impl {
+diff --git a/arras/arras4_core/arras4_core_impl/lib/computation_impl/CMakeLists.txt b/arras/arras4_core/arras4_core_impl/lib/computation_impl/CMakeLists.txt
+index ffeab6f..e01835e 100644
+--- a/arras/arras4_core/arras4_core_impl/lib/computation_impl/CMakeLists.txt
++++ b/arras/arras4_core/arras4_core_impl/lib/computation_impl/CMakeLists.txt
+@@ -37,6 +37,7 @@ target_link_libraries(${LibName}
+         ${PROJECT_NAME}::chunking
+         ${PROJECT_NAME}::core_messages
+         ${PROJECT_NAME}::network
++	jsoncpp
+         dl
+ )
+
+diff --git a/arras/arras4_core/arras4_network/lib/httpserver/HttpServer.cc b/arras/arras4_core/arras4_network/lib/httpserver/HttpServer.cc
+index 44e4144..52b505e 100644
+--- a/arras/arras4_core/arras4_network/lib/httpserver/HttpServer.cc
++++ b/arras/arras4_core/arras4_network/lib/httpserver/HttpServer.cc
+@@ -318,7 +318,7 @@ HttpServer::HttpServer(unsigned short aListenPort,
+                           MHD_USE_EPOLL_TURBO);
+
+     ARRAS_SOCKET socket = createListenSocket(mPort);
+-
++/*
+     if (!certData.empty() && !keyData.empty()) {
+         flags |= MHD_USE_SSL;
+
+@@ -380,7 +380,7 @@ HttpServer::HttpServer(unsigned short aListenPort,
+                     );
+
+     }
+-
++*/
+     if (!mDaemon) {
+         std::stringstream ss;
+         ss << "Could not listen on port " << mPort;
+@@ -418,10 +418,10 @@ void
+ HttpServer::_prepare(HttpServerRequest& aReq, MHD_Connection* aConn)
+ {
+     // headers...
+-    MHD_get_connection_values(aConn, MHD_HEADER_KIND, key_value_iterator, &aReq);
++    //MHD_get_connection_values(aConn, MHD_HEADER_KIND, key_value_iterator, &aReq);
+
+     // query params...
+-    MHD_get_connection_values(aConn, MHD_GET_ARGUMENT_KIND, key_value_iterator, &aReq);
++    //MHD_get_connection_values(aConn, MHD_GET_ARGUMENT_KIND, key_value_iterator, &aReq);
+ }
+
+ }
 diff --git a/arras/arras4_core/arras4_core_impl/cmd/execComp/CMakeLists.txt b/arras/arras4_core/arras4_core_impl/cmd/execComp/CMakeLists.txt
 index 03f56c5..da2d1f1 100644
 --- a/arras/arras4_core/arras4_core_impl/cmd/execComp/CMakeLists.txt
@@ -37,30 +95,6 @@ index f505fca..9206bf3 100644
 
      FileDataSource fds(filepath);
 
-diff --git a/arras/arras4_core/arras4_core_impl/lib/computation_impl/CMakeLists.txt b/arras/arras4_core/arras4_core_impl/lib/computation_impl/CMakeLists.txt
-index ffeab6f..abc3f08 100644
---- a/arras/arras4_core/arras4_core_impl/lib/computation_impl/CMakeLists.txt
-+++ b/arras/arras4_core/arras4_core_impl/lib/computation_impl/CMakeLists.txt
-@@ -37,6 +37,7 @@ target_link_libraries(${LibName}
-         ${PROJECT_NAME}::chunking
-         ${PROJECT_NAME}::core_messages
-         ${PROJECT_NAME}::network
-+    jsoncpp
-         dl
- )
-
-diff --git a/arras/arras4_core/arras4_core_impl/lib/shared_impl/ThreadsafeQueue.h b/arras/arras4_core/arras4_core_impl/lib/shared_impl/ThreadsafeQueue.h
-index 39cdc64..1833cc1 100644
---- a/arras/arras4_core/arras4_core_impl/lib/shared_impl/ThreadsafeQueue.h
-+++ b/arras/arras4_core/arras4_core_impl/lib/shared_impl/ThreadsafeQueue.h
-@@ -4,6 +4,7 @@
- #ifndef __ARRAS4_THREADSAFE_QUEUEH__
- #define __ARRAS4_THREADSAFE_QUEUEH__
-
-+#include <string>
- #include <mutex>
- #include <condition_variable>
- #include <queue>
 diff --git a/arras/arras4_core/arras4_log/lib/arras4_log/SyslogLogger.cc b/arras/arras4_core/arras4_log/lib/arras4_log/SyslogLogger.cc
 index 3f5a648..8b59e0f 100644
 --- a/arras/arras4_core/arras4_log/lib/arras4_log/SyslogLogger.cc
@@ -74,39 +108,6 @@ index 3f5a648..8b59e0f 100644
  }
 
  }
-diff --git a/arras/arras4_core/arras4_network/lib/httpserver/HttpServer.cc b/arras/arras4_core/arras4_network/lib/httpserver/HttpServer.cc
-index 44e4144..f124f2b 100644
---- a/arras/arras4_core/arras4_network/lib/httpserver/HttpServer.cc
-+++ b/arras/arras4_core/arras4_network/lib/httpserver/HttpServer.cc
-@@ -319,6 +319,7 @@ HttpServer::HttpServer(unsigned short aListenPort,
-
-     ARRAS_SOCKET socket = createListenSocket(mPort);
-
-+/*
-     if (!certData.empty() && !keyData.empty()) {
-         flags |= MHD_USE_SSL;
-
-@@ -380,6 +381,7 @@ HttpServer::HttpServer(unsigned short aListenPort,
-                     );
-
-     }
-+*/
-
-     if (!mDaemon) {
-         std::stringstream ss;
-@@ -418,10 +420,10 @@ void
- HttpServer::_prepare(HttpServerRequest& aReq, MHD_Connection* aConn)
- {
-     // headers...
--    MHD_get_connection_values(aConn, MHD_HEADER_KIND, key_value_iterator, &aReq);
-+    // MHD_get_connection_values(aConn, MHD_HEADER_KIND, key_value_iterator, &aReq);
-
-     // query params...
--    MHD_get_connection_values(aConn, MHD_GET_ARGUMENT_KIND, key_value_iterator, &aReq);
-+    // MHD_get_connection_values(aConn, MHD_GET_ARGUMENT_KIND, key_value_iterator, &aReq);
- }
-
- }
 diff --git a/arras/arras4_core/arras4_test/cmd/testClient/Data.cc b/arras/arras4_core/arras4_test/cmd/testClient/Data.cc
 index a8c6fac..40df394 100644
 --- a/arras/arras4_core/arras4_test/cmd/testClient/Data.cc
@@ -135,49 +136,9 @@ index 5e829c2..7d8f802 100644
              while (iter != aSubset.end()) {
                  const char* memberName = iter.memberName();
                  std::string name = aVarName + "." + iter.memberName();
-diff --git a/arras/arras4_core/cmake/ArrasCoreCompileDefinitions.cmake b/arras/arras4_core/cmake/ArrasCoreCompileDefinitions.cmake
-index d0c667f..5f402d2 100644
---- a/arras/arras4_core/cmake/ArrasCoreCompileDefinitions.cmake
-+++ b/arras/arras4_core/cmake/ArrasCoreCompileDefinitions.cmake
-@@ -23,7 +23,7 @@ function(ArrasCore_cxx_compile_definitions target)
-
-         PUBLIC
-             __AVX__
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
-Submodule arras/arras_render contains modified content
-diff --git a/arras/arras_render/cmake/ArrasRenderCompileDefinitions.cmake b/arras/arras_render/cmake/ArrasRenderCompileDefinitions.cmake
-index c455f49..d395152 100644
---- a/arras/arras_render/cmake/ArrasRenderCompileDefinitions.cmake
-+++ b/arras/arras_render/cmake/ArrasRenderCompileDefinitions.cmake
-@@ -16,7 +16,7 @@ function(ArrasRender_cxx_compile_definitions target)
-             >
-
-         PUBLIC
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
-Submodule arras/distributed/arras4_node contains modified content
-diff --git a/arras/distributed/arras4_node/cmake/ArrasNodeCompileDefinitions.cmake b/arras/distributed/arras4_node/cmake/ArrasNodeCompileDefinitions.cmake
-index b1619d9..a14c020 100644
---- a/arras/distributed/arras4_node/cmake/ArrasNodeCompileDefinitions.cmake
-+++ b/arras/distributed/arras4_node/cmake/ArrasNodeCompileDefinitions.cmake
-@@ -15,7 +15,7 @@ function(ArrasNode_cxx_compile_definitions target)
-             >
-
-         PUBLIC
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
+
 diff --git a/arras/distributed/arras4_node/cmd/node/ArrasNode.cc b/arras/distributed/arras4_node/cmd/node/ArrasNode.cc
-index 168e230..ed2b09a 100644
+index b545622..e4cbd09 100644
 --- a/arras/distributed/arras4_node/cmd/node/ArrasNode.cc
 +++ b/arras/distributed/arras4_node/cmd/node/ArrasNode.cc
 @@ -685,7 +685,7 @@ ArrasNode::updateTags(api::ObjectConstRef tags)
@@ -211,98 +172,6 @@ index cfe7e21..ba9e249 100644
      long mLastSentMessagesSecs{0};
      int mLastSentMessagesMicroSecs{0};
      long mLastReceivedMessagesSecs{0};
-Submodule cmake_modules contains modified content
-diff --git a/cmake_modules/cmake/FindMkl.cmake b/cmake_modules/cmake/FindMkl.cmake
-index 4c10535..28cae53 100644
---- a/cmake_modules/cmake/FindMkl.cmake
-+++ b/cmake_modules/cmake/FindMkl.cmake
-@@ -5,7 +5,7 @@
- #
- find_path(Mkl_INCLUDE_DIR
-   NAMES mkl.h
--  HINTS $ENV{MKL_ROOT}/include /usr/local/include)
-+  HINTS $ENV{MKL_ROOT}/include /usr/include/mkl /usr/local/include)
-
- find_library(Mkl_core_LIBRARY
-   NAMES mkl_core
-diff --git a/cmake_modules/cmake/MoonrayDso.cmake b/cmake_modules/cmake/MoonrayDso.cmake
-index a4f6704..1133253 100644
---- a/cmake_modules/cmake/MoonrayDso.cmake
-+++ b/cmake_modules/cmake/MoonrayDso.cmake
-@@ -57,7 +57,8 @@ function(Moonray_dso_ispc_compile_options target)
-         PRIVATE
-             --opt=force-aligned-memory          # always issue "aligned" vector load and store instructions
-             --pic                               # Generate position-independent code.  Ignored for Windows target
--            --werror                            # Treat warnings as errors
-+      # --werror                            # Treat warnings as errors
-+        --ignore-preprocessor-errors
-             --wno-perf                          # Don't issue warnings related to performance-related issues
-
-             $<$<CONFIG:DEBUG>:
-@@ -85,7 +86,7 @@ function(Moonray_dso_cxx_compile_definitions target)
-     target_compile_definitions(${target}
-         PRIVATE
-             __AVX__                             # TODO: add comment
--            _GLIBCXX_USE_CXX11_ABI=0            # TODO: add comment
-+            _GLIBCXX_USE_CXX11_ABI=1            # TODO: add comment
-             BOOST_FILESYSTEM_VERSION=3          # TODO: add comment
-             DWA_BOOST_VERSION=1073000           # TODO: add comment
-             OPENVDB_USE_BLOSC                   # TODO: Move this to where it is needed?
-diff --git a/moonray/hydra/cmake/HdMoonrayCompileDefinitions.cmake b/moonray/hydra/cmake/HdMoonrayCompileDefinitions.cmake
-index c5088eb..4a3e516 100644
---- a/moonray/hydra/cmake/HdMoonrayCompileDefinitions.cmake
-+++ b/moonray/hydra/cmake/HdMoonrayCompileDefinitions.cmake
-@@ -13,7 +13,7 @@ function(HdMoonray_cxx_compile_definitions target)
-             >
-
-         PUBLIC
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
-diff --git a/moonray/hydra/cmake/HdMoonrayCompileOptions.cmake b/moonray/hydra/cmake/HdMoonrayCompileOptions.cmake
-index 40560a7..5dfefe9 100644
---- a/moonray/hydra/cmake/HdMoonrayCompileOptions.cmake
-+++ b/moonray/hydra/cmake/HdMoonrayCompileOptions.cmake
-@@ -78,7 +78,8 @@ function(Moonray_ispc_compile_options target)
-         PRIVATE
-             --opt=force-aligned-memory          # always issue "aligned" vector load and store instructions
-             --pic                               # Generate position-independent code.  Ignored for Windows target
--            --werror                            # Treat warnings as errors
-+        # --werror                            # Treat warnings as errors
-+        --ignore-preprocessor-errors
-             --wno-perf                          # Don't issue warnings related to performance-related issues
-
-             $<$<CONFIG:DEBUG>:
-Submodule moonray/hydra/hdMoonray contains modified content
-diff --git a/moonray/hydra/hdMoonray/cmake/HdMoonrayCompileDefinitions.cmake b/moonray/hydra/hdMoonray/cmake/HdMoonrayCompileDefinitions.cmake
-index d7081b7..744d7a6 100644
---- a/moonray/hydra/hdMoonray/cmake/HdMoonrayCompileDefinitions.cmake
-+++ b/moonray/hydra/hdMoonray/cmake/HdMoonrayCompileDefinitions.cmake
-@@ -16,7 +16,7 @@ function(${PROJECT_NAME}_cxx_compile_definitions target)
-
-         PUBLIC
-             __AVX__
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
-diff --git a/moonray/hydra/hdMoonray/cmake/HdMoonrayCompileOptions.cmake b/moonray/hydra/hdMoonray/cmake/HdMoonrayCompileOptions.cmake
-index 4d98ea7..8682bbc 100644
---- a/moonray/hydra/hdMoonray/cmake/HdMoonrayCompileOptions.cmake
-+++ b/moonray/hydra/hdMoonray/cmake/HdMoonrayCompileOptions.cmake
-@@ -78,7 +78,8 @@ function(${PROJECT_NAME}_ispc_compile_options target)
-         PRIVATE
-             --opt=force-aligned-memory          # always issue "aligned" vector load and store instructions
-             --pic                               # Generate position-independent code.  Ignored for Windows target
--            --werror                            # Treat warnings as errors
-+        # --werror                            # Treat warnings as errors
-+        --ignore-preprocessor-errors
-             --wno-perf                          # Don't issue warnings related to performance-related issues
-
-             $<$<CONFIG:DEBUG>:
 diff --git a/moonray/hydra/hdMoonray/src/RendererPlugin.cc b/moonray/hydra/hdMoonray/src/RendererPlugin.cc
 index b0e3310..6f1019a 100644
 --- a/moonray/hydra/hdMoonray/src/RendererPlugin.cc
@@ -316,47 +185,6 @@ index b0e3310..6f1019a 100644
          return true;
      }
 
-Submodule moonray/mcrt_denoise contains modified content
-diff --git a/moonray/mcrt_denoise/cmake/McrtDenoiseCompileDefinitions.cmake b/moonray/mcrt_denoise/cmake/McrtDenoiseCompileDefinitions.cmake
-index 070e0be..ec77732 100644
---- a/moonray/mcrt_denoise/cmake/McrtDenoiseCompileDefinitions.cmake
-+++ b/moonray/mcrt_denoise/cmake/McrtDenoiseCompileDefinitions.cmake
-@@ -23,7 +23,7 @@ function(McrtDenoise_cxx_compile_definitions target)
-             >
-
-         PUBLIC
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
-diff --git a/moonray/moonray/cmake/MoonrayCompileDefinitions.cmake b/moonray/moonray/cmake/MoonrayCompileDefinitions.cmake
-index 4bfed25..a7c9669 100644
---- a/moonray/moonray/cmake/MoonrayCompileDefinitions.cmake
-+++ b/moonray/moonray/cmake/MoonrayCompileDefinitions.cmake
-@@ -27,7 +27,7 @@ function(${PROJECT_NAME}_cxx_compile_definitions target)
-
-         PUBLIC
-             __AVX__
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-
-diff --git a/moonray/moonray/cmake/MoonrayCompileOptions.cmake b/moonray/moonray/cmake/MoonrayCompileOptions.cmake
-index d6e2af7..fee218b 100644
---- a/moonray/moonray/cmake/MoonrayCompileOptions.cmake
-+++ b/moonray/moonray/cmake/MoonrayCompileOptions.cmake
-@@ -66,7 +66,8 @@ function(${PROJECT_NAME}_ispc_compile_options target)
-         PRIVATE
-             --opt=force-aligned-memory          # always issue "aligned" vector load and store instructions
-             --pic                               # Generate position-independent code.  Ignored for Windows target
--            --werror                            # Treat warnings as errors
-+        #--werror                            # Treat warnings as errors
-+        --ignore-preprocessor-errors
-             --wno-perf                          # Don't issue warnings related to performance-related issues
-
-             $<$<CONFIG:DEBUG>:
 diff --git a/moonray/moonray/lib/deepfile/DcxImageFormat.h b/moonray/moonray/lib/deepfile/DcxImageFormat.h
 index 5aaf284..f9fbdee 100644
 --- a/moonray/moonray/lib/deepfile/DcxImageFormat.h
@@ -383,206 +211,66 @@ index 6d4d4a7..5e972a8 100644
 
  #include <string.h> // for memset in some compilers
  #include <iostream>
-diff --git a/moonray/moonray/lib/rendering/bvh/shading/ispc/Intersection.ispc b/moonray/moonray/lib/rendering/bvh/shading/ispc/Intersection.ispc
-index 62f84f8..b33c05e 100644
---- a/moonray/moonray/lib/rendering/bvh/shading/ispc/Intersection.ispc
-+++ b/moonray/moonray/lib/rendering/bvh/shading/ispc/Intersection.ispc
-@@ -77,7 +77,7 @@ Intersection_adaptNormal(const varying Intersection &isect, const varying Vec3f
- varying Vec3f
- Intersection_adaptToonNormal(const varying Intersection &isect, const varying Vec3f &Ns)
- {
--    if (!Flags_get(isect.mFlags, (uint32_t)INTERSECTION_FLAGS_USE_ADAPT_NORMAL)) {
-+    if (!Flags_get(isect.mFlags, (uniform uint32_t)INTERSECTION_FLAGS_USE_ADAPT_NORMAL)) {
-         return Ns;
-     }
-     return Intersection_adaptNormal(isect, Ns);
-diff --git a/moonray/moonray/lib/rendering/bvh/shading/ispc/Intersection.isph b/moonray/moonray/lib/rendering/bvh/shading/ispc/Intersection.isph
-index a5ac249..0dee9fa 100644
---- a/moonray/moonray/lib/rendering/bvh/shading/ispc/Intersection.isph
-+++ b/moonray/moonray/lib/rendering/bvh/shading/ispc/Intersection.isph
-@@ -166,7 +166,7 @@ inline void
- setUseAdaptNormal(varying Intersection * uniform me, uniform bool useAdaptNormal)
-
- {
--    Flags_set(&(me->mFlags), (uint32_t)INTERSECTION_FLAGS_USE_ADAPT_NORMAL, useAdaptNormal);
-+    Flags_set(&(me->mFlags), (uniform uint32_t)INTERSECTION_FLAGS_USE_ADAPT_NORMAL, useAdaptNormal);
- }
- varying Vec3f Intersection_adaptNormal(const varying Intersection &isect, const varying Vec3f &Ns);
- varying Vec3f Intersection_adaptToonNormal(const varying Intersection &isect, const varying Vec3f &Ns);
-diff --git a/moonray/moonray/lib/rendering/rndr/RenderTimingRecord.h b/moonray/moonray/lib/rendering/rndr/RenderTimingRecord.h
-index ef98054..38955ab 100644
---- a/moonray/moonray/lib/rendering/rndr/RenderTimingRecord.h
-+++ b/moonray/moonray/lib/rendering/rndr/RenderTimingRecord.h
-@@ -5,6 +5,7 @@
- //
- #pragma once
-
-+#include <limits>
- #include <scene_rdl2/common/platform/Platform.h>
-
- #include <vector>
 diff --git a/moonray/moonray/lib/rendering/rt/gpu/GPUPrimitive.h b/moonray/moonray/lib/rendering/rt/gpu/GPUPrimitive.h
-index 18fa3c8..9a36e98 100644
+index 18fa3c8..2e99fc0 100644
 --- a/moonray/moonray/lib/rendering/rt/gpu/GPUPrimitive.h
 +++ b/moonray/moonray/lib/rendering/rt/gpu/GPUPrimitive.h
-@@ -3,6 +3,7 @@
-
- #pragma once
+@@ -8,6 +8,7 @@
 
+ #include <cuda.h>
+ #include <vector>
 +#include <array>
- #include "GPUBuffer.h"
- #include "GPUMath.h"
-
-diff --git a/moonray/moonray/lib/rendering/rt/gpu/GPUPrimitiveGroup.cc b/moonray/moonray/lib/rendering/rt/gpu/GPUPrimitiveGroup.cc
-index 0f0162c..6e33531 100644
---- a/moonray/moonray/lib/rendering/rt/gpu/GPUPrimitiveGroup.cc
-+++ b/moonray/moonray/lib/rendering/rt/gpu/GPUPrimitiveGroup.cc
-@@ -66,7 +66,7 @@ GPUPrimitiveGroup::build(CUstream cudaStream,
-         oinstance.instanceId = 0;
-         oinstance.visibilityMask = 255;
-         oinstance.sbtOffset = mSBTOffset;
--        oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
-+        // oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
-         oinstance.traversableHandle = mTrianglesGAS;
-         instances.push_back(oinstance);
-     }
-@@ -87,7 +87,7 @@ GPUPrimitiveGroup::build(CUstream cudaStream,
-         oinstance.instanceId = 0;
-         oinstance.visibilityMask = 255;
-         oinstance.sbtOffset = mSBTOffset + mTriMeshes.size();
--        oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
-+        // oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
-         oinstance.traversableHandle = mTrianglesMBGAS;
-         instances.push_back(oinstance);
-     }
-@@ -108,7 +108,7 @@ GPUPrimitiveGroup::build(CUstream cudaStream,
-         oinstance.instanceId = 0;
-         oinstance.visibilityMask = 255;
-         oinstance.sbtOffset = mSBTOffset + mTriMeshes.size() + mTriMeshesMB.size();
--        oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
-+        // oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
-         oinstance.traversableHandle = mRoundCurvesGAS;
-         instances.push_back(oinstance);
-     }
-@@ -129,7 +129,7 @@ GPUPrimitiveGroup::build(CUstream cudaStream,
-         oinstance.instanceId = 0;
-         oinstance.visibilityMask = 255;
-         oinstance.sbtOffset = mSBTOffset + mTriMeshes.size() + mTriMeshesMB.size() + mRoundCurves.size();
--        oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
-+        // oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
-         oinstance.traversableHandle = mRoundCurvesMBGAS;
-         instances.push_back(oinstance);
-     }
-@@ -151,7 +151,7 @@ GPUPrimitiveGroup::build(CUstream cudaStream,
-         oinstance.visibilityMask = 255;
-         oinstance.sbtOffset = mSBTOffset + mTriMeshes.size() + mTriMeshesMB.size() +
-                                            mRoundCurves.size() + mRoundCurvesMB.size();
--        oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
-+        // oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
-         oinstance.traversableHandle = mCustomPrimitivesGAS;
-         instances.push_back(oinstance);
-
-@@ -185,7 +185,7 @@ GPUPrimitiveGroup::build(CUstream cudaStream,
-                 // The xform is specified in the mMMTTraversable instead.  The child
-                 // node is the MatrixMotionTransform of the instance, which itself
-                 // has the group's top level IAS node as its child.
--                oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
-+                // oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
-                 GPUXform::identityXform().toOptixTransform(oinstance.transform);
-                 oinstance.traversableHandle = mInstances[i]->mMMTTraversable;
-             }
+
+ namespace moonray {
+ namespace rt {
 diff --git a/moonray/moonray/lib/rendering/shading/bsdf/hair/BsdfHairOneSampler.h b/moonray/moonray/lib/rendering/shading/bsdf/hair/BsdfHairOneSampler.h
-index e5fc2aa..fbf1e49 100644
+index e5fc2aa..ba6c0b6 100644
 --- a/moonray/moonray/lib/rendering/shading/bsdf/hair/BsdfHairOneSampler.h
 +++ b/moonray/moonray/lib/rendering/shading/bsdf/hair/BsdfHairOneSampler.h
-@@ -8,6 +8,7 @@
+@@ -14,6 +14,7 @@
+ #include <scene_rdl2/common/math/Color.h>
+ #include <scene_rdl2/common/math/Vec2.h>
+ #include <scene_rdl2/common/math/Vec3.h>
++#include <array>
 
- #pragma once
+ namespace moonray {
+ namespace shading {
+diff --git a/moonray/moonray/lib/rendering/texturing/sampler/TextureTLState.h b/moonray/moonray/lib/rendering/texturing/sampler/TextureTLState.h
+index 09955c2..9b403d1 100644
+--- a/moonray/moonray/lib/rendering/texturing/sampler/TextureTLState.h
++++ b/moonray/moonray/lib/rendering/texturing/sampler/TextureTLState.h
+@@ -7,6 +7,7 @@
+ #include <moonray/rendering/mcrt_common/ThreadLocalState.h>
+
+ //  OiiO includes for access to texture system.
++#include <Imath/ImathVec.h>  // OIIO uses the Vector classes from Imath but defines its own version if not already defined.
+ #include <OpenImageIO/version.h>
+ #include <OpenImageIO/texture.h>
+
+diff --git a/moonray/moonray/tests/lib/common/mcrt_util/test_aligned_element_array.cc b/moonray/moonray/tests/lib/common/mcrt_util/test_aligned_element_array.cc
+index e9ccd7e..3768e23 100644
+--- a/moonray/moonray/tests/lib/common/mcrt_util/test_aligned_element_array.cc
++++ b/moonray/moonray/tests/lib/common/mcrt_util/test_aligned_element_array.cc
+@@ -6,6 +6,7 @@
+ #include <moonray/common/mcrt_util/AlignedElementArray.h>
+
+ #include <numeric>
++#include <cstdint>
+
+ CPPUNIT_TEST_SUITE_REGISTRATION(TestAlignedElementArray);
 
-+#include <array>
- #include "BsdfHairLobes.h"
- #include <moonray/rendering/shading/ispc/bsdf/hair/BsdfHair_ispc_stubs.h>
-
-diff --git a/moonray/moonray/lib/rendering/shading/ispc/EvalAttribute.isph b/moonray/moonray/lib/rendering/shading/ispc/EvalAttribute.isph
-index 7908013..44148ef 100644
---- a/moonray/moonray/lib/rendering/shading/ispc/EvalAttribute.isph
-+++ b/moonray/moonray/lib/rendering/shading/ispc/EvalAttribute.isph
-@@ -511,7 +511,7 @@ evalFloat(const uniform Material *       uniform sceneObject,
-           const varying State &                  state,
-           const uniform FloatAttrKey *   uniform keyIn)
- {
--    return evalFloat((const SceneObject *) sceneObject, tls, state, keyIn);
-+    return evalFloat((const SceneObject * uniform) sceneObject, tls, state, keyIn);
- }
- inline float
- evalFloat(const uniform Map *            uniform sceneObject,
-diff --git a/moonray/moonray_arras/cmake/MoonrayArrasCompileDefinitions.cmake b/moonray/moonray_arras/cmake/MoonrayArrasCompileDefinitions.cmake
-index b2b21a0..038b648 100644
---- a/moonray/moonray_arras/cmake/MoonrayArrasCompileDefinitions.cmake
-+++ b/moonray/moonray_arras/cmake/MoonrayArrasCompileDefinitions.cmake
-@@ -13,7 +13,7 @@ function(MoonrayArras_cxx_compile_definitions target)
-             >
-
-         PUBLIC
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
-diff --git a/moonray/moonray_arras/cmake/MoonrayArrasCompileOptions.cmake b/moonray/moonray_arras/cmake/MoonrayArrasCompileOptions.cmake
-index 84f6742..7a2baef 100644
---- a/moonray/moonray_arras/cmake/MoonrayArrasCompileOptions.cmake
-+++ b/moonray/moonray_arras/cmake/MoonrayArrasCompileOptions.cmake
-@@ -37,7 +37,8 @@ function(Moonray_ispc_compile_options target)
-         PRIVATE
-             --opt=force-aligned-memory          # always issue "aligned" vector load and store instructions
-             --pic                               # Generate position-independent code.  Ignored for Windows target
--            --werror                            # Treat warnings as errors
-+        #--werror                            # Treat warnings as errors
-+        --ignore-preprocessor-errors
-             --wno-perf                          # Don't issue warnings related to performance-related issues
-
-             $<$<CONFIG:DEBUG>:
-Submodule moonray/moonray_arras/mcrt_computation contains modified content
-diff --git a/moonray/moonray_arras/mcrt_computation/cmake/McrtComputationCompileDefinitions.cmake b/moonray/moonray_arras/mcrt_computation/cmake/McrtComputationCompileDefinitions.cmake
-index 6b8d0e7..a14ac05 100644
---- a/moonray/moonray_arras/mcrt_computation/cmake/McrtComputationCompileDefinitions.cmake
-+++ b/moonray/moonray_arras/mcrt_computation/cmake/McrtComputationCompileDefinitions.cmake
-@@ -15,7 +15,7 @@ function(${PROJECT_NAME}_cxx_compile_definitions target)
-             >
-
-         PUBLIC
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
 diff --git a/moonray/moonray_arras/mcrt_computation/lib/engine/mcrt/McrtUpdate.h b/moonray/moonray_arras/mcrt_computation/lib/engine/mcrt/McrtUpdate.h
-index e229344..7bd3480 100644
+index e229344..a5b3567 100644
 --- a/moonray/moonray_arras/mcrt_computation/lib/engine/mcrt/McrtUpdate.h
 +++ b/moonray/moonray_arras/mcrt_computation/lib/engine/mcrt/McrtUpdate.h
-@@ -5,6 +5,7 @@
- //
- #pragma once
-
-+#include <functional>
+@@ -8,6 +8,7 @@
  #include <message_api/Message.h>
  #include <message_api/messageapi_names.h>
  #include <message_api/Object.h>
-Submodule moonray/moonray_arras/mcrt_dataio contains modified content
-diff --git a/moonray/moonray_arras/mcrt_dataio/cmake/McrtDataioCompileDefinitions.cmake b/moonray/moonray_arras/mcrt_dataio/cmake/McrtDataioCompileDefinitions.cmake
-index 6b8d0e7..a14ac05 100644
---- a/moonray/moonray_arras/mcrt_dataio/cmake/McrtDataioCompileDefinitions.cmake
-+++ b/moonray/moonray_arras/mcrt_dataio/cmake/McrtDataioCompileDefinitions.cmake
-@@ -15,7 +15,7 @@ function(${PROJECT_NAME}_cxx_compile_definitions target)
-             >
-
-         PUBLIC
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
++#include <functional>
+
+ namespace mcrt_computation {
+
 diff --git a/moonray/moonray_arras/mcrt_dataio/lib/engine/mcrt/McrtControl.h b/moonray/moonray_arras/mcrt_dataio/lib/engine/mcrt/McrtControl.h
 index 9ca5d92..6aa67a3 100644
 --- a/moonray/moonray_arras/mcrt_dataio/lib/engine/mcrt/McrtControl.h
@@ -596,10 +284,10 @@ index 9ca5d92..6aa67a3 100644
  namespace mcrt_dataio {
 
 diff --git a/moonray/moonray_arras/mcrt_dataio/lib/engine/merger/FbMsgUtil.cc b/moonray/moonray_arras/mcrt_dataio/lib/engine/merger/FbMsgUtil.cc
-index c0298aa..c06368e 100644
+index 532f5a0..f0b455d 100644
 --- a/moonray/moonray_arras/mcrt_dataio/lib/engine/merger/FbMsgUtil.cc
 +++ b/moonray/moonray_arras/mcrt_dataio/lib/engine/merger/FbMsgUtil.cc
-@@ -7,6 +7,7 @@
+@@ -4,6 +4,7 @@
 
  #include <iomanip>
  #include <sstream>
@@ -607,18 +295,6 @@ index c0298aa..c06368e 100644
 
  namespace mcrt_dataio {
 
-diff --git a/moonray/moonray_arras/mcrt_dataio/lib/engine/merger/MsgSendHandler.h b/moonray/moonray_arras/mcrt_dataio/lib/engine/merger/MsgSendHandler.h
-index 7c1875c..be61577 100644
---- a/moonray/moonray_arras/mcrt_dataio/lib/engine/merger/MsgSendHandler.h
-+++ b/moonray/moonray_arras/mcrt_dataio/lib/engine/merger/MsgSendHandler.h
-@@ -6,6 +6,7 @@
- #pragma once
-
- #include <functional>
-+#include <string>
-
- namespace mcrt_dataio {
-
 diff --git a/moonray/moonray_arras/mcrt_dataio/lib/share/codec/InfoCodec.cc b/moonray/moonray_arras/mcrt_dataio/lib/share/codec/InfoCodec.cc
 index e9a2e48..6b2853e 100644
 --- a/moonray/moonray_arras/mcrt_dataio/lib/share/codec/InfoCodec.cc
@@ -640,28 +316,37 @@ index e9a2e48..6b2853e 100644
 
  void
 diff --git a/moonray/moonray_arras/mcrt_dataio/lib/share/codec/InfoRec.cc b/moonray/moonray_arras/mcrt_dataio/lib/share/codec/InfoRec.cc
-index 77bb9ea..9e96294 100644
+index 7af5f66..36bc957 100644
 --- a/moonray/moonray_arras/mcrt_dataio/lib/share/codec/InfoRec.cc
 +++ b/moonray/moonray_arras/mcrt_dataio/lib/share/codec/InfoRec.cc
-@@ -45,7 +45,7 @@ InfoRecGlobal::setMerge(const std::string &hostName,
+@@ -81,7 +81,7 @@ InfoRecGlobal::setDispatch(const std::string& hostName,
  {
-     mArray["mg"]["name"] = hostName;
-     mArray["mg"]["cpu"] = cpuTotal;
--    mArray["mg"]["mem"] = (unsigned long long)memTotal;
-+    mArray["mg"]["mem"] = (unsigned long)memTotal;
+     mArray["dp"]["name"] = hostName;
+     mArray["dp"]["cpu"] = cpuTotal;
+-    mArray["dp"]["mem"] = static_cast<unsigned long long>(memTotal);
++    mArray["dp"]["mem"] = static_cast<unsigned long>(memTotal);
  }
 
  bool
-@@ -66,7 +66,7 @@ InfoRecGlobal::setMcrt(const int machineId,
+@@ -101,7 +101,7 @@ InfoRecGlobal::setMcrt(const int machineId,
      std::string mIdStr = mIdStrGen(machineId);
      mArray["mc"][mIdStr]["name"] = hostName;
      mArray["mc"][mIdStr]["cpu"] = cpuTotal;
--    mArray["mc"][mIdStr]["mem"] = (unsigned long long)memTotal;
-+    mArray["mc"][mIdStr]["mem"] = (unsigned long)memTotal;
+-    mArray["mc"][mIdStr]["mem"] = static_cast<unsigned long long>(memTotal);
++    mArray["mc"][mIdStr]["mem"] = static_cast<unsigned long>(memTotal);
  }
 
  size_t
-@@ -472,7 +472,7 @@ void
+@@ -124,7 +124,7 @@ InfoRecGlobal::setMerge(const std::string& hostName,
+ {
+     mArray["mg"]["name"] = hostName;
+     mArray["mg"]["cpu"] = cpuTotal;
+-    mArray["mg"]["mem"] = static_cast<unsigned long long>(memTotal);
++    mArray["mg"]["mem"] = static_cast<unsigned long>(memTotal);
+ }
+
+ std::string
+@@ -567,7 +567,7 @@ void
  InfoRecItem::setTimeStamp()
  {
      mTimeStamp = MiscUtil::getCurrentMicroSec();
@@ -671,10 +356,10 @@ index 77bb9ea..9e96294 100644
 
  int
 diff --git a/moonray/moonray_arras/mcrt_dataio/lib/share/util/FpsTracker.h b/moonray/moonray_arras/mcrt_dataio/lib/share/util/FpsTracker.h
-index 029b967..87d31f7 100644
+index db4d5d6..5ff8b7c 100644
 --- a/moonray/moonray_arras/mcrt_dataio/lib/share/util/FpsTracker.h
 +++ b/moonray/moonray_arras/mcrt_dataio/lib/share/util/FpsTracker.h
-@@ -7,6 +7,7 @@
+@@ -4,6 +4,7 @@
 
  #include <queue>
  #include <string>
@@ -682,171 +367,30 @@ index 029b967..87d31f7 100644
 
  namespace mcrt_dataio {
 
-Submodule moonray/moonray_arras/mcrt_messages contains modified content
-diff --git a/moonray/moonray_arras/mcrt_messages/cmake/McrtMessagesCompileDefinitions.cmake b/moonray/moonray_arras/mcrt_messages/cmake/McrtMessagesCompileDefinitions.cmake
-index 6b8d0e7..a14ac05 100644
---- a/moonray/moonray_arras/mcrt_messages/cmake/McrtMessagesCompileDefinitions.cmake
-+++ b/moonray/moonray_arras/mcrt_messages/cmake/McrtMessagesCompileDefinitions.cmake
-@@ -15,7 +15,7 @@ function(${PROJECT_NAME}_cxx_compile_definitions target)
-             >
-
-         PUBLIC
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
-diff --git a/moonray/moonray_arras/mcrt_messages/cmake/McrtMessagesCompileOptions.cmake b/moonray/moonray_arras/mcrt_messages/cmake/McrtMessagesCompileOptions.cmake
-index 06c6ba4..12fe077 100644
---- a/moonray/moonray_arras/mcrt_messages/cmake/McrtMessagesCompileOptions.cmake
-+++ b/moonray/moonray_arras/mcrt_messages/cmake/McrtMessagesCompileOptions.cmake
-@@ -39,7 +39,8 @@ function(Moonray_ispc_compile_options target)
-         PRIVATE
-             --opt=force-aligned-memory          # always issue "aligned" vector load and store instructions
-             --pic                               # Generate position-independent code.  Ignored for Windows target
--            --werror                            # Treat warnings as errors
-+        #--werror                            # Treat warnings as errors
-+        --ignore-preprocessor-errors
-             --wno-perf                          # Don't issue warnings related to performance-related issues
-
-             $<$<CONFIG:DEBUG>:
-Submodule moonray/moonray_gui contains modified content
-diff --git a/moonray/moonray_gui/cmake/MoonrayGuiCompileDefinitions.cmake b/moonray/moonray_gui/cmake/MoonrayGuiCompileDefinitions.cmake
-index 6b8d0e7..a14ac05 100644
---- a/moonray/moonray_gui/cmake/MoonrayGuiCompileDefinitions.cmake
-+++ b/moonray/moonray_gui/cmake/MoonrayGuiCompileDefinitions.cmake
-@@ -15,7 +15,7 @@ function(${PROJECT_NAME}_cxx_compile_definitions target)
-             >
-
-         PUBLIC
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
-diff --git a/moonray/moonray_gui/cmake/MoonrayGuiCompileOptions.cmake b/moonray/moonray_gui/cmake/MoonrayGuiCompileOptions.cmake
-index 85f7f5f..aa08f10 100644
---- a/moonray/moonray_gui/cmake/MoonrayGuiCompileOptions.cmake
-+++ b/moonray/moonray_gui/cmake/MoonrayGuiCompileOptions.cmake
-@@ -65,7 +65,8 @@ function(${PROJECT_NAME}_ispc_compile_options target)
-         PRIVATE
-             --opt=force-aligned-memory          # always issue "aligned" vector load and store instructions
-             --pic                               # Generate position-independent code.  Ignored for Windows target
--            --werror                            # Treat warnings as errors
-+        #--werror                            # Treat warnings as errors
-+        --ignore-preprocessor-errors
-             --wno-perf                          # Don't issue warnings related to performance-related issues
-
-             $<$<CONFIG:DEBUG>:
-Submodule moonray/moonshine contains modified content
-diff --git a/moonray/moonshine/cmake/MoonshineCompileDefinitions.cmake b/moonray/moonshine/cmake/MoonshineCompileDefinitions.cmake
-index 8f69b43..d001ad9 100644
---- a/moonray/moonshine/cmake/MoonshineCompileDefinitions.cmake
-+++ b/moonray/moonshine/cmake/MoonshineCompileDefinitions.cmake
-@@ -23,7 +23,7 @@ function(${PROJECT_NAME}_cxx_compile_definitions target)
-
-         PUBLIC
-             __AVX__
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
-diff --git a/moonray/moonshine/cmake/MoonshineCompileOptions.cmake b/moonray/moonshine/cmake/MoonshineCompileOptions.cmake
-index d6e2af7..2a83a56 100644
---- a/moonray/moonshine/cmake/MoonshineCompileOptions.cmake
-+++ b/moonray/moonshine/cmake/MoonshineCompileOptions.cmake
-@@ -66,7 +66,8 @@ function(${PROJECT_NAME}_ispc_compile_options target)
-         PRIVATE
-             --opt=force-aligned-memory          # always issue "aligned" vector load and store instructions
-             --pic                               # Generate position-independent code.  Ignored for Windows target
--            --werror                            # Treat warnings as errors
-+        --werror                            # Treat warnings as errors
-+        --ignore-preprocessor-errors
-             --wno-perf                          # Don't issue warnings related to performance-related issues
-
-             $<$<CONFIG:DEBUG>:
+diff --git a/moonray/moonshine/lib/common/noise/Worley.cc b/moonray/moonshine/lib/common/noise/Worley.cc
+index 248667a..7954f49 100644
+--- a/moonray/moonshine/lib/common/noise/Worley.cc
++++ b/moonray/moonshine/lib/common/noise/Worley.cc
+@@ -6,6 +6,7 @@
+ #include "Worley.h"
+ #include <scene_rdl2/render/util/Random.h>
+ #include <scene_rdl2/common/math/ReferenceFrame.h>
++#include <array>
+
+ namespace moonshine {
+ namespace noise {
 diff --git a/moonray/moonshine/lib/common/noise/Worley.h b/moonray/moonshine/lib/common/noise/Worley.h
-index 59997bc..e8d8c4a 100644
+index 59997bc..75d3955 100644
 --- a/moonray/moonshine/lib/common/noise/Worley.h
 +++ b/moonray/moonshine/lib/common/noise/Worley.h
-@@ -7,6 +7,7 @@
-
- #pragma warning disable 1711 // Warnings about assignemnt to statically allocated data
-
-+#include <array>
- #include "Noise.h"
+@@ -11,6 +11,7 @@
  #include "Noise_ispc_stubs.h"
  #include "Worley_ispc_stubs.h"
-diff --git a/moonray/moonshine/lib/material/dwabase/ispc/DwaBaseLayerable.isph b/moonray/moonshine/lib/material/dwabase/ispc/DwaBaseLayerable.isph
-index 79af0a7..3ec49d1 100644
---- a/moonray/moonshine/lib/material/dwabase/ispc/DwaBaseLayerable.isph
-+++ b/moonray/moonshine/lib/material/dwabase/ispc/DwaBaseLayerable.isph
-@@ -390,7 +390,7 @@ DWABASELAYERABLE_printHairParameters(const varying HairParameters * uniform cons
-
-     // Hair params
-     print("mHairCastsCaustics: %\n", DWABASE_EXTRACT((uint32_t) params->mHairCastsCaustics));
--    print("mHairUV: % % %\n",
-+    print("mHairUV: % %\n",
-         DWABASE_EXTRACT(params->mHairUV.x),
-         DWABASE_EXTRACT(params->mHairUV.y));
-     print("mHairIOR: %\n", DWABASE_EXTRACT(params->mHairIOR));
-Submodule moonray/moonshine_usd contains modified content
-diff --git a/moonray/moonshine_usd/cmake/MoonshineUsdCompileDefinitions.cmake b/moonray/moonshine_usd/cmake/MoonshineUsdCompileDefinitions.cmake
-index 8f69b43..d001ad9 100644
---- a/moonray/moonshine_usd/cmake/MoonshineUsdCompileDefinitions.cmake
-+++ b/moonray/moonshine_usd/cmake/MoonshineUsdCompileDefinitions.cmake
-@@ -23,7 +23,7 @@ function(${PROJECT_NAME}_cxx_compile_definitions target)
-
-         PUBLIC
-             __AVX__
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
-diff --git a/moonray/moonshine_usd/cmake/MoonshineUsdCompileOptions.cmake b/moonray/moonshine_usd/cmake/MoonshineUsdCompileOptions.cmake
-index 2c63538..a32398c 100644
---- a/moonray/moonshine_usd/cmake/MoonshineUsdCompileOptions.cmake
-+++ b/moonray/moonshine_usd/cmake/MoonshineUsdCompileOptions.cmake
-@@ -67,7 +67,8 @@ function(${PROJECT_NAME}_ispc_compile_options target)
-         PRIVATE
-             --opt=force-aligned-memory          # always issue "aligned" vector load and store instructions
-             --pic                               # Generate position-independent code.  Ignored for Windows target
--            --werror                            # Treat warnings as errors
-+        #--werror                            # Treat warnings as errors
-+        --ignore-preprocessor-errors
-             --wno-perf                          # Don't issue warnings related to performance-related issues
-
-             $<$<CONFIG:DEBUG>:
-Submodule moonray/scene_rdl2 contains modified content
-diff --git a/moonray/scene_rdl2/cmake/SceneRdl2CompileDefinitions.cmake b/moonray/scene_rdl2/cmake/SceneRdl2CompileDefinitions.cmake
-index 8dd3aed..9e8feaf 100644
---- a/moonray/scene_rdl2/cmake/SceneRdl2CompileDefinitions.cmake
-+++ b/moonray/scene_rdl2/cmake/SceneRdl2CompileDefinitions.cmake
-@@ -22,7 +22,7 @@ function(SceneRdl2_cxx_compile_definitions target)
-
-         PUBLIC
-             __AVX__
--            _GLIBCXX_USE_CXX11_ABI=0                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-+            _GLIBCXX_USE_CXX11_ABI=1                # https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-             GL_GLEXT_PROTOTYPES=1                   # This define makes function symbols to be available as extern declarations.
-             TBB_SUPPRESS_DEPRECATED_MESSAGES        # Suppress 'deprecated' messages from TBB
-     )
-diff --git a/moonray/scene_rdl2/cmake/SceneRdl2CompileOptions.cmake b/moonray/scene_rdl2/cmake/SceneRdl2CompileOptions.cmake
-index 462396b..911ee33 100644
---- a/moonray/scene_rdl2/cmake/SceneRdl2CompileOptions.cmake
-+++ b/moonray/scene_rdl2/cmake/SceneRdl2CompileOptions.cmake
-@@ -65,7 +65,8 @@ function(SceneRdl2_ispc_compile_options target)
-         PRIVATE
-             --opt=force-aligned-memory          # always issue "aligned" vector load and store instructions
-             --pic                               # Generate position-independent code.  Ignored for Windows target
--            --werror                            # Treat warnings as errors
-+        #--werror                            # Treat warnings as errors
-+        --ignore-preprocessor-errors
-             # --wno-perf                          # Don't issue warnings related to performance-related issues
-
-             $<$<CONFIG:DEBUG>:
+ #include <scene_rdl2/common/math/Color.h>
++#include <array>
+
+ namespace moonshine {
+ namespace noise {
 diff --git a/moonray/scene_rdl2/lib/common/platform/Platform.h b/moonray/scene_rdl2/lib/common/platform/Platform.h
 index 6baca9a..9d9f12a 100644
 --- a/moonray/scene_rdl2/lib/common/platform/Platform.h
@@ -859,54 +403,3 @@ index 6baca9a..9d9f12a 100644
 
  // Intel: begin *****
  /*
-diff --git a/moonray/scene_rdl2/lib/render/util/Arena.h b/moonray/scene_rdl2/lib/render/util/Arena.h
-index ada0b49..bd7e327 100644
---- a/moonray/scene_rdl2/lib/render/util/Arena.h
-+++ b/moonray/scene_rdl2/lib/render/util/Arena.h
-@@ -115,7 +115,7 @@ public:
-
- protected:
-     unsigned            mBlockSize;
--    tbb::atomic<unsigned> mTotalBlocks;
-+    std::atomic<unsigned> mTotalBlocks;
-
-     CACHE_ALIGN util::ConcurrentSList mFreeBlocks;
- };
-diff --git a/moonray/scene_rdl2/lib/render/util/ReaderWriterMutex.h b/moonray/scene_rdl2/lib/render/util/ReaderWriterMutex.h
-index e08db0e..9b0aa18 100644
---- a/moonray/scene_rdl2/lib/render/util/ReaderWriterMutex.h
-+++ b/moonray/scene_rdl2/lib/render/util/ReaderWriterMutex.h
-@@ -4,6 +4,8 @@
-
- #pragma once
-
-+#include <mutex>
-+
- #if defined(__has_include)
- #    if __has_include(<shared_mutex>)
- #        include <shared_mutex>
-diff --git a/moonray/scene_rdl2/lib/scene/rdl2/SceneContext.cc b/moonray/scene_rdl2/lib/scene/rdl2/SceneContext.cc
-index 811f55e..3e605f2 100644
---- a/moonray/scene_rdl2/lib/scene/rdl2/SceneContext.cc
-+++ b/moonray/scene_rdl2/lib/scene/rdl2/SceneContext.cc
-@@ -31,7 +31,7 @@
- #include <scene_rdl2/render/logging/logging.h>
-
- #include <tbb/concurrent_hash_map.h>
--#include <tbb/mutex.h>
-+#include </usr/include/oneapi/tbb/mutex.h>
- #include <tbb/parallel_for_each.h>
-
- #include <algorithm>
-diff --git a/moonray/scene_rdl2/lib/scene/rdl2/SceneContext.h b/moonray/scene_rdl2/lib/scene/rdl2/SceneContext.h
-index 8b7c9ce..c43d080 100644
---- a/moonray/scene_rdl2/lib/scene/rdl2/SceneContext.h
-+++ b/moonray/scene_rdl2/lib/scene/rdl2/SceneContext.h
-@@ -13,7 +13,7 @@
- #include <scene_rdl2/render/util/Alloc.h>
- #include <scene_rdl2/common/platform/Platform.h>
- #include <tbb/concurrent_hash_map.h>
--#include <tbb/mutex.h>
-+#include </usr/include/oneapi/tbb/mutex.h>
-
- #include <string>
diff --git a/optix.patch b/optix.patch
index 686892dbd6bd..1579b288a461 100644
--- a/optix.patch
+++ b/optix.patch
@@ -1,13 +1,110 @@
-diff --git a/OptixDenoiserImpl.cc.orig b/OptixDenoiserImpl.cc
+diff --git a/moonray/moonray/lib/rendering/rt/gpu/GPUAcceleratorImpl.cc b/moonray/moonray/lib/rendering/rt/gpu/GPUAcceleratorImpl.cc
+index 6e6820a..90638d0 100644
+--- a/moonray/moonray/lib/rendering/rt/gpu/GPUAcceleratorImpl.cc
++++ b/moonray/moonray/lib/rendering/rt/gpu/GPUAcceleratorImpl.cc
+@@ -1006,16 +1006,6 @@ GPUAcceleratorImpl::GPUAcceleratorImpl(const scene_rdl2::rdl2::Layer *layer,
+
+     scene_rdl2::logging::Logger::info("GPU: Creating pipeline");
+
+-    if (!createOptixPipeline(mContext,
+-                             pipelineCompileOptions,
+-                             { 1, // maxTraceDepth
+-                               OPTIX_COMPILE_DEBUG_LEVEL_NONE },
+-                             mProgramGroups,
+-                             &mPipeline,
+-                             errorMsg)) {
+-        return;
+-    }
+-
+     scene_rdl2::logging::Logger::info("GPU: Creating traversables");
+
+     std::string buildErrorMsg;
+diff --git a/moonray/moonray/lib/rendering/rt/gpu/GPUPrimitiveGroup.cc b/moonray/moonray/lib/rendering/rt/gpu/GPUPrimitiveGroup.cc
+index 0f0162c..b8b4d6b 100644
+--- a/moonray/moonray/lib/rendering/rt/gpu/GPUPrimitiveGroup.cc
++++ b/moonray/moonray/lib/rendering/rt/gpu/GPUPrimitiveGroup.cc
+@@ -66,7 +66,6 @@ GPUPrimitiveGroup::build(CUstream cudaStream,
+         oinstance.instanceId = 0;
+         oinstance.visibilityMask = 255;
+         oinstance.sbtOffset = mSBTOffset;
+-        oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
+         oinstance.traversableHandle = mTrianglesGAS;
+         instances.push_back(oinstance);
+     }
+@@ -87,7 +86,6 @@ GPUPrimitiveGroup::build(CUstream cudaStream,
+         oinstance.instanceId = 0;
+         oinstance.visibilityMask = 255;
+         oinstance.sbtOffset = mSBTOffset + mTriMeshes.size();
+-        oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
+         oinstance.traversableHandle = mTrianglesMBGAS;
+         instances.push_back(oinstance);
+     }
+@@ -108,7 +106,6 @@ GPUPrimitiveGroup::build(CUstream cudaStream,
+         oinstance.instanceId = 0;
+         oinstance.visibilityMask = 255;
+         oinstance.sbtOffset = mSBTOffset + mTriMeshes.size() + mTriMeshesMB.size();
+-        oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
+         oinstance.traversableHandle = mRoundCurvesGAS;
+         instances.push_back(oinstance);
+     }
+@@ -129,7 +126,6 @@ GPUPrimitiveGroup::build(CUstream cudaStream,
+         oinstance.instanceId = 0;
+         oinstance.visibilityMask = 255;
+         oinstance.sbtOffset = mSBTOffset + mTriMeshes.size() + mTriMeshesMB.size() + mRoundCurves.size();
+-        oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
+         oinstance.traversableHandle = mRoundCurvesMBGAS;
+         instances.push_back(oinstance);
+     }
+@@ -151,7 +147,6 @@ GPUPrimitiveGroup::build(CUstream cudaStream,
+         oinstance.visibilityMask = 255;
+         oinstance.sbtOffset = mSBTOffset + mTriMeshes.size() + mTriMeshesMB.size() +
+                                            mRoundCurves.size() + mRoundCurvesMB.size();
+-        oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
+         oinstance.traversableHandle = mCustomPrimitivesGAS;
+         instances.push_back(oinstance);
+
+@@ -185,7 +180,6 @@ GPUPrimitiveGroup::build(CUstream cudaStream,
+                 // The xform is specified in the mMMTTraversable instead.  The child
+                 // node is the MatrixMotionTransform of the instance, which itself
+                 // has the group's top level IAS node as its child.
+-                oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
+                 GPUXform::identityXform().toOptixTransform(oinstance.transform);
+                 oinstance.traversableHandle = mInstances[i]->mMMTTraversable;
+             }
+diff --git a/moonray/moonray/lib/rendering/rt/gpu/GPUUtils.cc b/moonray/moonray/lib/rendering/rt/gpu/GPUUtils.cc
+index 8ed5ee0..9564ae5 100644
+--- a/moonray/moonray/lib/rendering/rt/gpu/GPUUtils.cc
++++ b/moonray/moonray/lib/rendering/rt/gpu/GPUUtils.cc
+@@ -135,7 +135,7 @@ createOptixModule(OptixDeviceContext context,
+
+     char logString[MAX_LOGSTRING_SIZE];
+     size_t logStringSize = sizeof(logString);
+-    if (optixModuleCreateFromPTX(context,
++    if (optixModuleCreate(context,
+                                  &moduleCompileOptions,
+                                  &pipelineCompileOptions,
+                                  ptx.c_str(),
+@@ -293,7 +293,7 @@ createOptixPipeline(OptixDeviceContext context,
+
+     OptixStackSizes stackSizes = {};
+     for (auto pg : pgs) {
+-        if (optixUtilAccumulateStackSizes(pg, &stackSizes) != OPTIX_SUCCESS) {
++        if (optixUtilAccumulateStackSizes(pg, &stackSizes, *pipeline) != OPTIX_SUCCESS) {
+             optixPipelineDestroy(*pipeline);
+             *errorMsg = "Unable to accumulate Optix stack sizes.";
+             return false;
+
+diff --git a/moonray/mcrt_denoise/lib/denoiser/OptixDenoiserImpl.cc b/moonray/mcrt_denoise/lib/denoiser/OptixDenoiserImpl.cc
 index e9b4302..57f2fba 100644
---- a/OptixDenoiserImpl.cc.orig
-+++ b/OptixDenoiserImpl.cc
+--- a/moonray/mcrt_denoise/lib/denoiser/OptixDenoiserImpl.cc
++++ b/moonray/mcrt_denoise/lib/denoiser/OptixDenoiserImpl.cc
 @@ -107,7 +107,7 @@ OptixDenoiserImpl::OptixDenoiserImpl(int width,
      }
- 
+
      mDenoiserParams = {};                 // zero initialize
 -    mDenoiserParams.denoiseAlpha = 0;     // don't denoise alpha
 +    mDenoiserParams.denoiseAlpha = OPTIX_DENOISER_ALPHA_MODE_COPY;     // don't denoise alpha
-     mDenoiserParams.hdrIntensity = 0;     // optional average log intensity image of input image, 
+     mDenoiserParams.hdrIntensity = 0;     // optional average log intensity image of input image,
                                            //  helps with very dark/bright images
      mDenoiserParams.blendFactor = 0.f;    // show the denoised image only
+