Spaces:
Running
on
Zero
Running
on
Zero
Update setup_blender.sh
Browse files- setup_blender.sh +6 -15
setup_blender.sh
CHANGED
@@ -23,9 +23,6 @@ TORCHVISION_VERSION="0.18.1"
|
|
23 |
TARGET_CUDA_VERSION_SHORT="cu121" # PyTorch 2.3.1 wheels are available for cu121
|
24 |
TORCH_INDEX_URL="https://download.pytorch.org/whl/${TARGET_CUDA_VERSION_SHORT}"
|
25 |
|
26 |
-
# flash-attn version known to have compatible wheels (Python 3.11, PyTorch 2.3.1+cu121)
|
27 |
-
FLASH_ATTN_VERSION="2.5.8"
|
28 |
-
|
29 |
# --- Set Environment Variables for Build ---
|
30 |
export CUDA_HOME=${CUDA_HOME:-/usr/local/cuda}
|
31 |
export PATH="${CUDA_HOME}/bin:${LOCAL_BIN_DIR}:${PATH}"
|
@@ -36,7 +33,8 @@ export CPATH="${PYTHON_INCLUDE_DIR}:${CPATH}"
|
|
36 |
export C_INCLUDE_PATH="${PYTHON_INCLUDE_DIR}:${C_INCLUDE_PATH}"
|
37 |
export CPLUS_INCLUDE_PATH="${PYTHON_INCLUDE_DIR}:${CPLUS_INCLUDE_PATH}"
|
38 |
|
39 |
-
|
|
|
40 |
|
41 |
echo "--- Setup Script Start ---"
|
42 |
echo "Target Blender Installation Directory: ${INSTALL_DIR}"
|
@@ -44,7 +42,7 @@ echo "Blender Python Executable: ${BLENDER_PY_EXEC}"
|
|
44 |
echo "Using CUDA_HOME=${CUDA_HOME}"
|
45 |
echo "Targeting PyTorch for CUDA: ${TARGET_CUDA_VERSION_SHORT}"
|
46 |
echo "TORCH_CUDA_ARCH_LIST: ${TORCH_CUDA_ARCH_LIST}"
|
47 |
-
echo "
|
48 |
|
49 |
# --- Download and Extract Blender ---
|
50 |
mkdir -p "${BLENDER_INSTALL_BASE}"
|
@@ -102,18 +100,11 @@ echo "Step 1: Installing PyTorch ${TORCH_VERSION} (for CUDA ${TARGET_CUDA_VERSIO
|
|
102 |
--index-url ${TORCH_INDEX_URL} -vvv
|
103 |
echo "PyTorch and Torchvision installation attempted."
|
104 |
|
105 |
-
|
106 |
-
# Install flash-attn from PyPI, specifying version and forcing binary only
|
107 |
-
# The --only-binary flag applies to the package name immediately following it.
|
108 |
-
"${BLENDER_PY_EXEC}" -m pip install --no-cache-dir \
|
109 |
-
--only-binary flash-attn \
|
110 |
-
flash-attn==${FLASH_ATTN_VERSION} -vvv
|
111 |
-
echo "flash-attn installation attempted from PyPI."
|
112 |
|
113 |
-
echo "Step 3: Installing remaining dependencies from ${UNIRIG_REQS_FILE_IN_SPACE}..."
|
114 |
-
# Ensure flash-attn is REMOVED from unirig_requirements.txt
|
115 |
# This will install torch-scatter, torch-cluster, spconv, bpy, etc.
|
116 |
-
# These packages should find the PyTorch and flash-attn already installed.
|
117 |
"${BLENDER_PY_EXEC}" -m pip install --no-cache-dir \
|
118 |
-r "${UNIRIG_REQS_FILE_IN_SPACE}" -vvv
|
119 |
|
|
|
23 |
TARGET_CUDA_VERSION_SHORT="cu121" # PyTorch 2.3.1 wheels are available for cu121
|
24 |
TORCH_INDEX_URL="https://download.pytorch.org/whl/${TARGET_CUDA_VERSION_SHORT}"
|
25 |
|
|
|
|
|
|
|
26 |
# --- Set Environment Variables for Build ---
|
27 |
export CUDA_HOME=${CUDA_HOME:-/usr/local/cuda}
|
28 |
export PATH="${CUDA_HOME}/bin:${LOCAL_BIN_DIR}:${PATH}"
|
|
|
33 |
export C_INCLUDE_PATH="${PYTHON_INCLUDE_DIR}:${C_INCLUDE_PATH}"
|
34 |
export CPLUS_INCLUDE_PATH="${PYTHON_INCLUDE_DIR}:${CPLUS_INCLUDE_PATH}"
|
35 |
|
36 |
+
# TORCH_CUDA_ARCH_LIST might still be useful for other compiled packages if any
|
37 |
+
export TORCH_CUDA_ARCH_LIST="8.0;8.6;9.0"
|
38 |
|
39 |
echo "--- Setup Script Start ---"
|
40 |
echo "Target Blender Installation Directory: ${INSTALL_DIR}"
|
|
|
42 |
echo "Using CUDA_HOME=${CUDA_HOME}"
|
43 |
echo "Targeting PyTorch for CUDA: ${TARGET_CUDA_VERSION_SHORT}"
|
44 |
echo "TORCH_CUDA_ARCH_LIST: ${TORCH_CUDA_ARCH_LIST}"
|
45 |
+
echo "NOTE: flash-attn installation is now SKIPPED."
|
46 |
|
47 |
# --- Download and Extract Blender ---
|
48 |
mkdir -p "${BLENDER_INSTALL_BASE}"
|
|
|
100 |
--index-url ${TORCH_INDEX_URL} -vvv
|
101 |
echo "PyTorch and Torchvision installation attempted."
|
102 |
|
103 |
+
# Step 2 for flash-attn has been removed.
|
|
|
|
|
|
|
|
|
|
|
|
|
104 |
|
105 |
+
echo "Step 2 (formerly Step 3): Installing remaining dependencies from ${UNIRIG_REQS_FILE_IN_SPACE}..."
|
106 |
+
# Ensure flash-attn is REMOVED from unirig_requirements.txt.
|
107 |
# This will install torch-scatter, torch-cluster, spconv, bpy, etc.
|
|
|
108 |
"${BLENDER_PY_EXEC}" -m pip install --no-cache-dir \
|
109 |
-r "${UNIRIG_REQS_FILE_IN_SPACE}" -vvv
|
110 |
|