autoforge 1.5.2__tar.gz → 1.5.3__tar.gz

{autoforge-1.5.2 → autoforge-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: AutoForge
-Version: 1.5.2
+Version: 1.5.3
 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
@@ -26,7 +26,8 @@ AutoForge is a Python tool for generating 3D printed layered models from an inpu
 **TLDR:** It uses a picture to generate a 3D layer image that you can print with a 3d printer. Similar to [Hueforge](https://shop.thehueforge.com/), but without the manual work (and without the artistic control).
 
 ## Example
-All examples use only the 13 BambuLab Basic filaments, currently available in Hueforge.
+All examples use only the 13 BambuLab Basic filaments, currently available in Hueforge, the background color is set to black.
+The pruning is set to a maximum of 8 color and 20 swaps, so each image uses at most 8 different colors and swaps the filament at most 20 times. 
 <div style="display: flex; justify-content: center; gap: 20px;">
   <div style="text-align: center;">
     <h3>Input Image</h3>
@@ -37,7 +38,7 @@ All examples use only the 13 BambuLab Basic filaments, currently available in Hu
   <div style="text-align: center;">
     <h3>Autoforge Output (75 color layers (3.0mm) + 10 gray background layers (0.4mm)) </h3>
     <img src="https://github.com/hvoss-techfak/AutoForge/blob/main/images/lofi_discretized.png" width="200" />
-    <img src="https://github.com/hvoss-techfak/AutoForge/blob/main/images/nature_discretized.jpg" width="200" />
+    <img src="https://github.com/hvoss-techfak/AutoForge/blob/main/images/nature_discretized.png" width="200" />
     <img src="https://github.com/hvoss-techfak/AutoForge/blob/main/images/cat_discretized.png" width="200" />
   </div>
   <div style="text-align: center;">
@@ -95,7 +96,7 @@ autoforge --input_image path/to/input_image.jpg --csv_file path/to/materials.csv
 - `--iterations`: Number of optimization iterations (default: 5000).
 - `--learning_rate`: Learning rate for the optimizer (default: 1e-2).
 - `--layer_height`: Layer thickness in millimeters (default: 0.04).
-- `--max_layers`: Maximum number of layers (default: 75). \
+- `--max_layers`: Maximum number of layers (default: 100). \
   **Note:** This is about 3mm + the background height
 - `--min_layers`: Minimum number of layers (default: 0). Used to limit height of pruning 
 - `--background_height`: Height of the background in millimeters (default: 0.4).  \
@@ -110,11 +111,12 @@ autoforge --input_image path/to/input_image.jpg --csv_file path/to/materials.csv
 - `--stl_output_size`: Size of the output stl file in mm (default: 200) (20cm).
 - `--visualize`: Flag to enable live visualization of the composite image during optimization.
 - `--tensorboard`: Enable TensorBoard logging
-- `--run-name`: Name of the run used for TensorBoard logging (optional).
+- `--run_name`: Name of the run used for TensorBoard logging (optional).
 - `--perform_pruning`: Perform pruning after optimization (default: True). \
   **Note:** This is highly recommended even if you don't have a color/color swap limit, as it actually increases the quality of the output.
 - `--pruning_max_colors`: Max number of colors allowed after pruning (default: 100).
 - `--pruning_max_swaps`: Max number of swaps allowed after pruning (default: 100).
+- `--pruning_max_layers`: Max number of layers allowed after pruning (default: 75).
 - `--random_seed`: Random seed for reproducibility (default: 0 (disabled) ).
 
 ### Experimental Deph Anything V2 parameters

{autoforge-1.5.2 → autoforge-1.5.3}/README.md

@@ -5,7 +5,8 @@ AutoForge is a Python tool for generating 3D printed layered models from an inpu
 **TLDR:** It uses a picture to generate a 3D layer image that you can print with a 3d printer. Similar to [Hueforge](https://shop.thehueforge.com/), but without the manual work (and without the artistic control).
 
 ## Example
-All examples use only the 13 BambuLab Basic filaments, currently available in Hueforge.
+All examples use only the 13 BambuLab Basic filaments, currently available in Hueforge, the background color is set to black.
+The pruning is set to a maximum of 8 color and 20 swaps, so each image uses at most 8 different colors and swaps the filament at most 20 times. 
 <div style="display: flex; justify-content: center; gap: 20px;">
   <div style="text-align: center;">
     <h3>Input Image</h3>
@@ -16,7 +17,7 @@ All examples use only the 13 BambuLab Basic filaments, currently available in Hu
   <div style="text-align: center;">
     <h3>Autoforge Output (75 color layers (3.0mm) + 10 gray background layers (0.4mm)) </h3>
     <img src="https://github.com/hvoss-techfak/AutoForge/blob/main/images/lofi_discretized.png" width="200" />
-    <img src="https://github.com/hvoss-techfak/AutoForge/blob/main/images/nature_discretized.jpg" width="200" />
+    <img src="https://github.com/hvoss-techfak/AutoForge/blob/main/images/nature_discretized.png" width="200" />
     <img src="https://github.com/hvoss-techfak/AutoForge/blob/main/images/cat_discretized.png" width="200" />
   </div>
   <div style="text-align: center;">
@@ -74,7 +75,7 @@ autoforge --input_image path/to/input_image.jpg --csv_file path/to/materials.csv
 - `--iterations`: Number of optimization iterations (default: 5000).
 - `--learning_rate`: Learning rate for the optimizer (default: 1e-2).
 - `--layer_height`: Layer thickness in millimeters (default: 0.04).
-- `--max_layers`: Maximum number of layers (default: 75). \
+- `--max_layers`: Maximum number of layers (default: 100). \
   **Note:** This is about 3mm + the background height
 - `--min_layers`: Minimum number of layers (default: 0). Used to limit height of pruning 
 - `--background_height`: Height of the background in millimeters (default: 0.4).  \
@@ -89,11 +90,12 @@ autoforge --input_image path/to/input_image.jpg --csv_file path/to/materials.csv
 - `--stl_output_size`: Size of the output stl file in mm (default: 200) (20cm).
 - `--visualize`: Flag to enable live visualization of the composite image during optimization.
 - `--tensorboard`: Enable TensorBoard logging
-- `--run-name`: Name of the run used for TensorBoard logging (optional).
+- `--run_name`: Name of the run used for TensorBoard logging (optional).
 - `--perform_pruning`: Perform pruning after optimization (default: True). \
   **Note:** This is highly recommended even if you don't have a color/color swap limit, as it actually increases the quality of the output.
 - `--pruning_max_colors`: Max number of colors allowed after pruning (default: 100).
 - `--pruning_max_swaps`: Max number of swaps allowed after pruning (default: 100).
+- `--pruning_max_layers`: Max number of layers allowed after pruning (default: 75).
 - `--random_seed`: Random seed for reproducibility (default: 0 (disabled) ).
 
 ### Experimental Deph Anything V2 parameters

{autoforge-1.5.2 → autoforge-1.5.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "AutoForge"
-version="1.5.2"
+version="1.5.3"
 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.5.2 → autoforge-1.5.3}/src/AutoForge.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: AutoForge
-Version: 1.5.2
+Version: 1.5.3
 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
@@ -26,7 +26,8 @@ AutoForge is a Python tool for generating 3D printed layered models from an inpu
 **TLDR:** It uses a picture to generate a 3D layer image that you can print with a 3d printer. Similar to [Hueforge](https://shop.thehueforge.com/), but without the manual work (and without the artistic control).
 
 ## Example
-All examples use only the 13 BambuLab Basic filaments, currently available in Hueforge.
+All examples use only the 13 BambuLab Basic filaments, currently available in Hueforge, the background color is set to black.
+The pruning is set to a maximum of 8 color and 20 swaps, so each image uses at most 8 different colors and swaps the filament at most 20 times. 
 <div style="display: flex; justify-content: center; gap: 20px;">
   <div style="text-align: center;">
     <h3>Input Image</h3>
@@ -37,7 +38,7 @@ All examples use only the 13 BambuLab Basic filaments, currently available in Hu
   <div style="text-align: center;">
     <h3>Autoforge Output (75 color layers (3.0mm) + 10 gray background layers (0.4mm)) </h3>
     <img src="https://github.com/hvoss-techfak/AutoForge/blob/main/images/lofi_discretized.png" width="200" />
-    <img src="https://github.com/hvoss-techfak/AutoForge/blob/main/images/nature_discretized.jpg" width="200" />
+    <img src="https://github.com/hvoss-techfak/AutoForge/blob/main/images/nature_discretized.png" width="200" />
     <img src="https://github.com/hvoss-techfak/AutoForge/blob/main/images/cat_discretized.png" width="200" />
   </div>
   <div style="text-align: center;">
@@ -95,7 +96,7 @@ autoforge --input_image path/to/input_image.jpg --csv_file path/to/materials.csv
 - `--iterations`: Number of optimization iterations (default: 5000).
 - `--learning_rate`: Learning rate for the optimizer (default: 1e-2).
 - `--layer_height`: Layer thickness in millimeters (default: 0.04).
-- `--max_layers`: Maximum number of layers (default: 75). \
+- `--max_layers`: Maximum number of layers (default: 100). \
   **Note:** This is about 3mm + the background height
 - `--min_layers`: Minimum number of layers (default: 0). Used to limit height of pruning 
 - `--background_height`: Height of the background in millimeters (default: 0.4).  \
@@ -110,11 +111,12 @@ autoforge --input_image path/to/input_image.jpg --csv_file path/to/materials.csv
 - `--stl_output_size`: Size of the output stl file in mm (default: 200) (20cm).
 - `--visualize`: Flag to enable live visualization of the composite image during optimization.
 - `--tensorboard`: Enable TensorBoard logging
-- `--run-name`: Name of the run used for TensorBoard logging (optional).
+- `--run_name`: Name of the run used for TensorBoard logging (optional).
 - `--perform_pruning`: Perform pruning after optimization (default: True). \
   **Note:** This is highly recommended even if you don't have a color/color swap limit, as it actually increases the quality of the output.
 - `--pruning_max_colors`: Max number of colors allowed after pruning (default: 100).
 - `--pruning_max_swaps`: Max number of swaps allowed after pruning (default: 100).
+- `--pruning_max_layers`: Max number of layers allowed after pruning (default: 75).
 - `--random_seed`: Random seed for reproducibility (default: 0 (disabled) ).
 
 ### Experimental Deph Anything V2 parameters

{autoforge-1.5.2 → autoforge-1.5.3}/src/AutoForge.egg-info/SOURCES.txt

@@ -9,7 +9,6 @@ src/AutoForge.egg-info/top_level.txt
 src/autoforge/__init__.py
 src/autoforge/__main__.py
 src/autoforge/auto_forge.py
-src/autoforge/old_jax_files.py
 src/autoforge/Gui/__init__.py
 src/autoforge/Gui/app.py
 src/autoforge/Gui/main.py
@@ -24,6 +23,10 @@ src/autoforge/Helper/OutputHelper.py
 src/autoforge/Helper/PruningHelper.py
 src/autoforge/Helper/__init__.py
 src/autoforge/Helper/filamentcolors_library.py
+src/autoforge/Helper/Heightmaps/ChristofidesHeightMap.py
+src/autoforge/Helper/Heightmaps/DepthEstimateHeightMap.py
+src/autoforge/Helper/Heightmaps/OldHeightmap.py
+src/autoforge/Helper/Heightmaps/__init__.py
 src/autoforge/Loss/LossFunctions.py
 src/autoforge/Loss/PerceptionLoss.py
 src/autoforge/Loss/__init__.py

{autoforge-1.5.2 → autoforge-1.5.3}/src/autoforge/Helper/CAdamW.py

@@ -1,7 +1,6 @@
 # Taken from https://github.com/kyleliang919/C-Optim/blob/main/c_adamw.py
 # copy dependencies from transformers/optimization.py
 import math
-import warnings
 from typing import Callable, Iterable, Tuple
 
 import torch
@@ -32,24 +31,33 @@ class CAdamW(Optimizer):
     """
 
     def __init__(
-            self,
-            params: Iterable[nn.parameter.Parameter],
-            lr: float = 1e-3,
-            betas: Tuple[float, float] = (0.9, 0.999),
-            eps: float = 1e-6,
-            weight_decay: float = 0.0,
-            correct_bias: bool = True,
+        self,
+        params: Iterable[nn.parameter.Parameter],
+        lr: float = 1e-3,
+        betas: Tuple[float, float] = (0.9, 0.999),
+        eps: float = 1e-6,
+        weight_decay: float = 0.0,
+        correct_bias: bool = True,
     ):
-
         if lr < 0.0:
             raise ValueError(f"Invalid learning rate: {lr} - should be >= 0.0")
         if not 0.0 <= betas[0] < 1.0:
-            raise ValueError(f"Invalid beta parameter: {betas[0]} - should be in [0.0, 1.0)")
+            raise ValueError(
+                f"Invalid beta parameter: {betas[0]} - should be in [0.0, 1.0)"
+            )
         if not 0.0 <= betas[1] < 1.0:
-            raise ValueError(f"Invalid beta parameter: {betas[1]} - should be in [0.0, 1.0)")
+            raise ValueError(
+                f"Invalid beta parameter: {betas[1]} - should be in [0.0, 1.0)"
+            )
         if not 0.0 <= eps:
             raise ValueError(f"Invalid epsilon value: {eps} - should be >= 0.0")
-        defaults = {"lr": lr, "betas": betas, "eps": eps, "weight_decay": weight_decay, "correct_bias": correct_bias}
+        defaults = {
+            "lr": lr,
+            "betas": betas,
+            "eps": eps,
+            "weight_decay": weight_decay,
+            "correct_bias": correct_bias,
+        }
         super().__init__(params, defaults)
         self.init_lr = lr
 
@@ -102,12 +110,16 @@ class CAdamW(Optimizer):
                 if group["correct_bias"]:  # No bias correction for Bert
                     bias_correction1 = 1.0 - beta1 ** state["step"]
                     bias_correction2 = 1.0 - beta2 ** state["step"]
-                    step_size = step_size * math.sqrt(bias_correction2) / bias_correction1
+                    step_size = (
+                        step_size * math.sqrt(bias_correction2) / bias_correction1
+                    )
 
                 # compute norm gradient
                 mask = (exp_avg * grad > 0).to(grad.dtype)
                 # mask = mask * (mask.numel() / (mask.sum() + 1)) ## original implementation, leaving it here for record
-                mask.div_(mask.mean().clamp_(min=1e-3))  # https://huggingface.co/rwightman/timm-optim-caution found this implementation is more favoarable in many cases
+                mask.div_(
+                    mask.mean().clamp_(min=1e-3)
+                )  # https://huggingface.co/rwightman/timm-optim-caution found this implementation is more favoarable in many cases
                 norm_grad = (exp_avg * mask) / denom
                 p.add_(norm_grad, alpha=-step_size)
-        return loss
+        return loss