Fixed shear executable

Author: rjc8237

CMakeLists.txt

@@ -7,26 +7,26 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 add_compile_options(-fPIC)
 set(DIR_EXT "${CMAKE_CURRENT_SOURCE_DIR}/ext")
 
+# Set options if top level
 if (PROJECT_IS_TOP_LEVEL)
   # Options for the project
-  option(USE_PYBIND "Generate pybindings" ON)
   option(USE_MULTIPRECISION "Use high precision floating point" OFF)
-  option(ENABLE_VISUALIZATION "Generate viewers for visualization" ON)
   option(CHECK_VALIDITY "Check validity pre and post conditions" ON)
-  option(BUILD_CURVATURE_METRIC_TESTS "Build tests" ON)
-  option(USE_SUITESPARSE "Use suite sparse methods for matrix inversion" ON)
+  option(ENABLE_VISUALIZATION "Generate viewers for visualization" ON)
   option(RENDER_TEXTURE "Render results" ON)
+  option(USE_SUITESPARSE "Use suite sparse methods for matrix inversion" ON)
+  option(USE_PYBIND "Generate pybindings" ON)
+  option(BUILD_CURVATURE_METRIC_TESTS "Build tests" ON)
 
-  # Set libigl options
+  # Set libigl and suitesparse options
   option(LIBIGL_PREDICATES "Use Predicates" ON)
   set ( SUITESPARSE_ENABLE_PROJECTS "suitesparse_config;cholmod;spqr" )
   option ( SUITESPARSE_USE_CUDA OFF )
 endif()
 
-#find_package(Boost REQUIRED COMPONENTS system filesystem serialization)
-
 list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
+# Optionally get multiprecision libraries
 if(USE_MULTIPRECISION)
   # Turning this on activates mpfr in the conformal code
   option(LIBIGL_COPYLEFT_CGAL "Use CGAL" ON)
@@ -37,43 +37,33 @@ if(USE_MULTIPRECISION)
   link_directories(${MPFR_LIBRARIES_DIR})
 endif()
 
+# Set compile definitions
+add_compile_definitions(USE_EMBREE)
+add_compile_definitions(_USE_MATH_DEFINES)
+if(USE_MULTIPRECISION)
+  add_compile_definitions(MULTIPRECISION)
+endif()
 if(CHECK_VALIDITY)
   add_compile_definitions(CHECK_VALIDITY)
 endif()
-
 if (RENDER_TEXTURE)
   option(LIBIGL_OPENGL "Use OpenGL" ON)
   option(LIBIGL_GLFW "Use GLFW" ON)
   option(LIBIGL_PNG "Use PNG" ON)
   option(LIBIGL_EMBREE "Use EMBREE" ON)
+  add_compile_definitions(RENDER_TEXTURE)
 endif()
-
-# # Add highfive library
-if (USE_HIGHFIVE)
-  find_package(HDF5 REQUIRED)
-  include(highfive)
-  add_library(HighFiveLib INTERFACE)
-  target_include_directories(HighFiveLib SYSTEM INTERFACE ${highfive_SOURCE_DIR}/include/ ${HDF5_INCLUDE_DIRS})
-  target_link_libraries(HighFiveLib INTERFACE ${HDF5_LIBRARIES})
-  add_compile_definitions(USE_HIGHFIVE)
-endif()
-
-# Set compile definitions
 if(USE_PYBIND)
   add_compile_definitions(PYBIND)
 endif()
 
-if(USE_MULTIPRECISION)
-  add_compile_definitions(MULTIPRECISION)
-endif()
-
+# Set suitesparse compile definitions
+# WARNING: This compile definition publicly links suitesparse into the
+# conformal ideal delaunay library
 if(USE_SUITESPARSE)
   add_compile_definitions(USE_SUITESPARSE)
 endif()
 
-add_compile_definitions(USE_EMBREE)
-add_compile_definitions(_USE_MATH_DEFINES)
-
 # Get external libraries
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/util")
 include(conformal_ideal_delaunay)
@@ -83,32 +73,39 @@ include(cli11)
 
 # Optionally create visualization library
 if(RENDER_TEXTURE)
-  add_library(visualization
+  add_library(rendering
     src/util/visualization.cc
   )
-  target_link_libraries(visualization PUBLIC
+  target_link_libraries(rendering PUBLIC
     igl::core
     igl::glfw
     igl::png
     igl::embree
     plot
   )
+  set(RENDER_LIBRARIES
+    rendering
+  )
 endif()
 
+# Optionally enable polyscope visualization
 if(ENABLE_VISUALIZATION)
   add_compile_definitions(ENABLE_VISUALIZATION)
-endif()
-
-if(ENABLE_VISUALIZATION)
   include(polyscope)
   set(POLYSCOPE_LIBRARIES
     polyscope
   )
 endif()
 
+# Install executables to bin directory
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 # Make main cpp library
 add_subdirectory(src)
 
+# Build executables
+add_subdirectory(src/app)
+
 # Build pybind optimization functions
 if(USE_PYBIND)
   include(pybind11)
@@ -120,19 +117,8 @@ if(USE_PYBIND)
   target_link_libraries(optimization_py PUBLIC
     PennerOptimizationLib
     pybind11::module
+    ${RENDER_LIBRARIES}
   )
-  # Link visualization methods if created
-  if(RENDER_TEXTURE)
-    add_compile_definitions(RENDER_TEXTURE)
-    target_link_libraries(optimization_py PRIVATE
-      visualization
-    )
-  endif()
-  if(USE_HIGHFIVE)
-    target_link_libraries(optimization_py PUBLIC
-      HighFiveLib
-    )
-  endif()
 
   # Set pybinding settings
   set_target_properties(optimization_py PROPERTIES LIBRARY_OUTPUT_DIRECTORY
@@ -143,25 +129,18 @@ if(USE_PYBIND)
   )
 endif()
 
-if(APPLE OR NOT UNIX)
-  add_subdirectory(src/app)
-endif()
+# Optionally build tests (only valid for double precision)
+if((BUILD_CURVATURE_METRIC_TESTS) AND (NOT USE_MULTIPRECISION))
+  include(Catch2)
 
-# Following libraries only valid for double
-if(NOT USE_MULTIPRECISION)
-  # Optionally build tests
-  if(BUILD_CURVATURE_METRIC_TESTS)
-    include(Catch2)
-
-    # Build testing executable
-    add_executable(CurvatureMetricTests
-      src/tests/tests.cpp
-    )
-    target_link_libraries(CurvatureMetricTests PRIVATE
-      PennerOptimizationLib
-      Catch2::Catch2WithMain
-    )
-    set(TEST_DATA_ROOT "${PROJECT_SOURCE_DIR}/src/tests/regression/")
-    target_compile_definitions(CurvatureMetricTests PUBLIC TEST_DATA_DIR=\"${TEST_DATA_ROOT}\")
-  endif()
+  # Build testing executable
+  add_executable(CurvatureMetricTests
+    src/tests/tests.cpp
+  )
+  target_link_libraries(CurvatureMetricTests PRIVATE
+    PennerOptimizationLib
+    Catch2::Catch2WithMain
+  )
+  set(TEST_DATA_ROOT "${PROJECT_SOURCE_DIR}/src/tests/regression/")
+  target_compile_definitions(CurvatureMetricTests PUBLIC TEST_DATA_DIR=\"${TEST_DATA_ROOT}\")
 endif()

README.md

@@ -6,7 +6,7 @@
 
 An implementation of [Metric Optimization in Penner Coordinates](https://dl.acm.org/doi/10.1145/3618394).
 
-![Contour pipeline](media/teaser.jpg)
+![Parameterization with interpolation](media/teaser.jpg)
 
 ### Overview
 
@@ -54,7 +54,12 @@ Scripts to generate the figures of "Metric Optimization in Penner Coordinates" a
 TODO
 The models (with parameterizations) and cameras used in [Algebraic Smooth Occluding Contours](http://ryanjcapouellez.com/papers/algebraic_smooth_occluding_contours.html) necessary for these scripts can be downloaded [here](http://ryanjcapouellez.com/papers/algebraic-contours-data.zip); they must be copied to `data/meshes` and `data/cameras` respectively.
 
-The figure bash scripts can be run independently or in batch with the command
+A Conda environment must be activated (before compiling the code) with
+```
+conda env create -f environment.yml
+conda activate penner-optimization
+```
+The figure bash scripts can then be run independently or in batch with
 ```
 bash fig-all.sh
 ```

environment.yml

@@ -1,4 +1,4 @@
-name: curvature-metric
+name: penner-optimization
 channels:
   - conda-forge
   - defaults

src/app/CMakeLists.txt

@@ -1,16 +1,3 @@
-add_executable(conformal_metric
-  conformal_metric.cpp
-)
-target_link_libraries(conformal_metric PRIVATE
-  PennerOptimizationLib
-)
-if(USE_SUITESPARSE)
-target_link_libraries(conformal_metric PRIVATE
-  SuiteSparse::SuiteSparseConfig
-  SuiteSparse::CHOLMOD
-)
-endif()
-
 add_executable(optimize_metric
   optimize_metric.cpp
 )
@@ -23,7 +10,8 @@ add_executable(optimize_shear
   optimize_shear.cpp
 )
 target_link_libraries(optimize_shear PRIVATE
-PennerOptimizationLib
+  PennerOptimizationLib
+  CLI11::CLI11
 )
 
 add_executable(plot_shear_energy

src/app/conformal_metric.cpp

@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
 
     spdlog::set_level(spdlog::level::info);
     std::filesystem::create_directories(output_dir);
-		opt_params->output_dir = output_dir;
+    opt_params->output_dir = output_dir;
 
 		// TODO Make this automatic
 		if (use_discrete_metric)