[Auto Sync] Update pynccl_wrapper.py, environ.py, registry.... (20251111) (#13097)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
This commit is contained in:
co-authored by
github-actions[bot]
gemini-code-assist[bot]
parent
e9c0c55833
commit
19f6a33ce9
@@ -75,6 +75,11 @@ class EnvField:
|
|||||||
return self.get()
|
return self.get()
|
||||||
|
|
||||||
|
|
||||||
|
class EnvTuple(EnvField):
|
||||||
|
def parse(self, value: str) -> tuple[str, ...]:
|
||||||
|
return tuple(s.strip() for s in value.split(",") if s.strip())
|
||||||
|
|
||||||
|
|
||||||
class EnvStr(EnvField):
|
class EnvStr(EnvField):
|
||||||
def parse(self, value: str) -> str:
|
def parse(self, value: str) -> str:
|
||||||
return value
|
return value
|
||||||
@@ -125,6 +130,7 @@ class Envs:
|
|||||||
|
|
||||||
# Model & File Download
|
# Model & File Download
|
||||||
SGLANG_USE_MODELSCOPE = EnvBool(False)
|
SGLANG_USE_MODELSCOPE = EnvBool(False)
|
||||||
|
SGLANG_DISABLED_MODEL_ARCHS = EnvTuple(tuple())
|
||||||
|
|
||||||
# Logging Options
|
# Logging Options
|
||||||
SGLANG_LOG_GC = EnvBool(False)
|
SGLANG_LOG_GC = EnvBool(False)
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ from typing import AbstractSet, Dict, List, Optional, Tuple, Type, Union
|
|||||||
|
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
|
|
||||||
|
from sglang.srt.environ import envs
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
@@ -91,6 +93,10 @@ def import_model_classes(package_name: str):
|
|||||||
package = importlib.import_module(package_name)
|
package = importlib.import_module(package_name)
|
||||||
for _, name, ispkg in pkgutil.iter_modules(package.__path__, package_name + "."):
|
for _, name, ispkg in pkgutil.iter_modules(package.__path__, package_name + "."):
|
||||||
if not ispkg:
|
if not ispkg:
|
||||||
|
if name.split(".")[-1] in envs.SGLANG_DISABLED_MODEL_ARCHS.get():
|
||||||
|
logger.debug(f"Skip loading {name} due to SGLANG_DISABLED_MODEL_ARCHS")
|
||||||
|
continue
|
||||||
|
|
||||||
try:
|
try:
|
||||||
module = importlib.import_module(name)
|
module = importlib.import_module(name)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
Reference in New Issue
Block a user