Added support for fast version

niknah · niknah · commit 7bedd657fdc5 · 2025-02-04T14:21:39.000+11:00
diff --git a/README.md b/README.md
@@ -8,6 +8,15 @@ This custom node might fail after the first restart.  Restart ComfyUI again.  Cl
 
 ## If it doesn't install...
 
+### Windows
+
+You will need to install [Visual C++ build tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/)
+
+### ComfyUI\_windows\_portable
+
+If you installed ComfyUI with ComfyUI\_windows\_portable, it is using a version of python which is missing the libs and header files.  The way around it is to either copy some folders or install the module from else where. See [issue #]()
+
+
 ### Ubuntu 
 
 `sudo apt install python3-dev libgl-dev`
@@ -28,10 +37,9 @@ Hunyuan-3D needs g++ 13, Suse has g++ 14+ by default
 ## Workarounds...
 
 * If you get a square panel.  Make sure you have a transparent background in the image.  If the image came from another node, insert an "invert mask" node before giving the mask to this node, some nodes have a mask that's reversed.
-* Hunyuan-3D-2 uses more main memory than GPU memory.  On a 16gb RAM main memory computer, you'll have to quit everything else other than ComfyUI, have only a few custom\_nodes installed.  Or use the command line version.  I have ran it on 16gb RAM, 8gb VRAM without paint.  Best to have 24gb+ RAM, 12gb+ VRAM.
 
 
-### Install from git.  
+### Install from git
 
 Not recommended because ComfyUI-Manager will auto update when you press the update button. git will need manual updates for every custom\_node you have.
 
@@ -43,5 +51,13 @@ cd ComfyUI-Hunyuan-3D-2
 git submodule update --init   # You need to get the submodules if you install from git
 ```
 
+### Other models...
+
+* Right click on the node, click "convert input to widget", "model".
+* connect a string node to the "model" input.
+* Put in the string node the ID of the model on hugging face.  ie. tencent/Hunyuan3D-2
+
+* The big model files are downloaded into `~/.cache/huggingface/hub`
+
 
 ![Screenshot, workflow is in the examples/ folder](assets/workflow_screenshot.png)
diff --git a/examples/Hunyuan-3d-2-example.json b/examples/Hunyuan-3d-2-example.json
@@ -1,55 +1,7 @@
 {
-  "last_node_id": 21,
-  "last_link_id": 24,
+  "last_node_id": 23,
+  "last_link_id": 26,
   "nodes": [
-    {
-      "id": 18,
-      "type": "Hunyuan3D2ImageTo3D",
-      "pos": [
-        -307.19512939453125,
-        705.976318359375
-      ],
-      "size": [
-        315,
-        222
-      ],
-      "flags": {},
-      "order": 1,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "image",
-          "type": "IMAGE",
-          "link": 24
-        },
-        {
-          "name": "mask",
-          "type": "MASK",
-          "link": 23,
-          "shape": 7
-        }
-      ],
-      "outputs": [
-        {
-          "name": "filename",
-          "type": "STRING",
-          "links": [
-            16
-          ],
-          "slot_index": 0
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "Hunyuan3D2ImageTo3D"
-      },
-      "widgets_values": [
-        30,
-        true,
-        true,
-        true,
-        false
-      ]
-    },
     {
       "id": 7,
       "type": "LoadImage",
@@ -92,11 +44,11 @@
       ]
     },
     {
-      "id": 12,
+      "id": 23,
       "type": "Preview3D",
       "pos": [
-        89.18033599853516,
-        632.212646484375
+        149.37188720703125,
+        686.0650024414062
       ],
       "size": [
         315,
@@ -109,36 +61,91 @@
         {
           "name": "model_file",
           "type": "STRING",
-          "link": 16,
+          "link": 26,
           "widget": {
             "name": "model_file"
           }
         }
       ],
       "outputs": [],
       "properties": {
-        "Node name for S&R": "Preview3D"
+        "Node name for S&R": "Preview3D",
+        "Show Grid": true,
+        "Camera Info": {
+          "position": {
+            "x": 7.749448299061437,
+            "y": 10.439857209476756,
+            "z": 7.757242217589018
+          },
+          "target": {
+            "x": 0,
+            "y": 2.5,
+            "z": 0
+          },
+          "zoom": 1,
+          "cameraType": "perspective"
+        }
       },
       "widgets_values": [
-        "hunyuan3d_70E30.glb",
+        "hunyuan3d_7CE38.glb",
         "original",
-        "#000000",
         10,
         "original",
         75,
         null
       ]
+    },
+    {
+      "id": 18,
+      "type": "Hunyuan3D2ImageTo3D",
+      "pos": [
+        -307.19512939453125,
+        705.976318359375
+      ],
+      "size": [
+        315,
+        222
+      ],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "image",
+          "type": "IMAGE",
+          "link": 24
+        },
+        {
+          "name": "mask",
+          "type": "MASK",
+          "link": 23,
+          "shape": 7
+        }
+      ],
+      "outputs": [
+        {
+          "name": "model file",
+          "type": "STRING",
+          "links": [
+            26
+          ],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "Hunyuan3D2ImageTo3D"
+      },
+      "widgets_values": [
+        30,
+        true,
+        true,
+        true,
+        false,
+        "tencent/Hunyuan3D-2/hunyuan3d-dit-v2-0"
+      ]
     }
   ],
   "links": [
-    [
-      16,
-      18,
-      0,
-      12,
-      0,
-      "STRING"
-    ],
     [
       23,
       7,
@@ -154,16 +161,24 @@
       18,
       0,
       "IMAGE"
+    ],
+    [
+      26,
+      18,
+      0,
+      23,
+      0,
+      "STRING"
     ]
   ],
   "groups": [],
   "config": {},
   "extra": {
     "ds": {
-      "scale": 0.683013455365071,
+      "scale": 1.3109994191499976,
       "offset": [
-        958.835786988787,
-        -207.04284573998368
+        485.2584426492523,
+        -467.91069644496645
       ]
     },
     "0246.VERSION": [
@@ -172,10 +187,10 @@
       4
     ],
     "node_versions": {
-      "ComfyUI-Hunyuan-3D-2": "7c8cfc0ca3154ead3491e0d8a356d644b97710bf",
-      "comfy-core": "0.3.12"
+      "comfy-core": "0.3.13",
+      "ComfyUI-Hunyuan-3D-2": "cb6f7a41feebf9bbdf8a12ab0fc4fc1ff2067410"
     },
     "ue_links": []
   },
   "version": 0.4
-}
+}
diff --git a/hunyuan_3d_node.py b/hunyuan_3d_node.py
@@ -10,13 +10,18 @@
 import torch
 import hashlib
 import platform
+import re
 from PIL import Image
 import numpy as np
 
 
 class Hunyuan3DImageTo3D:
     @classmethod
     def INPUT_TYPES(s):
+        models = [
+            'tencent/Hunyuan3D-2/hunyuan3d-dit-v2-0',
+            'tencent/Hunyuan3D-2/hunyuan3d-dit-v2-0-fast',
+            ]
         return {
             "required": {
                 "image": ("IMAGE",),
@@ -27,11 +32,17 @@ def INPUT_TYPES(s):
                 "floater_remover": ("BOOLEAN", {"default": True}),
                 "face_remover": ("BOOLEAN", {"default": True}),
                 "face_reducer": ("BOOLEAN",  {"default": True}),
-                "paint": ("BOOLEAN",  {"default": False}),
+                "paint": ("BOOLEAN",  {
+                    "default": False,
+                    "tooltip": "Paint needs a lot more VRAM",
+                }),
+                "model": (models, {
+                    "tooltip": "huggingface id of model.  ie. author/name/subfolder",
+                }),
             }
         }
     RETURN_TYPES = ("STRING",)
-    RETURN_NAMES = ("filename",)
+    RETURN_NAMES = ("model file",)
     FUNCTION = "process"
     CATEGORY = "3d"
 
@@ -55,6 +66,12 @@ def popen_print_output(args, cwd=None, shell=False):
     @staticmethod
     def install_check():
         this_path = os.path.dirname(os.path.realpath(__file__))
+
+        Hunyuan3DImageTo3D.popen_print_output(
+            ['git', 'submodule', 'update', '--init', '--recursive'],
+            this_path,
+            shell=True,
+        )
         if importlib.util.find_spec('custom_rasterizer') is None:
             print("Installing custom_rasterizer")
             Hunyuan3DImageTo3D.popen_print_output(
@@ -106,11 +123,29 @@ def process(
         face_remover,
         face_reducer,
         paint,
+        model='tencent/Hunyuan3D-2',
     ):
         from hy3dgen.shapegen import Hunyuan3DDiTFlowMatchingPipeline
         import hy3dgen.shapegen
 
         output_dir = folder_paths.get_output_directory()
+        checkpoint_dir = os.path.join(
+            folder_paths.get_folder_paths('checkpoints')[0],
+            'Hunyuan3D-2'
+        )
+        if not os.path.exists(checkpoint_dir):
+            os.mkdir(checkpoint_dir)
+
+# Not working
+#        if 'HY3DGEN_MODELS' not in os.environ:
+#            os.environ['HY3DGEN_MODELS'] = checkpoint_dir
+
+        subfolder = None
+        subfolder_m = re.match(r"^([^/]+/[^/]+)/(.+)$", model)
+        if subfolder_m is not None:
+            model = subfolder_m.group(1)
+            subfolder = subfolder_m.group(2)
+
         output_3d_file = None
         with tempfile.TemporaryDirectory() as temp_dir:
             for img, mask1 in zip(image, mask):
@@ -121,14 +156,18 @@ def process(
                     mask = Image.fromarray(m)
                     mask = np.clip(mask, 0, 255).astype(np.uint8)
                     mask = 255 - mask
+                    # If it crashes here,
+                    # check that you have transparency in the image
                     img.putalpha(Image.fromarray(mask, mode='L'))
                 input_image_file = os.path.join(temp_dir, "input.png")
                 img.save(input_image_file)
 
                 mask = i = img = None
 
-                model_path = 'tencent/Hunyuan3D-2'
-                pipeline = Hunyuan3DDiTFlowMatchingPipeline.from_pretrained(model_path)  # noqa: E501
+                pipeline = Hunyuan3DDiTFlowMatchingPipeline.from_pretrained(
+                    model,
+                    subfolder=subfolder,
+                )
 
                 output_3d_file = Hunyuan3DImageTo3D.get_spare_filename(
                     os.path.join(output_dir, 'hunyuan3d_{:05X}.glb')
@@ -145,7 +184,10 @@ def process(
 
                 if paint:
                     from hy3dgen.texgen import Hunyuan3DPaintPipeline
-                    pipeline = Hunyuan3DPaintPipeline.from_pretrained(model_path)  # noqa: E501
+                    pipeline = Hunyuan3DPaintPipeline.from_pretrained(
+                        model,
+                        subfolder=subfolder,
+                    )
                     mesh = pipeline(mesh, image=input_image_file)
 
                 mesh.export(output_3d_file)
@@ -161,11 +203,13 @@ def IS_CHANGED(
         face_remover,
         face_reducer,
         paint,
+        model,
     ):
         m = hashlib.sha256()
         m.update(steps)
         m.update(floater_remover)
         m.update(face_remover)
         m.update(face_reducer)
         m.update(paint)
+        m.update(model)
         return m.digest().hex()
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-hunyuan-3d-2"
 description = "Image to 3D using Hunyuan-3D-2"
-version = "0.9.1"
+version = "0.9.2"
 license = {text = "MIT License"}
 
 [project.urls]
diff --git a/requirements.txt b/requirements.txt
