Commit ยท
7491d57
1
Parent(s): 2626da0
fix: resolve generation timeout on HuggingFace (2 vCPU environment)
Browse filesRoot causes:
1. num_search_workers=2 competed with 2 gunicorn workers for 2 vCPUs,
causing OR-Tools to run much slower than the 25s timeout allowed.
Changed to num_search_workers=1 (both phase 1 and phase 2).
2. Google Fonts stylesheet link was render-blocking, delaying the
waiting page JS startup and eating into the client-side timer.
Changed to rel="preload" onload pattern for non-blocking load.
3. TIMEOUT_SEC 90โ150 to give more buffer for CPU-constrained envs.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- optimizer/solver.py +2 -2
- templates/base.html +7 -2
- templates/generate/waiting.html +1 -1
optimizer/solver.py
CHANGED
|
@@ -484,7 +484,7 @@ def solve(
|
|
| 484 |
# โโ ๆฑ่งฃ โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
|
| 485 |
solver = cp_model.CpSolver()
|
| 486 |
solver.parameters.max_time_in_seconds = 25.0
|
| 487 |
-
solver.parameters.num_search_workers =
|
| 488 |
solver.parameters.log_search_progress = False
|
| 489 |
logger.info(f" [CP-SAT ๆฑ่งฃ้ๅง] max_time={solver.parameters.max_time_in_seconds}s "
|
| 490 |
f"workers={solver.parameters.num_search_workers}")
|
|
@@ -723,7 +723,7 @@ def _solve_best_effort(
|
|
| 723 |
|
| 724 |
solver = cp_model.CpSolver()
|
| 725 |
solver.parameters.max_time_in_seconds = 15.0
|
| 726 |
-
solver.parameters.num_search_workers =
|
| 727 |
solver.parameters.log_search_progress = False
|
| 728 |
logger.info(f" [ใใงใผใบ2 CP-SAT ๆฑ่งฃ้ๅง] max_time={solver.parameters.max_time_in_seconds}s")
|
| 729 |
status = solver.solve(model)
|
|
|
|
| 484 |
# โโ ๆฑ่งฃ โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
|
| 485 |
solver = cp_model.CpSolver()
|
| 486 |
solver.parameters.max_time_in_seconds = 25.0
|
| 487 |
+
solver.parameters.num_search_workers = 1
|
| 488 |
solver.parameters.log_search_progress = False
|
| 489 |
logger.info(f" [CP-SAT ๆฑ่งฃ้ๅง] max_time={solver.parameters.max_time_in_seconds}s "
|
| 490 |
f"workers={solver.parameters.num_search_workers}")
|
|
|
|
| 723 |
|
| 724 |
solver = cp_model.CpSolver()
|
| 725 |
solver.parameters.max_time_in_seconds = 15.0
|
| 726 |
+
solver.parameters.num_search_workers = 1
|
| 727 |
solver.parameters.log_search_progress = False
|
| 728 |
logger.info(f" [ใใงใผใบ2 CP-SAT ๆฑ่งฃ้ๅง] max_time={solver.parameters.max_time_in_seconds}s")
|
| 729 |
status = solver.solve(model)
|
templates/base.html
CHANGED
|
@@ -12,10 +12,15 @@
|
|
| 12 |
<link rel="icon" type="image/png" sizes="32x32" href="/static/icons/favicon-32.png">
|
| 13 |
<link rel="icon" type="image/png" sizes="16x16" href="/static/icons/favicon-16.png">
|
| 14 |
<link rel="apple-touch-icon" href="/static/icons/apple-touch-icon.png">
|
| 15 |
-
<!-- Noto Sans JP -->
|
| 16 |
<link rel="preconnect" href="https://fonts.googleapis.com">
|
| 17 |
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
| 18 |
-
<link
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 19 |
<title>{% block title %}SDU-Shift{% endblock %}</title>
|
| 20 |
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css">
|
| 21 |
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.css">
|
|
|
|
| 12 |
<link rel="icon" type="image/png" sizes="32x32" href="/static/icons/favicon-32.png">
|
| 13 |
<link rel="icon" type="image/png" sizes="16x16" href="/static/icons/favicon-16.png">
|
| 14 |
<link rel="apple-touch-icon" href="/static/icons/apple-touch-icon.png">
|
| 15 |
+
<!-- Noto Sans JP (ใใณใใญใใญใณใฐ่ชญใฟ่พผใฟ) -->
|
| 16 |
<link rel="preconnect" href="https://fonts.googleapis.com">
|
| 17 |
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
| 18 |
+
<link rel="preload" as="style"
|
| 19 |
+
href="https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@400;500;600;700&display=swap"
|
| 20 |
+
onload="this.rel='stylesheet'">
|
| 21 |
+
<noscript>
|
| 22 |
+
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@400;500;600;700&display=swap" rel="stylesheet">
|
| 23 |
+
</noscript>
|
| 24 |
<title>{% block title %}SDU-Shift{% endblock %}</title>
|
| 25 |
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css">
|
| 26 |
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.css">
|
templates/generate/waiting.html
CHANGED
|
@@ -54,7 +54,7 @@
|
|
| 54 |
// โโ ๅฎๆฐ โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
|
| 55 |
const MAX_SEC_P1 = 25.0; // ใใงใผใบ1ใฎๆๅคง็งๆฐ
|
| 56 |
const MAX_SEC_P2 = 15.0; // ใใงใผใบ2ใฎๆๅคง็งๆฐ
|
| 57 |
-
const TIMEOUT_SEC =
|
| 58 |
const scheduleUrl = "{{ url_for('schedule.index', period_id=period.id) }}";
|
| 59 |
|
| 60 |
// โโ DOM โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
|
|
|
|
| 54 |
// โโ ๅฎๆฐ โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
|
| 55 |
const MAX_SEC_P1 = 25.0; // ใใงใผใบ1ใฎๆๅคง็งๆฐ
|
| 56 |
const MAX_SEC_P2 = 15.0; // ใใงใผใบ2ใฎๆๅคง็งๆฐ
|
| 57 |
+
const TIMEOUT_SEC = 150; // ใใใ่ถ
ใใใ็ฐๅธธใจใฟใชใ๏ผCPU็ซถๅ่ๆ
ฎใงไฝ่ฃใๆใใใ๏ผ
|
| 58 |
const scheduleUrl = "{{ url_for('schedule.index', period_id=period.id) }}";
|
| 59 |
|
| 60 |
// โโ DOM โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
|