Update setup_blender.sh

setup_blender.sh

@@ -3,78 +3,103 @@ set -e
 
 # --- Configuration ---
 BLENDER_VERSION="4.2.0"
-BLENDER_MAJOR_MINOR="4.2"
+BLENDER_MAJOR_MINOR="4.2" # Corresponds to Blender's internal versioned Python directory
 BLENDER_PYTHON_VERSION="python3.11" # Should match the -dev package (e.g., python3.11-dev)
 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"
+
+# ** MODIFIED FOR LOCAL BLENDER INSTALLATION **
+# Assuming this script is run from /home/user/app (standard for HF Spaces app.py)
+APP_DIR="/home/user/app" # Or use $(pwd) if script is guaranteed to be in app root
+BLENDER_INSTALL_BASE="${APP_DIR}/blender_installation" # Base directory for Blender versions
+INSTALL_DIR="${BLENDER_INSTALL_BASE}/blender-${BLENDER_VERSION}-linux-x64" # Specific version install
+LOCAL_BIN_DIR="${APP_DIR}/local_bin" # For local symlinks, if used
+
 BLENDER_PY_EXEC="${INSTALL_DIR}/${BLENDER_MAJOR_MINOR}/python/bin/${BLENDER_PYTHON_VERSION}"
 
-# Path to your Gradio Space's unirig_requirements.txt (copy of UniRig's official)
-UNIRIG_REQS_FILE_IN_SPACE="/home/user/app/unirig_requirements.txt"
-# Path to the cloned UniRig repository in the Space
-UNIRIG_REPO_CLONE_DIR="/home/user/app/UniRig" # Standard path
+UNIRIG_REQS_FILE_IN_SPACE="${APP_DIR}/unirig_requirements.txt"
+UNIRIG_REPO_CLONE_DIR="${APP_DIR}/UniRig"
 
 TORCH_VERSION="2.3.1"
-TORCHVISION_VERSION="0.18.1"
-NUMPY_VERSION="1.26.4"
-TARGET_CUDA_VERSION_SHORT="cu121" # Verify ZeroGPU environment.
-
+# 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"
 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}"
+# SPCONV_PACKAGE="spconv-${TARGET_CUDA_VERSION_SHORT}" # Already in unirig_requirements.txt
 
 # --- Set Environment Variables for Build ---
-export CUDA_HOME=${CUDA_HOME:-/usr/local/cuda}
-export PATH="${CUDA_HOME}/bin:${PATH}"
-export MAX_JOBS=4 # For compilation processes like flash-attn
-# ** FIX: Explicitly add Python 3.11 include path for C/C++ header files **
-# This assumes python3.11-dev is installed via packages.txt, providing headers here.
-PYTHON_INCLUDE_DIR="/usr/include/python${BLENDER_PYTHON_VERSION#python}" # Extracts "3.11" from "python3.11"
+export CUDA_HOME=${CUDA_HOME:-/usr/local/cuda} # Keep for system CUDA if needed by compilations
+export PATH="${CUDA_HOME}/bin:${LOCAL_BIN_DIR}:${PATH}" # Add local_bin to PATH early
+export MAX_JOBS=${MAX_JOBS:-4} # For compilation processes
+
+PYTHON_INCLUDE_DIR="/usr/include/python${BLENDER_PYTHON_VERSION#python}" # e.g., /usr/include/python3.11
 export CPATH="${PYTHON_INCLUDE_DIR}:${CPATH}"
 export C_INCLUDE_PATH="${PYTHON_INCLUDE_DIR}:${C_INCLUDE_PATH}"
 export CPLUS_INCLUDE_PATH="${PYTHON_INCLUDE_DIR}:${CPLUS_INCLUDE_PATH}"
 
+echo "--- Setup Script Start ---"
+echo "Target Blender Installation Directory: ${INSTALL_DIR}"
+echo "Blender Python Executable: ${BLENDER_PY_EXEC}"
 echo "Using CUDA_HOME=${CUDA_HOME}"
-echo "Updated PATH: ${PATH}"
+echo "Initial PATH: ${PATH}"
 echo "CPATH set to: ${CPATH}"
-echo "C_INCLUDE_PATH set to: ${C_INCLUDE_PATH}"
-echo "CPLUS_INCLUDE_PATH set to: ${CPLUS_INCLUDE_PATH}"
 echo "Expected Python include directory: ${PYTHON_INCLUDE_DIR}"
-# Check if the Python.h file actually exists where we expect it
+
 if [ -f "${PYTHON_INCLUDE_DIR}/Python.h" ]; then
     echo "Found Python.h at ${PYTHON_INCLUDE_DIR}/Python.h"
 else
     echo "WARNING: Python.h NOT FOUND at ${PYTHON_INCLUDE_DIR}/Python.h. Ensure python${BLENDER_PYTHON_VERSION#python}-dev is in packages.txt and installed."
 fi
 
-
 # --- Download and Extract Blender ---
-echo "Downloading Blender ${BLENDER_VERSION}..."
-if [ ! -f "/tmp/${BLENDER_TARBALL}" ]; then
-    wget -nv -O /tmp/${BLENDER_TARBALL} ${BLENDER_URL}
+# Create the local installation base directory
+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
+    echo "Downloading Blender ${BLENDER_VERSION}..."
+    if [ ! -f "/tmp/${BLENDER_TARBALL}" ]; then
+        wget -nv -O "/tmp/${BLENDER_TARBALL}" ${BLENDER_URL}
+    else
+        echo "Blender tarball /tmp/${BLENDER_TARBALL} already downloaded."
+    fi
+
+    echo "Extracting Blender to ${BLENDER_INSTALL_BASE}..."
+    # Extracts to a subdirectory like blender-4.2.0-linux-x64 inside BLENDER_INSTALL_BASE
+    tar -xJf "/tmp/${BLENDER_TARBALL}" -C "${BLENDER_INSTALL_BASE}"
+    # The tarball extracts into a folder named "blender-4.2.0-linux-x64", so INSTALL_DIR should be correct.
+    if [ -d "${INSTALL_DIR}" ]; then
+        echo "Blender extracted successfully to ${INSTALL_DIR}"
+    else
+        echo "ERROR: Blender extraction failed or extracted to an unexpected path. Expected: ${INSTALL_DIR}"
+        # List contents of BLENDER_INSTALL_BASE for debugging
+        ls -la "${BLENDER_INSTALL_BASE}"
+        exit 1
+    fi
 else
-    echo "Blender tarball /tmp/${BLENDER_TARBALL} already downloaded."
+    echo "Blender already appears to be extracted to ${INSTALL_DIR}."
 fi
+echo "Extraction complete."
 
-echo "Extracting Blender to ${INSTALL_DIR}..."
-if [ ! -d "${INSTALL_DIR}/${BLENDER_MAJOR_MINOR}" ]; then
-    mkdir -p /opt
-    tar -xJf /tmp/${BLENDER_TARBALL} -C /opt
+# --- 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"
+    echo "Local symlink created at ${LOCAL_BIN_DIR}/blender. Make sure ${LOCAL_BIN_DIR} is in your PATH."
 else
-    echo "Blender already extracted to ${INSTALL_DIR}."
+    echo "WARNING: Blender executable not found at ${INSTALL_DIR}/blender. Cannot create symlink."
 fi
-echo "Extraction complete."
 
-# --- Create Blender Symlink ---
-echo "Creating symlink for Blender executable..."
-ln -sf ${INSTALL_DIR}/blender /usr/local/bin/blender
-echo "Symlink created."
 
 # --- Install Dependencies into Blender's Python ---
 echo "Installing dependencies into Blender's Python (${BLENDER_PY_EXEC})..."
 if [ ! -f "${BLENDER_PY_EXEC}" ]; then
     echo "ERROR: Blender Python executable not found at ${BLENDER_PY_EXEC}!"
+    echo "Check Blender extraction and paths."
     exit 1
 fi
 if [ ! -f "${UNIRIG_REQS_FILE_IN_SPACE}" ]; then
@@ -83,37 +108,13 @@ if [ ! -f "${UNIRIG_REQS_FILE_IN_SPACE}" ]; then
 fi
 
 echo "Upgrading pip for Blender Python..."
-# ** ADDED -vvv for verbosity **
 "${BLENDER_PY_EXEC}" -m pip install --no-cache-dir --upgrade pip setuptools wheel -vvv
 
-echo "1. Installing PyTorch ${TORCH_VERSION} and Torchvision ${TORCHVISION_VERSION}..."
-# ** ADDED -vvv for verbosity **
-"${BLENDER_PY_EXEC}" -m pip install --no-cache-dir \
-    torch==${TORCH_VERSION} \
-    torchvision==${TORCHVISION_VERSION} \
-    --index-url ${TORCH_INDEX_URL} -vvv
-
-echo "2. Installing dependencies from ${UNIRIG_REQS_FILE_IN_SPACE} (includes bpy, flash_attn)..."
-# flash-attn compilation might also benefit from CPATH
-# ** ADDED -vvv for verbosity **
+# 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}..."
 "${BLENDER_PY_EXEC}" -m pip install --no-cache-dir -r "${UNIRIG_REQS_FILE_IN_SPACE}" -vvv
 
-echo "3. Installing ${SPCONV_PACKAGE}..."
-# ** ADDED -vvv for verbosity **
-"${BLENDER_PY_EXEC}" -m pip install --no-cache-dir ${SPCONV_PACKAGE} -vvv
-
-echo "4. Installing torch-scatter and torch-cluster..."
-# The CPATH, C_INCLUDE_PATH, CPLUS_INCLUDE_PATH set above should help this step
-# ** ADDED -vvv for verbosity **
-"${BLENDER_PY_EXEC}" -m pip install --no-cache-dir \
-    torch-scatter \
-    torch-cluster \
-    -f "${PYG_FIND_LINKS_URL}" -vvv
-
-echo "5. Installing numpy==${NUMPY_VERSION}..."
-# ** ADDED -vvv for verbosity **
-"${BLENDER_PY_EXEC}" -m pip install --no-cache-dir numpy==${NUMPY_VERSION} -vvv
-
 echo "Dependency installation for Blender's Python complete."
 
 # --- FIX: Ensure UniRig/src is treated as a package ---
@@ -130,13 +131,13 @@ if [ -d "${UNIRIG_SRC_DIR}" ]; then
 else
   echo "WARNING: UniRig src directory not found at ${UNIRIG_SRC_DIR}. Cannot create __init__.py."
 fi
-# --- END FIX ---
 
 # (Optional) VRM Addon installation
-VRM_ADDON_REL_PATH="blender/add-on-vrm-v2.20.77_modified.zip"
+VRM_ADDON_REL_PATH="blender/add-on-vrm-v2.20.77_modified.zip" # Relative to UniRig repo root
 ABSOLUTE_ADDON_PATH="${UNIRIG_REPO_CLONE_DIR}/${VRM_ADDON_REL_PATH}"
 if [ -f "${ABSOLUTE_ADDON_PATH}" ]; then
     echo "Installing optional VRM addon for Blender..."
+    # Ensure CWD is UniRig repo for relative path in addon script if any
     (cd "${UNIRIG_REPO_CLONE_DIR}" && \
      "${BLENDER_PY_EXEC}" -c "import bpy, os; bpy.ops.preferences.addon_install(overwrite=True, filepath=os.path.abspath('${VRM_ADDON_REL_PATH}')); bpy.ops.preferences.addon_enable(module='io_scene_vrm'); print('VRM Addon installed and enabled.')")
     echo "VRM addon installation attempted."
@@ -148,5 +149,5 @@ fi
 echo "Cleaning up downloaded Blender tarball..."
 rm -f /tmp/${BLENDER_TARBALL}
 echo "Cleanup complete."
-echo "Blender setup finished successfully."
-
+echo "Blender setup finished successfully. Blender is in ${INSTALL_DIR}"
+echo "--- Setup Script End ---"