diff --git a/CMakeLists.txt b/CMakeLists.txt index d54be3d..b5a1d6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.10.0) project(gc_polyscope_example) +set(CMAKE_CXX_STANDARD 20) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # Check if Boost is installed on the system diff --git a/deps/polyscope/include/polyscope/internal.h b/deps/polyscope/include/polyscope/internal.h index d339e77..959d469 100644 --- a/deps/polyscope/include/polyscope/internal.h +++ b/deps/polyscope/include/polyscope/internal.h @@ -3,6 +3,7 @@ #pragma once #include +#include namespace polyscope { diff --git a/modules/include/modules/knn-cpp/knncpp.h b/modules/include/modules/knn-cpp/knncpp.h index 05d98ec..b17c821 100644 --- a/modules/include/modules/knn-cpp/knncpp.h +++ b/modules/include/modules/knn-cpp/knncpp.h @@ -530,7 +530,7 @@ namespace knncpp indices.setConstant(knn, queryPoints.cols(), -1); distances.setConstant(knn, queryPoints.cols(), -1); - #pragma omp parallel for num_threads(threads_) + //#pragma omp parallel for num_threads(threads_) for(Index i = 0; i < queryPoints.cols(); ++i) { Index *idxPoint = &indices.data()[i * knn]; @@ -1216,7 +1216,7 @@ namespace knncpp Index *indicesRaw = indices.data(); Scalar *distsRaw = distances.data(); - #pragma omp parallel for num_threads(threads_) + //#pragma omp parallel for num_threads(threads_) for(Index i = 0; i < queryPoints.cols(); ++i) { @@ -1461,7 +1461,7 @@ namespace knncpp Scalar maxDistPart = maxDist_ / buckets_.size(); - #pragma omp parallel for num_threads(threads_) + //#pragma omp parallel for num_threads(threads_) for(Index c = 0; c < queryPoints.cols(); ++c) { std::set candidates; @@ -1674,7 +1674,7 @@ namespace knncpp index_->knnSearch(queryPts, indicesF, distancesF, knn, searchParams_); // make result matrices compatible to API - #pragma omp parallel for num_threads(searchParams_.cores) + //#pragma omp parallel for num_threads(searchParams_.cores) for(Index i = 0; i < indices.cols(); ++i) { bool found = false; diff --git a/src/knot_untangling.cpp b/src/knot_untangling.cpp index dd63703..c93f0f9 100644 --- a/src/knot_untangling.cpp +++ b/src/knot_untangling.cpp @@ -25,6 +25,8 @@ #include "polyscope/surface_mesh.h" #include +#include +#include #include diff --git a/src/main.cpp b/src/main.cpp index 8602582..5843442 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -23,6 +23,8 @@ #include "polyscope/surface_mesh.h" #include +#include +#include #include