Use modified tbb include path (Linux stdlib forces this).

* Linux has decided to break their entire stdlib by adding a bunch of tbb garbage to their stdlib headers, which means if a proper valid TBB library happens to exist on a users Linux system, the stdlib will completely break itself, thus we do everything in our power to ensure the Linux stdlib doesn't see our fully proper valid TBB library.
wabiverse · Aug 5, 2024 · 144f9ea · 144f9ea
1 parent 361adbf
commit 144f9ea
Show file tree

Hide file tree

Showing 76 changed files with 172 additions and 124 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "b6dbd07823040b8eb65c53f596893481e2f6b31e3806c0304ecbf9d7ff4de7b1",
+  "originHash" : "09a37217d26d064bbfb26491267019087c42146ab45bd3625ad90873ba20141d",
   "pins" : [
     {
       "identity" : "aexml",
@@ -10,6 +10,15 @@
         "version" : "4.6.1"
       }
     },
+    {
+      "identity" : "galah",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/wabiverse/galah.git",
+      "state" : {
+        "revision" : "a90d086184e8e0fb3d32803b051acf75ff50d66d",
+        "version" : "1.0.0"
+      }
+    },
     {
       "identity" : "graphviz",
       "kind" : "remoteSourceControl",
@@ -37,6 +46,24 @@
         "version" : "1.7.6"
       }
     },
+    {
+      "identity" : "metaversepythonframework",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/wabiverse/MetaversePythonFramework",
+      "state" : {
+        "revision" : "e2f4ba867b7e287a283a27a0005ab64deef14279",
+        "version" : "3.11.7"
+      }
+    },
+    {
+      "identity" : "metaversevulkanframework",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/wabiverse/MetaverseVulkanFramework",
+      "state" : {
+        "revision" : "13c7061599c61a4959c558d8ec1836e5b32b640b",
+        "version" : "1.26.2"
+      }
+    },
     {
       "identity" : "pathkit",
       "kind" : "remoteSourceControl",
@@ -46,6 +73,15 @@
         "version" : "1.0.1"
       }
     },
+    {
+      "identity" : "pythonkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pvieito/PythonKit.git",
+      "state" : {
+        "revision" : "43647b36cacb99558e57ef98e97ef598f91d1164",
+        "version" : "0.5.0"
+      }
+    },
     {
       "identity" : "rainbow",
       "kind" : "remoteSourceControl",
@@ -145,6 +181,15 @@
         "version" : "1.6.1"
       }
     },
+    {
+      "identity" : "swift-macro-toolkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/stackotter/swift-macro-toolkit",
+      "state" : {
+        "revision" : "106daeb38eb3f52b1540aed981fc63fa22274576",
+        "version" : "0.3.1"
+      }
+    },
     {
       "identity" : "swift-markdown",
       "kind" : "remoteSourceControl",
@@ -246,4 +291,4 @@
     }
   ],
   "version" : 3
-}
+}
diff --git a/Package.swift b/Package.swift
@@ -1510,6 +1510,8 @@ enum Arch
     case web
     /// everything not windows (apple + linux).
     case nix
+    /// everything not linux (apple + windows).
+    case applewindows
     /// everything not apple (linux + windows).
     case linwin
 
@@ -1522,6 +1524,7 @@ enum Arch
         case .windows: [.windows]
         case .web: [.wasi]
         case .nix: [.macOS, .iOS, .visionOS, .tvOS, .watchOS, .linux, .android, .openbsd]
+        case .applewindows: [.macOS, .iOS, .visionOS, .tvOS, .watchOS, .windows]
         case .linwin: [.linux, .android, .openbsd, .windows]
       }
     }

diff --git a/Sources/Ar/include/Ar/threadLocalScopedCache.h b/Sources/Ar/include/Ar/threadLocalScopedCache.h
@@ -31,7 +31,7 @@
 #include "Vt/value.h"
 
 #include <memory>
-#include <tbb/enumerable_thread_specific.h>
+#include <OneTBB/tbb/enumerable_thread_specific.h>
 #include <vector>
 
 PXR_NAMESPACE_OPEN_SCOPE

diff --git a/Sources/Ar/resolver.cpp b/Sources/Ar/resolver.cpp
@@ -50,7 +50,7 @@
 #include "Tf/type.h"
 #include "Vt/value.h"
 
-#include <tbb/concurrent_hash_map.h>
+#include <OneTBB/tbb/concurrent_hash_map.h>
 
 #include <memory>
 #include <mutex>

diff --git a/Sources/Extras/usd/examples/usdObj/pch.h b/Sources/Extras/usd/examples/usdObj/pch.h
@@ -166,15 +166,15 @@
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-#include <tbb/cache_aligned_allocator.h>
-#include <tbb/concurrent_queue.h>
-#include <tbb/concurrent_unordered_set.h>
-#include <tbb/concurrent_vector.h>
-#include <tbb/enumerable_thread_specific.h>
-#include <tbb/spin_mutex.h>
-#include <tbb/spin_rw_mutex.h>
-#include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <OneTBB/tbb/cache_aligned_allocator.h>
+#include <OneTBB/tbb/concurrent_queue.h>
+#include <OneTBB/tbb/concurrent_unordered_set.h>
+#include <OneTBB/tbb/concurrent_vector.h>
+#include <OneTBB/tbb/enumerable_thread_specific.h>
+#include <OneTBB/tbb/spin_mutex.h>
+#include <OneTBB/tbb/spin_rw_mutex.h>
+#include <OneTBB/tbb/task.h>
+#include <OneTBB/tbb/task_arena.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "Tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/Sources/Extras/usd/examples/usdSchemaExamples/pch.h b/Sources/Extras/usd/examples/usdSchemaExamples/pch.h
@@ -168,15 +168,15 @@
 #include <boost/unordered_map.hpp>
 #include <boost/utility.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <tbb/cache_aligned_allocator.h>
-#include <tbb/concurrent_queue.h>
-#include <tbb/concurrent_unordered_set.h>
-#include <tbb/concurrent_vector.h>
-#include <tbb/enumerable_thread_specific.h>
-#include <tbb/spin_mutex.h>
-#include <tbb/spin_rw_mutex.h>
-#include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <OneTBB/tbb/cache_aligned_allocator.h>
+#include <OneTBB/tbb/concurrent_queue.h>
+#include <OneTBB/tbb/concurrent_unordered_set.h>
+#include <OneTBB/tbb/concurrent_vector.h>
+#include <OneTBB/tbb/enumerable_thread_specific.h>
+#include <OneTBB/tbb/spin_mutex.h>
+#include <OneTBB/tbb/spin_rw_mutex.h>
+#include <OneTBB/tbb/task.h>
+#include <OneTBB/tbb/task_arena.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "Tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/Sources/Hd/flattenedPrimvarsDataSourceProvider.cpp b/Sources/Hd/flattenedPrimvarsDataSourceProvider.cpp
@@ -27,7 +27,7 @@
 #include "Hd/primvarSchema.h"
 #include "Hd/primvarsSchema.h"
 
-#include <tbb/concurrent_hash_map.h>
+#include <OneTBB/tbb/concurrent_hash_map.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 

diff --git a/Sources/Hd/include/Hd/changeTracker.h b/Sources/Hd/include/Hd/changeTracker.h
@@ -32,7 +32,7 @@
 #include "Sdf/path.h"
 #include "Tf/hashmap.h"
 
-#include <tbb/concurrent_hash_map.h>
+#include <OneTBB/tbb/concurrent_hash_map.h>
 #include <atomic>
 
 PXR_NAMESPACE_OPEN_SCOPE

diff --git a/Sources/Hd/include/Hd/dependencyForwardingSceneIndex.h b/Sources/Hd/include/Hd/dependencyForwardingSceneIndex.h
@@ -29,8 +29,8 @@
 #include "Hd/api.h"
 #include "Hd/filteringSceneIndex.h"
 
-#include <tbb/concurrent_unordered_map.h>
-#include <tbb/concurrent_unordered_set.h>
+#include <OneTBB/tbb/concurrent_unordered_map.h>
+#include <OneTBB/tbb/concurrent_unordered_set.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 

diff --git a/Sources/Hd/include/Hd/flatteningSceneIndex.h b/Sources/Hd/include/Hd/flatteningSceneIndex.h
@@ -29,7 +29,7 @@
 #include "Hd/filteringSceneIndex.h"
 
 #include "Sdf/pathTable.h"
-#include <tbb/concurrent_hash_map.h>
+#include <OneTBB/tbb/concurrent_hash_map.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 

diff --git a/Sources/Hd/include/Hd/instanceRegistry.h b/Sources/Hd/include/Hd/instanceRegistry.h
@@ -30,7 +30,7 @@
 #include "Hd/perfLog.h"
 #include "Hf/perfLog.h"
 
-#include <tbb/concurrent_unordered_map.h>
+#include <OneTBB/tbb/concurrent_unordered_map.h>
 
 #include <memory>
 #include <mutex>

diff --git a/Sources/Hd/include/Hd/primGather.h b/Sources/Hd/include/Hd/primGather.h
@@ -30,8 +30,8 @@
 #include "Sdf/path.h"
 
 #include <vector>
-#include <tbb/enumerable_thread_specific.h>
-#include <tbb/blocked_range.h>
+#include <OneTBB/tbb/enumerable_thread_specific.h>
+#include <OneTBB/tbb/blocked_range.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 

diff --git a/Sources/Hd/include/Hd/renderIndex.h b/Sources/Hd/include/Hd/renderIndex.h
@@ -47,7 +47,7 @@
 #include "Gf/vec4i.h"
 #include "Tf/hashmap.h"
 
-#include <tbb/enumerable_thread_specific.h>
+#include <OneTBB/tbb/enumerable_thread_specific.h>
 
 #include <vector>
 #include <unordered_map>

diff --git a/Sources/Hd/mergingSceneIndex.cpp b/Sources/Hd/mergingSceneIndex.cpp
@@ -26,7 +26,7 @@
 #include "Tf/denseHashSet.h"
 #include "Trace/traceImpl.h"
 #include "Work/dispatcher.h"
-#include <tbb/concurrent_queue.h>
+#include <OneTBB/tbb/concurrent_queue.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 

diff --git a/Sources/Hd/primGather.cpp b/Sources/Hd/primGather.cpp
@@ -27,7 +27,7 @@
 #include "Tf/diagnostic.h"
 #include "Work/dispatcher.h"
 #include "Work/withScopedParallelism.h"
-#include <tbb/parallel_for.h>
+#include <OneTBB/tbb/parallel_for.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 

diff --git a/Sources/Hd/renderIndex.cpp b/Sources/Hd/renderIndex.cpp
@@ -61,8 +61,8 @@
 #include <mutex>
 #include <unordered_set>
 
-#include <tbb/concurrent_unordered_map.h>
-#include <tbb/concurrent_vector.h>
+#include <OneTBB/tbb/concurrent_unordered_map.h>
+#include <OneTBB/tbb/concurrent_vector.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 

diff --git a/Sources/Hd/sceneIndexAdapterSceneDelegate.cpp b/Sources/Hd/sceneIndexAdapterSceneDelegate.cpp
@@ -94,7 +94,7 @@
 #include "Hd/volumeFieldSchema.h"
 #include "Hd/xformSchema.h"
 
-#include <tbb/concurrent_unordered_set.h>
+#include <OneTBB/tbb/concurrent_unordered_set.h>
 
 #include "Hf/perfLog.h"
 

diff --git a/Sources/OpenUSD/Commands/UpdateCommand.swift b/Sources/OpenUSD/Commands/UpdateCommand.swift
@@ -406,7 +406,7 @@ public enum Pxr: String, CaseIterable
       source = source.replacingOccurrences(of: "<tbb/mutex.h>", with: "<mutex>")
       source = source.replacingOccurrences(of: "tbb::mutex", with: "std::mutex")
       // modern versions of tbb no longer contain a task_scheduler_init.
-      source = source.replacingOccurrences(of: "#include <tbb/task_scheduler_init.h>", with: "#if WITH_TBB_LEGACY\n#include <tbb/task_scheduler_init.h>\n#endif /* WITH_TBB_LEGACY */")
+      source = source.replacingOccurrences(of: "#include <OneTBB/tbb/task_scheduler_init.h>", with: "#if WITH_TBB_LEGACY\n#include <OneTBB/tbb/task_scheduler_init.h>\n#endif /* WITH_TBB_LEGACY */")
 
       /* ---- materialx headers ----------- */
 

diff --git a/Sources/OpenUSD/Resources/Work/dispatcher.h b/Sources/OpenUSD/Resources/Work/dispatcher.h
@@ -33,9 +33,9 @@
 #include "Tf/errorMark.h"
 #include "Tf/errorTransport.h"
 
-#include <tbb/concurrent_vector.h>
-#include <tbb/task.h>
-#include <tbb/task_group.h>
+#include <OneTBB/tbb/concurrent_vector.h>
+#include <OneTBB/tbb/task.h>
+#include <OneTBB/tbb/task_group.h>
 
 #include <functional>
 #include <type_traits>

diff --git a/Sources/OpenUSD/Resources/Work/threadLimits.cpp b/Sources/OpenUSD/Resources/Work/threadLimits.cpp
@@ -30,9 +30,9 @@
 #include "Tf/envSetting.h"
 
 #if WITH_TBB_LEGACY
-#include <tbb/task_scheduler_init.h>
+#include <OneTBB/tbb/task_scheduler_init.h>
 #endif /* WITH_TBB_LEGACY */
-#include <tbb/task_arena.h>
+#include <OneTBB/tbb/task_arena.h>
 
 #include <algorithm>
 #include <atomic>

diff --git a/Sources/Pcp/cache.cpp b/Sources/Pcp/cache.cpp
@@ -53,8 +53,8 @@
 #include "Work/utils.h"
 #include "Work/withScopedParallelism.h"
 
-#include <tbb/concurrent_queue.h>
-#include <tbb/spin_rw_mutex.h>
+#include <OneTBB/tbb/concurrent_queue.h>
+#include <OneTBB/tbb/spin_rw_mutex.h>
 
 #include <algorithm>
 #include <iostream>

diff --git a/Sources/Pcp/diagnostic.cpp b/Sources/Pcp/diagnostic.cpp
@@ -42,7 +42,7 @@
 #include "Tf/enum.h"
 #include "Tf/stringUtils.h"
 
-#include <tbb/concurrent_hash_map.h>
+#include <OneTBB/tbb/concurrent_hash_map.h>
 #include <fstream>
 #include <mutex>
 #include <sstream>

diff --git a/Sources/Pcp/include/Pcp/dependencies.h b/Sources/Pcp/include/Pcp/dependencies.h
@@ -36,7 +36,7 @@
 #include "Sdf/path.h"
 #include <pxr/pxrns.h>
 
-#include <tbb/spin_mutex.h>
+#include <OneTBB/tbb/spin_mutex.h>
 
 #include <unordered_map>
 

diff --git a/Sources/Pcp/include/Pcp/layerStack.h b/Sources/Pcp/include/Pcp/layerStack.h
@@ -37,7 +37,7 @@
 #include "Pcp/layerStackIdentifier.h"
 #include "Pcp/mapExpression.h"
 
-#include <tbb/spin_mutex.h>
+#include <OneTBB/tbb/spin_mutex.h>
 #include <iosfwd>
 #include <memory>
 #include <string>

diff --git a/Sources/Pcp/include/Pcp/mapExpression.h b/Sources/Pcp/include/Pcp/mapExpression.h
@@ -30,7 +30,7 @@
 
 #include <boost/intrusive_ptr.hpp>
 
-#include <tbb/spin_mutex.h>
+#include <OneTBB/tbb/spin_mutex.h>
 
 #include <atomic>
 #include <memory>

diff --git a/Sources/Pcp/include/Pcp/primIndex.h b/Sources/Pcp/include/Pcp/primIndex.h
@@ -43,7 +43,7 @@
 #include "Pcp/node.h"
 #include "Pcp/types.h"
 
-#include <tbb/spin_rw_mutex.h>
+#include <OneTBB/tbb/spin_rw_mutex.h>
 
 #include <functional>
 #include <map>

diff --git a/Sources/Pcp/layerStackRegistry.cpp b/Sources/Pcp/layerStackRegistry.cpp
@@ -33,7 +33,7 @@
 #include "Tf/diagnostic.h"
 #include "Tf/staticData.h"
 
-#include <tbb/queuing_rw_mutex.h>
+#include <OneTBB/tbb/queuing_rw_mutex.h>
 
 #include <boost/unordered_map.hpp>
 

diff --git a/Sources/Pcp/mapExpression.cpp b/Sources/Pcp/mapExpression.cpp
@@ -29,7 +29,7 @@
 
 #include "Trace/traceImpl.h"
 
-#include <tbb/concurrent_hash_map.h>
+#include <OneTBB/tbb/concurrent_hash_map.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 

diff --git a/Sources/Plug/registry.cpp b/Sources/Plug/registry.cpp
@@ -43,8 +43,8 @@
 #include "Tf/type.h"
 #include "Work/withScopedParallelism.h"
 
-#include <tbb/concurrent_vector.h>
-#include <tbb/spin_mutex.h>
+#include <OneTBB/tbb/concurrent_vector.h>
+#include <OneTBB/tbb/spin_mutex.h>
 
 #include <functional>