Fixed Conformal header includes

rjc8237 · rjc8237 · commit 7491f395feb4 · 2024-01-19T20:59:51.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -133,10 +133,6 @@ if(USE_SUITESPARSE)
     SuiteSparse::SuiteSparseConfig
     SuiteSparse::CHOLMOD
   )
-  target_link_libraries(optimization_py PRIVATE
-    SuiteSparse::SuiteSparseConfig
-    SuiteSparse::CHOLMOD
-  )
 endif()
 
   # Set pybinding settings
@@ -174,12 +170,6 @@ if(NOT USE_MULTIPRECISION)
       MetricOptimizationLib
       Catch2::Catch2WithMain
     )
-    if(USE_SUITESPARSE)
-      target_link_libraries(CurvatureMetricTests PRIVATE
-        SuiteSparse::SuiteSparseConfig
-        SuiteSparse::CHOLMOD
-      )
-    endif()
     set(TEST_DATA_ROOT "${PROJECT_SOURCE_DIR}/src/tests/regression/")
     target_compile_definitions(CurvatureMetricTests PUBLIC TEST_DATA_DIR=\"${TEST_DATA_ROOT}\")
   endif()
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -4,6 +4,12 @@ add_executable(conformal_metric
 target_link_libraries(conformal_metric PRIVATE
   MetricOptimizationLib
 )
+if(USE_SUITESPARSE)
+target_link_libraries(conformal_metric PRIVATE
+  SuiteSparse::SuiteSparseConfig
+  SuiteSparse::CHOLMOD
+)
+endif()
 
 add_executable(optimize_metric
   optimize_metric.cpp
diff --git a/src/app/conformal_metric.cpp b/src/app/conformal_metric.cpp
@@ -2,6 +2,7 @@
 #include "implicit_optimization.hh"
 #include "optimization_interface.hh"
 #include "layout.hh"
+#include "conformal_ideal_delaunay/ConformalInterface.hh"
 #include "logging.hh"
 #include <igl/readOBJ.h>
 #include <igl/writeOBJ.h>
diff --git a/src/optimization/cone_metric.cpp b/src/optimization/cone_metric.cpp
@@ -1,6 +1,7 @@
 #include "cone_metric.hh"
 #include "constraint.hh"
 #include "projection.hh"
+#include "conformal_ideal_delaunay/ConformalInterface.hh"
 
 namespace CurvatureMetric {
 
diff --git a/src/optimization/explicit_optimization.hh b/src/optimization/explicit_optimization.hh
@@ -2,8 +2,6 @@
 
 #include <filesystem>
 #include "common.hh"
-#include "conformal_ideal_delaunay/ConformalInterface.hh"
-#include "conformal_ideal_delaunay/OverlayMesh.hh"
 #include "embedding.hh"
 #include "energy_functor.hh"
 
diff --git a/src/optimization/implicit_optimization.hh b/src/optimization/implicit_optimization.hh
@@ -5,7 +5,6 @@
 #include "energy_functor.hh"
 #include "cone_metric.hh"
 #include "conformal_ideal_delaunay/OverlayMesh.hh"
-#include "conformal_ideal_delaunay/ConformalInterface.hh"
 #include <filesystem>
 
 namespace CurvatureMetric
diff --git a/src/optimization/interpolation.cpp b/src/optimization/interpolation.cpp
@@ -1,6 +1,7 @@
 #include "interpolation.hh"
 
 #include "conformal_ideal_delaunay/ConformalIdealDelaunayMapping.hh"
+#include "conformal_ideal_delaunay/ConformalInterface.hh"
 #include "embedding.hh"
 #include "reparametrization.hh"
 #include "projection.hh"
@@ -948,4 +949,4 @@ overlay_has_all_original_halfedges(
   return (num_missing_original_halfedges == 0);
 }
 
-}
+}
diff --git a/src/optimization/interpolation.hh b/src/optimization/interpolation.hh
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common.hh"
-#include "conformal_ideal_delaunay/ConformalInterface.hh"
 #include "conformal_ideal_delaunay/OverlayMesh.hh"
 
 namespace CurvatureMetric {
diff --git a/src/optimization/layout.cpp b/src/optimization/layout.cpp
@@ -3,6 +3,7 @@
 #include <igl/doublearea.h>
 #include <igl/flipped_triangles.h>
 #include "conformal_ideal_delaunay/ConformalIdealDelaunayMapping.hh"
+#include "conformal_ideal_delaunay/ConformalInterface.hh"
 #include "conformal_ideal_delaunay/Layout.hh"
 #include "embedding.hh"
 #include "energies.hh"
diff --git a/src/optimization/layout.hh b/src/optimization/layout.hh
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common.hh"
-#include "conformal_ideal_delaunay/ConformalInterface.hh"
 #include "conformal_ideal_delaunay/OverlayMesh.hh"
 
 namespace CurvatureMetric {
diff --git a/src/optimization/optimization_pybind.cpp b/src/optimization/optimization_pybind.cpp
@@ -36,7 +36,6 @@
 #include "common.hh"
 
 #include "area.hh"
-#include "conformal_ideal_delaunay/ConformalInterface.hh"
 #include "constraint.hh"
 #include "convergence.hh"
 #include "embedding.hh"
@@ -294,10 +293,11 @@ init_conformal_pybind(pybind11::module& m)
         "Create double mesh from FV",
         pybind11::call_guard<pybind11::scoped_ostream_redirect,
                              pybind11::scoped_estream_redirect>());
-  m.def("overlay_mesh_to_VL",
-        &overlay_mesh_to_VL<Scalar>,
-        pybind11::call_guard<pybind11::scoped_ostream_redirect,
-                             pybind11::scoped_estream_redirect>());
+// TODO Replace with internal method
+//  m.def("overlay_mesh_to_VL",
+//        &overlay_mesh_to_VL<Scalar>,
+//        pybind11::call_guard<pybind11::scoped_ostream_redirect,
+//                             pybind11::scoped_estream_redirect>());
 #ifdef ENABLE_VISUALIZATION
   m.def("cpp_viewer", &cpp_viewer, "viewer mesh in libigl gui");
   m.def("get_pt_mat", &get_pt_mat, "get pt_mat");
diff --git a/src/optimization/projection.cpp b/src/optimization/projection.cpp
@@ -6,6 +6,7 @@
 #include "constraint.hh"
 #include "embedding.hh"
 #include "globals.hh"
+#include "conformal_ideal_delaunay/ConformalInterface.hh"
 
 /// FIXME Do cleaning pass
 
diff --git a/src/optimization/projection.hh b/src/optimization/projection.hh
@@ -2,8 +2,6 @@
 
 #include "common.hh"
 #include "cone_metric.hh"
-#include "conformal_ideal_delaunay/ConformalInterface.hh"
-#include "conformal_ideal_delaunay/OverlayMesh.hh"
 
 namespace CurvatureMetric
 {
@@ -94,4 +92,4 @@ namespace CurvatureMetric
   /// @return descent direction after projection to the constraint
   VectorX project_descent_direction(const DifferentiableConeMetric &cone_metric, const VectorX &descent_direction);
 
-}
+}
diff --git a/src/optimization/reparametrization.hh b/src/optimization/reparametrization.hh
@@ -1,8 +1,6 @@
 #pragma once
 
 #include "common.hh"
-#include "conformal_ideal_delaunay/ConformalInterface.hh"
-#include "conformal_ideal_delaunay/OverlayMesh.hh"
 
 namespace CurvatureMetric {
 
diff --git a/src/optimization/shear.hh b/src/optimization/shear.hh
@@ -2,8 +2,6 @@
 
 #include "common.hh"
 #include "cone_metric.hh"
-#include "conformal_ideal_delaunay/ConformalInterface.hh"
-#include "conformal_ideal_delaunay/OverlayMesh.hh"
 
 namespace CurvatureMetric {
 
diff --git a/src/optimization/translation.hh b/src/optimization/translation.hh
@@ -1,8 +1,6 @@
 #pragma once
 
 #include "common.hh"
-#include "conformal_ideal_delaunay/ConformalInterface.hh"
-#include "conformal_ideal_delaunay/OverlayMesh.hh"
 
 namespace CurvatureMetric {
 
diff --git a/src/tests/test_energies.cpp b/src/tests/test_energies.cpp
@@ -1,6 +1,4 @@
 #include <catch2/catch_test_macros.hpp>
-#include "conformal_ideal_delaunay/ConformalInterface.hh"
-
 
 #include "energies.hh"
 #include "shapes.hh"
