File a996e7760da0cc23b548b3082722a4bfe8602540.patch of Package OpenUSD

Overview Repositories Revisions Requests Users Attributes Meta

File a996e7760da0cc23b548b3082722a4bfe8602540.patch of Package OpenUSD (Revision d7cd9cf1480a3123ca93eaf73f4f7f2d)

Currently displaying revision d7cd9cf1480a3123ca93eaf73f4f7f2d , Show latest

From a996e7760da0cc23b548b3082722a4bfe8602540 Mon Sep 17 00:00:00 2001
From: Jiwen Cai <steve@gozeta.io>
Date: Sun, 24 Dec 2023 21:33:39 -0800
Subject: [PATCH] Update to oneTBB 2021.11.0

Index: OpenUSD-23.11/cmake/modules/FindTBB.cmake
===================================================================
--- OpenUSD-23.11.orig/cmake/modules/FindTBB.cmake
+++ OpenUSD-23.11/cmake/modules/FindTBB.cmake
@@ -72,7 +72,7 @@
 # * TBB_VERSION_MAJOR     - The major version
 # * TBB_VERSION_MINOR     - The minor version
 # * TBB_INTERFACE_VERSION - The interface version number defined in 
-#                           tbb/tbb_stddef.h.
+#                           oneapi/tbb/version.h.
 # * TBB_<library>_LIBRARY_RELEASE - The path of the TBB release version of 
 #                           <library>, where <library> may be tbb, tbb_debug,
 #                           tbbmalloc, tbbmalloc_debug, tbb_preview, or 
@@ -196,16 +196,20 @@ if(NOT TBB_FOUND)
   # Set version strings
   ##################################
 
-  if(TBB_INCLUDE_DIRS)
-    file(READ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" _tbb_version_file)
-    string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1"
-        TBB_VERSION_MAJOR "${_tbb_version_file}")
-    string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1"
-        TBB_VERSION_MINOR "${_tbb_version_file}")
-    string(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1"
-        TBB_INTERFACE_VERSION "${_tbb_version_file}")
-    set(TBB_VERSION "${TBB_VERSION_MAJOR}.${TBB_VERSION_MINOR}")
-  endif()
+  # if(TBB_INCLUDE_DIRS)
+  #   file(READ "${TBB_INCLUDE_DIRS}/oneapi/tbb/version.h" _tbb_version_file)
+  #   string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1"
+  #       TBB_VERSION_MAJOR "${_tbb_version_file}")
+  #   string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1"
+  #       TBB_VERSION_MINOR "${_tbb_version_file}")
+  #   string(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1"
+  #       TBB_INTERFACE_VERSION "${_tbb_version_file}")
+  #   set(TBB_VERSION "${TBB_VERSION_MAJOR}.${TBB_VERSION_MINOR}")
+  # endif()
+
+  # set(TBB_VERSION_MAJOR "2021")
+  # set(TBB_VERSION_MINOR "11")
+  set(TBB_VERSION "2021.11.0")
 
   ##################################
   # Find TBB components
Index: OpenUSD-23.11/extras/usd/examples/usdObj/pch.h
===================================================================
--- OpenUSD-23.11.orig/extras/usd/examples/usdObj/pch.h
+++ OpenUSD-23.11/extras/usd/examples/usdObj/pch.h
@@ -166,7 +166,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/extras/usd/examples/usdSchemaExamples/pch.h
===================================================================
--- OpenUSD-23.11.orig/extras/usd/examples/usdSchemaExamples/pch.h
+++ OpenUSD-23.11/extras/usd/examples/usdSchemaExamples/pch.h
@@ -168,7 +168,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/pxr/base/plug/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/base/plug/pch.h
+++ OpenUSD-23.11/pxr/base/plug/pch.h
@@ -183,7 +183,6 @@
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_vector.h>
 #include <tbb/enumerable_thread_specific.h>
Index: OpenUSD-23.11/pxr/base/tf/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/base/tf/pch.h
+++ OpenUSD-23.11/pxr/base/tf/pch.h
@@ -242,7 +242,6 @@
 #include <boost/variant.hpp>
 #include <boost/variant/get.hpp>
 #include <boost/variant/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
Index: OpenUSD-23.11/pxr/base/tf/testenv/error.cpp
===================================================================
--- OpenUSD-23.11.orig/pxr/base/tf/testenv/error.cpp
+++ OpenUSD-23.11/pxr/base/tf/testenv/error.cpp
@@ -29,7 +29,7 @@
 
 #include "pxr/base/arch/functionLite.h"
 
-#include <tbb/tbb_thread.h>
+#include <thread>
 
 #define FILENAME   "error.cpp"
 
@@ -195,7 +195,7 @@ Test_TfErrorThreadTransport()
     printf("Creating TfErrorMark\n");
     TfErrorMark m;
     printf("Launching thread\n");
-    tbb::tbb_thread t([&transport]() { _ThreadTask(&transport); });
+    std::thread t([&transport]() { _ThreadTask(&transport); });
     TF_AXIOM(m.IsClean());
     t.join();
     printf("Thread completed, posting error.\n");
Index: OpenUSD-23.11/pxr/base/trace/concurrentList.h
===================================================================
--- OpenUSD-23.11.orig/pxr/base/trace/concurrentList.h
+++ OpenUSD-23.11/pxr/base/trace/concurrentList.h
@@ -111,7 +111,7 @@ public:
         while (curNode) {
             Node* nodeToDelete = curNode;
             curNode = curNode->next;
-            _alloc.destroy(nodeToDelete);
+            nodeToDelete->~Node();
             _alloc.deallocate(nodeToDelete, 1);
         }
     }
@@ -130,7 +130,7 @@ public:
     /// the newly created item.
     iterator Insert() {
         Node* newNode = _alloc.allocate(1);
-        _alloc.construct(newNode);
+        new(newNode) Node();
 
         // Add the node to the linked list in an atomic manner.
         do {
Index: OpenUSD-23.11/pxr/base/trace/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/base/trace/pch.h
+++ OpenUSD-23.11/pxr/base/trace/pch.h
@@ -178,7 +178,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_vector.h>
Index: OpenUSD-23.11/pxr/base/vt/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/base/vt/pch.h
+++ OpenUSD-23.11/pxr/base/vt/pch.h
@@ -171,7 +171,6 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_unordered_map.h>
 #include <tbb/enumerable_thread_specific.h>
Index: OpenUSD-23.11/pxr/base/work/detachedTask.h
===================================================================
--- OpenUSD-23.11.orig/pxr/base/work/detachedTask.h
+++ OpenUSD-23.11/pxr/base/work/detachedTask.h
@@ -41,7 +41,7 @@ struct Work_DetachedTask
 {
     explicit Work_DetachedTask(Fn &&fn) : _fn(std::move(fn)) {}
     explicit Work_DetachedTask(Fn const &fn) : _fn(fn) {}
-    void operator()() {
+    void operator()() const {
         TfErrorMark m;
         _fn();
         m.Clear();
Index: OpenUSD-23.11/pxr/base/work/dispatcher.cpp
===================================================================
--- OpenUSD-23.11.orig/pxr/base/work/dispatcher.cpp
+++ OpenUSD-23.11/pxr/base/work/dispatcher.cpp
@@ -35,24 +35,20 @@ WorkDispatcher::WorkDispatcher()
 {
     _waitCleanupFlag.clear();
     
-    // The concurrent_wait flag used with the task_group_context ensures
-    // the ref count will remain at 1 after all predecessor tasks are
-    // completed, so we don't need to keep resetting it in Wait().
-    _rootTask = new(tbb::task::allocate_root(_context)) tbb::empty_task;
-    _rootTask->set_ref_count(1);
+    _taskGroup = new tbb::task_group(_context);
 }
 
 WorkDispatcher::~WorkDispatcher()
 {
     Wait();
-    tbb::task::destroy(*_rootTask);
+    delete _taskGroup;
 }
 
 void
 WorkDispatcher::Wait()
 {
     // Wait for tasks to complete.
-    _rootTask->wait_for_all();
+    _taskGroup->wait();
 
     // If we take the flag from false -> true, we do the cleanup.
     if (_waitCleanupFlag.test_and_set() == false) {
Index: OpenUSD-23.11/pxr/base/work/dispatcher.h
===================================================================
--- OpenUSD-23.11.orig/pxr/base/work/dispatcher.h
+++ OpenUSD-23.11/pxr/base/work/dispatcher.h
@@ -35,6 +35,7 @@
 
 #include <tbb/concurrent_vector.h>
 #include <tbb/task.h>
+#include <tbb/task_group.h>
 
 #include <functional>
 #include <type_traits>
@@ -103,7 +104,7 @@ public:
 
     template <class Callable>
     inline void Run(Callable &&c) {
-        _rootTask->spawn(_MakeInvokerTask(std::forward<Callable>(c)));
+        _taskGroup->run(std::forward<Callable>(c));
     }
 
     template <class Callable, class A0, class ... Args>
@@ -133,38 +134,6 @@ public:
 private:
     typedef tbb::concurrent_vector<TfErrorTransport> _ErrorTransports;
 
-    // Function invoker helper that wraps the invocation with an ErrorMark so we
-    // can transmit errors that occur back to the thread that Wait() s for tasks
-    // to complete.
-    template <class Fn>
-    struct _InvokerTask : public tbb::task {
-        explicit _InvokerTask(Fn &&fn, _ErrorTransports *err) 
-            : _fn(std::move(fn)), _errors(err) {}
-
-        explicit _InvokerTask(Fn const &fn, _ErrorTransports *err) 
-            : _fn(fn), _errors(err) {}
-
-        virtual tbb::task* execute() {
-            TfErrorMark m;
-            _fn();
-            if (!m.IsClean())
-                WorkDispatcher::_TransportErrors(m, _errors);
-            return NULL;
-        }
-    private:
-        Fn _fn;
-        _ErrorTransports *_errors;
-    };
-
-    // Make an _InvokerTask instance, letting the function template deduce Fn.
-    template <class Fn>
-    _InvokerTask<typename std::remove_reference<Fn>::type>&
-    _MakeInvokerTask(Fn &&fn) { 
-        return *new( _rootTask->allocate_additional_child_of(*_rootTask) )
-            _InvokerTask<typename std::remove_reference<Fn>::type>(
-                std::forward<Fn>(fn), &_errors);
-    }
-
     // Helper function that removes errors from \p m and stores them in a new
     // entry in \p errors.
     WORK_API static void
@@ -172,8 +141,8 @@ private:
 
     // Task group context and associated root task that allows us to cancel
     // tasks invoked directly by this dispatcher.
-    tbb::task_group_context _context;
-    tbb::empty_task* _rootTask;
+    tbb::detail::d1::task_group_context _context;
+    tbb::detail::d1::task_group *_taskGroup;
 
     // The error transports we use to transmit errors in other threads back to
     // this thread.
Index: OpenUSD-23.11/pxr/base/work/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/base/work/pch.h
+++ OpenUSD-23.11/pxr/base/work/pch.h
@@ -110,7 +110,6 @@
 #include <boost/type_traits/is_enum.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_vector.h>
Index: OpenUSD-23.11/pxr/base/work/threadLimits.cpp
===================================================================
--- OpenUSD-23.11.orig/pxr/base/work/threadLimits.cpp
+++ OpenUSD-23.11/pxr/base/work/threadLimits.cpp
@@ -29,7 +29,7 @@
 
 #include "pxr/base/tf/envSetting.h"
 
-#include <tbb/task_scheduler_init.h>
+#include <tbb/global_control.h>
 #include <tbb/task_arena.h>
 
 #include <algorithm>
@@ -58,16 +58,15 @@ TF_DEFINE_ENV_SETTING(
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-// We create a task_scheduler_init instance at static initialization time if
-// PXR_WORK_THREAD_LIMIT is set to a nonzero value.  Otherwise this stays NULL.
-static tbb::task_scheduler_init *_tbbTaskSchedInit;
+static unsigned kThreadLimit = 0;
+static tbb::global_control *_tbbGlobalControl;
 
 unsigned
 WorkGetPhysicalConcurrencyLimit()
 {
     // Use TBB here, since it pays attention to the affinity mask on Linux and
     // Windows.
-    return tbb::task_scheduler_init::default_num_threads();
+    return tbb::info::default_concurrency();
 }
 
 // This function always returns an actual thread count >= 1.
@@ -123,7 +122,8 @@ Work_InitializeThreading()
     // previously initialized by the hosting environment (e.g. if we are running
     // as a plugin to another application.)
     if (settingVal) {
-        _tbbTaskSchedInit = new tbb::task_scheduler_init(threadLimit);
+         _tbbGlobalControl = new tbb::global_control(tbb::global_control::max_allowed_parallelism, threadLimit);
+         kThreadLimit = threadLimit;
     }
 }
 static int _forceInitialization = (Work_InitializeThreading(), 0);
@@ -162,12 +162,12 @@ WorkSetConcurrencyLimit(unsigned n)
     // According to the documentation that should be the case, but we should
     // make sure.  If we do decide to delete it, we have to make sure to 
     // note that it has already been initialized.
-    if (_tbbTaskSchedInit) {
-        _tbbTaskSchedInit->terminate();
-        _tbbTaskSchedInit->initialize(threadLimit);
-    } else {
-        _tbbTaskSchedInit = new tbb::task_scheduler_init(threadLimit);
+    kThreadLimit = threadLimit;
+    if(_tbbGlobalControl)
+    {
+        delete _tbbGlobalControl;
     }
+    _tbbGlobalControl = new tbb::global_control(tbb::global_control::max_allowed_parallelism, threadLimit);
 }
 
 void 
@@ -185,7 +185,7 @@ WorkSetConcurrencyLimitArgument(int n)
 unsigned
 WorkGetConcurrencyLimit()
 {
-    return tbb::this_task_arena::max_concurrency();
+    return kThreadLimit > 0 ? kThreadLimit: tbb::global_control::active_value(tbb::global_control::max_allowed_parallelism);
 }
 
 bool
Index: OpenUSD-23.11/pxr/imaging/garch/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/garch/pch.h
+++ OpenUSD-23.11/pxr/imaging/garch/pch.h
@@ -145,7 +145,6 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/vmd/is_empty.hpp>
 #include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/spin_rw_mutex.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
Index: OpenUSD-23.11/pxr/imaging/glf/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/glf/pch.h
+++ OpenUSD-23.11/pxr/imaging/glf/pch.h
@@ -199,7 +199,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/imaging/hd/dependencyForwardingSceneIndex.cpp
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/hd/dependencyForwardingSceneIndex.cpp
+++ OpenUSD-23.11/pxr/imaging/hd/dependencyForwardingSceneIndex.cpp
@@ -211,7 +211,7 @@ HdDependencyForwardingSceneIndex::_PrimD
 void 
 HdDependencyForwardingSceneIndex::_ClearDependencies(const SdfPath &primPath)
 {
-    _AffectedPrimToDependsOnPathsEntryMap::const_iterator it =
+    _AffectedPrimToDependsOnPathsEntryMap::iterator it =
         _affectedPrimToDependsOnPathsMap.find(primPath);
     if (it == _affectedPrimToDependsOnPathsMap.end()) {
         return;
Index: OpenUSD-23.11/pxr/imaging/hd/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/hd/pch.h
+++ OpenUSD-23.11/pxr/imaging/hd/pch.h
@@ -152,7 +152,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/imaging/hdGp/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/hdGp/pch.h
+++ OpenUSD-23.11/pxr/imaging/hdGp/pch.h
@@ -120,7 +120,6 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/vmd/is_empty.hpp>
 #include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
Index: OpenUSD-23.11/pxr/imaging/hdMtlx/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/hdMtlx/pch.h
+++ OpenUSD-23.11/pxr/imaging/hdMtlx/pch.h
@@ -139,7 +139,6 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/vmd/is_empty.hpp>
 #include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/imaging/hdSt/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/hdSt/pch.h
+++ OpenUSD-23.11/pxr/imaging/hdSt/pch.h
@@ -170,7 +170,6 @@
 #include <opensubdiv/osd/cpuVertexBuffer.h>
 #include <opensubdiv/osd/mesh.h>
 #include <opensubdiv/version.h>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/imaging/hdar/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/hdar/pch.h
+++ OpenUSD-23.11/pxr/imaging/hdar/pch.h
@@ -131,7 +131,6 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/vmd/is_empty.hpp>
 #include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/spin_mutex.h>
Index: OpenUSD-23.11/pxr/imaging/hdsi/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/hdsi/pch.h
+++ OpenUSD-23.11/pxr/imaging/hdsi/pch.h
@@ -119,7 +119,6 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/vmd/is_empty.hpp>
 #include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/concurrent_queue.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
Index: OpenUSD-23.11/pxr/imaging/hdx/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/hdx/pch.h
+++ OpenUSD-23.11/pxr/imaging/hdx/pch.h
@@ -152,7 +152,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/imaging/hgiMetal/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/hgiMetal/pch.h
+++ OpenUSD-23.11/pxr/imaging/hgiMetal/pch.h
@@ -141,7 +141,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/spin_mutex.h>
Index: OpenUSD-23.11/pxr/imaging/plugin/hdEmbree/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/plugin/hdEmbree/pch.h
+++ OpenUSD-23.11/pxr/imaging/plugin/hdEmbree/pch.h
@@ -154,7 +154,6 @@
 #include <embree3/rtcore.h>
 #include <embree3/rtcore_geometry.h>
 #include <embree3/rtcore_ray.h>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/imaging/plugin/hdStorm/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/plugin/hdStorm/pch.h
+++ OpenUSD-23.11/pxr/imaging/plugin/hdStorm/pch.h
@@ -141,7 +141,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/spin_mutex.h>
Index: OpenUSD-23.11/pxr/imaging/plugin/hioOiio/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/imaging/plugin/hioOiio/pch.h
+++ OpenUSD-23.11/pxr/imaging/plugin/hioOiio/pch.h
@@ -199,7 +199,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/usd/ar/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/ar/pch.h
+++ OpenUSD-23.11/pxr/usd/ar/pch.h
@@ -166,7 +166,6 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/concurrent_hash_map.h>
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/spin_rw_mutex.h>
Index: OpenUSD-23.11/pxr/usd/ndr/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/ndr/pch.h
+++ OpenUSD-23.11/pxr/usd/ndr/pch.h
@@ -198,7 +198,6 @@
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/enumerable_thread_specific.h>
Index: OpenUSD-23.11/pxr/usd/pcp/mapExpression.cpp
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/pcp/mapExpression.cpp
+++ OpenUSD-23.11/pxr/usd/pcp/mapExpression.cpp
@@ -238,7 +238,7 @@ PcpMapExpression::_Node::New( _Op op_,
         // Check for existing instance to re-use
         _NodeMap::accessor accessor;
         if (_nodeRegistry->map.insert(accessor, key) ||
-            accessor->second->_refCount.fetch_and_increment() == 0) {
+            accessor->second->_refCount.fetch_add(1, std::memory_order_relaxed) == 0) {
             // Either there was no node in the table, or there was but it had
             // begun dying (another client dropped its refcount to 0).  We have
             // to create a new node in the table.  When the client that is
@@ -388,7 +388,7 @@ intrusive_ptr_add_ref(PcpMapExpression::
 void
 intrusive_ptr_release(PcpMapExpression::_Node* p)
 {
-    if (p->_refCount.fetch_and_decrement() == 1)
+    if (p->_refCount.fetch_sub(1, std::memory_order_relaxed) == 1)
         delete p;
 }
 
Index: OpenUSD-23.11/pxr/usd/pcp/mapExpression.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/pcp/mapExpression.h
+++ OpenUSD-23.11/pxr/usd/pcp/mapExpression.h
@@ -29,8 +29,6 @@
 #include "pxr/usd/pcp/mapFunction.h"
 
 #include <boost/intrusive_ptr.hpp>
-
-#include <tbb/atomic.h>
 #include <tbb/spin_mutex.h>
 
 #include <atomic>
@@ -267,7 +265,7 @@ private: // data
         struct _NodeMap;
         static TfStaticData<_NodeMap> _nodeRegistry;
 
-        mutable tbb::atomic<int> _refCount;
+        mutable std::atomic<int> _refCount;
         mutable Value _cachedValue;
         mutable std::set<_Node*> _dependentExpressions;
         Value _valueForVariable;
Index: OpenUSD-23.11/pxr/usd/pcp/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/pcp/pch.h
+++ OpenUSD-23.11/pxr/usd/pcp/pch.h
@@ -194,7 +194,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_hash_map.h>
Index: OpenUSD-23.11/pxr/usd/plugin/usdAbc/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/plugin/usdAbc/pch.h
+++ OpenUSD-23.11/pxr/usd/plugin/usdAbc/pch.h
@@ -206,7 +206,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/pxr/usd/plugin/usdDraco/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/plugin/usdDraco/pch.h
+++ OpenUSD-23.11/pxr/usd/plugin/usdDraco/pch.h
@@ -169,7 +169,6 @@
 #include <draco/compression/encode.h>
 #include <draco/mesh/mesh.h>
 #include <draco/mesh/mesh_misc_functions.h>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/pxr/usd/sdf/changeManager.cpp
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/sdf/changeManager.cpp
+++ OpenUSD-23.11/pxr/usd/sdf/changeManager.cpp
@@ -34,7 +34,7 @@
 #include "pxr/base/tf/instantiateSingleton.h"
 #include "pxr/base/tf/stackTrace.h"
 
-#include <tbb/atomic.h>
+#include <atomic>
 
 using std::string;
 using std::vector;
@@ -150,9 +150,9 @@ Sdf_ChangeManager::_ProcessRemoveIfInert
     TF_VERIFY(data->outermostBlock);
 }
 
-static tbb::atomic<size_t> &
+static std::atomic<size_t> &
 _InitChangeSerialNumber() {
-    static tbb::atomic<size_t> value;
+    static std::atomic<size_t> value;
     value = 1;
     return value;
 }
@@ -191,8 +191,8 @@ Sdf_ChangeManager::_SendNotices(_Data *d
     }
 
     // Obtain a serial number for this round of change processing.
-    static tbb::atomic<size_t> &changeSerialNumber = _InitChangeSerialNumber();
-    size_t serialNumber = changeSerialNumber.fetch_and_increment();
+    static std::atomic<size_t> &changeSerialNumber = _InitChangeSerialNumber();
+    size_t serialNumber = changeSerialNumber.fetch_add(1, std::memory_order_relaxed);
 
     // Send global notice.
     SdfNotice::LayersDidChange(changes, serialNumber).Send();
Index: OpenUSD-23.11/pxr/usd/sdf/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/sdf/pch.h
+++ OpenUSD-23.11/pxr/usd/sdf/pch.h
@@ -225,7 +225,6 @@
 #include <boost/variant.hpp>
 #include <boost/vmd/is_empty.hpp>
 #include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_hash_map.h>
Index: OpenUSD-23.11/pxr/usd/usd/crateData.cpp
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usd/crateData.cpp
+++ OpenUSD-23.11/pxr/usd/usd/crateData.cpp
@@ -801,21 +801,8 @@ private:
             TfAutoMallocTag tag("field data");
             auto &fieldValuePairs =
                 liveFieldSets[FieldSetIndex(fsBegin-fieldSets.begin())];
-                    
-            dispatcher.Run(
-                [this, fsBegin, fsEnd, &fields, &fieldValuePairs]() mutable {
-                    // XXX Won't need first two tags when bug #132031 is
-                    // addressed
-                    TfAutoMallocTag tag(
-                        "Usd", "Usd_CrateDataImpl::Open", "field data");
-                    auto &pairs = fieldValuePairs.GetMutable();
-                    pairs.resize(fsEnd-fsBegin);
-                    for (size_t i = 0; fsBegin != fsEnd; ++fsBegin, ++i) {
-                        auto const &field = fields[fsBegin->value];
-                        pairs[i].first = _crateFile->GetToken(field.tokenIndex);
-                        pairs[i].second = _UnpackForField(field.valueRep);
-                    }
-                });
+            TaskOpenFieldData task(this, _crateFile.get(), fsBegin, fsEnd, fields, fieldValuePairs);
+            dispatcher.Run(task);
         }
                 
         dispatcher.Wait();
@@ -1043,6 +1030,54 @@ private:
         SdfSpecType specType;
     };
 
+    struct TaskOpenFieldData {
+        typedef std::pair<TfToken, VtValue> FieldValuePair;
+        typedef Usd_Shared<_FieldValuePairVector> SharedFieldValuePairVector;
+        TaskOpenFieldData(Usd_CrateDataImpl* owner, CrateFile* crateFile, vector<Usd_CrateFile::FieldIndex>::iterator begin, vector<Usd_CrateFile::FieldIndex>::iterator end,
+            vector<CrateFile::Field> &fields, SharedFieldValuePairVector &fieldValuePairs)
+            :m_owner(owner),
+            m_crateFile(crateFile),
+            m_begin(begin),
+            m_end(end),
+            m_fields(fields),
+            m_fieldValuePairs(fieldValuePairs)
+        {
+
+        }
+
+        void operator()() const {
+            try{
+                // XXX Won't need first two tags when bug #132031 is
+                // addressed
+                TfAutoMallocTag tag(
+                    "Usd", "Usd_CrateDataImpl::Open", "field data");
+                auto &pairs = m_fieldValuePairs.GetMutable();
+                 vector<Usd_CrateFile::FieldIndex>::const_iterator begin = m_begin;
+                pairs.resize(m_end-begin);
+                for (size_t i = 0; begin != m_end; ++begin, ++i) {
+                    auto const &field = m_fields[begin->value];
+                    pairs[i].first =
+                        m_crateFile->GetToken(field.tokenIndex);
+                    pairs[i].second = m_owner->_UnpackForField(field.valueRep);
+                }
+            } catch (const std::exception &e){
+                TF_RUNTIME_ERROR("Encountered exception: %s %s",
+                    e.what(), m_crateFile->GetAssetPath().c_str());
+
+            } catch (...) {
+                TF_RUNTIME_ERROR("Encountered unknown exception");
+            }
+        }
+
+    private:
+        Usd_CrateDataImpl *m_owner;
+        CrateFile         *m_crateFile;
+        vector<Usd_CrateFile::FieldIndex>::iterator m_begin;
+        vector<Usd_CrateFile::FieldIndex>::iterator m_end;
+        vector<CrateFile::Field>        m_fields;
+        SharedFieldValuePairVector      m_fieldValuePairs;
+    };
+
     using _HashMap = pxr_tsl::robin_map<
         SdfPath, _SpecData, SdfPath::Hash, std::equal_to<SdfPath>,
         std::allocator<std::pair<SdfPath, _SpecData>>,
Index: OpenUSD-23.11/pxr/usd/usd/crateFile.cpp
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usd/crateFile.cpp
+++ OpenUSD-23.11/pxr/usd/usd/crateFile.cpp
@@ -3677,16 +3677,8 @@ CrateFile::_ReadPathsImpl(Reader reader,
             if (hasSibling) {
                 // Branch off a parallel task for the sibling subtree.
                 auto siblingOffset = reader.template Read<int64_t>();
-                dispatcher.Run(
-                    [this, reader,
-                     siblingOffset, &dispatcher, parentPath]() mutable {
-                        // XXX Remove these tags when bug #132031 is addressed
-                        TfAutoMallocTag tag(
-                            "Usd", "Usd_CrateDataImpl::Open",
-                            "Usd_CrateFile::CrateFile::Open", "_ReadPaths");
-                        reader.Seek(siblingOffset);
-                        _ReadPathsImpl<Header>(reader, dispatcher, parentPath);
-                    });
+                TaskReadPath<Header, Reader> task(this, &reader, siblingOffset, &dispatcher, parentPath);
+                dispatcher.Run(task);
             }
             // Have a child (may have also had a sibling). Reset parent path.
             parentPath = _paths[h.index.value];
@@ -3813,17 +3805,8 @@ CrateFile::_BuildDecompressedPathsImpl(
                     return;
                 }
 #endif
-                dispatcher.Run(
-                    [this, &pathIndexes, &elementTokenIndexes, &jumps,
-                     siblingIndex, &dispatcher, parentPath]() mutable {
-                        // XXX Remove these tags when bug #132031 is addressed
-                        TfAutoMallocTag tag(
-                            "Usd", "Usd_CrateDataImpl::Open",
-                            "Usd_CrateFile::CrateFile::Open", "_ReadPaths");
-                        _BuildDecompressedPathsImpl(
-                            pathIndexes, elementTokenIndexes, jumps,
-                            siblingIndex, parentPath, dispatcher);
-                    });
+                TaskBuildDecompressedpath task(this, pathIndexes, elementTokenIndexes, jumps, siblingIndex, &dispatcher, parentPath);
+                dispatcher.Run(task);
             }
             // Have a child (may have also had a sibling). Reset parent path.
             parentPath = _paths[pathIndexes[thisIndex]];
Index: OpenUSD-23.11/pxr/usd/usd/crateFile.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usd/crateFile.h
+++ OpenUSD-23.11/pxr/usd/usd/crateFile.h
@@ -338,10 +338,27 @@ private:
         class _Impl {
             friend class _FileMapping;
 
+            class tbb_hash
+            {
+            public:
+                tbb_hash() {}
+
+                template<typename Key>
+                std::size_t operator () (const Key& z) const
+                {
+                   return TfHash::Combine(
+                        reinterpret_cast<uintptr_t>(z.GetAddr()),
+                        z.GetNumBytes()
+                    );
+                }
+            };
+
             // This is a foreign data source for VtArray that refers into a
             // memory-mapped region, and shares in the lifetime of the mapping.
             struct ZeroCopySource : public Vt_ArrayForeignDataSource {
-                explicit ZeroCopySource(_Impl *m,
+                ZeroCopySource() = default;
+
+                ZeroCopySource(_Impl *m,
                                         void const *addr,
                                         size_t numBytes);
                 
@@ -422,7 +439,7 @@ private:
             ArchConstFileMapping _mapping;
             char const *_start;
             int64_t _length;
-            tbb::concurrent_unordered_set<ZeroCopySource> _outstandingRanges;
+            tbb::concurrent_unordered_set<ZeroCopySource, tbb_hash> _outstandingRanges;
         };
 
     public:
@@ -666,6 +683,67 @@ public:
         SdfSpecType specType;
     };
 
+    template<typename Header, typename Reader>
+    struct TaskReadPath {
+        TaskReadPath(CrateFile* owner, Reader *reader, int64_t offset, WorkDispatcher* dispatcher, SdfPath path)
+            :m_owner(owner),
+            m_reader(reader),
+            m_offset(offset),
+            m_dispatcher(dispatcher),
+            m_path(path)
+        {
+
+        }
+
+        void operator()() const{
+            TfAutoMallocTag tag(
+                "Usd", "Usd_CrateDataImpl::Open",
+                "Usd_CrateFile::CrateFile::Open", "_ReadPaths");
+                m_reader->Seek(m_offset);
+                m_owner->_ReadPathsImpl<Header>(*m_reader, *m_dispatcher, m_path);
+        }
+
+    private:
+        CrateFile     *m_owner = nullptr;
+        Reader        *m_reader;
+        int64_t        m_offset = 0;
+        WorkDispatcher *m_dispatcher = nullptr;
+        SdfPath        m_path;
+    };
+
+    struct TaskBuildDecompressedpath {
+        TaskBuildDecompressedpath(CrateFile* owner, vector<uint32_t> const &pathIndexes,  vector<int32_t> const &elementTokenIndexes, vector<int32_t> const &jumps,
+                int64_t offset, WorkDispatcher* dispatcher, SdfPath path)
+            :m_owner(owner),
+            m_pathIndexes(pathIndexes),
+            m_elementTokenIndexes(elementTokenIndexes),
+            m_jumps(jumps),
+            m_offset(offset),
+            m_dispatcher(dispatcher),
+            m_path(path)
+        {
+
+        }
+
+        void operator()() const{
+            TfAutoMallocTag tag(
+                            "Usd", "Usd_CrateDataImpl::Open",
+                            "Usd_CrateFile::CrateFile::Open", "_ReadPaths");
+            m_owner->_BuildDecompressedPathsImpl(
+                            m_pathIndexes, m_elementTokenIndexes, m_jumps,
+                            m_offset, m_path, *m_dispatcher);
+        }
+
+    private:
+        CrateFile         *m_owner = nullptr;
+        vector<uint32_t>  m_pathIndexes;
+        vector<int32_t>   m_elementTokenIndexes;
+        vector<int32_t>   m_jumps;
+        int64_t           m_offset = 0;
+        WorkDispatcher    *m_dispatcher = nullptr;
+        SdfPath           m_path;
+    };
+
     ~CrateFile();
 
     static bool CanRead(string const &assetPath);
Index: OpenUSD-23.11/pxr/usd/usd/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usd/pch.h
+++ OpenUSD-23.11/pxr/usd/usd/pch.h
@@ -227,7 +227,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/utility/in_place_factory.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_hash_map.h>
Index: OpenUSD-23.11/pxr/usd/usdGeom/bboxCache.cpp
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdGeom/bboxCache.cpp
+++ OpenUSD-23.11/pxr/usd/usdGeom/bboxCache.cpp
@@ -99,9 +99,9 @@ public:
     explicit operator bool() const {
         return _owner;
     }
-    void operator()() {
+    void operator()() const {
         // Do not save state here; all state should be accumulated externally.
-        _owner->_ResolvePrim(this, _primContext, _inverseComponentCtm);
+        _owner->_ResolvePrim(const_cast<_BBoxTask*>(this), _primContext, _inverseComponentCtm);
     }
     _ThreadXformCache* GetXformCaches() { return _xfCaches; }
 };
@@ -126,9 +126,15 @@ private:
     {
         _PrototypeTask() : numDependencies(0) { }
 
+        _PrototypeTask(const _PrototypeTask& other)
+        {
+            dependentPrototypes = other.dependentPrototypes;
+            numDependencies.store(other.numDependencies.load(std::memory_order_relaxed), std::memory_order_relaxed);
+        }
+
         // Number of dependencies -- prototype prims that must be resolved
         // before this prototype can be resolved.
-        tbb::atomic<size_t> numDependencies;
+        std::atomic<size_t> numDependencies;
 
         // List of prototype prims that depend on this prototype.
         std::vector<_PrimContext> dependentPrototypes;
@@ -172,9 +178,12 @@ private:
     void _PopulateTasksForPrototype(const _PrimContext& prototypePrim,
                                  _PrototypeTaskMap* prototypeTasks)
     {
+        const std::pair<const _PrimContext, _PrototypeTask> pair = std::make_pair(
+            std::ref(prototypePrim), _PrototypeTask()
+        );
         std::pair<_PrototypeTaskMap::iterator, bool> prototypeTaskStatus =
-            prototypeTasks->insert(std::make_pair(
-                    prototypePrim, _PrototypeTask()));
+            prototypeTasks->insert(pair);
+
         if (!prototypeTaskStatus.second) {
             return;
         }
@@ -220,7 +229,7 @@ private:
             _PrototypeTask& dependentPrototypeData =
                 prototypeTasks->find(dependentPrototype)->second;
             if (dependentPrototypeData.numDependencies
-                .fetch_and_decrement() == 1){
+                .fetch_sub(1, std::memory_order_relaxed) == 1){
                 dispatcher->Run(
                     &_PrototypeBBoxResolver::_ExecuteTaskForPrototype,
                     this, dependentPrototype, prototypeTasks, xfCaches,
Index: OpenUSD-23.11/pxr/usd/usdGeom/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdGeom/pch.h
+++ OpenUSD-23.11/pxr/usd/usdGeom/pch.h
@@ -181,7 +181,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/usd/usdHydra/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdHydra/pch.h
+++ OpenUSD-23.11/pxr/usd/usdHydra/pch.h
@@ -162,7 +162,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/pxr/usd/usdLux/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdLux/pch.h
+++ OpenUSD-23.11/pxr/usd/usdLux/pch.h
@@ -177,7 +177,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/pxr/usd/usdMedia/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdMedia/pch.h
+++ OpenUSD-23.11/pxr/usd/usdMedia/pch.h
@@ -170,7 +170,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/pxr/usd/usdMtlx/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdMtlx/pch.h
+++ OpenUSD-23.11/pxr/usd/usdMtlx/pch.h
@@ -193,7 +193,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
Index: OpenUSD-23.11/pxr/usd/usdPhysics/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdPhysics/pch.h
+++ OpenUSD-23.11/pxr/usd/usdPhysics/pch.h
@@ -181,7 +181,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/usd/usdProc/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdProc/pch.h
+++ OpenUSD-23.11/pxr/usd/usdProc/pch.h
@@ -165,7 +165,6 @@
 #include <boost/variant.hpp>
 #include <boost/vmd/is_empty.hpp>
 #include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/pxr/usd/usdRender/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdRender/pch.h
+++ OpenUSD-23.11/pxr/usd/usdRender/pch.h
@@ -170,7 +170,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/pxr/usd/usdRi/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdRi/pch.h
+++ OpenUSD-23.11/pxr/usd/usdRi/pch.h
@@ -173,7 +173,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/pxr/usd/usdShade/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdShade/pch.h
+++ OpenUSD-23.11/pxr/usd/usdShade/pch.h
@@ -179,7 +179,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/usd/usdSkel/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdSkel/pch.h
+++ OpenUSD-23.11/pxr/usd/usdSkel/pch.h
@@ -180,7 +180,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/usd/usdUI/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdUI/pch.h
+++ OpenUSD-23.11/pxr/usd/usdUI/pch.h
@@ -168,7 +168,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/pxr/usd/usdUtils/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdUtils/pch.h
+++ OpenUSD-23.11/pxr/usd/usdUtils/pch.h
@@ -215,7 +215,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/usd/usdVol/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usd/usdVol/pch.h
+++ OpenUSD-23.11/pxr/usd/usdVol/pch.h
@@ -170,7 +170,6 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/pxr/usdImaging/plugin/usdShaders/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usdImaging/plugin/usdShaders/pch.h
+++ OpenUSD-23.11/pxr/usdImaging/plugin/usdShaders/pch.h
@@ -160,7 +160,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/pxr/usdImaging/usdAppUtils/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usdImaging/usdAppUtils/pch.h
+++ OpenUSD-23.11/pxr/usdImaging/usdAppUtils/pch.h
@@ -173,7 +173,6 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
 #include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
Index: OpenUSD-23.11/pxr/usdImaging/usdImaging/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usdImaging/usdImaging/pch.h
+++ OpenUSD-23.11/pxr/usdImaging/usdImaging/pch.h
@@ -173,7 +173,6 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
 #include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/usdImaging/usdImaging/resolvedAttributeCache.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usdImaging/usdImaging/resolvedAttributeCache.h
+++ OpenUSD-23.11/pxr/usdImaging/usdImaging/resolvedAttributeCache.h
@@ -40,6 +40,8 @@
 #include <tbb/concurrent_unordered_map.h>
 #include <functional>
 
+#include <atomic>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 /// A general caching mechanism for attributes that are nontrivial to resolve,
@@ -283,22 +285,36 @@ private:
     // non-time varying data, entries may exist in the cache with invalid
     // values. The version is used to determine validity.
     struct _Entry {
-        _Entry()
+        _Entry() noexcept
             : value(Strategy::MakeDefault())
             , version(_GetInitialEntryVersion()) 
         { }
 
         _Entry(const query_type & query_,
                const value_type& value_,
-               unsigned version_)
+               unsigned version_) noexcept
             : query(query_)
             , value(value_)
             , version(version_)
         { }
 
+        _Entry(const _Entry &other) noexcept
+            : query(other.query)
+            , value(other.value)
+        {
+            version.store(other.version.load());
+        }
+
+        _Entry(_Entry &&other) noexcept
+            : query(std::move(other.query))
+            , value(std::move(other.value))
+        {
+            version.store(other.version.load());
+        }
+
         query_type query;
         value_type value;
-        tbb::atomic<unsigned> version;
+        std::atomic<unsigned> version;
     };
 
     // Returns the version number for a valid cache entry
@@ -338,7 +354,7 @@ private:
 
     // A serial number indicating the valid state of entries in the cache. When
     // an entry has an equal or greater value, the entry is valid.
-    tbb::atomic<unsigned> _cacheVersion;
+    std::atomic<unsigned> _cacheVersion;
 
     // Value overrides for a set of descendents.
     ValueOverridesMap _valueOverrides;
@@ -357,7 +373,7 @@ UsdImaging_ResolvedAttributeCache<Strate
     // Note: _cacheVersion is not allowed to change during cache access.
     unsigned v = entry->version;
     if (v < _cacheVersion 
-        && entry->version.compare_and_swap(_cacheVersion, v) == v)
+        && entry->version.compare_exchange_strong(v, _cacheVersion.load()))
     {
         entry->value = value;
         entry->version = _GetValidVersion();
@@ -377,7 +393,7 @@ typename UsdImaging_ResolvedAttributeCac
 UsdImaging_ResolvedAttributeCache<Strategy, ImplData>::_GetCacheEntryForPrim(
     const UsdPrim &prim) const
 {
-    typename _CacheMap::const_iterator it = _cache.find(prim);
+    typename _CacheMap::iterator it = _cache.find(prim);
     if (it != _cache.end()) {
         return &it->second;
     }
Index: OpenUSD-23.11/pxr/usdImaging/usdImagingGL/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usdImaging/usdImagingGL/pch.h
+++ OpenUSD-23.11/pxr/usdImaging/usdImagingGL/pch.h
@@ -186,7 +186,6 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
 #include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
Index: OpenUSD-23.11/pxr/usdImaging/usdProcImaging/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usdImaging/usdProcImaging/pch.h
+++ OpenUSD-23.11/pxr/usdImaging/usdProcImaging/pch.h
@@ -161,7 +161,6 @@
 #include <boost/variant.hpp>
 #include <boost/vmd/is_empty.hpp>
 #include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/usdImaging/usdSkelImaging/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usdImaging/usdSkelImaging/pch.h
+++ OpenUSD-23.11/pxr/usdImaging/usdSkelImaging/pch.h
@@ -169,7 +169,6 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
 #include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
Index: OpenUSD-23.11/pxr/usdImaging/usdVolImaging/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usdImaging/usdVolImaging/pch.h
+++ OpenUSD-23.11/pxr/usdImaging/usdVolImaging/pch.h
@@ -167,7 +167,6 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
 #include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
Index: OpenUSD-23.11/pxr/usdImaging/usdviewq/pch.h
===================================================================
--- OpenUSD-23.11.orig/pxr/usdImaging/usdviewq/pch.h
+++ OpenUSD-23.11/pxr/usdImaging/usdviewq/pch.h
@@ -164,7 +164,6 @@
 #include <boost/variant.hpp>
 #include <boost/vmd/is_empty.hpp>
 #include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>

Places

File a996e7760da0cc23b548b3082722a4bfe8602540.patch of Package OpenUSD (Revision d7cd9cf1480a3123ca93eaf73f4f7f2d)

Places