Merge pull request #854 from wildmeshing/mtao/pruned_attribute

Cleaning attribute folder

Author: daniel-zint

CMakeLists.txt

@@ -40,6 +40,14 @@ if(WMTK_WITH_CCACHE AND CCACHE_PROGRAM)
     endforeach()
 endif()
 
+option(WMTK_USE_DEV_MODE "Changes to make compilation faster when developing" OFF)
+if(WMTK_USE_DEV_MODE)
+    set(WMTK_LIBRARY_TYPE SHARED)
+else()
+    set(WMTK_LIBRARY_TYPE STATIC)
+endif()
+
+
 # ###############################################################################
 project(WildMeshingToolkit DESCRIPTION "A mesh optimization toolkit" LANGUAGES C CXX)
 
@@ -100,7 +108,7 @@ include(CLI11)
 include(CDT)
 
 # Core library
-add_library(wildmeshing_toolkit)
+add_library(wildmeshing_toolkit ${WMTK_LIBRARY_TYPE})
 add_library(wmtk::toolkit ALIAS wildmeshing_toolkit)
 target_link_libraries(wildmeshing_toolkit PUBLIC wmtk_coverage_config)
 set_property(TARGET wildmeshing_toolkit PROPERTY COMPILE_WARNING_AS_ERROR  ON)
@@ -118,14 +126,19 @@ target_compile_definitions(wildmeshing_toolkit PUBLIC _USE_MATH_DEFINES)
 target_compile_definitions(wildmeshing_toolkit PUBLIC NOMINMAX)
 
 # C++ standard
-option(WMTK_USE_CXX20 "Sets WMTK to use C++20, defaults to C++17")
+option(WMTK_USE_CXX20 "Sets WMTK to use C++20, defaults to C++17" OFF)
 if(WMTK_USE_CXX20)
 target_compile_features(wildmeshing_toolkit PUBLIC cxx_std_20)
 target_compile_definitions(wildmeshing_toolkit PUBLIC -DWMTK_ENABLED_CPP20)
 else()
 target_compile_features(wildmeshing_toolkit PUBLIC cxx_std_17)
 endif()
 
+if(WMTK_USE_DEV_MODE)
+    target_compile_definitions(wildmeshing_toolkit PUBLIC -DWMTK_ENABLED_DEV_MODE)
+    set(BUILD_SHARED_LIBS ON) # we globally want to disable this option due to use of TBB
+endif()
+
 #target_compile_options(wildmeshing_toolkit PUBLIC  -fconcepts)
 
 # the max dimension an attribute can be - default is to be any size (a dynamic size), but this can be set to a number like 6

cmake/recipes/predicates.cmake

@@ -7,8 +7,8 @@ message(STATUS "Third-party: creating target 'predicates::predicates'")
 include(CPM)
     CPMAddPackage(
     NAME predicates
-    GITHUB_REPOSITORY libigl/libigl-predicates
-    GIT_TAG        488242fa2b1f98a9c5bd1441297fb4a99a6a9ae4
+    GITHUB_REPOSITORY wildmeshing/libigl-predicates
+    GIT_TAG        f1fcce5d20d5a8e887cb694dc6aeaafab9ca1e29
 )
 
 FetchContent_MakeAvailable(predicates)

components/delaunay/wmtk/components/delaunay/delaunay.hpp

@@ -1,7 +1,15 @@
 #pragma once
+#include <string>
+#include <memory>
 
-#include <wmtk/Mesh.hpp>
 
+namespace wmtk {
+    class Mesh;
+    class PointMesh;
+    namespace attribute {
+        class MeshAttributeHandle;
+    }
+}
 namespace wmtk::components {
 
 std::shared_ptr<Mesh> delaunay(

components/edge_insertion/wmtk/components/edge_insertion/edge_insertion.hpp

@@ -1,8 +1,11 @@
 #pragma once
 
-#include <wmtk/Mesh.hpp>
+#include <memory>
 
 namespace wmtk {
+    class TriMesh;
+    class Mesh;
+    class EdgeMesh;
 namespace components {
 
 struct EdgeInsertionMeshes

components/marching/wmtk/components/marching/internal/Marching.cpp

@@ -286,13 +286,8 @@ void Marching::process()
                     }
                 }
             }
-#if defined(WMTK_ENABLE_HASH_UPDATE)
-            assert(m_mesh.is_valid_with_hash(v0));
-            assert(m_mesh.is_valid_with_hash(v1));
-#else
             assert(m_mesh.is_valid(v0));
             assert(m_mesh.is_valid(v1));
-#endif
             const auto p0 = pos_acc.const_vector_attribute(v0);
             const auto p1 = pos_acc.const_vector_attribute(v1);
             const double sf0 = sf_acc.const_scalar_attribute(v0);

components/simplicial_embedding/wmtk/components/simplicial_embedding/internal/SimplicialEmbedding.cpp

@@ -279,6 +279,10 @@ void SimplicialEmbedding::regularize_tags(bool generate_simplicial_embedding)
 
             break;
         }
+        case PrimitiveType::Vertex: { // edge split
+            log_and_throw_error("Cannot split point mesh");
+            break;
+        }
         default: log_and_throw_error("unknown primitive type"); break;
         }
 
@@ -308,4 +312,4 @@ void SimplicialEmbedding::regularize_tags(bool generate_simplicial_embedding)
 }
 
 
-} // namespace wmtk::components::internal
+} // namespace wmtk::components::internal

components/to_points/wmtk/components/to_points/to_points.cpp

@@ -1,4 +1,5 @@
 #include "to_points.hpp"
+#include <Eigen/Geometry>
 
 
 #include <bitset>

components/to_points/wmtk/components/to_points/to_points.hpp

@@ -1,7 +1,16 @@
 #pragma once
 
 
-#include <wmtk/Mesh.hpp>
+#include <string>
+#include <memory>
+
+namespace wmtk {
+    class Mesh;
+    class PointMesh;
+    namespace attribute {
+        class MeshAttributeHandle;
+    }
+}
 
 namespace wmtk::components {
 

components/triangle_insertion/wmtk/components/triangle_insertion/triangle_insertion.hpp

@@ -1,6 +1,18 @@
 #pragma once
 
-#include <wmtk/Mesh.hpp>
+#include <string>
+#include <tuple>
+#include <memory>
+#include <vector>
+
+namespace wmtk {
+    class Mesh;
+    class TriMesh;
+    class TetMesh;
+    namespace attribute {
+        class MeshAttributeHandle;
+    }
+}
 
 namespace wmtk::components::triangle_insertion {
 
@@ -23,4 +35,4 @@ std::tuple<std::shared_ptr<wmtk::TetMesh>, ChildMeshes> triangle_insertion(
     bool track_submeshes = true,
     bool make_child_free = false);
 
-} // namespace wmtk::components::triangle_insertion
+} // namespace wmtk::components::triangle_insertion

src/wmtk/CMakeLists.txt

@@ -32,7 +32,6 @@ set(SRC_FILES
     Types.hpp
     Scheduler.hpp
     Scheduler.cpp
-    MultiMeshManager.hpp
 )
 target_sources(wildmeshing_toolkit PRIVATE ${SRC_FILES})