Update setup_blender.sh

setup_blender.sh

@@ -20,13 +20,13 @@ BLENDER_PY_EXEC="${INSTALL_DIR}/${BLENDER_MAJOR_MINOR}/python/bin/${BLENDER_PYTH
 UNIRIG_REQS_FILE_IN_SPACE="${APP_DIR}/unirig_requirements.txt"
 UNIRIG_REPO_CLONE_DIR="${APP_DIR}/UniRig"
 
+# PyTorch specific versions and URLs for pre-installation
 TORCH_VERSION="2.3.1"
-# TORCHVISION_VERSION="0.18.1" # Already in unirig_requirements.txt
-# NUMPY_VERSION="1.26.4" # Already in unirig_requirements.txt
-TARGET_CUDA_VERSION_SHORT="cu121"
+TORCHVISION_VERSION="0.18.1"
+TARGET_CUDA_VERSION_SHORT="cu121" # Ensure this matches ZeroGPU environment
 TORCH_INDEX_URL="https://download.pytorch.org/whl/${TARGET_CUDA_VERSION_SHORT}"
-PYG_FIND_LINKS_URL="https://data.pyg.org/whl/torch-${TORCH_VERSION}+${TARGET_CUDA_VERSION_SHORT}.html"
-# SPCONV_PACKAGE="spconv-${TARGET_CUDA_VERSION_SHORT}" # Already in unirig_requirements.txt
+# PYG_FIND_LINKS_URL is used when installing from requirements.txt later
+# PYG_FIND_LINKS_URL="https://data.pyg.org/whl/torch-${TORCH_VERSION}+${TARGET_CUDA_VERSION_SHORT}.html"
 
 # --- Set Environment Variables for Build ---
 export CUDA_HOME=${CUDA_HOME:-/usr/local/cuda} # Keep for system CUDA if needed by compilations
@@ -57,7 +57,10 @@ fi
 mkdir -p "${BLENDER_INSTALL_BASE}"
 mkdir -p "${LOCAL_BIN_DIR}" # Ensure local_bin exists
 
-if [ ! -d "${INSTALL_DIR}/blender-${BLENDER_VERSION}-linux-x64" ]; then # Check if specific version is already extracted
+# Check if the *specific version's directory* inside INSTALL_DIR exists and is not empty.
+# Blender extracts to a folder like "blender-4.2.0-linux-x64"
+if [ ! -d "${INSTALL_DIR}" ] || [ -z "$(ls -A "${INSTALL_DIR}")" ]; then
+    echo "Blender not found or directory empty at ${INSTALL_DIR}. Proceeding with download and extraction."
     echo "Downloading Blender ${BLENDER_VERSION}..."
     if [ ! -f "/tmp/${BLENDER_TARBALL}" ]; then
         wget -nv -O "/tmp/${BLENDER_TARBALL}" ${BLENDER_URL}
@@ -83,9 +86,6 @@ fi
 echo "Extraction complete."
 
 # --- Create Blender Symlink (Optional - to local_bin) ---
-# This system symlink would require sudo and likely fail:
-# ln -sf ${INSTALL_DIR}/blender /usr/local/bin/blender
-# Instead, create a local symlink if desired, and ensure local_bin is in PATH (done above)
 if [ -f "${INSTALL_DIR}/blender" ]; then
     echo "Creating local symlink for Blender executable in ${LOCAL_BIN_DIR}..."
     ln -sf "${INSTALL_DIR}/blender" "${LOCAL_BIN_DIR}/blender"
@@ -110,9 +110,20 @@ fi
 echo "Upgrading pip for Blender Python..."
 "${BLENDER_PY_EXEC}" -m pip install --no-cache-dir --upgrade pip setuptools wheel -vvv
 
-# Simplified: Install all from unirig_requirements.txt
-# Ensure unirig_requirements.txt has all specific versions and index URLs for torch, pyg, spconv, etc.
-echo "Installing all dependencies from ${UNIRIG_REQS_FILE_IN_SPACE}..."
+echo "Step 1: Installing PyTorch ${TORCH_VERSION} and Torchvision ${TORCHVISION_VERSION} for Blender's Python..."
+# Install torch and torchvision first, as other packages (torch-scatter, etc.) depend on it being present for their setup.
+# Ensure your unirig_requirements.txt also lists these versions so pip can resolve correctly later if needed,
+# but this direct install ensures they are present for build steps of other packages.
+"${BLENDER_PY_EXEC}" -m pip install --no-cache-dir \
+    torch==${TORCH_VERSION} \
+    torchvision==${TORCHVISION_VERSION} \
+    --index-url ${TORCH_INDEX_URL} -vvv
+echo "PyTorch and Torchvision installation attempted."
+
+echo "Step 2: Installing remaining dependencies from ${UNIRIG_REQS_FILE_IN_SPACE}..."
+# Now install the rest of the packages.
+# unirig_requirements.txt should contain torch-scatter, torch-cluster, spconv, flash_attn (if needed), bpy, etc.
+# with their respective find-links URLs or direct package names.
 "${BLENDER_PY_EXEC}" -m pip install --no-cache-dir -r "${UNIRIG_REQS_FILE_IN_SPACE}" -vvv
 
 echo "Dependency installation for Blender's Python complete."