Update setup_blender.sh

setup_blender.sh

@@ -19,20 +19,6 @@ 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
 
-# PyTorch Geometric wheel URLs (Update these if versions change)
-PYG_TORCH_VERSION_SUFFIX="2.3.1" # PyTorch version suffix in PyG URLs
-PYG_PYTHON_VERSION="cp311"       # Python version suffix
-PYG_CUDA_SUFFIX="cu121"          # CUDA version suffix
-# Base URL for the directory containing the wheels
-PYG_BASE_URL="https://data.pyg.org/whl/torch-${PYG_TORCH_VERSION_SUFFIX}+${PYG_CUDA_SUFFIX}"
-# Correct wheel filenames (checked against the index page)
-TORCH_SCATTER_WHL_FILENAME="torch_scatter-2.1.2-${PYG_PYTHON_VERSION}-${PYG_PYTHON_VERSION}-linux_x86_64.whl"
-TORCH_CLUSTER_WHL_FILENAME="torch_cluster-1.6.3-${PYG_PYTHON_VERSION}-${PYG_PYTHON_VERSION}-linux_x86_64.whl"
-# Construct the full URLs
-TORCH_SCATTER_WHL_URL="${PYG_BASE_URL}/${TORCH_SCATTER_WHL_FILENAME}"
-TORCH_CLUSTER_WHL_URL="${PYG_BASE_URL}/${TORCH_CLUSTER_WHL_FILENAME}"
-
-
 # --- Download and Extract Blender ---
 echo "Downloading Blender ${BLENDER_VERSION}..."
 wget -nv -O /tmp/${BLENDER_TARBALL} ${BLENDER_URL}
@@ -67,7 +53,7 @@ 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 some packages (like torch-scatter) need torch during their own setup
+# 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})..."
 "${BLENDER_PY_EXEC}" -m pip install --no-cache-dir \
     torch==${TORCH_VERSION} \
@@ -76,20 +62,10 @@ echo "Installing PyTorch ${TORCH_VERSION} and Torchvision ${TORCHVISION_VERSION}
 
 echo "PyTorch and Torchvision installation complete."
 
-# --- Install torch-scatter and torch-cluster using direct wheel URLs SECOND ---
-# This avoids build issues by using pre-compiled wheels directly.
-echo "Installing torch-scatter and torch-cluster from specific wheels..."
-echo "Scatter wheel URL: ${TORCH_SCATTER_WHL_URL}"
-echo "Cluster wheel URL: ${TORCH_CLUSTER_WHL_URL}"
-"${BLENDER_PY_EXEC}" -m pip install --no-cache-dir \
-    "${TORCH_SCATTER_WHL_URL}" \
-    "${TORCH_CLUSTER_WHL_URL}"
-
-echo "torch-scatter and torch-cluster installation complete."
-
-# --- Install the rest of the packages from unirig_requirements.txt THIRD ---
-# Pip will skip torch, torchvision, torch-scatter, torch-cluster if already installed.
-echo "Installing remaining packages from ${UNIRIG_REQS_FILE}..."
+# --- 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.
+echo "Installing remaining packages from ${UNIRIG_REQS_FILE} (including torch-scatter/cluster via -f flags)..."
 "${BLENDER_PY_EXEC}" -m pip install --no-cache-dir -r "${UNIRIG_REQS_FILE}"
 
 echo "UniRig dependency installation for Blender Python complete."