HY3Dv2 is incompatible with old models in 3D-Pack, reverting pt25

YanWenKun · Jan 23, 2025 · 7572bcf · 7572bcf
1 parent 3306c8b
commit 7572bcf
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 33 deletions.
diff --git a/pt25-cu124/attachments/!FIRST_RUN-compile-install.bat b/pt25-cu124/attachments/!FIRST_RUN-compile-install.bat
@@ -44,12 +44,6 @@ set PATH=%PATH%;%~dp0\python_standalone\Scripts
 .\python_standalone\python.exe -s -m pip install ^
  .\extras\diffoctreerast
 
-@REM ===========================================================================
-@REM For Hunyuan3D-2
-
-.\python_standalone\python.exe -s -m pip install --force-reinstall ^
- .\extras\hunyuan3d_v2_custom_rasterizer
-
 @REM ===========================================================================
 @REM Ensure NumPy1
 

diff --git a/pt25-cu124/attachments/reinstall-deps-for-3d.bat b/pt25-cu124/attachments/reinstall-deps-for-3d.bat
@@ -53,9 +53,6 @@ git clone --depth=1 https://github.com/MrForExample/Comfy3D_Pre_Builds.git ^
 .\python_standalone\python.exe -s -m pip wheel -w tmp_build ^
  .\tmp_build\Comfy3D_Pre_Builds\_Libs\vox2seq
 
-.\python_standalone\python.exe -s -m pip wheel -w tmp_build ^
- .\tmp_build\Comfy3D_Pre_Builds\_Libs\hunyuan3d_v2_custom_rasterizer
-
 @REM Note that PIP will auto git clone submodules, no need to explicit clone it.
 .\python_standalone\python.exe -s -m pip wheel -w tmp_build ^
  git+https://github.com/ashawkey/diff-gaussian-rasterization.git

diff --git a/pt25-cu124/attachments/中文脚本/!首次运行-编译安装依赖项.bat b/pt25-cu124/attachments/中文脚本/!首次运行-编译安装依赖项.bat
@@ -46,12 +46,6 @@ set CMAKE_ARGS=-DBUILD_opencv_world=ON -DWITH_CUDA=ON -DCUDA_FAST_MATH=ON -DWITH
 .\python_standalone\python.exe -s -m pip install ^
  .\extras\diffoctreerast
 
-@REM ===========================================================================
-@REM 用于 混元3D 2.0
-
-.\python_standalone\python.exe -s -m pip install --force-reinstall ^
- .\extras\hunyuan3d_v2_custom_rasterizer
-
 @REM ===========================================================================
 @REM 确保使用 NumPy1
 

diff --git a/pt25-cu124/attachments/中文脚本/重新编译安装3D-Pack依赖项.bat b/pt25-cu124/attachments/中文脚本/重新编译安装3D-Pack依赖项.bat
@@ -57,9 +57,6 @@ git clone --depth=1 https://gh-proxy.com/https://github.com/MrForExample/Comfy3D
 .\python_standalone\python.exe -s -m pip wheel -w tmp_build ^
  .\tmp_build\Comfy3D_Pre_Builds\_Libs\vox2seq
 
-.\python_standalone\python.exe -s -m pip wheel -w tmp_build ^
- .\tmp_build\Comfy3D_Pre_Builds\_Libs\hunyuan3d_v2_custom_rasterizer
-
 @REM PIP 会自动 git clone --recurse-submodules ，无需手动克隆
 .\python_standalone\python.exe -s -m pip wheel -w tmp_build ^
  git+https://gh-proxy.com/https://github.com/ashawkey/diff-gaussian-rasterization.git

diff --git a/pt25-cu124/generate-pak5.sh b/pt25-cu124/generate-pak5.sh
@@ -5,7 +5,7 @@ echo '#' > pak5.txt
 
 array=(
 https://github.com/comfyanonymous/ComfyUI/raw/refs/heads/master/requirements.txt
-https://github.com/MrForExample/ComfyUI-3D-Pack/raw/62a3e7c247562d5150de58083b684f899faa81e9/requirements.txt
+https://github.com/MrForExample/ComfyUI-3D-Pack/raw/a35a737676cf3cbb23360d98032870e242dae199/requirements.txt
 https://github.com/Stability-AI/stable-fast-3d/raw/refs/heads/main/requirements.txt
 https://github.com/edenartlab/eden_comfy_pipelines/raw/refs/heads/main/requirements.txt
 https://github.com/kijai/ComfyUI-KJNodes/raw/refs/heads/main/requirements.txt

diff --git a/pt25-cu124/stage1.sh b/pt25-cu124/stage1.sh
@@ -23,18 +23,18 @@ mv python python_standalone
 # Download 3D-Pack
 # Note: zip archive doesn't contain the ".git" folder, it's not upgradable.
 cd "$workdir"
-curl -sSL https://github.com/YanWenKun/ComfyUI-3D-Pack/archive/cef793fa17c5d89a7ac39e55cf4dc01bb2234310.zip \
-    -o ComfyUI-3D-Pack-cef793fa17c5d89a7ac39e55cf4dc01bb2234310.zip
-unzip -q ComfyUI-3D-Pack-cef793fa17c5d89a7ac39e55cf4dc01bb2234310.zip
-mv ComfyUI-3D-Pack-cef793fa17c5d89a7ac39e55cf4dc01bb2234310 ComfyUI-3D-Pack
-rm ComfyUI-3D-Pack-cef793fa17c5d89a7ac39e55cf4dc01bb2234310.zip
+curl -sSL https://github.com/YanWenKun/ComfyUI-3D-Pack/archive/0601d2165fa906d7c1013925f9182b75d99972a1.zip \
+    -o ComfyUI-3D-Pack-0601d2165fa906d7c1013925f9182b75d99972a1.zip
+unzip -q ComfyUI-3D-Pack-0601d2165fa906d7c1013925f9182b75d99972a1.zip
+mv ComfyUI-3D-Pack-0601d2165fa906d7c1013925f9182b75d99972a1 ComfyUI-3D-Pack
+rm ComfyUI-3D-Pack-0601d2165fa906d7c1013925f9182b75d99972a1.zip
 
 cd "$workdir"
-curl -sSL https://github.com/MrForExample/Comfy3D_Pre_Builds/archive/5f8984a94f54fcf328f9113aa0afa93a2fc7d060.zip \
-    -o Comfy3D_Pre_Builds-5f8984a94f54fcf328f9113aa0afa93a2fc7d060.zip
-unzip -q Comfy3D_Pre_Builds-5f8984a94f54fcf328f9113aa0afa93a2fc7d060.zip
-mv Comfy3D_Pre_Builds-5f8984a94f54fcf328f9113aa0afa93a2fc7d060 Comfy3D_Pre_Builds
-rm Comfy3D_Pre_Builds-5f8984a94f54fcf328f9113aa0afa93a2fc7d060.zip
+curl -sSL https://github.com/MrForExample/Comfy3D_Pre_Builds/archive/ac9f238f092b94ba319ce06f3ccd80b9d0f6c8c4.zip \
+    -o Comfy3D_Pre_Builds-ac9f238f092b94ba319ce06f3ccd80b9d0f6c8c4.zip
+unzip -q Comfy3D_Pre_Builds-ac9f238f092b94ba319ce06f3ccd80b9d0f6c8c4.zip
+mv Comfy3D_Pre_Builds-ac9f238f092b94ba319ce06f3ccd80b9d0f6c8c4 Comfy3D_Pre_Builds
+rm Comfy3D_Pre_Builds-ac9f238f092b94ba319ce06f3ccd80b9d0f6c8c4.zip
 
 # PIP installs
 $pip_exe install --upgrade pip wheel setuptools
@@ -54,7 +54,6 @@ $pip_exe install pointnet2_ops-3.0.0-cp312-cp312-win_amd64.whl
 $pip_exe install pytorch3d-0.7.8-cp312-cp312-win_amd64.whl
 $pip_exe install simple_knn-0.0.0-cp312-cp312-win_amd64.whl
 $pip_exe install vox2seq-0.0.0-cp312-cp312-win_amd64.whl
-$pip_exe install custom_rasterizer-0.1-cp312-cp312-win_amd64.whl
 cd "$workdir"
 
 $pip_exe install -r "$workdir"/pak8.txt

diff --git a/pt25-cu124/stage2.sh b/pt25-cu124/stage2.sh
@@ -114,9 +114,6 @@ mv "$workdir"/Comfy3D_Pre_Builds/_Libs/simple-knn \
 mv "$workdir"/Comfy3D_Pre_Builds/_Libs/vox2seq \
     "$workdir"/Comfy3D_WinPortable/extras/vox2seq
 
-mv "$workdir"/Comfy3D_Pre_Builds/_Libs/hunyuan3d_v2_custom_rasterizer \
-    "$workdir"/Comfy3D_WinPortable/extras/hunyuan3d_v2_custom_rasterizer
-
 # PyTorch3D
 curl -sSL https://github.com/facebookresearch/pytorch3d/archive/refs/heads/main.zip \
     -o temp.zip