Fixed various pipelines

rjc8237 · rjc8237 · commit 81cf5285707e · 2024-03-25T13:27:45.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,6 +20,7 @@ if (PROJECT_IS_TOP_LEVEL)
   # Set libigl 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)
diff --git a/figures/fig-interpolation.sh b/figures/fig-interpolation.sh
@@ -2,5 +2,9 @@
 SCRIPT=$(realpath "$0")
 SCRIPTPATH=$(dirname "$SCRIPT")
 
-bash ${SCRIPTPATH}/pipeline.sh interpolation_log_length &
-bash ${SCRIPTPATH}/pipeline.sh interpolation_log_scale &
+bash ${SCRIPTPATH}/pipeline.sh interpolation_log_length
+
+# Need to run sequentially for interpolation
+wait
+
+bash ${SCRIPTPATH}/pipeline.sh interpolation_log_scale
diff --git a/figures/pipeline.sh b/figures/pipeline.sh
@@ -6,4 +6,4 @@ pipeline=$1
 output_dir=${SCRIPTPATH}/../output/${pipeline}
 mkdir -p ${output_dir}
 cp ${SCRIPTPATH}/pipelines/${pipeline}.json ${output_dir}/_pipeline.json
-python3 ${SCRIPTPATH}/../scripts/pipeline.py ${output_dir}/_pipeline.json &
+python3 ${SCRIPTPATH}/../scripts/pipeline.py ${output_dir}/_pipeline.json
diff --git a/figures/pipelines/comparison_fixed.json b/figures/pipelines/comparison_fixed.json
@@ -34,18 +34,6 @@
         }
       ]
     },
-    {
-      "method": "refine",
-      "skip": false,
-      "args_list": [
-        {
-          "suffix": "conf"
-        },
-        {
-          "suffix": "opt"
-        }
-      ]
-    },
     {
       "method": "colormap_histogram",
       "skip": false,
@@ -54,19 +42,20 @@
           "color": "blue",
           "bin_min": 0,
           "bin_max": 3,
-          "label": "sym. dirichlet"
+          "label": "sym. dirichlet",
+          "suffix": "opt_overlay"
         }
       ]
     },
     {
-      "method": "render_pipeline",
+      "method": "render_uv",
       "skip": false,
       "args_list": [
         {
-          "suffix": "conf_refined"
+          "suffix": "conf_overlay"
         },
         {
-          "suffix": "opt_refined"
+          "suffix": "opt_overlay"
         }
       ]
     }
diff --git a/figures/pipelines/comparison_quadratic.json b/figures/pipelines/comparison_quadratic.json
@@ -50,14 +50,14 @@
       "skip": false,
       "args_list": [
         {
-          "suffix": "conf_simplified_with_uv",
+          "suffix": "conf_refined",
           "color": "red",
           "bin_min": 0,
           "bin_max": 3,
           "label": "sym. dirichlet"
         },
         {
-          "suffix": "opt_simplified_with_uv",
+          "suffix": "opt_refined",
           "bin_min": 0,
           "bin_max": 3,
           "color": "blue",
diff --git a/figures/pipelines/disk_quadratic.json b/figures/pipelines/disk_quadratic.json
@@ -3,7 +3,7 @@
     "fname": [
       "nicolo_da_uzzano.obj"
     ],
-    "input_dir": "data/open-myles",
+    "input_dir": "data/open-Myles",
     "energy_choice": "quadratic_sym_dirichlet",
     "colormap": "sym_dirichlet",
     "direction_choice": "projected_newton",
@@ -70,7 +70,7 @@
       ]
     },
     {
-      "method": "render_layout",
+      "method": "render_uv",
       "skip": false,
       "args_list": [
         {
@@ -82,7 +82,7 @@
       ]
     },
     {
-      "method": "render_uv",
+      "method": "render_layout",
       "skip": false,
       "args_list": [
         {
diff --git a/figures/pipelines/disk_slim.json b/figures/pipelines/disk_slim.json
@@ -3,7 +3,7 @@
     "fname": [
       "nicolo_da_uzzano.obj"
     ],
-    "input_dir": "data/open-myles",
+    "input_dir": "data/open-Myles",
     "colormap": "sym_dirichlet",
     "free_bd_angles": true,
     "no_cones": true,
@@ -36,7 +36,7 @@
       ]
     },
     {
-      "method": "render_layout",
+      "method": "render_uv",
       "skip": false,
       "args_list": [
         {
@@ -45,7 +45,7 @@
       ]
     },
     {
-      "method": "render_uv",
+      "method": "render_layout",
       "skip": false,
       "args_list": [
         {
diff --git a/figures/pipelines/examples_closed.json b/figures/pipelines/examples_closed.json
@@ -62,6 +62,7 @@
       "method": "render_uv",
       "skip": false,
       "args_list": [
+        {
           "suffix": "conf_refined"
         },
         {
diff --git a/figures/pipelines/examples_cut.json b/figures/pipelines/examples_cut.json
@@ -62,6 +62,7 @@
       "method": "render_uv",
       "skip": false,
       "args_list": [
+        {
           "suffix": "conf_refined"
         },
         {
diff --git a/figures/pipelines/examples_open.json b/figures/pipelines/examples_open.json
@@ -62,6 +62,7 @@
       "method": "render_uv",
       "skip": false,
       "args_list": [
+        {
           "suffix": "conf_refined"
         },
         {
diff --git a/figures/pipelines/interpolation_log_scale.json b/figures/pipelines/interpolation_log_scale.json
@@ -19,7 +19,7 @@
       "skip": false,
       "args_list": [
         {
-          "lambdas_dir": "figures/interpolation/log_length"
+          "lambdas_dir": "output/interpolation/log_length"
         }
       ]
     },
diff --git a/figures/pipelines/objectives_log_length.json b/figures/pipelines/objectives_log_length.json
@@ -255,7 +255,7 @@
             "kitten100K.obj"
           ],
           "input_dir": "data/closed-Myles",
-          "output_dir": "figures/objectives/log_length/strectch_tail",
+          "output_dir": "output/objectives/log_length/strectch_tail",
           "suffix": "opt",
           "histogram_choice": "stretch_factors",
           "color": "blue",
@@ -268,7 +268,7 @@
             "julius.obj"
           ],
           "input_dir": "data/open-Myles",
-          "output_dir": "figures/objectives/log_length/strectch_tail",
+          "output_dir": "output/objectives/log_length/strectch_tail",
           "suffix": "opt",
           "histogram_choice": "stretch_factors",
           "color": "blue",
diff --git a/figures/pipelines/objectives_log_length_p4.json b/figures/pipelines/objectives_log_length_p4.json
@@ -163,7 +163,7 @@
             "kitten100K.obj"
           ],
           "input_dir": "data/closed-Myles",
-          "output_dir": "figures/objectives/log_length_p_4/strectch_tail",
+          "output_dir": "output/objectives/log_length_p_4/strectch_tail",
           "suffix": "opt",
           "histogram_choice": "stretch_factors",
           "color": "blue",
@@ -176,7 +176,7 @@
             "julius.obj"
           ],
           "input_dir": "data/open-Myles",
-          "output_dir": "figures/objectives/log_length_p_4/strectch_tail",
+          "output_dir": "output/objectives/log_length_p_4/strectch_tail",
           "suffix": "opt",
           "histogram_choice": "stretch_factors",
           "color": "blue",
diff --git a/figures/pipelines/teaser.json b/figures/pipelines/teaser.json
@@ -105,7 +105,7 @@
           "uv_scale": 0.5
         },
         {
-          "suffix": "3_refined",
+          "suffix": "2_refined",
           "colormap_scale": 2,
           "uv_scale": 0.5
         }
diff --git a/figures/pipelines/test.json b/figures/pipelines/test.json
@@ -3,7 +3,7 @@
     "fname": [
       "eight.obj"
     ],
-    "input_dir": "data/cut-myles",
+    "input_dir": "data/cut-Myles",
     "energy_choice": "p_norm",
     "colormap": "scale_factors",
     "opt_num_iter": 50
diff --git a/py/conformal_impl/__pycache__/__init__.cpython-39.pyc b/py/conformal_impl/__pycache__/__init__.cpython-39.pyc
diff --git a/py/conformal_impl/__pycache__/halfedge.cpython-39.pyc b/py/conformal_impl/__pycache__/halfedge.cpython-39.pyc
diff --git a/py/conformal_impl/__pycache__/overload_math.cpython-39.pyc b/py/conformal_impl/__pycache__/overload_math.cpython-39.pyc
diff --git a/py/optimize_impl/__pycache__/analysis.cpython-39.pyc b/py/optimize_impl/__pycache__/analysis.cpython-39.pyc
diff --git a/py/optimize_impl/__pycache__/energies.cpython-39.pyc b/py/optimize_impl/__pycache__/energies.cpython-39.pyc
diff --git a/py/optimize_impl/__pycache__/optimization.cpython-39.pyc b/py/optimize_impl/__pycache__/optimization.cpython-39.pyc
diff --git a/py/optimize_impl/__pycache__/render.cpython-39.pyc b/py/optimize_impl/__pycache__/render.cpython-39.pyc
diff --git a/py/optimize_impl/__pycache__/targets.cpython-39.pyc b/py/optimize_impl/__pycache__/targets.cpython-39.pyc
diff --git a/py/optimize_impl/targets.py b/py/optimize_impl/targets.py
@@ -36,10 +36,10 @@ def generate_tutte_param(v, f):
     """
     bd = igl.boundary_loop(f)
     bd_uv = igl.map_vertices_to_circle(v, bd)
-    uv = igl.harmonic_weights(v, f, bd, bd_uv, 1)
+    uv = igl.harmonic(v, f, bd, bd_uv, 1)
     uv_embed = np.zeros((len(uv), 3))
     uv_embed[:,:2] = uv[:,:2]
 
     return uv_embed
 
-    
+    
diff --git a/scripts/__pycache__/script_util.cpython-39.pyc b/scripts/__pycache__/script_util.cpython-39.pyc
diff --git a/scripts/error_table.py b/scripts/error_table.py
@@ -69,9 +69,9 @@ def error_table(args):
             # Load input mesh information
             try:
                 input_dir = args['input_dir']
-                logger.info("Loading initial mesh at {}".format(input_dir))
-                v3d_orig, f_orig = igl.read_triangle_mesh(
-                    os.path.join(input_dir, m+'.obj'))
+                input_path = os.path.join(input_dir, m+'.obj')
+                logger.info("Loading initial mesh at {}".format(input_path))
+                v3d_orig, f_orig = igl.read_triangle_mesh(input_path)
             except:
                 logger.error("Could not load initial mesh")
                 return
@@ -86,11 +86,14 @@ def error_table(args):
                 logger.error("Could not load uvs for {}".format(name))
 
             # Get topology information
+            logger.info("Getting count information")
             error_dict['num_faces'].append(len(f_orig))
             error_dict['num_overlay_faces'].append(len(f))
+
+            logger.info("Getting topology information")
             error_dict['is_manifold'].append(igl.is_edge_manifold(f))
-            error_dict['num_components'].append(
-                np.max(igl.face_components(fuv)) + 1)
+            error_dict['num_components'].append(-1)
+            #    np.max(igl.face_components(fuv)) + 1)
 
             # Get areas
             logger.info("Computing areas")
diff --git a/scripts/interpolate.py b/scripts/interpolate.py
@@ -34,7 +34,7 @@ def interpolate_metric(
         interpolated_metric = C.set_metric_coordinates(lambdas)
         projected_metric = opt.project_metric_to_constraint(
             interpolated_metric, proj_params, "")
-        lambdas = projected_metric.get_metric_coordinates()
+        lambdas = projected_metric.get_reduced_metric_coordinates()
         np.savetxt(os.path.join(output_dir, 'lambdas_' + str(i)), lambdas)
 
 
diff --git a/scripts/overlay.py b/scripts/overlay.py
@@ -79,7 +79,7 @@ def overlay_one(args, fname):
         C_o = opt.add_overlay(C_embed, lambdas)
         opt.make_tufted_overlay(C_o, v3d, f, Th_hat)
         v_overlay = v3d[vtx_reindex].T
-        endpoints = np.full((len(C.out), 2), -1)
+        endpoints = np.full((len(C_embed.out), 2), -1)
 
         # Get layout parametrization from overlay
         logger.info("Getting parametrization from overlay")
diff --git a/src/penner_optimization_pybind.cpp b/src/penner_optimization_pybind.cpp
@@ -58,6 +58,7 @@
 #endif
 
 #ifdef RENDER_TEXTURE
+#include "conformal_ideal_delaunay/ConformalInterface.hh"
 #include "conformal_ideal_delaunay/Sampling.hh"
 #include "visualization.hh"
 #endif
@@ -290,10 +291,10 @@ void init_conformal_pybind(pybind11::module& m)
         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>());
+  m.def("overlay_mesh_to_VL",
+        &overlay_mesh_to_VL<Scalar>,
+        pybind11::call_guard<pybind11::scoped_ostream_redirect,
+                             pybind11::scoped_estream_redirect>());
 #ifdef RENDER_TEXTURE
     m.def("cpp_viewer", &cpp_viewer, "viewer mesh in libigl gui");
     m.def("get_pt_mat", &get_pt_mat, "get pt_mat");
@@ -361,6 +362,11 @@ void init_energies_pybind(pybind11::module& m)
         &surface_hencky_strain_energy_vf,
         pybind11::
             call_guard<pybind11::scoped_ostream_redirect, pybind11::scoped_estream_redirect>());
+    m.def(
+        "conformal_scaling_matrix",
+        &conformal_scaling_matrix,
+        pybind11::
+            call_guard<pybind11::scoped_ostream_redirect, pybind11::scoped_estream_redirect>());
     m.def(
         "best_fit_conformal",
         &best_fit_conformal,

Original file line number	Diff line number	Diff line change
`@@ -34,18 +34,6 @@`
`34`	`34`	`}`
`35`	`35`	`]`
`36`	`36`	`},`
`37`		`- {`
`38`		`- "method": "refine",`
`39`		`- "skip": false,`
`40`		`- "args_list": [`
`41`		`- {`
`42`		`- "suffix": "conf"`
`43`		`- },`
`44`		`- {`
`45`		`- "suffix": "opt"`
`46`		`- }`
`47`		`- ]`
`48`		`- },`
`49`	`37`	`{`
`50`	`38`	`"method": "colormap_histogram",`
`51`	`39`	`"skip": false,`
`@@ -54,19 +42,20 @@`
`54`	`42`	`"color": "blue",`
`55`	`43`	`"bin_min": 0,`
`56`	`44`	`"bin_max": 3,`
`57`		`- "label": "sym. dirichlet"`
	`45`	`+ "label": "sym. dirichlet",`
	`46`	`+ "suffix": "opt_overlay"`
`58`	`47`	`}`
`59`	`48`	`]`
`60`	`49`	`},`
`61`	`50`	`{`
`62`		`- "method": "render_pipeline",`
	`51`	`+ "method": "render_uv",`
`63`	`52`	`"skip": false,`
`64`	`53`	`"args_list": [`
`65`	`54`	`{`
`66`		`- "suffix": "conf_refined"`
	`55`	`+ "suffix": "conf_overlay"`
`67`	`56`	`},`
`68`	`57`	`{`
`69`		`- "suffix": "opt_refined"`
	`58`	`+ "suffix": "opt_overlay"`
`70`	`59`	`}`
`71`	`60`	`]`
`72`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"fname": [`
`4`	`4`	`"nicolo_da_uzzano.obj"`
`5`	`5`	`],`
`6`		`- "input_dir": "data/open-myles",`
	`6`	`+ "input_dir": "data/open-Myles",`
`7`	`7`	`"energy_choice": "quadratic_sym_dirichlet",`
`8`	`8`	`"colormap": "sym_dirichlet",`
`9`	`9`	`"direction_choice": "projected_newton",`
`@@ -70,7 +70,7 @@`
`70`	`70`	`]`
`71`	`71`	`},`
`72`	`72`	`{`
`73`		`- "method": "render_layout",`
	`73`	`+ "method": "render_uv",`
`74`	`74`	`"skip": false,`
`75`	`75`	`"args_list": [`
`76`	`76`	`{`
`@@ -82,7 +82,7 @@`
`82`	`82`	`]`
`83`	`83`	`},`
`84`	`84`	`{`
`85`		`- "method": "render_uv",`
	`85`	`+ "method": "render_layout",`
`86`	`86`	`"skip": false,`
`87`	`87`	`"args_list": [`
`88`	`88`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@`
`62`	`62`	`"method": "render_uv",`
`63`	`63`	`"skip": false,`
`64`	`64`	`"args_list": [`
	`65`	`+ {`
`65`	`66`	`"suffix": "conf_refined"`
`66`	`67`	`},`
`67`	`68`	`{`