pt25 ready for trellis

pt25-cu124/generate-requirements5.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
 set -eu
 
+echo '#' > requirements5.txt
+
 array=(
 https://github.com/comfyanonymous/ComfyUI/raw/refs/tags/v0.3.7/requirements.txt
-https://github.com/MrForExample/ComfyUI-3D-Pack/raw/b015ed3918d6916ff2a2ee230beafe2169a5de51/requirements.txt
+https://github.com/MrForExample/ComfyUI-3D-Pack/raw/0880fa8d2945b8abb990ad768e0cfe704e0d025e/requirements.txt
 https://github.com/kijai/ComfyUI-KJNodes/raw/refs/heads/main/requirements.txt
 https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite/raw/refs/heads/main/requirements.txt
 https://github.com/ltdrdata/ComfyUI-Impact-Pack/raw/refs/heads/Main/requirements.txt
@@ -23,9 +25,9 @@ sed -i 's/[[:space:]]*$//' requirements5.txt
 sed -i 's/>=.*$//' requirements5.txt
 sed -i 's/_/-/g' requirements5.txt
 
+sort -ufo requirements5.txt requirements5.txt
+
 # Remove duplicate items, compare to requirements4.txt
 grep -Fixv -f requirements4.txt requirements5.txt > temp.txt && mv temp.txt requirements5.txt
 
-sort -uo requirements5.txt requirements5.txt
-
 echo "<requirements5.txt> generated. Check before use."

pt25-cu124/requirements4.txt

@@ -3,6 +3,7 @@ aiohttp
 diffusers
 einops
 fairscale
+flash-attn
 ftfy
 huggingface-hub[hf-transfer]
 imageio
@@ -28,6 +29,7 @@ scipy
 sentencepiece
 soundfile
 spandrel
+spconv-cu124
 timm
 tokenizers
 torchmetrics

pt25-cu124/requirements5.txt

@@ -3,12 +3,15 @@
 cachetools
 clip-interrogator
 color-matcher
-diffusers
 dill
-gitpython
+easydict
+GitPython
 gpytoolbox
+igraph
 imageio-ffmpeg
+iopath
 jaxtyping
+libigl
 mss
 nerfacc
 ninja
@@ -23,10 +26,12 @@ PyGithub
 pygltflib
 pyhocon
 PyMCubes
+pymeshfix
 pymeshlab
 python-dotenv
 pytorch-lightning
 pytorch-msssim
+pyvista
 rembg
 requests
 rich

pt25-cu124/requirements6.txt

@@ -1,3 +1,4 @@
 git+https://github.com/WASasquatch/cstr
 git+https://github.com/WASasquatch/ffmpy.git
 git+https://github.com/WASasquatch/img2texture.git
+git+https://github.com/EasternJournalist/utils3d.git#egg=utils3d

pt25-cu124/requirements7.txt

@@ -0,0 +1,4 @@
+# https://pip.pypa.io/en/stable/reference/requirements-file-format/
+# https://github.com/rusty1s/pytorch_scatter?tab=readme-ov-file#binaries
+--find-links https://data.pyg.org/whl/torch-2.5.1%2Bcu124.html
+torch-scatter

pt25-cu124/requirements8.txt

@@ -0,0 +1,2 @@
+--find-links https://nvidia-kaolin.s3.us-east-2.amazonaws.com/torch-2.5.1_cu124.html
+kaolin

pt25-cu124/stage1.sh

@@ -21,11 +21,11 @@ unzip -q python_embeded.zip -d "$workdir"/python_embeded
 # Download 3D-Pack
 # Note: zip archive doesn't contain the ".git" folder, it's not upgradable.
 cd "$workdir"
-curl -sSL https://github.com/MrForExample/ComfyUI-3D-Pack/archive/b015ed3918d6916ff2a2ee230beafe2169a5de51.zip \
-    -o ComfyUI-3D-Pack-b015ed3918d6916ff2a2ee230beafe2169a5de51.zip
-unzip -q ComfyUI-3D-Pack-b015ed3918d6916ff2a2ee230beafe2169a5de51.zip
-mv ComfyUI-3D-Pack-b015ed3918d6916ff2a2ee230beafe2169a5de51 ComfyUI-3D-Pack
-rm ComfyUI-3D-Pack-b015ed3918d6916ff2a2ee230beafe2169a5de51.zip
+curl -sSL https://github.com/MrForExample/ComfyUI-3D-Pack/archive/0880fa8d2945b8abb990ad768e0cfe704e0d025e.zip \
+    -o ComfyUI-3D-Pack-0880fa8d2945b8abb990ad768e0cfe704e0d025e.zip
+unzip -q ComfyUI-3D-Pack-0880fa8d2945b8abb990ad768e0cfe704e0d025e.zip
+mv ComfyUI-3D-Pack-0880fa8d2945b8abb990ad768e0cfe704e0d025e ComfyUI-3D-Pack
+rm ComfyUI-3D-Pack-0880fa8d2945b8abb990ad768e0cfe704e0d025e.zip
 
 cd "$workdir"
 curl -sSL https://github.com/MrForExample/Comfy3D_Pre_Builds/archive/606a5cf09aef1ecaf0092f6b645ac46bc2772d86.zip \
@@ -58,14 +58,13 @@ $pip_exe install -r "$workdir"/requirements3.txt
 $pip_exe install -r "$workdir"/requirements4.txt
 $pip_exe install -r "$workdir"/requirements5.txt
 $pip_exe install -r "$workdir"/requirements6.txt
+$pip_exe install -r "$workdir"/requirements7.txt
+$pip_exe install -r "$workdir"/requirements8.txt
 
 rm "$workdir"/Comfy3D_Pre_Builds/_Build_Wheels/_Wheels_win_py312_torch2.5.1_cu124/torch_scatter-2.1.2-cp312-cp312-win_amd64.whl
 $pip_exe install "$workdir"/Comfy3D_Pre_Builds/_Build_Wheels/_Wheels_win_py312_torch2.5.1_cu124/*.whl
 
-# From: https://github.com/rusty1s/pytorch_scatter?tab=readme-ov-file#binaries
-$pip_exe install torch-scatter -f https://data.pyg.org/whl/torch-2.5.1%2Bcu124.html
-
-$pip_exe install -r "$workdir"/requirements9.txt
+$pip_exe install -r "$workdir"/requirementsA.txt
 
 # Add Ninja binary (replacing PIP Ninja)
 ## The 'python_embeded\Scripts\ninja.exe' is not working,

pt25-cu124/stage2.sh

@@ -31,11 +31,12 @@ rm ./ComfyUI-3D-Pack/install.py
 rm -rf ./ComfyUI-3D-Pack/_Pre_Builds
 
 # Install ComfyUI-Manager but disable it by default
-git clone https://ghp.ci/https://github.com/ltdrdata/ComfyUI-Manager.git
-mv ComfyUI-Manager ComfyUI-Manager.disabled
+# Not this time
+$gcs https://github.com/ltdrdata/ComfyUI-Manager.git
+# mv ComfyUI-Manager ComfyUI-Manager.disabled
 
 $gcs https://github.com/AIGODLIKE/AIGODLIKE-ComfyUI-Translation.git
-mv AIGODLIKE-ComfyUI-Translation AIGODLIKE-ComfyUI-Translation.disabled
+# mv AIGODLIKE-ComfyUI-Translation AIGODLIKE-ComfyUI-Translation.disabled
 
 $gcs https://github.com/cubiq/ComfyUI_IPAdapter_plus.git
 $gcs https://github.com/edenartlab/eden_comfy_pipelines.git