remove support for TRELLIS demo

plus more tweaks
YanWenKun · Dec 29, 2024 · 44de0f2 · 44de0f2
1 parent 781ce6b
commit 44de0f2
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 167 deletions.
diff --git a/pt25-cu124/attachments/!FIRST_RUN-compile-install.bat b/pt25-cu124/attachments/!FIRST_RUN-compile-install.bat
@@ -25,6 +25,11 @@ set PATH=%PATH%;%~dp0\python_embeded\Scripts
 .\python_embeded\python.exe -s -m pip install --force-reinstall ^
  .\extras\simple-knn
 
+@REM Differential Gaussian Rasterization
+
+.\python_embeded\python.exe -s -m pip install --force-reinstall ^
+ .\extras\diff-gaussian-rasterization
+
 @REM ===========================================================================
 @REM For TRELLIS
 @REM Note here we skipped 'utils3d'
@@ -34,11 +39,6 @@ set PATH=%PATH%;%~dp0\python_embeded\Scripts
 .\python_embeded\python.exe -s -m pip install --force-reinstall ^
  .\extras\vox2seq
 
-@REM diff-gaussian-rasterization
-
-.\python_embeded\python.exe -s -m pip install --force-reinstall ^
- .\extras\diff-gaussian-rasterization
-
 @REM Differential Octree Rasterization
 
 .\python_embeded\python.exe -s -m pip install ^

diff --git a/pt25-cu124/attachments/reinstall-deps-for-3d.bat b/pt25-cu124/attachments/reinstall-deps-for-3d.bat
@@ -44,9 +44,6 @@ if not exist ".\tmp_build" mkdir tmp_build
 git clone --depth=1 https://github.com/MrForExample/Comfy3D_Pre_Builds.git ^
  .\tmp_build\Comfy3D_Pre_Builds
 
-git clone --depth=1 https://github.com/autonomousvision/mip-splatting.git ^
- .\tmp_build\mip-splatting
-
 .\python_embeded\python.exe -s -m pip wheel -w tmp_build ^
  .\tmp_build\Comfy3D_Pre_Builds\_Libs\pointnet2_ops
 
@@ -56,10 +53,10 @@ git clone --depth=1 https://github.com/autonomousvision/mip-splatting.git ^
 .\python_embeded\python.exe -s -m pip wheel -w tmp_build ^
  .\tmp_build\Comfy3D_Pre_Builds\_Libs\vox2seq
 
+@REM Note that PIP will auto git clone submodules, no need to explicit clone it.
 .\python_embeded\python.exe -s -m pip wheel -w tmp_build ^
- .\tmp_build\mip-splatting\submodules\diff-gaussian-rasterization
+ git+https://github.com/ashawkey/diff-gaussian-rasterization.git
 
-@REM Note that PIP will auto git clone submodules, no need to explicit clone it.
 .\python_embeded\python.exe -s -m pip wheel -w tmp_build ^
  git+https://github.com/JeffreyXiang/diffoctreerast.git
 
@@ -83,7 +80,7 @@ for %%i in (.\tmp_build\*.whl) do .\python_embeded\python.exe -s -m pip install
 
 @REM ===========================================================================
 
-@REM (Optional) Flash Attention for TRELLIS demo
+@REM (Optional) Flash Attention for TRELLIS, Hunyuan3D-1
 @REM "flash-attn" can ONLY be used on Ampere and later GPUs (RTX 30 series / A100 and beyond).
 @REM WARNING: VERY long build time!
 

diff --git a/pt25-cu124/attachments/run_trellis_demo.bat b/pt25-cu124/attachments/run_trellis_demo.bat
diff --git a/pt25-cu124/attachments/中文脚本/!首次运行-编译安装依赖项.bat b/pt25-cu124/attachments/中文脚本/!首次运行-编译安装依赖项.bat
@@ -22,12 +22,16 @@ set CMAKE_ARGS=-DBUILD_opencv_world=ON -DWITH_CUDA=ON -DCUDA_FAST_MATH=ON -DWITH
 .\python_embeded\python.exe -s -m pip install --force-reinstall ^
  .\extras\pointnet2_ops
 
-
 @REM 编译安装 simple-knn ，该组件用于 Gaussian Splatting
 
 .\python_embeded\python.exe -s -m pip install --force-reinstall ^
  .\extras\simple-knn
 
+@REM Differential Gaussian Rasterization
+
+.\python_embeded\python.exe -s -m pip install --force-reinstall ^
+ .\extras\diff-gaussian-rasterization
+
 @REM ===========================================================================
 @REM 用于 TRELLIS 的组件
 @REM 注意我们跳过了 'utils3d' ，该组件不需要本地重新编译
@@ -37,11 +41,6 @@ set CMAKE_ARGS=-DBUILD_opencv_world=ON -DWITH_CUDA=ON -DCUDA_FAST_MATH=ON -DWITH
 .\python_embeded\python.exe -s -m pip install --force-reinstall ^
  .\extras\vox2seq
 
-@REM diff-gaussian-rasterization
-
-.\python_embeded\python.exe -s -m pip install --force-reinstall ^
- .\extras\diff-gaussian-rasterization
-
 @REM Differential Octree Rasterization
 
 .\python_embeded\python.exe -s -m pip install ^

diff --git a/pt25-cu124/attachments/中文脚本/run_trellis_demo_cn.bat b/pt25-cu124/attachments/中文脚本/run_trellis_demo_cn.bat
diff --git a/pt25-cu124/attachments/中文脚本/使用国内镜像强制更新全部节点.sh b/pt25-cu124/attachments/中文脚本/使用国内镜像强制更新全部节点.sh
@@ -15,7 +15,7 @@ function change_url_or_pull () {
     elif [[ $git_remote_url =~ ^(https:\/\/github\.com\/)(.*)(\.git)$ ]]; then
         echo "正在修改URL并更新: $1" ;
         git -C "$1" reset --hard ;
-        git -C "$1" remote set-url origin "https://ghp.ci/$git_remote_url" ;
+        git -C "$1" remote set-url origin "https://gh-proxy.com/$git_remote_url" ;
         git -C "$1" pull --ff-only ;
         echo "更新完成: $1" ;
     fi ;

diff --git a/pt25-cu124/attachments/中文脚本/重新编译安装3D-Pack依赖项.bat b/pt25-cu124/attachments/中文脚本/重新编译安装3D-Pack依赖项.bat
@@ -45,12 +45,9 @@ if not exist ".\tmp_build" mkdir tmp_build
 
 .\python_embeded\python.exe -s -m pip install numpy==1.26.4
 
-git clone --depth=1 https://ghp.ci/https://github.com/MrForExample/Comfy3D_Pre_Builds.git ^
+git clone --depth=1 https://gh-proxy.com/https://github.com/MrForExample/Comfy3D_Pre_Builds.git ^
  .\tmp_build\Comfy3D_Pre_Builds
 
-git clone --depth=1 https://ghp.ci/https://github.com/autonomousvision/mip-splatting.git ^
- .\tmp_build\mip-splatting
-
 .\python_embeded\python.exe -s -m pip wheel -w tmp_build ^
  .\tmp_build\Comfy3D_Pre_Builds\_Libs\pointnet2_ops
 
@@ -60,24 +57,24 @@ git clone --depth=1 https://ghp.ci/https://github.com/autonomousvision/mip-splat
 .\python_embeded\python.exe -s -m pip wheel -w tmp_build ^
  .\tmp_build\Comfy3D_Pre_Builds\_Libs\vox2seq
 
+@REM PIP 会自动 git clone --recurse-submodules ，无需手动克隆
 .\python_embeded\python.exe -s -m pip wheel -w tmp_build ^
- .\tmp_build\mip-splatting\submodules\diff-gaussian-rasterization
+ git+https://gh-proxy.com/https://github.com/ashawkey/diff-gaussian-rasterization.git
 
-@REM PIP 会自动 git clone --recurse-submodules ，无需手动克隆
 .\python_embeded\python.exe -s -m pip wheel -w tmp_build ^
- git+https://ghp.ci/https://github.com/JeffreyXiang/diffoctreerast.git
+ git+https://gh-proxy.com/https://github.com/JeffreyXiang/diffoctreerast.git
 
 .\python_embeded\python.exe -s -m pip wheel -w tmp_build ^
- git+https://ghp.ci/https://github.com/EasternJournalist/utils3d.git
+ git+https://gh-proxy.com/https://github.com/EasternJournalist/utils3d.git
 
 .\python_embeded\python.exe -s -m pip wheel -w tmp_build ^
- git+https://ghp.ci/https://github.com/ashawkey/kiuikit.git
+ git+https://gh-proxy.com/https://github.com/ashawkey/kiuikit.git
 
 .\python_embeded\python.exe -s -m pip wheel -w tmp_build ^
- git+https://ghp.ci/https://github.com/NVlabs/nvdiffrast.git
+ git+https://gh-proxy.com/https://github.com/NVlabs/nvdiffrast.git
 
 .\python_embeded\python.exe -s -m pip wheel -w tmp_build ^
- "git+https://ghp.ci/https://github.com/facebookresearch/pytorch3d.git"
+ "git+https://gh-proxy.com/https://github.com/facebookresearch/pytorch3d.git"
 
 echo "编译完成，开始安装……"
 
@@ -87,7 +84,7 @@ for %%i in (.\tmp_build\*.whl) do .\python_embeded\python.exe -s -m pip install
 
 @REM ===========================================================================
 
-@REM (可选,默认关闭) Flash Attention, 用于 TRELLIS demo 等
+@REM (可选,默认关闭) Flash Attention, 用于 TRELLIS, 混元3D-1 等
 @REM "flash-attn" 只能用于 Ampere (RTX 30 系 / A100) 及更新的 GPU。
 @REM 注意：编译耗时很长！
 

diff --git a/pt25-cu124/requirements8.txt b/pt25-cu124/requirements8.txt
@@ -1,4 +1,7 @@
-https://huggingface.co/lldacing/flash-attention-windows-wheel/resolve/main/flash_attn-2.7.0.post2%2Bcu124torch2.5.1cxx11abiFALSE-cp312-cp312-win_amd64.whl
 https://github.com/YanWenKun/ComfyUI-Windows-Portable/releases/download/v6.2-wheels/pynim-0.0.3-cp312-abi3-win_amd64.whl
 https://github.com/YanWenKun/ComfyUI-Windows-Portable/releases/download/v6.2-wheels/texture_baker-0.0.1-cp312-cp312-win_amd64.whl
 https://github.com/YanWenKun/ComfyUI-Windows-Portable/releases/download/v6.2-wheels/uv_unwrapper-0.0.1-cp312-cp312-win_amd64.whl
+
+# Flash Attention is useful for Ampere and newer GPUs,
+# but incompatible with older GPUs (Pascal, Turing).
+#https://huggingface.co/lldacing/flash-attention-windows-wheel/resolve/main/flash_attn-2.7.0.post2%2Bcu124torch2.5.1cxx11abiFALSE-cp312-cp312-win_amd64.whl
diff --git a/pt25-cu124/requirementsB.txt b/pt25-cu124/requirementsB.txt
@@ -7,6 +7,8 @@ numpy==1.26.4
 # Here I just choose not install it. It's a client for Matrix.org.
 #matrix-client==0.4.0
 
-# For TRELLIS demo
-gradio==4.44.1
-gradio_litmodel3d==0.0.1
+# Compatibility for CRM (ugly fix)
+open-clip-torch==2.24.0
+
+# Compatibility for CharacterGen (ugly fix)
+diffusers==0.29.1
diff --git a/pt25-cu124/stage1.sh b/pt25-cu124/stage1.sh
@@ -88,7 +88,6 @@ rm aria2.zip
 
 # Setup Python embeded, part 3/3
 cd "$workdir"/python_embeded
-sed -i '1i../TRELLIS' ./python312._pth
 sed -i '1i../ComfyUI' ./python312._pth
 $pip_exe list