Revert "Move parallel.h to src"

parallel.h was apparently specifically public

This reverts commit 08fbcdf.

extras/stl_test.cpp

@@ -10,7 +10,7 @@
 #include <random>
 #include <vector>
 
-#include "../src/parallel.h"
+#include "manifold/parallel.h"
 
 static constexpr size_t g_Iterations = 5;
 static constexpr size_t g_IterationsDiscard = 1;

include/manifold/CMakeLists.txt

@@ -3,6 +3,7 @@ set(MANIFOLD_PUBLIC_HDRS
 	iters.h
 	manifold.h
 	optional_assert.h
+	parallel.h
 	polygon.h
 	vec_view.h
 	)

scripts/test-cmake.sh

@@ -12,6 +12,7 @@ EOT
 
 cat <<EOT > test.cpp
 #include <manifold/manifold.h>
+#include <manifold/parallel.h>
 int main() { manifold::Manifold foo; return 0; }
 EOT
 

scripts/test-pkgconfig.sh

@@ -11,6 +11,7 @@ EOT
 
 cat <<EOT > testing.cpp
 #include <manifold/manifold.h>
+#include <manifold/parallel.h>
 int main() { manifold::Manifold foo; return 0; }
 EOT
 

src/CMakeLists.txt

@@ -40,7 +40,6 @@ set(MANIFOLD_PRIVATE_HDRS
 	hashtable.h
 	impl.h
 	mesh_fixes.h
-	parallel.h
 	quickhull.h
 	shared.h
 	sparse.h

src/boolean3.cpp

@@ -16,7 +16,7 @@
 
 #include <limits>
 
-#include "./parallel.h"
+#include "manifold/parallel.h"
 
 using namespace manifold;
 

src/boolean_result.cpp

@@ -29,8 +29,8 @@ template <typename K, typename V>
 // not really concurrent when tbb is disabled
 using concurrent_map = std::map<K, V>;
 #endif
-#include "./boolean3.h"
-#include "./parallel.h"
+#include "boolean3.h"
+#include "manifold/parallel.h"
 
 using namespace manifold;
 

src/collider.h

@@ -13,11 +13,11 @@
 // limitations under the License.
 
 #pragma once
-#include "./parallel.h"
 #include "./sparse.h"
 #include "./utils.h"
 #include "./vec.h"
 #include "manifold/common.h"
+#include "manifold/parallel.h"
 
 #ifdef _MSC_VER
 #include <intrin.h>

src/constructors.cpp

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "./csg_tree.h"
-#include "./impl.h"
-#include "./parallel.h"
+#include "csg_tree.h"
+#include "impl.h"
+#include "manifold/parallel.h"
 #include "manifold/polygon.h"
 
 namespace manifold {

src/csg_tree.cpp

@@ -21,10 +21,10 @@
 #include <algorithm>
 #include <variant>
 
-#include "./boolean3.h"
-#include "./csg_tree.h"
-#include "./impl.h"
-#include "./parallel.h"
+#include "boolean3.h"
+#include "csg_tree.h"
+#include "impl.h"
+#include "manifold/parallel.h"
 #include "mesh_fixes.h"
 
 constexpr int kParallelThreshold = 4096;

src/edge_op.cpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "./impl.h"
-#include "./parallel.h"
+#include "impl.h"
+#include "manifold/parallel.h"
 
 namespace {
 using namespace manifold;

src/impl.cpp

@@ -19,8 +19,8 @@
 #include <map>
 
 #include "./hashtable.h"
-#include "./parallel.h"
 #include "./svd.h"
+#include "manifold/parallel.h"
 #include "mesh_fixes.h"
 
 namespace {

src/manifold.cpp

@@ -16,10 +16,10 @@
 #include <map>
 #include <numeric>
 
-#include "./boolean3.h"
-#include "./csg_tree.h"
-#include "./impl.h"
-#include "./parallel.h"
+#include "boolean3.h"
+#include "csg_tree.h"
+#include "impl.h"
+#include "manifold/parallel.h"
 
 namespace {
 using namespace manifold;

src/properties.cpp

@@ -15,8 +15,8 @@
 #include <limits>
 
 #include "./impl.h"
-#include "./parallel.h"
 #include "./tri_dist.h"
+#include "manifold/parallel.h"
 
 namespace {
 using namespace manifold;

src/sdf.cpp

@@ -16,10 +16,10 @@
 
 #include "./hashtable.h"
 #include "./impl.h"
-#include "./parallel.h"
 #include "./utils.h"
 #include "./vec.h"
 #include "manifold/manifold.h"
+#include "manifold/parallel.h"
 
 namespace {
 using namespace manifold;

src/shared.h

@@ -14,10 +14,10 @@
 
 #pragma once
 
-#include "./parallel.h"
 #include "./sparse.h"
 #include "./utils.h"
 #include "./vec.h"
+#include "manifold/parallel.h"
 
 namespace manifold {
 

src/smoothing.cpp

@@ -15,8 +15,8 @@
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/quaternion.hpp>
 
-#include "./impl.h"
-#include "./parallel.h"
+#include "impl.h"
+#include "manifold/parallel.h"
 
 namespace {
 using namespace manifold;

src/sort.cpp

@@ -15,8 +15,8 @@
 #include <atomic>
 #include <set>
 
-#include "./impl.h"
-#include "./parallel.h"
+#include "impl.h"
+#include "manifold/parallel.h"
 
 namespace {
 using namespace manifold;

src/sparse.h

@@ -15,11 +15,11 @@
 #pragma once
 #include <math.h>
 
-#include "./parallel.h"
 #include "./utils.h"
 #include "./vec.h"
 #include "manifold/common.h"
 #include "manifold/optional_assert.h"
+#include "manifold/parallel.h"
 
 namespace {
 template <typename T>

src/subdivision.cpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "./impl.h"
-#include "./parallel.h"
+#include "impl.h"
+#include "manifold/parallel.h"
 
 template <>
 struct std::hash<manifold::ivec4> {

src/utils.h

@@ -23,8 +23,8 @@
 #include <iostream>
 #endif
 
-#include "./parallel.h"
 #include "./vec.h"
+#include "manifold/parallel.h"
 
 #if __has_include(<tracy/Tracy.hpp>)
 #include <tracy/Tracy.hpp>

src/vec.h

@@ -20,7 +20,7 @@
 #define TracyFreeS(ptr, n) (void)0
 #endif
 
-#include "./parallel.h"
+#include "manifold/parallel.h"
 #include "manifold/vec_view.h"
 
 namespace manifold {