Update setup_blender.sh

setup_blender.sh

@@ -5,19 +5,18 @@ set -e
 
 # --- Configuration ---
 BLENDER_VERSION="4.2.0"
-BLENDER_MAJOR_MINOR="4.2" # Matches the version directory structure
-BLENDER_PYTHON_VERSION="python3.11" # Blender 4.2 uses Python 3.11
+BLENDER_MAJOR_MINOR="4.2"
+BLENDER_PYTHON_VERSION="python3.11"
 BLENDER_TARBALL="blender-${BLENDER_VERSION}-linux-x64.tar.xz"
 BLENDER_URL="https://download.blender.org/release/Blender${BLENDER_MAJOR_MINOR}/blender-${BLENDER_VERSION}-linux-x64.tar.xz"
 INSTALL_DIR="/opt/blender-${BLENDER_VERSION}-linux-x64"
 BLENDER_PY_EXEC="${INSTALL_DIR}/${BLENDER_MAJOR_MINOR}/python/bin/${BLENDER_PYTHON_VERSION}"
-# Assuming unirig_requirements.txt is in the root directory alongside this script and app.py
-UNIRIG_REQS_FILE="unirig_requirements.txt"
-# Define the specific torch version and index URL (matching unirig_requirements.txt)
+UNIRIG_REQS_FILE="/home/user/app/unirig_requirements.txt"  # Adjust path if different
 TORCH_VERSION="2.3.1"
 TORCHVISION_VERSION="0.18.1"
-TORCH_CUDA_SUFFIX="cu121" # CUDA version suffix for wheels
-TORCH_INDEX_URL="https://download.pytorch.org/whl/${TORCH_CUDA_SUFFIX}" # Make sure this matches your target CUDA
+TORCH_CUDA_SUFFIX="cu121"
+TORCH_INDEX_URL="https://download.pytorch.org/whl/${TORCH_CUDA_SUFFIX}"
+PYG_WHEEL_INDEX="https://data.pyg.org/whl/torch-2.3.0+cu121.html"  # Compatible with 2.3.1
 
 # --- Download and Extract Blender ---
 echo "Downloading Blender ${BLENDER_VERSION}..."
@@ -25,56 +24,48 @@ wget -nv -O /tmp/${BLENDER_TARBALL} ${BLENDER_URL}
 echo "Download complete."
 
 echo "Extracting Blender to ${INSTALL_DIR}..."
-mkdir -p /opt # Ensure /opt exists
+mkdir -p /opt
 tar -xJf /tmp/${BLENDER_TARBALL} -C /opt
 echo "Extraction complete."
 
 # --- Create Blender Symlink ---
 echo "Creating symlink for Blender executable..."
-ln -sf ${INSTALL_DIR}/blender /usr/local/bin/blender # Use -f to force overwrite if exists
+ln -sf ${INSTALL_DIR}/blender /usr/local/bin/blender
 echo "Symlink created."
 
-# --- Install UniRig Dependencies into Blender's Python ---
-echo "Installing UniRig Python dependencies into Blender's Python (${BLENDER_PYTHON_VERSION})..."
+# --- Install Dependencies into Blender's Python ---
+echo "Installing dependencies into Blender's Python (${BLENDER_PYTHON_VERSION})..."
 
 if [ ! -f "${BLENDER_PY_EXEC}" ]; then
-    echo "ERROR: Blender Python executable not found at ${BLENDER_PY_EXEC} after extraction!"
+    echo "ERROR: Blender Python executable not found at ${BLENDER_PY_EXEC}!"
     exit 1
 fi
 
 if [ ! -f "${UNIRIG_REQS_FILE}" ]; then
-    echo "ERROR: UniRig requirements file not found at ${UNIRIG_REQS_FILE}!"
-    echo "Ensure this file exists in the root directory."
+    echo "ERROR: Requirements file not found at ${UNIRIG_REQS_FILE}!"
     exit 1
 fi
 
-# Upgrade pip within Blender's Python environment
+# Upgrade pip
 echo "Upgrading pip for Blender Python..."
 "${BLENDER_PY_EXEC}" -m pip install --upgrade pip setuptools wheel
 
-# --- Install PyTorch and Torchvision FIRST ---
-# This is crucial because torch-scatter/torch-cluster setup needs torch.
-echo "Installing PyTorch ${TORCH_VERSION} and Torchvision ${TORCHVISION_VERSION} first (CUDA: ${TORCH_CUDA_SUFFIX})..."
+# Install PyTorch and Torchvision first
+echo "Installing PyTorch ${TORCH_VERSION} and Torchvision ${TORCHVISION_VERSION} (CUDA: ${TORCH_CUDA_SUFFIX})..."
 "${BLENDER_PY_EXEC}" -m pip install --no-cache-dir \
     torch==${TORCH_VERSION} \
     torchvision==${TORCHVISION_VERSION} \
     --index-url ${TORCH_INDEX_URL}
 
-echo "PyTorch and Torchvision installation complete."
+# Install remaining dependencies with PyG wheel index
+echo "Installing remaining packages from ${UNIRIG_REQS_FILE} with PyG wheel index..."
+"${BLENDER_PY_EXEC}" -m pip install --no-cache-dir -r "${UNIRIG_REQS_FILE}" -f ${PYG_WHEEL_INDEX}
 
-# --- Install the rest of the packages from unirig_requirements.txt SECOND ---
-# This will now install torch-scatter, torch-cluster (using the -f flags in the file),
-# and all other dependencies. Pip will skip torch/torchvision as they are already installed.
-# Added --no-build-isolation to potentially help builds find already installed packages like torch.
-echo "Installing remaining packages from ${UNIRIG_REQS_FILE} (including torch-scatter/cluster via -f flags)..."
-"${BLENDER_PY_EXEC}" -m pip install --no-cache-dir --no-build-isolation -r "${UNIRIG_REQS_FILE}"
-
-echo "UniRig dependency installation for Blender Python complete."
+echo "Dependency installation complete."
 
 # --- Cleanup ---
 echo "Cleaning up downloaded tarball..."
 rm /tmp/${BLENDER_TARBALL}
 echo "Cleanup complete."
 
-echo "Blender setup finished successfully."
-
+echo "Blender setup finished successfully."