diff --git a/Checkpoints/CharacterGen/2D_Stage/models/checkpoint/scaler.pt b/Checkpoints/CharacterGen/2D_Stage/models/checkpoint/scaler.pt new file mode 100644 index 0000000..38ac882 --- /dev/null +++ b/Checkpoints/CharacterGen/2D_Stage/models/checkpoint/scaler.pt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c63c3d2e7b7f18788aca8a5a0e766ad4633f631d49192602d8532b6b0df7615 +size 559 diff --git a/DOCKER_INSTRUCTIONS.md b/DOCKER_INSTRUCTIONS.md index da13b64..3a4a7e6 100644 --- a/DOCKER_INSTRUCTIONS.md +++ b/DOCKER_INSTRUCTIONS.md @@ -8,7 +8,7 @@ These instructions are based on the assumption that you have Docker installed on All tests were performed using Docker version 26.1.3 and Docker Compose version 2.27.0 under Ubuntu 22.04. -These instructions are focused on running the Unique3D workflows, you can use the same steps to run the other workflows, but you need to check the model requirements for each workflow at the [README.md](../README.md) file. +These instructions are focused on running the Unique3D workflows, you can use the same steps to run the other workflows, but you need to check the model requirements for each workflow at the [README.md](./README.md) file. ### Requirements diff --git a/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/.ninja_deps b/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/.ninja_deps index 7aba721..ac6e593 100644 Binary files a/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/.ninja_deps and b/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/.ninja_deps differ diff --git a/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/.ninja_log b/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/.ninja_log index 00ef57d..5b4072e 100644 --- a/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/.ninja_log +++ b/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/.ninja_log @@ -18,3 +18,10 @@ 13106 13198 7445113325278709 _slangtorch_texture_baker_44136fa355b3678a.pyd 9b21a5c60eb03f2c 22 11857 7445113444318882 texture_baker.o d2552713bf2b5a12 11859 11938 7445113445275668 _slangtorch_texture_baker_44136fa355b3678a.pyd 9b21a5c60eb03f2c +24 20146 7509048038891258 texture_baker.o d2552713bf2b5a12 +20147 20305 7509048040563846 _slangtorch_texture_baker_44136fa355b3678a.pyd 9b21a5c60eb03f2c +29 12060 7509048161816250 texture_baker.o d2552713bf2b5a12 +12061 12140 7509048162781653 _slangtorch_texture_baker_44136fa355b3678a.pyd 9b21a5c60eb03f2c +34 3236 7509048217212053 texture_baker_cuda.cuda.o ce8c20f9bf2876fd +30 14859 7509048333313026 texture_baker.o fada63e2f1da810b +14878 14995 7509048334862300 _slangtorch_texture_baker_44136fa355b3678a.pyd f7f598e558c5da34 diff --git a/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/build.ninja b/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/build.ninja index f7c3157..2160d1e 100644 --- a/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/build.ninja +++ b/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/build.ninja @@ -2,12 +2,12 @@ ninja_required_version = 1.3 cxx = cl nvcc = C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin\nvcc -cflags = -DTORCH_EXTENSION_NAME=_slangtorch_texture_baker_44136fa355b3678a -DTORCH_API_INCLUDE_EXTENSION_H -IC:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\_Projects\stable-fast-3d\sf3d -IC:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\Lib\site-packages\torch\include -IC:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\Lib\site-packages\torch\include\torch\csrc\api\include -IC:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\Lib\site-packages\torch\include\TH -IC:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\Lib\site-packages\torch\include\THC "-IC:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\include" -IC:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\Include -D_GLIBCXX_USE_CXX11_ABI=0 /MD /wd4819 /wd4251 /wd4244 /wd4267 /wd4275 /wd4018 /wd4190 /wd4624 /wd4067 /wd4068 /EHsc /std:c++17 /std:c++17 +cflags = -DTORCH_EXTENSION_NAME=_slangtorch_texture_baker_44136fa355b3678a -DTORCH_API_INCLUDE_EXTENSION_H -IC:\Users\reall\Softwares\ComfyUI_windows_portable\ComfyUI\custom_nodes\ComfyUI-3D-Pack\Gen_3D_Modules\StableFast3D\sf3d -IC:\Users\reall\Softwares\ComfyUI_windows_portable\python_embeded\Lib\site-packages\torch\include -IC:\Users\reall\Softwares\ComfyUI_windows_portable\python_embeded\Lib\site-packages\torch\include\torch\csrc\api\include -IC:\Users\reall\Softwares\ComfyUI_windows_portable\python_embeded\Lib\site-packages\torch\include\TH -IC:\Users\reall\Softwares\ComfyUI_windows_portable\python_embeded\Lib\site-packages\torch\include\THC "-IC:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\include" -IC:\Users\reall\Softwares\ComfyUI_windows_portable\python_embeded\Include -D_GLIBCXX_USE_CXX11_ABI=0 /MD /wd4819 /wd4251 /wd4244 /wd4267 /wd4275 /wd4018 /wd4190 /wd4624 /wd4067 /wd4068 /EHsc /std:c++17 /std:c++17 post_cflags = -cuda_cflags = -Xcudafe --diag_suppress=dll_interface_conflict_dllexport_assumed -Xcudafe --diag_suppress=dll_interface_conflict_none_assumed -Xcudafe --diag_suppress=field_without_dll_interface -Xcudafe --diag_suppress=base_class_has_different_dll_interface -Xcompiler /EHsc -Xcompiler /wd4068 -Xcompiler /wd4067 -Xcompiler /wd4624 -Xcompiler /wd4190 -Xcompiler /wd4018 -Xcompiler /wd4275 -Xcompiler /wd4267 -Xcompiler /wd4244 -Xcompiler /wd4251 -Xcompiler /wd4819 -Xcompiler /MD -DTORCH_EXTENSION_NAME=_slangtorch_texture_baker_44136fa355b3678a -DTORCH_API_INCLUDE_EXTENSION_H -IC:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\_Projects\stable-fast-3d\sf3d -IC:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\Lib\site-packages\torch\include -IC:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\Lib\site-packages\torch\include\torch\csrc\api\include -IC:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\Lib\site-packages\torch\include\TH -IC:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\Lib\site-packages\torch\include\THC "-IC:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\include" -IC:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\Include -D_GLIBCXX_USE_CXX11_ABI=0 -D__CUDA_NO_HALF_OPERATORS__ -D__CUDA_NO_HALF_CONVERSIONS__ -D__CUDA_NO_BFLOAT16_CONVERSIONS__ -D__CUDA_NO_HALF2_OPERATORS__ --expt-relaxed-constexpr -gencode=arch=compute_89,code=compute_89 -gencode=arch=compute_89,code=sm_89 -std=c++17 --std=c++17 -U__CUDA_NO_HALF_OPERATORS__ -U__CUDA_NO_HALF_CONVERSIONS__ -U__CUDA_NO_HALF2_OPERATORS__ -U__CUDA_NO_BFLOAT16_CONVERSIONS__ -DSLANG_CUDA_ENABLE_HALF=1 +cuda_cflags = -Xcudafe --diag_suppress=dll_interface_conflict_dllexport_assumed -Xcudafe --diag_suppress=dll_interface_conflict_none_assumed -Xcudafe --diag_suppress=field_without_dll_interface -Xcudafe --diag_suppress=base_class_has_different_dll_interface -Xcompiler /EHsc -Xcompiler /wd4068 -Xcompiler /wd4067 -Xcompiler /wd4624 -Xcompiler /wd4190 -Xcompiler /wd4018 -Xcompiler /wd4275 -Xcompiler /wd4267 -Xcompiler /wd4244 -Xcompiler /wd4251 -Xcompiler /wd4819 -Xcompiler /MD -DTORCH_EXTENSION_NAME=_slangtorch_texture_baker_44136fa355b3678a -DTORCH_API_INCLUDE_EXTENSION_H -IC:\Users\reall\Softwares\ComfyUI_windows_portable\ComfyUI\custom_nodes\ComfyUI-3D-Pack\Gen_3D_Modules\StableFast3D\sf3d -IC:\Users\reall\Softwares\ComfyUI_windows_portable\python_embeded\Lib\site-packages\torch\include -IC:\Users\reall\Softwares\ComfyUI_windows_portable\python_embeded\Lib\site-packages\torch\include\torch\csrc\api\include -IC:\Users\reall\Softwares\ComfyUI_windows_portable\python_embeded\Lib\site-packages\torch\include\TH -IC:\Users\reall\Softwares\ComfyUI_windows_portable\python_embeded\Lib\site-packages\torch\include\THC "-IC:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\include" -IC:\Users\reall\Softwares\ComfyUI_windows_portable\python_embeded\Include -D_GLIBCXX_USE_CXX11_ABI=0 -D__CUDA_NO_HALF_OPERATORS__ -D__CUDA_NO_HALF_CONVERSIONS__ -D__CUDA_NO_BFLOAT16_CONVERSIONS__ -D__CUDA_NO_HALF2_OPERATORS__ --expt-relaxed-constexpr -gencode=arch=compute_89,code=compute_89 -gencode=arch=compute_89,code=sm_89 -std=c++17 --std=c++17 -U__CUDA_NO_HALF_OPERATORS__ -U__CUDA_NO_HALF_CONVERSIONS__ -U__CUDA_NO_HALF2_OPERATORS__ -U__CUDA_NO_BFLOAT16_CONVERSIONS__ -DSLANG_CUDA_ENABLE_HALF=1 cuda_post_cflags = cuda_dlink_post_cflags = -ldflags = /DLL c10.lib c10_cuda.lib torch_cpu.lib torch_cuda.lib -INCLUDE:?warp_size@cuda@at@@YAHXZ torch.lib /LIBPATH:C:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\Lib\site-packages\torch\lib torch_python.lib /LIBPATH:C:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\libs "/LIBPATH:C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\lib\x64" cudart.lib +ldflags = /DLL c10.lib c10_cuda.lib torch_cpu.lib torch_cuda.lib -INCLUDE:?warp_size@cuda@at@@YAHXZ torch.lib /LIBPATH:C:\Users\reall\Softwares\ComfyUI_windows_portable\python_embeded\Lib\site-packages\torch\lib torch_python.lib /LIBPATH:C:\Users\reall\Softwares\ComfyUI_windows_portable\python_embeded\libs "/LIBPATH:C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\lib\x64" cudart.lib rule compile command = cl /showIncludes $cflags -c $in /Fo$out $post_cflags @@ -23,8 +23,8 @@ rule cuda_compile rule link command = "C$:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.40.33807\bin\Hostx64\x64/link.exe" $in /nologo $ldflags /out:$out -build texture_baker.o: compile C$:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\_Projects\stable-fast-3d\sf3d\.slangtorch_cache\texture_baker\44136fa355b3678a\texture_baker.cpp -build texture_baker_cuda.cuda.o: cuda_compile C$:\Users\reall\Softwares\Miniconda\envs\AI3D_Exp\_Projects\stable-fast-3d\sf3d\.slangtorch_cache\texture_baker\44136fa355b3678a\texture_baker_cuda.cu +build texture_baker.o: compile C$:\Users\reall\Softwares\ComfyUI_windows_portable\ComfyUI\custom_nodes\ComfyUI-3D-Pack\Gen_3D_Modules\StableFast3D\sf3d\.slangtorch_cache\texture_baker\44136fa355b3678a\texture_baker.cpp +build texture_baker_cuda.cuda.o: cuda_compile C$:\Users\reall\Softwares\ComfyUI_windows_portable\ComfyUI\custom_nodes\ComfyUI-3D-Pack\Gen_3D_Modules\StableFast3D\sf3d\.slangtorch_cache\texture_baker\44136fa355b3678a\texture_baker_cuda.cu diff --git a/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/metadata.json b/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/metadata.json index f2063aa..bd94613 100644 --- a/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/metadata.json +++ b/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/metadata.json @@ -38,5 +38,5 @@ "includePaths": [] }, "moduleName": "_slangtorch_texture_baker_44136fa355b3678a", - "moduleBinary": "C:\\Users\\reall\\Softwares\\Miniconda\\envs\\AI3D_Exp\\_Projects\\stable-fast-3d\\sf3d\\.slangtorch_cache\\texture_baker\\44136fa355b3678a\\0\\_slangtorch_texture_baker_44136fa355b3678a.pyd" + "moduleBinary": "C:\\Users\\reall\\Softwares\\ComfyUI_windows_portable\\ComfyUI\\custom_nodes\\ComfyUI-3D-Pack\\Gen_3D_Modules\\StableFast3D\\sf3d\\.slangtorch_cache\\texture_baker\\44136fa355b3678a\\0\\_slangtorch_texture_baker_44136fa355b3678a.pyd" } \ No newline at end of file diff --git a/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/texture_baker.o b/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/texture_baker.o index 445008f..92ec1e8 100644 Binary files a/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/texture_baker.o and b/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/texture_baker.o differ diff --git a/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/texture_baker_cuda.cuda.o b/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/texture_baker_cuda.cuda.o index 9010512..5124b83 100644 Binary files a/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/texture_baker_cuda.cuda.o and b/Gen_3D_Modules/StableFast3D/sf3d/.slangtorch_cache/texture_baker/44136fa355b3678a/0/texture_baker_cuda.cuda.o differ diff --git a/_Example_Workflows/CRM_T2I_V3/CRM_T2I_V3_to_MV_to_Texture_dora_model_Handgun_Example.json b/_Example_Workflows/CRM_T2I_V3/CRM_T2I_V3_to_MV_to_Texture_dora_model_Handgun_Example.json new file mode 100644 index 0000000..f5fc670 --- /dev/null +++ b/_Example_Workflows/CRM_T2I_V3/CRM_T2I_V3_to_MV_to_Texture_dora_model_Handgun_Example.json @@ -0,0 +1,1824 @@ +{ + "last_node_id": 139, + "last_link_id": 226, + "nodes": [ + { + "id": 71, + "type": "[Comfy3D] Get Masks From Normal Maps", + "pos": { + "0": 2156, + "1": 1121 + }, + "size": { + "0": 304.79998779296875, + "1": 26 + }, + "flags": {}, + "order": 10, + "mode": 0, + "inputs": [ + { + "name": "normal_maps", + "type": "IMAGE", + "link": 126 + } + ], + "outputs": [ + { + "name": "normal_masks", + "type": "MASK", + "links": [ + 128, + 189 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "[Comfy3D] Get Masks From Normal Maps" + } + }, + { + "id": 73, + "type": "[Comfy3D] Image Add Pure Color Background", + "pos": { + "0": 2511, + "1": 950 + }, + "size": { + "0": 315, + "1": 126 + }, + "flags": {}, + "order": 14, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 226 + }, + { + "name": "masks", + "type": "MASK", + "link": 128 + } + ], + "outputs": [ + { + "name": "images", + "type": "IMAGE", + "links": [ + 131, + 197 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "[Comfy3D] Image Add Pure Color Background" + }, + "widgets_values": [ + 137, + 137, + 137 + ] + }, + { + "id": 104, + "type": "UpscaleModelLoader", + "pos": { + "0": 3268, + "1": -80 + }, + "size": { + "0": 401.14697265625, + "1": 68.85823822021484 + }, + "flags": {}, + "order": 0, + "mode": 0, + "inputs": [], + "outputs": [ + { + "name": "UPSCALE_MODEL", + "type": "UPSCALE_MODEL", + "links": [ + 172, + 200, + 202 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "UpscaleModelLoader" + }, + "widgets_values": [ + "RealESRGAN_x4plus.pth" + ] + }, + { + "id": 70, + "type": "PreviewImage", + "pos": { + "0": 2879, + "1": 1492 + }, + "size": { + "0": 1056.7071533203125, + "1": 267.20068359375 + }, + "flags": {}, + "order": 9, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 125 + } + ], + "outputs": [], + "properties": { + "Node name for S&R": "PreviewImage" + } + }, + { + "id": 109, + "type": "PreviewImage", + "pos": { + "0": 2887, + "1": 1814 + }, + "size": { + "0": 1060.749755859375, + "1": 269.04522705078125 + }, + "flags": {}, + "order": 23, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 182 + } + ], + "outputs": [], + "properties": { + "Node name for S&R": "PreviewImage" + } + }, + { + "id": 118, + "type": "PreviewImage", + "pos": { + "0": 2882, + "1": 2144 + }, + "size": { + "0": 1060.749755859375, + "1": 269.04522705078125 + }, + "flags": {}, + "order": 24, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 198 + } + ], + "outputs": [], + "properties": { + "Node name for S&R": "PreviewImage" + } + }, + { + "id": 121, + "type": "PreviewImage", + "pos": { + "0": 2881, + "1": 2476 + }, + "size": { + "0": 1060.749755859375, + "1": 269.04522705078125 + }, + "flags": {}, + "order": 26, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 203 + } + ], + "outputs": [], + "properties": { + "Node name for S&R": "PreviewImage" + } + }, + { + "id": 110, + "type": "MaskToImage", + "pos": { + "0": 3984, + "1": 1187 + }, + "size": { + "0": 210, + "1": 26 + }, + "flags": {}, + "order": 15, + "mode": 0, + "inputs": [ + { + "name": "mask", + "type": "MASK", + "link": 183 + } + ], + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 184 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "MaskToImage" + } + }, + { + "id": 111, + "type": "PreviewImage", + "pos": { + "0": 4245, + "1": 1276 + }, + "size": { + "0": 1060.749755859375, + "1": 269.04522705078125 + }, + "flags": {}, + "order": 18, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 184 + } + ], + "outputs": [], + "properties": { + "Node name for S&R": "PreviewImage" + } + }, + { + "id": 105, + "type": "ImageUpscaleWithModel", + "pos": { + "0": 3772, + "1": -76 + }, + "size": { + "0": 241.79998779296875, + "1": 46 + }, + "flags": {}, + "order": 19, + "mode": 0, + "inputs": [ + { + "name": "upscale_model", + "type": "UPSCALE_MODEL", + "link": 172 + }, + { + "name": "image", + "type": "IMAGE", + "link": 195 + } + ], + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 174, + 182 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "ImageUpscaleWithModel" + } + }, + { + "id": 119, + "type": "ImageUpscaleWithModel", + "pos": { + "0": 3777, + "1": 266 + }, + "size": { + "0": 241.79998779296875, + "1": 46 + }, + "flags": {}, + "order": 20, + "mode": 0, + "inputs": [ + { + "name": "upscale_model", + "type": "UPSCALE_MODEL", + "link": 200 + }, + { + "name": "image", + "type": "IMAGE", + "link": 199 + } + ], + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 198, + 204 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "ImageUpscaleWithModel" + } + }, + { + "id": 120, + "type": "ImageUpscaleWithModel", + "pos": { + "0": 3777, + "1": 559 + }, + "size": { + "0": 241.79998779296875, + "1": 46 + }, + "flags": {}, + "order": 21, + "mode": 0, + "inputs": [ + { + "name": "upscale_model", + "type": "UPSCALE_MODEL", + "link": 202 + }, + { + "name": "image", + "type": "IMAGE", + "link": 201 + } + ], + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 203, + 206 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "ImageUpscaleWithModel" + } + }, + { + "id": 75, + "type": "PreviewImage", + "pos": { + "0": 2879, + "1": 1185 + }, + "size": { + "0": 1057.5609130859375, + "1": 246 + }, + "flags": {}, + "order": 16, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 131 + } + ], + "outputs": [], + "properties": { + "Node name for S&R": "PreviewImage" + } + }, + { + "id": 128, + "type": "PreviewImage", + "pos": { + "0": 4945, + "1": 263 + }, + "size": { + "0": 1057.5609130859375, + "1": 246 + }, + "flags": {}, + "order": 31, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 208 + } + ], + "outputs": [], + "properties": { + "Node name for S&R": "PreviewImage" + } + }, + { + "id": 129, + "type": "PreviewImage", + "pos": { + "0": 4572, + "1": -370 + }, + "size": { + "0": 1057.5609130859375, + "1": 246 + }, + "flags": {}, + "order": 28, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 213 + } + ], + "outputs": [], + "properties": { + "Node name for S&R": "PreviewImage" + } + }, + { + "id": 130, + "type": "PreviewImage", + "pos": { + "0": 4580, + "1": -68 + }, + "size": { + "0": 1057.5609130859375, + "1": 246 + }, + "flags": {}, + "order": 30, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 214 + } + ], + "outputs": [], + "properties": { + "Node name for S&R": "PreviewImage" + } + }, + { + "id": 107, + "type": "ResizeMask", + "pos": { + "0": 3602, + "1": 981 + }, + "size": { + "0": 315, + "1": 146 + }, + "flags": {}, + "order": 13, + "mode": 0, + "inputs": [ + { + "name": "mask", + "type": "MASK", + "link": 189 + } + ], + "outputs": [ + { + "name": "mask", + "type": "MASK", + "links": [ + 177, + 183, + 215 + ], + "slot_index": 0, + "shape": 3 + }, + { + "name": "width", + "type": "INT", + "links": null, + "shape": 3 + }, + { + "name": "height", + "type": "INT", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "ResizeMask" + }, + "widgets_values": [ + 1024, + 1024, + false + ] + }, + { + "id": 127, + "type": "ConvertToGrayscale", + "pos": { + "0": 4263, + "1": 556 + }, + "size": { + "0": 226.79998779296875, + "1": 26 + }, + "flags": {}, + "order": 27, + "mode": 0, + "inputs": [ + { + "name": "image", + "type": "IMAGE", + "link": 206 + } + ], + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 207, + 214 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "ConvertToGrayscale" + } + }, + { + "id": 125, + "type": "MergeImageChannels", + "pos": { + "0": 4577, + "1": 260 + }, + "size": { + "0": 252, + "1": 86 + }, + "flags": {}, + "order": 29, + "mode": 0, + "inputs": [ + { + "name": "red", + "type": "IMAGE", + "link": 218 + }, + { + "name": "green", + "type": "IMAGE", + "link": 207 + }, + { + "name": "blue", + "type": "IMAGE", + "link": 205 + }, + { + "name": "mask", + "type": "MASK", + "link": null + } + ], + "outputs": [ + { + "name": "image", + "type": "IMAGE", + "links": [ + 208, + 209 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "MergeImageChannels" + } + }, + { + "id": 126, + "type": "ConvertToGrayscale", + "pos": { + "0": 4266, + "1": 300 + }, + "size": { + "0": 226.79998779296875, + "1": 26 + }, + "flags": {}, + "order": 25, + "mode": 0, + "inputs": [ + { + "name": "image", + "type": "IMAGE", + "link": 204 + } + ], + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 205, + 213, + 218 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "ConvertToGrayscale" + } + }, + { + "id": 80, + "type": "InvertMask", + "pos": { + "0": 2784, + "1": 581 + }, + "size": { + "0": 210, + "1": 26 + }, + "flags": {}, + "order": 6, + "mode": 0, + "inputs": [ + { + "name": "mask", + "type": "MASK", + "link": 138 + } + ], + "outputs": [ + { + "name": "MASK", + "type": "MASK", + "links": [ + 193 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "InvertMask" + } + }, + { + "id": 138, + "type": "[Comfy3D] Preview 3DMesh", + "pos": { + "0": 1768, + "1": 166 + }, + "size": [ + 600, + 500 + ], + "flags": {}, + "order": 12, + "mode": 0, + "inputs": [ + { + "name": "mesh_file_path", + "type": "STRING", + "link": 223, + "widget": { + "name": "mesh_file_path" + } + } + ], + "outputs": [], + "properties": { + "Node name for S&R": "[Comfy3D] Preview 3DMesh" + }, + "widgets_values": [ + "", + null + ] + }, + { + "id": 136, + "type": "PreviewImage", + "pos": { + "0": 2845, + "1": -71 + }, + "size": { + "0": 268.88623046875, + "1": 286.243408203125 + }, + "flags": { + "collapsed": false + }, + "order": 5, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 222 + } + ], + "outputs": [], + "properties": { + "Node name for S&R": "PreviewImage" + } + }, + { + "id": 135, + "type": "[Comfy3D] OrbitPoses JK", + "pos": { + "0": 1126, + "1": 1477 + }, + "size": { + "0": 315, + "1": 202 + }, + "flags": {}, + "order": 1, + "mode": 0, + "inputs": [], + "outputs": [ + { + "name": "orbit_camposes", + "type": "ORBIT_CAMPOSES", + "links": [ + 219, + 220, + 221 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "[Comfy3D] OrbitPoses JK" + }, + "widgets_values": [ + "Custom", + "1.63634, 1.63634, 1.63634, 1.63634, 1.63634, 1.63634", + "0.0, 90.0, 0.0, 0.0, -90.0, 0.0", + "-90.0, 0.0, 180.0, 90.0, 0.0, 0.0", + "0.0, 0.0, 0.0, 0.0, 0.0, 0.0", + "0.0, 0.0, 0.0, 0.0, 0.0, 0.0", + "0.0, 0.0, 0.0, 0.0, 0.0, 0.0" + ] + }, + { + "id": 98, + "type": "[Comfy3D] Preview 3DMesh", + "pos": { + "0": 5932, + "1": 828 + }, + "size": [ + 600, + 500 + ], + "flags": {}, + "order": 34, + "mode": 0, + "inputs": [ + { + "name": "mesh_file_path", + "type": "STRING", + "link": 166, + "widget": { + "name": "mesh_file_path" + } + } + ], + "outputs": [], + "properties": { + "Node name for S&R": "[Comfy3D] Preview 3DMesh" + }, + "widgets_values": [ + "", + null + ] + }, + { + "id": 116, + "type": "[Comfy3D] CRM T2I V3 Models", + "pos": { + "0": 3063, + "1": 509 + }, + "size": { + "0": 582, + "1": 302 + }, + "flags": {}, + "order": 17, + "mode": 0, + "inputs": [ + { + "name": "t2iadapter_v2", + "type": "T2IADAPTER_V2", + "link": 191 + }, + { + "name": "crm_mvdiffusion_sampler_v3", + "type": "CRM_MVDIFFUSION_SAMPLER_V3", + "link": 192 + }, + { + "name": "reference_image", + "type": "IMAGE", + "link": 194 + }, + { + "name": "reference_mask", + "type": "MASK", + "link": 193 + }, + { + "name": "normal_maps", + "type": "IMAGE", + "link": 197 + } + ], + "outputs": [ + { + "name": "multiview_albedos", + "type": "IMAGE", + "links": [ + 195 + ], + "slot_index": 0, + "shape": 3 + }, + { + "name": "multiview_metalness", + "type": "IMAGE", + "links": [ + 199 + ], + "slot_index": 1, + "shape": 3 + }, + { + "name": "multiview_roughness", + "type": "IMAGE", + "links": [ + 201 + ], + "slot_index": 2, + "shape": 3 + }, + { + "name": "orbit_camposes", + "type": "ORBIT_CAMPOSES", + "links": [], + "slot_index": 3, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "[Comfy3D] CRM T2I V3 Models" + }, + "widgets_values": [ + "3D assets", + "uniform low no texture ugly, boring, bad anatomy, blurry, pixelated, obscure, unnatural colors, poor lighting, dull, and unclear.", + 381410845697745, + "randomize", + 5.5, + 50 + ] + }, + { + "id": 77, + "type": "VHS_LoadImagesPath", + "pos": { + "0": 2420, + "1": 423 + }, + "size": [ + 282.3397521972656, + 194 + ], + "flags": {}, + "order": 2, + "mode": 0, + "inputs": [], + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 194, + 222 + ], + "slot_index": 0, + "shape": 3 + }, + { + "name": "MASK", + "type": "MASK", + "links": [ + 138 + ], + "slot_index": 1, + "shape": 3 + }, + { + "name": "INT", + "type": "INT", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "VHS_LoadImagesPath" + }, + "widgets_values": { + "directory": "C:\\Users\\reall\\Softwares\\ComfyUI_windows_portable\\ComfyUI\\input\\Test_CRM_T2I_V2\\RGBA", + "image_load_cap": 1, + "skip_first_images": 5, + "select_every_nth": 1, + "choose folder to upload": "image", + "videopreview": { + "hidden": false, + "paused": false, + "params": { + "frame_load_cap": 1, + "skip_first_images": 5, + "filename": "C:\\Users\\reall\\Softwares\\ComfyUI_windows_portable\\ComfyUI\\input\\Test_CRM_T2I_V2\\RGBA", + "type": "path", + "format": "folder", + "select_every_nth": 1 + } + } + } + }, + { + "id": 137, + "type": "[Comfy3D] Save 3D Mesh", + "pos": { + "0": 1416, + "1": 722 + }, + "size": { + "0": 315, + "1": 58 + }, + "flags": {}, + "order": 8, + "mode": 0, + "inputs": [ + { + "name": "mesh", + "type": "MESH", + "link": 224 + } + ], + "outputs": [ + { + "name": "save_path", + "type": "STRING", + "links": [ + 223 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "[Comfy3D] Save 3D Mesh" + }, + "widgets_values": [ + "Test_CRM_T21_V3\\gun_0.obj" + ] + }, + { + "id": 19, + "type": "[Comfy3D] Load 3D Mesh", + "pos": { + "0": 1066, + "1": 868 + }, + "size": { + "0": 315, + "1": 202 + }, + "flags": {}, + "order": 3, + "mode": 0, + "inputs": [], + "outputs": [ + { + "name": "mesh", + "type": "MESH", + "links": [ + 118, + 178, + 224 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "[Comfy3D] Load 3D Mesh" + }, + "widgets_values": [ + "C:\\Users\\reall\\Softwares\\ComfyUI_windows_portable\\ComfyUI\\input\\Meshes\\steampunk_handgun_normalized.glb", + true, + false, + true, + true, + false, + 0.5 + ] + }, + { + "id": 61, + "type": "[Comfy3D] Mesh Orbit Renderer", + "pos": { + "0": 1520, + "1": 1000 + }, + "size": { + "0": 582, + "1": 330 + }, + "flags": {}, + "order": 7, + "mode": 0, + "inputs": [ + { + "name": "mesh", + "type": "MESH", + "link": 118 + }, + { + "name": "render_orbit_camera_poses", + "type": "ORBIT_CAMPOSES", + "link": 219 + } + ], + "outputs": [ + { + "name": "rendered_mesh_images", + "type": "IMAGE", + "links": [], + "slot_index": 0, + "shape": 3 + }, + { + "name": "rendered_mesh_masks", + "type": "MASK", + "links": null, + "shape": 3 + }, + { + "name": "all_rendered_depths", + "type": "IMAGE", + "links": null, + "shape": 3 + }, + { + "name": "all_rendered_normals", + "type": "IMAGE", + "links": [], + "slot_index": 3, + "shape": 3 + }, + { + "name": "all_rendered_viewcos", + "type": "IMAGE", + "links": [ + 125, + 126, + 129 + ], + "slot_index": 4, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "[Comfy3D] Mesh Orbit Renderer" + }, + "widgets_values": [ + 512, + 512, + 47.5, + 0, + 0, + 0, + false, + false, + true + ] + }, + { + "id": 74, + "type": "RemapImageRange", + "pos": { + "0": 2152, + "1": 951 + }, + "size": { + "0": 315, + "1": 106 + }, + "flags": {}, + "order": 11, + "mode": 0, + "inputs": [ + { + "name": "image", + "type": "IMAGE", + "link": 129 + } + ], + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 226 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "RemapImageRange" + }, + "widgets_values": [ + 0, + 0.9, + true + ] + }, + { + "id": 117, + "type": "[Comfy3D] Load CRM T2I V3 Models", + "pos": { + "0": 2417, + "1": 183 + }, + "size": { + "0": 342.5999755859375, + "1": 174 + }, + "flags": {}, + "order": 4, + "mode": 0, + "inputs": [], + "outputs": [ + { + "name": "t2iadapter_v2", + "type": "T2IADAPTER_V2", + "links": [ + 191 + ], + "slot_index": 0, + "shape": 3 + }, + { + "name": "crm_mvdiffusion_sampler_v3", + "type": "CRM_MVDIFFUSION_SAMPLER_V3", + "links": [ + 192 + ], + "slot_index": 1, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "[Comfy3D] Load CRM T2I V3 Models" + }, + "widgets_values": [ + "pixel-diffusion_Hyper.pth", + "pixel-diffusion_dora_90k_rank_128_Hyper.pth", + "sd_v2_base_ipmv_zero_SNR_Hyper.yaml", + 128, + true + ] + }, + { + "id": 95, + "type": "[Comfy3D] ExplicitTarget Color Projection", + "pos": { + "0": 4338, + "1": 832 + }, + "size": { + "0": 418.1999816894531, + "1": 262 + }, + "flags": {}, + "order": 22, + "mode": 0, + "inputs": [ + { + "name": "mesh", + "type": "MESH", + "link": 178 + }, + { + "name": "reference_images", + "type": "IMAGE", + "link": 174 + }, + { + "name": "reference_masks", + "type": "MASK", + "link": 177 + }, + { + "name": "reference_orbit_camera_poses", + "type": "ORBIT_CAMPOSES", + "link": 220 + } + ], + "outputs": [ + { + "name": "mesh", + "type": "MESH", + "links": [ + 210 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "[Comfy3D] ExplicitTarget Color Projection" + }, + "widgets_values": [ + 1024, + true, + 47.5, + "2, 0.5, 1, 2, 0.5, 2", + 0.02, + true, + "Albedo" + ] + }, + { + "id": 122, + "type": "[Comfy3D] ExplicitTarget Color Projection", + "pos": { + "0": 4932, + "1": 829 + }, + "size": { + "0": 418.1999816894531, + "1": 262 + }, + "flags": {}, + "order": 32, + "mode": 0, + "inputs": [ + { + "name": "mesh", + "type": "MESH", + "link": 210 + }, + { + "name": "reference_images", + "type": "IMAGE", + "link": 209 + }, + { + "name": "reference_masks", + "type": "MASK", + "link": 215 + }, + { + "name": "reference_orbit_camera_poses", + "type": "ORBIT_CAMPOSES", + "link": 221 + } + ], + "outputs": [ + { + "name": "mesh", + "type": "MESH", + "links": [ + 212 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "[Comfy3D] ExplicitTarget Color Projection" + }, + "widgets_values": [ + 1024, + true, + 47.5, + "2, 0.5, 1, 2, 0.5, 2", + 0.02, + true, + "Metallic_and_Roughness" + ] + }, + { + "id": 97, + "type": "[Comfy3D] Save 3D Mesh", + "pos": { + "0": 5470, + "1": 829 + }, + "size": { + "0": 315, + "1": 58 + }, + "flags": {}, + "order": 33, + "mode": 0, + "inputs": [ + { + "name": "mesh", + "type": "MESH", + "link": 212 + } + ], + "outputs": [ + { + "name": "save_path", + "type": "STRING", + "links": [ + 166 + ], + "slot_index": 0, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "[Comfy3D] Save 3D Mesh" + }, + "widgets_values": [ + "Test_CRM_T21_V3\\gun_out.obj" + ] + } + ], + "links": [ + [ + 118, + 19, + 0, + 61, + 0, + "MESH" + ], + [ + 125, + 61, + 4, + 70, + 0, + "IMAGE" + ], + [ + 126, + 61, + 4, + 71, + 0, + "IMAGE" + ], + [ + 128, + 71, + 0, + 73, + 1, + "MASK" + ], + [ + 129, + 61, + 4, + 74, + 0, + "IMAGE" + ], + [ + 131, + 73, + 0, + 75, + 0, + "IMAGE" + ], + [ + 138, + 77, + 1, + 80, + 0, + "MASK" + ], + [ + 166, + 97, + 0, + 98, + 0, + "STRING" + ], + [ + 172, + 104, + 0, + 105, + 0, + "UPSCALE_MODEL" + ], + [ + 174, + 105, + 0, + 95, + 1, + "IMAGE" + ], + [ + 177, + 107, + 0, + 95, + 2, + "MASK" + ], + [ + 178, + 19, + 0, + 95, + 0, + "MESH" + ], + [ + 182, + 105, + 0, + 109, + 0, + "IMAGE" + ], + [ + 183, + 107, + 0, + 110, + 0, + "MASK" + ], + [ + 184, + 110, + 0, + 111, + 0, + "IMAGE" + ], + [ + 189, + 71, + 0, + 107, + 0, + "MASK" + ], + [ + 191, + 117, + 0, + 116, + 0, + "T2IADAPTER_V2" + ], + [ + 192, + 117, + 1, + 116, + 1, + "CRM_MVDIFFUSION_SAMPLER_V3" + ], + [ + 193, + 80, + 0, + 116, + 3, + "MASK" + ], + [ + 194, + 77, + 0, + 116, + 2, + "IMAGE" + ], + [ + 195, + 116, + 0, + 105, + 1, + "IMAGE" + ], + [ + 197, + 73, + 0, + 116, + 4, + "IMAGE" + ], + [ + 198, + 119, + 0, + 118, + 0, + "IMAGE" + ], + [ + 199, + 116, + 1, + 119, + 1, + "IMAGE" + ], + [ + 200, + 104, + 0, + 119, + 0, + "UPSCALE_MODEL" + ], + [ + 201, + 116, + 2, + 120, + 1, + "IMAGE" + ], + [ + 202, + 104, + 0, + 120, + 0, + "UPSCALE_MODEL" + ], + [ + 203, + 120, + 0, + 121, + 0, + "IMAGE" + ], + [ + 204, + 119, + 0, + 126, + 0, + "IMAGE" + ], + [ + 205, + 126, + 0, + 125, + 2, + "IMAGE" + ], + [ + 206, + 120, + 0, + 127, + 0, + "IMAGE" + ], + [ + 207, + 127, + 0, + 125, + 1, + "IMAGE" + ], + [ + 208, + 125, + 0, + 128, + 0, + "IMAGE" + ], + [ + 209, + 125, + 0, + 122, + 1, + "IMAGE" + ], + [ + 210, + 95, + 0, + 122, + 0, + "MESH" + ], + [ + 212, + 122, + 0, + 97, + 0, + "MESH" + ], + [ + 213, + 126, + 0, + 129, + 0, + "IMAGE" + ], + [ + 214, + 127, + 0, + 130, + 0, + "IMAGE" + ], + [ + 215, + 107, + 0, + 122, + 2, + "MASK" + ], + [ + 218, + 126, + 0, + 125, + 0, + "IMAGE" + ], + [ + 219, + 135, + 0, + 61, + 1, + "ORBIT_CAMPOSES" + ], + [ + 220, + 135, + 0, + 95, + 3, + "ORBIT_CAMPOSES" + ], + [ + 221, + 135, + 0, + 122, + 3, + "ORBIT_CAMPOSES" + ], + [ + 222, + 77, + 0, + 136, + 0, + "IMAGE" + ], + [ + 223, + 137, + 0, + 138, + 0, + "STRING" + ], + [ + 224, + 19, + 0, + 137, + 0, + "MESH" + ], + [ + 226, + 74, + 0, + 73, + 0, + "IMAGE" + ] + ], + "groups": [], + "config": {}, + "extra": { + "ds": { + "scale": 1.4641000000000006, + "offset": [ + -5562.656832653642, + -814.1607615097106 + ] + } + }, + "version": 0.4 +} \ No newline at end of file diff --git a/_Example_Workflows/CRM_T2I_V3/CRM_T2I_V3_to_MV_to_Texture.json b/_Example_Workflows/CRM_T2I_V3/CRM_T2I_V3_to_MV_to_Texture_lora_model_Cup_Example.json similarity index 100% rename from _Example_Workflows/CRM_T2I_V3/CRM_T2I_V3_to_MV_to_Texture.json rename to _Example_Workflows/CRM_T2I_V3/CRM_T2I_V3_to_MV_to_Texture_lora_model_Cup_Example.json diff --git a/_Example_Workflows/_Example_Inputs_Files/CharacterGen_Test_2.png b/_Example_Workflows/_Example_Inputs_Files/CharacterGen_Test_2.png index c42d98c..b52d21c 100644 Binary files a/_Example_Workflows/_Example_Inputs_Files/CharacterGen_Test_2.png and b/_Example_Workflows/_Example_Inputs_Files/CharacterGen_Test_2.png differ diff --git a/_Example_Workflows/_Example_Inputs_Files/Meshes/steampunk_handgun_normalized.glb b/_Example_Workflows/_Example_Inputs_Files/Meshes/steampunk_handgun_normalized.glb new file mode 100644 index 0000000..1964b73 Binary files /dev/null and b/_Example_Workflows/_Example_Inputs_Files/Meshes/steampunk_handgun_normalized.glb differ diff --git a/_Example_Workflows/_Example_Inputs_Files/PirateCat_0.png b/_Example_Workflows/_Example_Inputs_Files/PirateCat.png similarity index 100% rename from _Example_Workflows/_Example_Inputs_Files/PirateCat_0.png rename to _Example_Workflows/_Example_Inputs_Files/PirateCat.png diff --git a/_Example_Workflows/_Example_Inputs_Files/ref_gun.png b/_Example_Workflows/_Example_Inputs_Files/ref_gun.png new file mode 100644 index 0000000..e3f5888 Binary files /dev/null and b/_Example_Workflows/_Example_Inputs_Files/ref_gun.png differ diff --git a/nodes.py b/nodes.py index 4ea5b36..16b193f 100644 --- a/nodes.py +++ b/nodes.py @@ -2562,11 +2562,11 @@ def run_model( # Get input data img_batch = dataset.__getitem__(0) - imgs_in = torch.cat([img_batch['imgs_in']]*2, dim=0).to(DEVICE).to(WEIGHT_DTYPE) # (B*Nv, 3, H, W) B==1 + imgs_in = torch.cat([img_batch['imgs_in']]*2, dim=0).to(DEVICE, dtype=WEIGHT_DTYPE) # (B*Nv, 3, H, W) B==1 #num_views = imgs_in.shape[1] normal_prompt_embeddings, clr_prompt_embeddings = img_batch['normal_prompt_embeddings'], img_batch['color_prompt_embeddings'] - prompt_embeddings = torch.cat([normal_prompt_embeddings, clr_prompt_embeddings], dim=0).to(DEVICE).to(WEIGHT_DTYPE) # (B*Nv, N, C) B==1 + prompt_embeddings = torch.cat([normal_prompt_embeddings, clr_prompt_embeddings], dim=0).to(DEVICE, dtype=WEIGHT_DTYPE) # (B*Nv, N, C) B==1 generator = torch.Generator(device=era3d_pipe.unet.device).manual_seed(seed) @@ -2586,8 +2586,8 @@ def run_model( images_pred = out[bsz:] # [N, 3, H, W] -> [N, H, W, 3] - multiview_images = images_pred.permute(0, 2, 3, 1).to(reference_image.dtype, reference_image.device) - multiview_normals = normals_pred.permute(0, 2, 3, 1).to(reference_image.dtype, reference_image.device) + multiview_images = images_pred.permute(0, 2, 3, 1).to(reference_image.dtype, dtype=reference_image.device) + multiview_normals = normals_pred.permute(0, 2, 3, 1).to(reference_image.dtype, dtype=reference_image.device) azimuths = [0, 45, 90, 180, -90, -45] elevations = [0.0] * 6 @@ -3449,7 +3449,7 @@ def load_CRM(self, crm_model_name, crm_config_path): crm_mvdiffusion_model.clip_model = crm_mvdiffusion_model.clip_model.to(DEVICE, dtype=WEIGHT_DTYPE) crm_mvdiffusion_model.vae_model = crm_mvdiffusion_model.vae_model.to(DEVICE, dtype=WEIGHT_DTYPE) - crm_mvdiffusion_model = crm_mvdiffusion_model.to(DEVICE).to(WEIGHT_DTYPE) + crm_mvdiffusion_model = crm_mvdiffusion_model.to(DEVICE, dtype=WEIGHT_DTYPE) crm_mvdiffusion_sampler_v2 = get_obj_from_str(crm_config.sampler.target)( crm_mvdiffusion_model, device=DEVICE, dtype=WEIGHT_DTYPE, **crm_config.sampler.params @@ -3545,7 +3545,7 @@ class Load_CRM_T2I_V3_Models: crm_checkpoints_dir = "CRM" crm_t2i_v3_checkpoints_dir = "CRM_T2I_V3" t2i_v2_checkpoints_dir = "T2I_V2" - default_crm_t2i_v3_ckpt_name = ["pixel-diffusion_lora_80k_Hyper.pth"] + default_crm_t2i_v3_ckpt_name = ["pixel-diffusion_lora_80k_rank_60_Hyper.pth", "pixel-diffusion_dora_90k_rank_128_Hyper.pth"] default_crm_ckpt_name = ["pixel-diffusion_Hyper.pth"] default_crm_conf_name = ["sd_v2_base_ipmv_zero_SNR_Hyper.yaml"] default_crm_repo_id = "Zhengyi/CRM" @@ -3610,7 +3610,7 @@ def load_CRM(self, crm_model_name, crm_t2i_v3_model_name, crm_config_path, rank, crm_mvdiffusion_model.clip_model = crm_mvdiffusion_model.clip_model.to(DEVICE, dtype=WEIGHT_DTYPE) crm_mvdiffusion_model.vae_model = crm_mvdiffusion_model.vae_model.to(DEVICE, dtype=WEIGHT_DTYPE) - crm_mvdiffusion_model = crm_mvdiffusion_model.to(DEVICE).to(WEIGHT_DTYPE) + crm_mvdiffusion_model = crm_mvdiffusion_model.to(DEVICE, dtype=WEIGHT_DTYPE) crm_mvdiffusion_sampler_v3 = get_obj_from_str(crm_config.sampler.target)( crm_mvdiffusion_model, device=DEVICE, dtype=WEIGHT_DTYPE, **crm_config.sampler.params diff --git a/pyproject.toml b/pyproject.toml index faab20a..5ccc905 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,11 @@ [project] name = "comfyui-3d-pack" description = "Make ComfyUI generates 3D assets as good & convenient as it generates image/video!" -version = "0.1.0" +version = "0.1.1" license = { file = "LICENSE" } -dependencies = ["cmake", "ninja", "PyGithub", "requests", "numpy", "einops", "scipy", "kornia", "opencv-python", "pillow", "roma", "nerfacc>=0.5.3", "PyMCubes", "diffusers>=0.26.1", "transformers>=4.36.2", "safetensors", "open_clip_torch", "torchmetrics", "pytorch_msssim", "pytorch-lightning", "imageio", "imageio-ffmpeg", "matplotlib", "trimesh", "plyfile", "pygltflib", "xatlas", "pymeshlab", "torchtyping", "tqdm", "jaxtyping", "packaging", "OmegaConf", "pyhocon"] +dynamic = ["dependencies"] +[tool.setuptools.dynamic] +dependencies = {file = ["requirements.txt"]} [project.urls] Repository = "https://github.com/MrForExample/ComfyUI-3D-Pack" diff --git a/web/html/gsVisualizer.html b/web/html/gsVisualizer.html index 98b5d3f..b8304c1 100644 --- a/web/html/gsVisualizer.html +++ b/web/html/gsVisualizer.html @@ -4,7 +4,7 @@ - +
@@ -29,7 +29,7 @@ - + - +