Moved mt file to mt_tbb and symlinked

openvdb/openvdb/mt

@@ -0,0 +1 @@
+mt_naive

openvdb/openvdb/mt/MakeHeaders.py → openvdb/openvdb/mt_naive/MakeHeaders.py

@@ -1,3 +1,6 @@
+# This is a temporary python script to get us going with tbb replacement headers.
+# This script should NOT end up merged back in the mainline repo.
+
 
 # These are the types being used in openvdb
 '''

openvdb/openvdb/mt_tbb/blocked_range.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file blocked_range.h
+
+#ifndef OPENVDB_BLOCKED_RANGE_HAS_BEEN_INCLUDED
+#define OPENVDB_BLOCKED_RANGE_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/blocked_range.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_BLOCKED_RANGE_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/blocked_range2d.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file blocked_range2d.h
+
+#ifndef OPENVDB_BLOCKED_RANGE2D_HAS_BEEN_INCLUDED
+#define OPENVDB_BLOCKED_RANGE2D_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/blocked_range2d.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_BLOCKED_RANGE2D_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/blocked_range3d.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file blocked_range3d.h
+
+#ifndef OPENVDB_BLOCKED_RANGE3D_HAS_BEEN_INCLUDED
+#define OPENVDB_BLOCKED_RANGE3D_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/blocked_range3d.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_BLOCKED_RANGE3D_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/combinable.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file combinable.h
+
+#ifndef OPENVDB_COMBINABLE_HAS_BEEN_INCLUDED
+#define OPENVDB_COMBINABLE_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/combinable.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_COMBINABLE_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/concurrent_hash_map.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file concurrent_hash_map.h
+
+#ifndef OPENVDB_CONCURRENT_HASH_MAP_HAS_BEEN_INCLUDED
+#define OPENVDB_CONCURRENT_HASH_MAP_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/concurrent_hash_map.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_CONCURRENT_HASH_MAP_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/concurrent_vector.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file concurrent_vector.h
+
+#ifndef OPENVDB_CONCURRENT_VECTOR_HAS_BEEN_INCLUDED
+#define OPENVDB_CONCURRENT_VECTOR_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/concurrent_vector.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_CONCURRENT_VECTOR_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/enumerable_thread_specific.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file enumerable_thread_specific.h
+
+#ifndef OPENVDB_ENUMERABLE_THREAD_SPECIFIC_HAS_BEEN_INCLUDED
+#define OPENVDB_ENUMERABLE_THREAD_SPECIFIC_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/enumerable_thread_specific.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_ENUMERABLE_THREAD_SPECIFIC_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/parallel_for.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file parallel_for.h
+
+#ifndef OPENVDB_PARALLEL_FOR_HAS_BEEN_INCLUDED
+#define OPENVDB_PARALLEL_FOR_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/parallel_for.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_PARALLEL_FOR_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/parallel_invoke.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file parallel_invoke.h
+
+#ifndef OPENVDB_PARALLEL_INVOKE_HAS_BEEN_INCLUDED
+#define OPENVDB_PARALLEL_INVOKE_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/parallel_invoke.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_PARALLEL_INVOKE_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/parallel_reduce.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file parallel_reduce.h
+
+#ifndef OPENVDB_PARALLEL_REDUCE_HAS_BEEN_INCLUDED
+#define OPENVDB_PARALLEL_REDUCE_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/parallel_reduce.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_PARALLEL_REDUCE_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/parallel_sort.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file parallel_sort.h
+
+#ifndef OPENVDB_PARALLEL_SORT_HAS_BEEN_INCLUDED
+#define OPENVDB_PARALLEL_SORT_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/parallel_sort.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_PARALLEL_SORT_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/partitioner.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file partitioner.h
+
+#ifndef OPENVDB_PARTITIONER_HAS_BEEN_INCLUDED
+#define OPENVDB_PARTITIONER_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/partitioner.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_PARTITIONER_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/spin_mutex.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file spin_mutex.h
+
+#ifndef OPENVDB_SPIN_MUTEX_HAS_BEEN_INCLUDED
+#define OPENVDB_SPIN_MUTEX_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/spin_mutex.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_SPIN_MUTEX_HAS_BEEN_INCLUDED

openvdb/openvdb/mt/Multithreading.h → openvdb/openvdb/mt_tbb/task.h

@@ -1,13 +1,16 @@
+
 // Copyright Contributors to the OpenVDB Project
 // SPDX-License-Identifier: MPL-2.0
 ///
-/// @file Multithreading.h
+/// @file task.h
 
-#ifndef OPENVDB_MULTITHREADING_HAS_BEEN_INCLUDED
-#define OPENVDB_MULTITHREADING_HAS_BEEN_INCLUDED
+#ifndef OPENVDB_TASK_HAS_BEEN_INCLUDED
+#define OPENVDB_TASK_HAS_BEEN_INCLUDED
 
 #include <openvdb/version.h>
 
+#include <tbb/task.h>
+
 namespace openvdb {
 OPENVDB_USE_VERSION_NAMESPACE
 namespace OPENVDB_VERSION_NAME {
@@ -17,4 +20,4 @@ namespace mt = ::tbb;
 } // OPENVDB_VERSION_NAME
 } // openvdb
 
-#endif // OPENVDB_MULTITHREADING_HAS_BEEN_INCLUDED
+#endif // OPENVDB_TASK_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/task_arena.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file task_arena.h
+
+#ifndef OPENVDB_TASK_ARENA_HAS_BEEN_INCLUDED
+#define OPENVDB_TASK_ARENA_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/task_arena.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_TASK_ARENA_HAS_BEEN_INCLUDED

openvdb/openvdb/mt_tbb/task_group.h

@@ -0,0 +1,23 @@
+
+// Copyright Contributors to the OpenVDB Project
+// SPDX-License-Identifier: MPL-2.0
+///
+/// @file task_group.h
+
+#ifndef OPENVDB_TASK_GROUP_HAS_BEEN_INCLUDED
+#define OPENVDB_TASK_GROUP_HAS_BEEN_INCLUDED
+
+#include <openvdb/version.h>
+
+#include <tbb/task_group.h>
+
+namespace openvdb {
+OPENVDB_USE_VERSION_NAMESPACE
+namespace OPENVDB_VERSION_NAME {
+
+namespace mt = ::tbb;
+
+} // OPENVDB_VERSION_NAME
+} // openvdb
+
+#endif // OPENVDB_TASK_GROUP_HAS_BEEN_INCLUDED