Fix line endings: setup_flux2_full.sh

scripts/setup_flux2_full.sh

@@ -1,108 +1,88 @@
-#!/bin/bash
-# Dataset-Prep v3 — Flux2 Dev Full setup
-# Includes ALL base deps + ComfyUI + Flux2-dev models (80GB+ VRAM needed)
-set -e
-
-echo "=== Dataset-Prep v3: Flux2 Dev Full Setup ==="
-
-# Run base setup first
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-if [ -f "$SCRIPT_DIR/setup_base.sh" ]; then
-    bash "$SCRIPT_DIR/setup_base.sh"
-else
-    # Download and run base setup from HF
-    python3 -c "
-from huggingface_hub import hf_hub_download
-path = hf_hub_download('msrcam/ds-prep-backend', 'scripts/setup_base.sh', repo_type='dataset')
-print(path)
-" > /tmp/base_path.txt
-    bash "$(cat /tmp/base_path.txt)"
-fi
-
-echo "Installing ComfyUI..."
-if [ ! -d /workspace/ComfyUI ]; then
-    cd /workspace
-    git clone --depth 1 https://github.com/comfyanonymous/ComfyUI.git
-    cd ComfyUI
-    uv pip install --system -q -r requirements.txt > /dev/null 2>&1
-    cd custom_nodes
-    git clone --depth 1 https://github.com/city96/ComfyUI-GGUF.git 2>/dev/null || true
-    if [ -d ComfyUI-GGUF ] && [ -f ComfyUI-GGUF/requirements.txt ]; then
-        uv pip install --system -q -r ComfyUI-GGUF/requirements.txt > /dev/null 2>&1
-    fi
-    cd /workspace/ComfyUI
-    mkdir -p models/unet models/clip models/vae
-    echo "ComfyUI installed."
-else
-    echo "ComfyUI already installed."
-fi
-
-# Start ComfyUI
-cd /workspace/ComfyUI
-nohup python main.py --listen 0.0.0.0 --port 8188 --preview-method auto > /tmp/comfyui.log 2>&1 &
-echo $! > /tmp/comfyui.pid
-echo "ComfyUI starting on port 8188..."
-
-# Login to HF for gated repos
-if [ -n "$HF_TOKEN" ]; then
-    python3 -c "from huggingface_hub import login; login(token='$HF_TOKEN', add_to_git_credential=False)" 2>/dev/null || true
-fi
-
-# Download Flux2 models
-echo "Downloading Flux2 models (this takes a while)..."
-python3 << 'PYEOF'
-from huggingface_hub import hf_hub_download
-import os
-
-models_dir = "/workspace/ComfyUI/models"
-
-downloads = [
-    # UNET — flux2-dev bf16 (~64.5GB)
-    {
-        "repo": "black-forest-labs/FLUX.2-dev",
-        "file": "flux2-dev.safetensors",
-        "dest": f"{models_dir}/unet",
-        "hf_file": "flux1-dev.safetensors",
-    },
-    # VAE
-    {
-        "repo": "msrcam/ds-prep-models",
-        "file": "flux2-vae.safetensors",
-        "dest": f"{models_dir}/vae",
-        "hf_file": "flux2-vae.safetensors",
-    },
-    # CLIP — Qwen3 8B abliterated fp8
-    {
-        "repo": "msrcam/ds-prep-models",
-        "file": "qwen3_8b_abliterated_v2-fp8mixed.safetensors",
-        "dest": f"{models_dir}/clip",
-        "hf_file": "qwen3_8b_abliterated_v2-fp8mixed.safetensors",
-    },
-]
-
-for dl in downloads:
-    dest_path = os.path.join(dl["dest"], dl["file"])
-    if os.path.exists(dest_path):
-        print(f"  {dl['file']} already exists, skipping")
-        continue
-    print(f"  Downloading {dl['file']}...")
-    try:
-        os.makedirs(dl["dest"], exist_ok=True)
-        downloaded = hf_hub_download(
-            repo_id=dl["repo"],
-            filename=dl["hf_file"],
-            local_dir=dl["dest"],
-            local_dir_use_symlinks=False,
-        )
-        # Rename if needed
-        actual = os.path.join(dl["dest"], dl["hf_file"])
-        if os.path.exists(actual) and actual != dest_path:
-            os.rename(actual, dest_path)
-        print(f"  OK: {dl['file']}")
-    except Exception as e:
-        print(f"  WARNING: Failed to download {dl['file']}: {e}")
-
-print("Model downloads complete.")
-PYEOF
-
-echo "=== Flux2 Dev Full setup complete ==="
+#!/bin/bash
+# Dataset-Prep v3 — Flux2 Dev Full setup
+# Base deps + ComfyUI + Flux2-dev models (80GB+ VRAM needed)
+set -e
+
+echo "=== Dataset-Prep v3: Flux2 Dev Full Setup ==="
+
+# Run base setup first
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+if [ -f "$SCRIPT_DIR/setup_base.sh" ]; then
+    bash "$SCRIPT_DIR/setup_base.sh"
+else
+    python3 -c "
+from huggingface_hub import hf_hub_download
+path = hf_hub_download('msrcam/ds-prep-backend', 'scripts/setup_base.sh', repo_type='dataset')
+print(path)
+" > /tmp/base_path.txt
+    bash "$(cat /tmp/base_path.txt)"
+fi
+
+echo "Installing ComfyUI..."
+if [ ! -d /workspace/ComfyUI ]; then
+    cd /workspace
+    git clone --depth 1 https://github.com/comfyanonymous/ComfyUI.git
+    cd ComfyUI
+    uv pip install --system -q -r requirements.txt > /dev/null 2>&1
+    cd custom_nodes
+    git clone --depth 1 https://github.com/city96/ComfyUI-GGUF.git 2>/dev/null || true
+    if [ -d ComfyUI-GGUF ] && [ -f ComfyUI-GGUF/requirements.txt ]; then
+        uv pip install --system -q -r ComfyUI-GGUF/requirements.txt > /dev/null 2>&1
+    fi
+    cd /workspace/ComfyUI
+    mkdir -p models/unet models/clip models/vae
+    echo "ComfyUI installed."
+else
+    echo "ComfyUI already installed."
+fi
+
+# Start ComfyUI
+cd /workspace/ComfyUI
+nohup python main.py --listen 0.0.0.0 --port 8188 --preview-method auto > /tmp/comfyui.log 2>&1 &
+echo $! > /tmp/comfyui.pid
+echo "ComfyUI starting on port 8188..."
+
+# Login to HF for gated repos (FLUX.2-dev is gated)
+if [ -n "$HF_TOKEN" ]; then
+    python3 -c "from huggingface_hub import login; login(token='$HF_TOKEN', add_to_git_credential=False)" 2>/dev/null || true
+fi
+
+# Download Flux2 models
+echo "Downloading Flux2 models..."
+python3 << 'PYEOF'
+from huggingface_hub import hf_hub_download
+import os
+
+unet_dir = "/workspace/ComfyUI/models/unet"
+clip_dir = "/workspace/ComfyUI/models/clip"
+vae_dir  = "/workspace/ComfyUI/models/vae"
+
+downloads = [
+    # FLUX.2-dev UNET (gated, ~64.5GB)
+    ("black-forest-labs/FLUX.2-dev", "flux2-dev.safetensors", unet_dir, "flux2-dev.safetensors"),
+    # Qwen3 8B CLIP encoder (fp8, ~8.5GB) — from msrcam/klein-fleet
+    ("msrcam/klein-fleet", "clip/qwen3_8b_abliterated_v2-fp8mixed.safetensors", clip_dir, "qwen3_8b_abliterated_v2-fp8mixed.safetensors"),
+    # Flux2 VAE (~0.3GB) — from msrcam/klein-fleet
+    ("msrcam/klein-fleet", "vae/flux2-vae.safetensors", vae_dir, "flux2-vae.safetensors"),
+]
+
+for repo, hf_file, dest_dir, local_name in downloads:
+    dest = os.path.join(dest_dir, local_name)
+    if os.path.exists(dest) and os.path.getsize(dest) > 0:
+        print(f"  {local_name} exists, skipping")
+        continue
+    print(f"  Downloading {local_name} from {repo}...")
+    try:
+        os.makedirs(dest_dir, exist_ok=True)
+        path = hf_hub_download(repo_id=repo, filename=hf_file, local_dir=dest_dir, local_dir_use_symlinks=False)
+        # Flatten if hf put it in a subfolder
+        if os.path.exists(path) and path != dest:
+            os.rename(path, dest)
+        print(f"  OK: {local_name}")
+    except Exception as e:
+        print(f"  FAILED: {local_name}: {e}")
+
+print("Model downloads complete.")
+PYEOF
+
+echo "=== Flux2 Dev Full setup complete ==="