Sen Fang commited on
Commit
16d0be5
·
1 Parent(s): 5dced4c

Tighten CPU download throttling and stagger startup

Browse files
reproduce_independently_slurm.sh CHANGED
@@ -58,6 +58,9 @@ DOWNLOAD_TIME="${DOWNLOAD_TIME:-04:00:00}"
58
  DOWNLOAD_CPUS_PER_TASK="${DOWNLOAD_CPUS_PER_TASK:-1}"
59
  DOWNLOAD_MEM="${DOWNLOAD_MEM:-4G}"
60
  DOWNLOAD_ARRAY_PARALLEL="${DOWNLOAD_ARRAY_PARALLEL:-32}"
 
 
 
61
  ORCHESTRATOR_PARTITION="${ORCHESTRATOR_PARTITION:-main}"
62
  ORCHESTRATOR_ACCOUNT="${ORCHESTRATOR_ACCOUNT:-}"
63
  ORCHESTRATOR_TIME="${ORCHESTRATOR_TIME:-24:00:00}"
@@ -346,7 +349,7 @@ if [[ -z "${SLURM_JOB_ID:-}" && "$RUN_LOCAL" != "1" ]]; then
346
  echo "Missing orchestration wrapper: $wrapper" >&2
347
  exit 1
348
  fi
349
- export_args="ALL,ROOT_DIR=$ROOT_DIR,RUNTIME_ROOT=$RUNTIME_ROOT,STATE_ROOT=$STATE_ROOT,SOURCE_METADATA_CSV=$SOURCE_METADATA_CSV,OUTPUT_METADATA_CSV=$OUTPUT_METADATA_CSV,RAW_VIDEO_DIR=$RAW_VIDEO_DIR,RAW_CAPTION_DIR=$RAW_CAPTION_DIR,RAW_METADATA_DIR=$RAW_METADATA_DIR,DATASET_DIR=$DATASET_DIR,ARCHIVE_DIR=$ARCHIVE_DIR,STATS_NPZ=$STATS_NPZ,PROGRESS_JSON=$PROGRESS_JSON,STAGE=$STAGE,LIMIT=$LIMIT,FPS=$FPS,WORKERS=$WORKERS,TARGET_BYTES=$TARGET_BYTES,DOWNLOAD_BATCH_SIZE=$DOWNLOAD_BATCH_SIZE,DOWNLOAD_WORKERS=$DOWNLOAD_WORKERS,USE_SLURM_DOWNLOAD=$USE_SLURM_DOWNLOAD,SLURM_DOWNLOAD_SUBMIT_SCRIPT=$SLURM_DOWNLOAD_SUBMIT_SCRIPT,DOWNLOAD_PARTITIONS=$DOWNLOAD_PARTITIONS,DOWNLOAD_ACCOUNT=$DOWNLOAD_ACCOUNT,DOWNLOAD_TIME=$DOWNLOAD_TIME,DOWNLOAD_CPUS_PER_TASK=$DOWNLOAD_CPUS_PER_TASK,DOWNLOAD_MEM=$DOWNLOAD_MEM,DOWNLOAD_ARRAY_PARALLEL=$DOWNLOAD_ARRAY_PARALLEL,PROCESS_BATCH_SIZE=$PROCESS_BATCH_SIZE,DOWNLOAD_CLAIM_DIR=$DOWNLOAD_CLAIM_DIR,DOWNLOAD_CSV_LOCK_PATH=$DOWNLOAD_CSV_LOCK_PATH,MIN_PROCESS_START_BACKLOG=$MIN_PROCESS_START_BACKLOG,RAW_BACKLOG_LIMIT=$RAW_BACKLOG_LIMIT,MAX_RAW_VIDEO_BYTES=$MAX_RAW_VIDEO_BYTES,MAX_ITERATIONS=$MAX_ITERATIONS,IDLE_SLEEP_SECONDS=$IDLE_SLEEP_SECONDS,REPO_ID=$REPO_ID,COOKIES_FILE=$COOKIES_FILE,COOKIES_FROM_BROWSER=$COOKIES_FROM_BROWSER,EXTRACTOR_ARGS=$EXTRACTOR_ARGS,GPU_PARTITIONS=$GPU_PARTITIONS,GPU_ACCOUNT=$GPU_ACCOUNT,ARRAY_PARALLEL=$ARRAY_PARALLEL,MAX_BACKLOG_VIDEOS=$MAX_BACKLOG_VIDEOS,FORCE_METADATA=$FORCE_METADATA,FORCE_SUBTITLES=$FORCE_SUBTITLES,FORCE_DOWNLOAD=$FORCE_DOWNLOAD,FORCE_PROCESS=$FORCE_PROCESS,SKIP_VIDEO_DOWNLOAD=$SKIP_VIDEO_DOWNLOAD,SKIP_SUBTITLES=$SKIP_SUBTITLES,DRY_RUN_UPLOAD=$DRY_RUN_UPLOAD,RUN_LOCAL=1"
350
  if [[ ${#VIDEO_IDS[@]} -gt 0 ]]; then
351
  export VIDEO_IDS_JOINED
352
  VIDEO_IDS_JOINED="${VIDEO_IDS[*]}"
@@ -397,6 +400,7 @@ run_download_stage() {
397
  --mem "$DOWNLOAD_MEM"
398
  --max-backlog-videos "$RAW_BACKLOG_LIMIT"
399
  --workers "$DOWNLOAD_WORKERS"
 
400
  --claim-dir "$DOWNLOAD_CLAIM_DIR"
401
  --csv-lock-path "$DOWNLOAD_CSV_LOCK_PATH"
402
  )
 
58
  DOWNLOAD_CPUS_PER_TASK="${DOWNLOAD_CPUS_PER_TASK:-1}"
59
  DOWNLOAD_MEM="${DOWNLOAD_MEM:-4G}"
60
  DOWNLOAD_ARRAY_PARALLEL="${DOWNLOAD_ARRAY_PARALLEL:-32}"
61
+ DOWNLOAD_MAX_ACTIVE="${DOWNLOAD_MAX_ACTIVE:-30}"
62
+ DOWNLOAD_START_STAGGER_MIN="${DOWNLOAD_START_STAGGER_MIN:-1}"
63
+ DOWNLOAD_START_STAGGER_MAX="${DOWNLOAD_START_STAGGER_MAX:-3}"
64
  ORCHESTRATOR_PARTITION="${ORCHESTRATOR_PARTITION:-main}"
65
  ORCHESTRATOR_ACCOUNT="${ORCHESTRATOR_ACCOUNT:-}"
66
  ORCHESTRATOR_TIME="${ORCHESTRATOR_TIME:-24:00:00}"
 
349
  echo "Missing orchestration wrapper: $wrapper" >&2
350
  exit 1
351
  fi
352
+ export_args="ALL,ROOT_DIR=$ROOT_DIR,RUNTIME_ROOT=$RUNTIME_ROOT,STATE_ROOT=$STATE_ROOT,SOURCE_METADATA_CSV=$SOURCE_METADATA_CSV,OUTPUT_METADATA_CSV=$OUTPUT_METADATA_CSV,RAW_VIDEO_DIR=$RAW_VIDEO_DIR,RAW_CAPTION_DIR=$RAW_CAPTION_DIR,RAW_METADATA_DIR=$RAW_METADATA_DIR,DATASET_DIR=$DATASET_DIR,ARCHIVE_DIR=$ARCHIVE_DIR,STATS_NPZ=$STATS_NPZ,PROGRESS_JSON=$PROGRESS_JSON,STAGE=$STAGE,LIMIT=$LIMIT,FPS=$FPS,WORKERS=$WORKERS,TARGET_BYTES=$TARGET_BYTES,DOWNLOAD_BATCH_SIZE=$DOWNLOAD_BATCH_SIZE,DOWNLOAD_WORKERS=$DOWNLOAD_WORKERS,USE_SLURM_DOWNLOAD=$USE_SLURM_DOWNLOAD,SLURM_DOWNLOAD_SUBMIT_SCRIPT=$SLURM_DOWNLOAD_SUBMIT_SCRIPT,DOWNLOAD_PARTITIONS=$DOWNLOAD_PARTITIONS,DOWNLOAD_ACCOUNT=$DOWNLOAD_ACCOUNT,DOWNLOAD_TIME=$DOWNLOAD_TIME,DOWNLOAD_CPUS_PER_TASK=$DOWNLOAD_CPUS_PER_TASK,DOWNLOAD_MEM=$DOWNLOAD_MEM,DOWNLOAD_ARRAY_PARALLEL=$DOWNLOAD_ARRAY_PARALLEL,DOWNLOAD_MAX_ACTIVE=$DOWNLOAD_MAX_ACTIVE,DOWNLOAD_START_STAGGER_MIN=$DOWNLOAD_START_STAGGER_MIN,DOWNLOAD_START_STAGGER_MAX=$DOWNLOAD_START_STAGGER_MAX,PROCESS_BATCH_SIZE=$PROCESS_BATCH_SIZE,DOWNLOAD_CLAIM_DIR=$DOWNLOAD_CLAIM_DIR,DOWNLOAD_CSV_LOCK_PATH=$DOWNLOAD_CSV_LOCK_PATH,MIN_PROCESS_START_BACKLOG=$MIN_PROCESS_START_BACKLOG,RAW_BACKLOG_LIMIT=$RAW_BACKLOG_LIMIT,MAX_RAW_VIDEO_BYTES=$MAX_RAW_VIDEO_BYTES,MAX_ITERATIONS=$MAX_ITERATIONS,IDLE_SLEEP_SECONDS=$IDLE_SLEEP_SECONDS,REPO_ID=$REPO_ID,COOKIES_FILE=$COOKIES_FILE,COOKIES_FROM_BROWSER=$COOKIES_FROM_BROWSER,EXTRACTOR_ARGS=$EXTRACTOR_ARGS,GPU_PARTITIONS=$GPU_PARTITIONS,GPU_ACCOUNT=$GPU_ACCOUNT,ARRAY_PARALLEL=$ARRAY_PARALLEL,MAX_BACKLOG_VIDEOS=$MAX_BACKLOG_VIDEOS,FORCE_METADATA=$FORCE_METADATA,FORCE_SUBTITLES=$FORCE_SUBTITLES,FORCE_DOWNLOAD=$FORCE_DOWNLOAD,FORCE_PROCESS=$FORCE_PROCESS,SKIP_VIDEO_DOWNLOAD=$SKIP_VIDEO_DOWNLOAD,SKIP_SUBTITLES=$SKIP_SUBTITLES,DRY_RUN_UPLOAD=$DRY_RUN_UPLOAD,RUN_LOCAL=1"
353
  if [[ ${#VIDEO_IDS[@]} -gt 0 ]]; then
354
  export VIDEO_IDS_JOINED
355
  VIDEO_IDS_JOINED="${VIDEO_IDS[*]}"
 
400
  --mem "$DOWNLOAD_MEM"
401
  --max-backlog-videos "$RAW_BACKLOG_LIMIT"
402
  --workers "$DOWNLOAD_WORKERS"
403
+ --max-active-downloads "$DOWNLOAD_MAX_ACTIVE"
404
  --claim-dir "$DOWNLOAD_CLAIM_DIR"
405
  --csv-lock-path "$DOWNLOAD_CSV_LOCK_PATH"
406
  )
slurm/process_download_array.slurm CHANGED
@@ -59,6 +59,13 @@ trap cleanup_claim EXIT
59
 
60
  echo "[$(date '+%F %T')] job=${SLURM_JOB_ID:-na} task=${SLURM_ARRAY_TASK_ID} host=$(hostname) video_id=$VIDEO_ID"
61
 
 
 
 
 
 
 
 
62
  # shellcheck disable=SC1090
63
  source "$CONDA_SH"
64
  cmd=(python "$PIPELINE01"
 
59
 
60
  echo "[$(date '+%F %T')] job=${SLURM_JOB_ID:-na} task=${SLURM_ARRAY_TASK_ID} host=$(hostname) video_id=$VIDEO_ID"
61
 
62
+ STAGGER_MIN="${DOWNLOAD_START_STAGGER_MIN:-1}"
63
+ STAGGER_MAX="${DOWNLOAD_START_STAGGER_MAX:-3}"
64
+ if [[ "$STAGGER_MIN" =~ ^[0-9]+$ && "$STAGGER_MAX" =~ ^[0-9]+$ && "$STAGGER_MAX" -ge "$STAGGER_MIN" ]]; then
65
+ delay=$(( STAGGER_MIN + RANDOM % (STAGGER_MAX - STAGGER_MIN + 1) ))
66
+ sleep "$delay"
67
+ fi
68
+
69
  # shellcheck disable=SC1090
70
  source "$CONDA_SH"
71
  cmd=(python "$PIPELINE01"
slurm/submit_download_slurm.sh CHANGED
@@ -26,6 +26,7 @@ MEMORY="4G"
26
  LIMIT=""
27
  ARRAY_PARALLEL=""
28
  MAX_BACKLOG_VIDEOS="180"
 
29
  WORKERS="4"
30
  VIDEO_IDS=()
31
  FORCE_METADATA=0
@@ -53,6 +54,7 @@ Options:
53
  --limit N Only submit the first N pending, unclaimed videos this cycle
54
  --array-parallel N Add a %N cap to the array
55
  --max-backlog-videos N Max raw backlog + active download claims allowed. Default: 180
 
56
  --workers N Max download tasks to submit in one cycle. Default: 4
57
  --claim-dir DIR Download claim directory
58
  --csv-lock-path PATH CSV lock path
@@ -82,6 +84,7 @@ while [[ $# -gt 0 ]]; do
82
  --array-parallel) ARRAY_PARALLEL="$2"; shift 2 ;;
83
  --max-backlog-videos) MAX_BACKLOG_VIDEOS="$2"; shift 2 ;;
84
  --workers) WORKERS="$2"; shift 2 ;;
 
85
  --claim-dir) DOWNLOAD_CLAIM_DIR="$2"; shift 2 ;;
86
  --csv-lock-path) DOWNLOAD_CSV_LOCK_PATH="$2"; shift 2 ;;
87
  --video-ids)
@@ -117,7 +120,7 @@ ACTIVE_JOBS_FILE="$STATE_DIR/active_download_jobs_${TIMESTAMP}.txt"
117
 
118
  squeue -h -u "$USER" -o "%A" | sed 's/_.*//' | sort -u > "$ACTIVE_JOBS_FILE"
119
 
120
- SELECTED_COUNT="$(python - "$SOURCE_METADATA_CSV" "$OUTPUT_METADATA_CSV" "$RAW_VIDEO_DIR" "$DOWNLOAD_CLAIM_DIR" "$ACTIVE_JOBS_FILE" "$MAX_BACKLOG_VIDEOS" "$LIMIT" "$WORKERS" "$BASE_MANIFEST" "${VIDEO_IDS[*]:-}" <<'PY'
121
  import csv
122
  import sys
123
  from pathlib import Path
@@ -128,10 +131,11 @@ raw_video_dir = Path(sys.argv[3])
128
  claim_dir = Path(sys.argv[4])
129
  active_jobs_path = Path(sys.argv[5])
130
  max_backlog = int(sys.argv[6])
131
- limit_arg = sys.argv[7]
132
- workers = int(sys.argv[8])
133
- manifest_path = Path(sys.argv[9])
134
- video_ids_joined = sys.argv[10].strip()
 
135
  limit = int(limit_arg) if limit_arg else None
136
  video_filter = set(video_ids_joined.split()) if video_ids_joined else None
137
 
@@ -181,6 +185,7 @@ if raw_video_dir.exists():
181
  existing_raw.add(path.stem)
182
 
183
  remaining_slots = max(0, max_backlog - raw_backlog - len(active_claims))
 
184
  remaining_slots = min(remaining_slots, workers)
185
  if limit is not None:
186
  remaining_slots = min(remaining_slots, limit)
@@ -243,7 +248,7 @@ cmd=(sbatch
243
  --array "$ARRAY_SPEC"
244
  --output "$LOG_DIR/download_%A_%a.out"
245
  --error "$LOG_DIR/download_%A_%a.err"
246
- --export "ALL,ROOT_DIR=$ROOT_DIR,RUNTIME_ROOT=$RUNTIME_ROOT,STATE_ROOT=$STATE_ROOT,CONDA_SH=/home/sf895/miniconda3/etc/profile.d/conda.sh,CONDA_ENV=signx2,SOURCE_METADATA_CSV=$SOURCE_METADATA_CSV,OUTPUT_METADATA_CSV=$OUTPUT_METADATA_CSV,RAW_VIDEO_DIR=$RAW_VIDEO_DIR,RAW_CAPTION_DIR=$RAW_CAPTION_DIR,RAW_METADATA_DIR=$RAW_METADATA_DIR,DATASET_DIR=$DATASET_DIR,STATS_NPZ=$STATS_NPZ,PIPELINE01=$ROOT_DIR/scripts/pipeline01_download_video_fix_caption.py,DOWNLOAD_CLAIM_DIR=$DOWNLOAD_CLAIM_DIR,DOWNLOAD_CSV_LOCK_PATH=$DOWNLOAD_CSV_LOCK_PATH,MANIFEST=$BASE_MANIFEST,FORCE_METADATA=$FORCE_METADATA,FORCE_SUBTITLES=$FORCE_SUBTITLES,FORCE_DOWNLOAD=$FORCE_DOWNLOAD,SKIP_VIDEO_DOWNLOAD=$SKIP_VIDEO_DOWNLOAD,SKIP_SUBTITLES=$SKIP_SUBTITLES,COOKIES_FILE=$COOKIES_FILE,COOKIES_FROM_BROWSER=$COOKIES_FROM_BROWSER,EXTRACTOR_ARGS=$EXTRACTOR_ARGS"
247
  )
248
  if [[ -n "$ACCOUNT" ]]; then
249
  cmd+=(--account "$ACCOUNT")
 
26
  LIMIT=""
27
  ARRAY_PARALLEL=""
28
  MAX_BACKLOG_VIDEOS="180"
29
+ MAX_ACTIVE_DOWNLOADS="30"
30
  WORKERS="4"
31
  VIDEO_IDS=()
32
  FORCE_METADATA=0
 
54
  --limit N Only submit the first N pending, unclaimed videos this cycle
55
  --array-parallel N Add a %N cap to the array
56
  --max-backlog-videos N Max raw backlog + active download claims allowed. Default: 180
57
+ --max-active-downloads N Max active download claims allowed at once. Default: 30
58
  --workers N Max download tasks to submit in one cycle. Default: 4
59
  --claim-dir DIR Download claim directory
60
  --csv-lock-path PATH CSV lock path
 
84
  --array-parallel) ARRAY_PARALLEL="$2"; shift 2 ;;
85
  --max-backlog-videos) MAX_BACKLOG_VIDEOS="$2"; shift 2 ;;
86
  --workers) WORKERS="$2"; shift 2 ;;
87
+ --max-active-downloads) MAX_ACTIVE_DOWNLOADS="$2"; shift 2 ;;
88
  --claim-dir) DOWNLOAD_CLAIM_DIR="$2"; shift 2 ;;
89
  --csv-lock-path) DOWNLOAD_CSV_LOCK_PATH="$2"; shift 2 ;;
90
  --video-ids)
 
120
 
121
  squeue -h -u "$USER" -o "%A" | sed 's/_.*//' | sort -u > "$ACTIVE_JOBS_FILE"
122
 
123
+ SELECTED_COUNT="$(python - "$SOURCE_METADATA_CSV" "$OUTPUT_METADATA_CSV" "$RAW_VIDEO_DIR" "$DOWNLOAD_CLAIM_DIR" "$ACTIVE_JOBS_FILE" "$MAX_BACKLOG_VIDEOS" "$MAX_ACTIVE_DOWNLOADS" "$LIMIT" "$WORKERS" "$BASE_MANIFEST" "${VIDEO_IDS[*]:-}" <<'PY'
124
  import csv
125
  import sys
126
  from pathlib import Path
 
131
  claim_dir = Path(sys.argv[4])
132
  active_jobs_path = Path(sys.argv[5])
133
  max_backlog = int(sys.argv[6])
134
+ max_active_downloads = int(sys.argv[7])
135
+ limit_arg = sys.argv[8]
136
+ workers = int(sys.argv[9])
137
+ manifest_path = Path(sys.argv[10])
138
+ video_ids_joined = sys.argv[11].strip()
139
  limit = int(limit_arg) if limit_arg else None
140
  video_filter = set(video_ids_joined.split()) if video_ids_joined else None
141
 
 
185
  existing_raw.add(path.stem)
186
 
187
  remaining_slots = max(0, max_backlog - raw_backlog - len(active_claims))
188
+ remaining_slots = min(remaining_slots, max(0, max_active_downloads - len(active_claims)))
189
  remaining_slots = min(remaining_slots, workers)
190
  if limit is not None:
191
  remaining_slots = min(remaining_slots, limit)
 
248
  --array "$ARRAY_SPEC"
249
  --output "$LOG_DIR/download_%A_%a.out"
250
  --error "$LOG_DIR/download_%A_%a.err"
251
+ --export "ALL,ROOT_DIR=$ROOT_DIR,RUNTIME_ROOT=$RUNTIME_ROOT,STATE_ROOT=$STATE_ROOT,CONDA_SH=/home/sf895/miniconda3/etc/profile.d/conda.sh,CONDA_ENV=signx2,SOURCE_METADATA_CSV=$SOURCE_METADATA_CSV,OUTPUT_METADATA_CSV=$OUTPUT_METADATA_CSV,RAW_VIDEO_DIR=$RAW_VIDEO_DIR,RAW_CAPTION_DIR=$RAW_CAPTION_DIR,RAW_METADATA_DIR=$RAW_METADATA_DIR,DATASET_DIR=$DATASET_DIR,STATS_NPZ=$STATS_NPZ,PIPELINE01=$ROOT_DIR/scripts/pipeline01_download_video_fix_caption.py,DOWNLOAD_CLAIM_DIR=$DOWNLOAD_CLAIM_DIR,DOWNLOAD_CSV_LOCK_PATH=$DOWNLOAD_CSV_LOCK_PATH,MANIFEST=$BASE_MANIFEST,FORCE_METADATA=$FORCE_METADATA,FORCE_SUBTITLES=$FORCE_SUBTITLES,FORCE_DOWNLOAD=$FORCE_DOWNLOAD,SKIP_VIDEO_DOWNLOAD=$SKIP_VIDEO_DOWNLOAD,SKIP_SUBTITLES=$SKIP_SUBTITLES,COOKIES_FILE=$COOKIES_FILE,COOKIES_FROM_BROWSER=$COOKIES_FROM_BROWSER,EXTRACTOR_ARGS=$EXTRACTOR_ARGS,DOWNLOAD_START_STAGGER_MIN=${DOWNLOAD_START_STAGGER_MIN:-1},DOWNLOAD_START_STAGGER_MAX=${DOWNLOAD_START_STAGGER_MAX:-3}"
252
  )
253
  if [[ -n "$ACCOUNT" ]]; then
254
  cmd+=(--account "$ACCOUNT")