v10: auto-detect all NVMe disks + GPU count, no hardcoded devices

job_ml.sh

@@ -20,11 +20,8 @@ export HF_TOKEN="${HF_TOKEN:?Set HF_TOKEN}"
 export TRAIN_STAGE="${TRAIN_STAGE:-flux}"
 export HF_USER="memoryai"
 export PROJECT_DIR="/home/adminuser/chungcat"
-export DATA0="/data0"
-export DATA1="/data1"
 export PYTORCH_CUDA_ALLOC_CONF=expandable_segments:True
 export PYTHONPATH="$PROJECT_DIR:${PYTHONPATH:-}"
-export HF_HOME="$DATA0/models"
 
 log() { echo "[$(date +%H:%M:%S)] $1"; }
 
@@ -77,26 +74,40 @@ BACKUP_PID=""
 trap 'echo "[TRAP] Evicted/killed"; kill $BACKUP_PID 2>/dev/null; backup_checkpoint; exit 0' SIGTERM SIGINT
 
 ###############################################################################
-# 1. STORAGE - Format & mount 2x NVMe 3.5TB
+# 1. STORAGE - Auto-detect & mount all NVMe disks
 ###############################################################################
-log "=== [1/7] Storage (NVMe 3.5TB x2) ==="
-for pair in "/dev/nvme0n1:$DATA0" "/dev/nvme1n1:$DATA1"; do
-    dev="${pair%%:*}"; mnt="${pair##*:}"
-    if [ -b "$dev" ]; then
-        if ! mountpoint -q "$mnt" 2>/dev/null; then
-            blkid "$dev" 2>/dev/null | grep -q ext4 || mkfs.ext4 -q "$dev"
-            mkdir -p "$mnt"
-            mount "$dev" "$mnt"
-            log "  Mounted $dev -> $mnt"
-        else
-            log "  $mnt already mounted"
-        fi
-    else
-        log "  $dev not found, using local dir"
+log "=== [1/7] Storage ==="
+
+# Auto-detect all NVMe devices and mount them
+MOUNT_IDX=0
+DATA_DIRS=()
+for dev in $(lsblk -dpno NAME,TYPE 2>/dev/null | grep disk | awk '{print $1}' | grep nvme); do
+    mnt="/data${MOUNT_IDX}"
+    if ! mountpoint -q "$mnt" 2>/dev/null; then
+        blkid "$dev" 2>/dev/null | grep -q ext4 || mkfs.ext4 -q "$dev" 2>/dev/null || continue
         mkdir -p "$mnt"
+        mount "$dev" "$mnt" 2>/dev/null || continue
+        log "  Mounted $dev -> $mnt ($(lsblk -dno SIZE $dev))"
+    else
+        log "  $mnt already mounted"
     fi
+    DATA_DIRS+=("$mnt")
+    MOUNT_IDX=$((MOUNT_IDX + 1))
 done
-df -h "$DATA0" "$DATA1" 2>/dev/null | grep -v Filesystem || true
+
+# Fallback: if no NVMe found, use local dirs
+if [ ${#DATA_DIRS[@]} -eq 0 ]; then
+    log "  No NVMe found, using local directories"
+    mkdir -p /data0 /data1
+    DATA_DIRS=("/data0" "/data1")
+fi
+
+# Use first disk for data/models, second (or same) for logs
+export DATA0="${DATA_DIRS[0]}"
+export DATA1="${DATA_DIRS[1]:-$DATA0}"
+log "  DATA0=$DATA0 DATA1=$DATA1 (${#DATA_DIRS[@]} disks)"
+df -h "${DATA_DIRS[@]}" 2>/dev/null | grep -v Filesystem || true
+
 mkdir -p "$DATA0"/{datasets/{raw,processed},checkpoints,models} "$DATA1"/{outputs,logs}
 mkdir -p "$PROJECT_DIR"/{scripts/{training,data_collection,serving},configs,logs,data}
 ln -sfn "$DATA0/datasets/processed" "$PROJECT_DIR/data/processed" 2>/dev/null || true
@@ -104,6 +115,15 @@ ln -sfn "$DATA0/datasets/raw" "$PROJECT_DIR/data/raw" 2>/dev/null || true
 ln -sfn "$DATA0/checkpoints" "$PROJECT_DIR/checkpoints" 2>/dev/null || true
 ln -sfn "$DATA1/outputs" "$PROJECT_DIR/outputs" 2>/dev/null || true
 log "  Done"
+mkdir -p "$DATA0"/{datasets/{raw,processed},checkpoints,models} "$DATA1"/{outputs,logs}
+mkdir -p "$PROJECT_DIR"/{scripts/{training,data_collection,serving},configs,logs,data}
+ln -sfn "$DATA0/datasets/processed" "$PROJECT_DIR/data/processed" 2>/dev/null || true
+ln -sfn "$DATA0/datasets/raw" "$PROJECT_DIR/data/raw" 2>/dev/null || true
+ln -sfn "$DATA0/checkpoints" "$PROJECT_DIR/checkpoints" 2>/dev/null || true
+ln -sfn "$DATA1/outputs" "$PROJECT_DIR/outputs" 2>/dev/null || true
+log "  Done"
+
+export HF_HOME="$DATA0/models"
 
 ###############################################################################
 # 2. INSTALL