Update app.py
Browse files
app.py
CHANGED
|
@@ -48,18 +48,25 @@ try:
|
|
| 48 |
if 'sess_options' not in kwargs and 'so' not in kwargs:
|
| 49 |
try:
|
| 50 |
so = _ort.SessionOptions()
|
| 51 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 52 |
so.inter_op_num_threads = 1
|
|
|
|
| 53 |
so.enable_cpu_mem_arena = False
|
| 54 |
so.enable_mem_pattern = False
|
| 55 |
-
so.graph_optimization_level = _ort.GraphOptimizationLevel.
|
| 56 |
kwargs['sess_options'] = so
|
| 57 |
except Exception:
|
| 58 |
pass
|
| 59 |
return _orig_session_init(self, *args, **kwargs)
|
| 60 |
|
| 61 |
_ort.InferenceSession.__init__ = _patched_session_init
|
| 62 |
-
print("ONNX Runtime patched: arena=OFF, mem_pattern=OFF, threads=
|
| 63 |
except Exception as e:
|
| 64 |
print(f"Could not patch ONNX Runtime: {e}")
|
| 65 |
|
|
@@ -295,7 +302,7 @@ class ModelManager:
|
|
| 295 |
MODEL_MEMORY_ESTIMATES_MB = {
|
| 296 |
'u2netp': 700, 'silueta': 900, 'isnet-general-use': 1800,
|
| 297 |
'isnet-anime': 1500, 'u2net_human_seg': 1600,
|
| 298 |
-
'birefnet-general-lite':
|
| 299 |
}
|
| 300 |
|
| 301 |
def __init__(self, max_models: int = 2):
|
|
@@ -308,8 +315,8 @@ class ModelManager:
|
|
| 308 |
# Silueta is the small, dedicated video fallback. u2netp is evictable.
|
| 309 |
self.protected = {'silueta'}
|
| 310 |
self.lock = threading.RLock()
|
| 311 |
-
self.memory_budget_mb = max(2048, int(os.environ.get('REMOVA_MEMORY_BUDGET_MB', '
|
| 312 |
-
self.load_headroom_mb = max(
|
| 313 |
|
| 314 |
def _effective_budget_mb(self):
|
| 315 |
limit = get_container_limit_mb()
|
|
@@ -586,7 +593,9 @@ os.makedirs("/tmp/u2net_models", exist_ok=True)
|
|
| 586 |
cpu_executor = ThreadPoolExecutor(max_workers=1) # one CPU inference job at a time
|
| 587 |
content_classifier = ContentClassifier()
|
| 588 |
resolution_manager = ResolutionManager()
|
| 589 |
-
|
|
|
|
|
|
|
| 590 |
mask_checker = MaskQualityChecker()
|
| 591 |
hair_refiner = HairRefiner()
|
| 592 |
|
|
@@ -960,8 +969,16 @@ def _load_session(name: str):
|
|
| 960 |
if resolved not in VALID_REMBG_MODELS:
|
| 961 |
logger.warning(f"'{resolved}' dormant/invalid. Using isnet-general-use.")
|
| 962 |
resolved = 'isnet-general-use'
|
| 963 |
-
|
| 964 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 965 |
|
| 966 |
|
| 967 |
def _alpha_stats(image):
|
|
@@ -1608,6 +1625,10 @@ def process_image_sync(image_data, model_name=None, transparent=True,
|
|
| 1608 |
route_analysis = analyze_image_complexity(image)
|
| 1609 |
router_enabled = True
|
| 1610 |
selected = route_analysis['processor']
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1611 |
cc_category = route_analysis.get('cc_category', 'general_photo')
|
| 1612 |
cc_confidence = route_analysis.get('cc_confidence', 0.7)
|
| 1613 |
target_res = min(resolution_manager.get_resolution(cc_category, image.size),
|
|
|
|
| 48 |
if 'sess_options' not in kwargs and 'so' not in kwargs:
|
| 49 |
try:
|
| 50 |
so = _ort.SessionOptions()
|
| 51 |
+
# Keep CPU session construction predictable on small Spaces.
|
| 52 |
+
# ORT_ENABLE_ALL can create very large temporary allocations
|
| 53 |
+
# while optimizing BiRefNet's graph. BASIC keeps safe constant
|
| 54 |
+
# folding/basic rewrites without the expensive extended/layout
|
| 55 |
+
# optimizer passes. Sequential execution also avoids parallel
|
| 56 |
+
# graph workspaces multiplying the peak RSS.
|
| 57 |
+
so.intra_op_num_threads = 1
|
| 58 |
so.inter_op_num_threads = 1
|
| 59 |
+
so.execution_mode = _ort.ExecutionMode.ORT_SEQUENTIAL
|
| 60 |
so.enable_cpu_mem_arena = False
|
| 61 |
so.enable_mem_pattern = False
|
| 62 |
+
so.graph_optimization_level = _ort.GraphOptimizationLevel.ORT_ENABLE_BASIC
|
| 63 |
kwargs['sess_options'] = so
|
| 64 |
except Exception:
|
| 65 |
pass
|
| 66 |
return _orig_session_init(self, *args, **kwargs)
|
| 67 |
|
| 68 |
_ort.InferenceSession.__init__ = _patched_session_init
|
| 69 |
+
print("ONNX Runtime patched: BASIC graph opt, sequential, arena=OFF, mem_pattern=OFF, threads=1/1")
|
| 70 |
except Exception as e:
|
| 71 |
print(f"Could not patch ONNX Runtime: {e}")
|
| 72 |
|
|
|
|
| 302 |
MODEL_MEMORY_ESTIMATES_MB = {
|
| 303 |
'u2netp': 700, 'silueta': 900, 'isnet-general-use': 1800,
|
| 304 |
'isnet-anime': 1500, 'u2net_human_seg': 1600,
|
| 305 |
+
'birefnet-general-lite': 5200,
|
| 306 |
}
|
| 307 |
|
| 308 |
def __init__(self, max_models: int = 2):
|
|
|
|
| 315 |
# Silueta is the small, dedicated video fallback. u2netp is evictable.
|
| 316 |
self.protected = {'silueta'}
|
| 317 |
self.lock = threading.RLock()
|
| 318 |
+
self.memory_budget_mb = max(2048, int(os.environ.get('REMOVA_MEMORY_BUDGET_MB', '9216')))
|
| 319 |
+
self.load_headroom_mb = max(512, int(os.environ.get('REMOVA_MODEL_LOAD_HEADROOM_MB', '768')))
|
| 320 |
|
| 321 |
def _effective_budget_mb(self):
|
| 322 |
limit = get_container_limit_mb()
|
|
|
|
| 593 |
cpu_executor = ThreadPoolExecutor(max_workers=1) # one CPU inference job at a time
|
| 594 |
content_classifier = ContentClassifier()
|
| 595 |
resolution_manager = ResolutionManager()
|
| 596 |
+
# Keep the dedicated video Silueta plus only ONE interchangeable image model.
|
| 597 |
+
# This prevents U2NetP/ISNet/BiRefNet sessions accumulating together.
|
| 598 |
+
model_manager = ModelManager(max_models=2)
|
| 599 |
mask_checker = MaskQualityChecker()
|
| 600 |
hair_refiner = HairRefiner()
|
| 601 |
|
|
|
|
| 969 |
if resolved not in VALID_REMBG_MODELS:
|
| 970 |
logger.warning(f"'{resolved}' dormant/invalid. Using isnet-general-use.")
|
| 971 |
resolved = 'isnet-general-use'
|
| 972 |
+
before_mb = get_process_rss_mb()
|
| 973 |
+
logger.info('[model-load] begin model=%s rss=%.0fMB budget=%.0fMB loaded=%s',
|
| 974 |
+
resolved, before_mb, model_manager._effective_budget_mb(),
|
| 975 |
+
list(model_manager.models.keys()) if 'model_manager' in globals() else [])
|
| 976 |
+
started = time.time()
|
| 977 |
+
session = new_session(resolved)
|
| 978 |
+
after_mb = get_process_rss_mb()
|
| 979 |
+
logger.info('[model-load] complete model=%s elapsed=%.1fs rss=%.0f->%.0fMB delta=%.0fMB',
|
| 980 |
+
resolved, time.time()-started, before_mb, after_mb, after_mb-before_mb)
|
| 981 |
+
return session
|
| 982 |
|
| 983 |
|
| 984 |
def _alpha_stats(image):
|
|
|
|
| 1625 |
route_analysis = analyze_image_complexity(image)
|
| 1626 |
router_enabled = True
|
| 1627 |
selected = route_analysis['processor']
|
| 1628 |
+
logger.info('[REQ %s] complexity route=%s category=%s score=%s reason=%s availability=%s',
|
| 1629 |
+
req, selected, route_analysis.get('category'),
|
| 1630 |
+
route_analysis.get('score'), route_analysis.get('reason'),
|
| 1631 |
+
route_analysis.get('available'))
|
| 1632 |
cc_category = route_analysis.get('cc_category', 'general_photo')
|
| 1633 |
cc_confidence = route_analysis.get('cc_confidence', 0.7)
|
| 1634 |
target_res = min(resolution_manager.get_resolution(cc_category, image.size),
|