autoforge 1.6.1__tar.gz → 1.6.2__tar.gz

{autoforge-1.6.1 → autoforge-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: AutoForge
-Version: 1.6.1
+Version: 1.6.2
 Summary: AutoForge is a Python tool for generating 3D printed layered models from an input image.
 Author-email: Hendric Voss <hvoss@techfak.uni-bielefeld.de>
 License: CC BY-NC-SA 4.0

{autoforge-1.6.1 → autoforge-1.6.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "AutoForge"
-version="1.6.1"
+version="1.6.2"
 description = "AutoForge is a Python tool for generating 3D printed layered models from an input image."
 authors = [{ name = "Hendric Voss", email = "hvoss@techfak.uni-bielefeld.de" }]
 readme = "README.md"

{autoforge-1.6.1 → autoforge-1.6.2}/src/AutoForge.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: AutoForge
-Version: 1.6.1
+Version: 1.6.2
 Summary: AutoForge is a Python tool for generating 3D printed layered models from an input image.
 Author-email: Hendric Voss <hvoss@techfak.uni-bielefeld.de>
 License: CC BY-NC-SA 4.0

{autoforge-1.6.1 → autoforge-1.6.2}/src/autoforge/Loss/LossFunctions.py

@@ -50,46 +50,42 @@ def compute_loss(
     add_penalty_loss: float = 0.0,
 ) -> torch.Tensor:
     """
-    Combined MSE + Perceptual + penalty losses.
+    Combined MSE + Perceptual + penalty losses with patch-based smoothness.
     """
-    # MSE
+    # MSE Loss
     comp_mse = srgb_to_lab(comp)
-    # we slightly increase saturation of our target image to make the color matching more robust
-    # target = increase_saturation(target, 0.1)
     target_mse = srgb_to_lab(target)
     mse_loss = F.huber_loss(comp_mse, target_mse)
 
     if pixel_height_logits is not None:
+        # Existing neighbor-based smoothness loss:
         target_gray = target.mean(dim=2)  # shape becomes [H, W]
-
-        # Compute weights using the grayscale image
-        weight_x = torch.exp(
-            -torch.abs(target_gray[:, 1:] - target_gray[:, :-1])
-        )  # shape [H, W-1]
-        weight_y = torch.exp(
-            -torch.abs(target_gray[1:, :] - target_gray[:-1, :])
-        )  # shape [H-1, W]
-
+        weight_x = torch.exp(-torch.abs(target_gray[:, 1:] - target_gray[:, :-1]))
+        weight_y = torch.exp(-torch.abs(target_gray[1:, :] - target_gray[:-1, :]))
         weight_x = torch.clamp(weight_x, 0.5, 1.0)
         weight_y = torch.clamp(weight_y, 0.5, 1.0)
-
-        # Compute differences in the depth map
-        dx = torch.abs(
-            pixel_height_logits[:, 1:] - pixel_height_logits[:, :-1]
-        )  # shape [H, W-1]
-        dy = torch.abs(
-            pixel_height_logits[1:, :] - pixel_height_logits[:-1, :]
-        )  # shape [H-1, W]
-
-        # provide a target tensor (zeros) for the huber loss.
+        dx = torch.abs(pixel_height_logits[:, 1:] - pixel_height_logits[:, :-1])
+        dy = torch.abs(pixel_height_logits[1:, :] - pixel_height_logits[:-1, :])
         loss_dx = torch.mean(F.huber_loss(dx * weight_x, torch.zeros_like(dx)))
         loss_dy = torch.mean(F.huber_loss(dy * weight_y, torch.zeros_like(dy)))
-        # loss_dx = torch.mean(F.huber_loss(dx, torch.zeros_like(dx)))
-        # loss_dy = torch.mean(F.huber_loss(dy, torch.zeros_like(dy)))
+        smoothness_loss = (loss_dx + loss_dy) * (10 * add_penalty_loss)
 
-        smoothness_loss = (loss_dx + loss_dy) * (20 * add_penalty_loss)
-        # print(f"mse_loss: {mse_loss}, smoothness_loss: {smoothness_loss}")
-        total_loss = mse_loss + smoothness_loss
+        # Additional patch-based smoothness loss (using a 3x3 Laplacian):
+        laplacian_kernel = (
+            torch.tensor(
+                [[0, 1, 0], [1, -4, 1], [0, 1, 0]],
+                dtype=pixel_height_logits.dtype,
+                device=pixel_height_logits.device,
+            )
+            .unsqueeze(0)
+            .unsqueeze(0)
+        )
+        height_map = pixel_height_logits.unsqueeze(0).unsqueeze(0)
+        laplacian_output = F.conv2d(height_map, laplacian_kernel, padding=1)
+        patch_smooth_loss = (
+            F.huber_loss(laplacian_output, torch.zeros_like(laplacian_output)) * 10
+        )
+        total_loss = mse_loss + smoothness_loss + add_penalty_loss * patch_smooth_loss
     else:
         total_loss = mse_loss
     return total_loss

{autoforge-1.6.1 → autoforge-1.6.2}/src/autoforge/auto_forge.py

@@ -46,7 +46,10 @@ def main():
     )
 
     parser.add_argument(
-        "--warmup_fraction", type=float, default=1.0, help="Fraction of iterations for keeping the tau at the initial value"
+        "--warmup_fraction",
+        type=float,
+        default=1.0,
+        help="Fraction of iterations for keeping the tau at the initial value",
     )
     #
     # parser.add_argument(
@@ -98,8 +101,6 @@ def main():
         "--background_color", type=str, default="#000000", help="Background color"
     )
 
-
-
     parser.add_argument(
         "--visualize",
         action="store_true",