wip: uniform simplific ation

Author: akhileshh

pychunkedgraph/meshing/meshgen.py

@@ -1,4 +1,4 @@
-# pylint: disable=invalid-name, missing-docstring, no-member, too-many-lines, c-extension-no-member, bare-except, not-callable
+# pylint: disable=invalid-name, missing-docstring, no-member, too-many-lines, c-extension-no-member, bare-except, not-callable, no-value-for-parameter, unused-argument
 
 from typing import Sequence
 import os
@@ -94,6 +94,8 @@ def simplify_skipped_layers(cg, fragment, fragment_id, fragment_parent_id):
     while layer < parent_layer:
         fragment = simplify(cg, fragment, fragment_id, lod=layer)
         layer += 1
+    fragment["vertices"] = fragment["vertices"].reshape(-1, 3)
+    fragment["faces"] = fragment["faces"].reshape(-1, 3)
     return fragment
 
 
@@ -257,7 +259,6 @@ def _lower_remaps(ks):
     lower_remaps = {}
     if cg.get_chunk_layer(chunk_id) > 2:
         for lower_chunk_id in cg.get_chunk_child_ids(chunk_id):
-            # TODO speedup
             lower_remaps.update(
                 get_higher_to_lower_remapping(cg, lower_chunk_id, time_stamp=time_stamp)
             )
@@ -749,7 +750,13 @@ def transform_draco_fragment_and_return_encoding_options(
 
 
 def merge_draco_meshes_across_boundaries(
-    cg, fragments, chunk_id, mip, high_padding, return_zmesh_object=False
+    cg,
+    new_fragment_id,
+    fragments,
+    chunk_id,
+    mip,
+    high_padding,
+    return_zmesh_object=False,
 ):
     """
     Merge a list of draco mesh fragments, removing duplicate vertices that lie
@@ -758,6 +765,13 @@ def merge_draco_meshes_across_boundaries(
 
     # repeat simplify here?
 
+    for fragment in fragments:
+        frag = fragment["mesh"]
+        fragment_id = fragment["node_id"]
+        fragment["mesh"] = simplify_skipped_layers(
+            cg, frag, fragment_id, new_fragment_id
+        )
+
     vertexct = np.zeros(len(fragments) + 1, np.uint32)
     vertexct[1:] = np.cumsum([x["mesh"]["num_vertices"] for x in fragments])
     vertices = np.concatenate([x["mesh"]["vertices"] for x in fragments])
@@ -1091,11 +1105,11 @@ def chunk_initial_mesh_task(
     stotal_faces = int(np.sum(og_mesh_faces))
     stotal_vertices = int(np.sum(og_mesh_vertices))
 
-    # redis = get_redis_connection()
-    # redis.sadd(f"{cg.graph_id}/faces/2", total_faces)
-    # redis.sadd(f"{cg.graph_id}/vertices/2", total_vertices)
-    # redis.sadd(f"{cg.graph_id}/og_faces/2", stotal_faces)
-    # redis.sadd(f"{cg.graph_id}/og_vertices/2", stotal_vertices)
+    redis = get_redis_connection()
+    redis.sadd(f"{cg.graph_id}/faces/2", total_faces)
+    redis.sadd(f"{cg.graph_id}/vertices/2", total_vertices)
+    redis.sadd(f"{cg.graph_id}/og_faces/2", stotal_faces)
+    redis.sadd(f"{cg.graph_id}/og_vertices/2", stotal_vertices)
 
     if sharded and WRITING_TO_CLOUD:
         shard_binary = sharding_spec.synthesize_shard(merged_meshes)
@@ -1279,7 +1293,7 @@ def chunk_stitch_remeshing_task(
                 )
 
         new_fragment = merge_draco_meshes_across_boundaries(
-            cg, old_fragments, chunk_id, mip, high_padding
+            cg, new_fragment_id, old_fragments, chunk_id, mip, high_padding
         )
         new_fragment = simplify(cg, new_fragment, new_fragment_id)
 
@@ -1403,7 +1417,7 @@ def chunk_initial_sharded_stitching_task(
                     )
 
             new_fragment = merge_draco_meshes_across_boundaries(
-                cg, old_fragments, chunk_id, mip, high_padding
+                cg, new_fragment_id, old_fragments, chunk_id, mip, high_padding
             )
 
             new_fragment = simplify(cg, new_fragment, new_fragment_id)
@@ -1432,9 +1446,9 @@ def chunk_initial_sharded_stitching_task(
     total_faces = int(np.sum(mesh_faces))
     total_vertices = int(np.sum(mesh_vertices))
 
-    # redis = get_redis_connection()
-    # redis.sadd(f"{cg.graph_id}/faces/{layer}", total_faces)
-    # redis.sadd(f"{cg.graph_id}/vertices/{layer}", total_vertices)
+    redis = get_redis_connection()
+    redis.sadd(f"{cg.graph_id}/faces/{layer}", total_faces)
+    redis.sadd(f"{cg.graph_id}/vertices/{layer}", total_vertices)
 
     del mesh_dict
     shard_binary = sharding_spec.synthesize_shard(merged_meshes)