From c015a5da9a9934038c361048e02742bd4794ca9d Mon Sep 17 00:00:00 2001 From: tastelikefeet <58414341+tastelikefeet@users.noreply.github.com> Date: Tue, 8 Apr 2025 18:54:13 +0800 Subject: [PATCH 1/2] add more ignore patterns (#1303) --- modelscope/utils/hf_util/patcher.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/modelscope/utils/hf_util/patcher.py b/modelscope/utils/hf_util/patcher.py index 4980c323..c1b4f54f 100644 --- a/modelscope/utils/hf_util/patcher.py +++ b/modelscope/utils/hf_util/patcher.py @@ -16,8 +16,16 @@ from modelscope.utils.repo_utils import (CommitInfo, CommitOperation, CommitOperationAdd) ignore_file_pattern = [ - r'\w+\.bin', r'\w+\.safetensors', r'\w+\.pth', r'\w+\.pt', r'\w+\.h5', - r'\w+\.ckpt' + r'\w+\.bin', + r'\w+\.safetensors', + r'\w+\.pth', + r'\w+\.pt', + r'\w+\.h5', + r'\w+\.ckpt', + r'\w+\.zip', + r'\w+\.onnx', + r'\w+\.tar', + r'\w+\.gz', ] @@ -43,7 +51,7 @@ def get_all_imported_modules(): diffusers_include_names = [ '^(?!TF|Flax).*Pipeline$', '^(?!TF|Flax).*Autoencoder.*', '^(?!TF|Flax).*Model$', '^(?!TF|Flax).*Adapter$', 'ImageProjection', - '^(?!TF|Flax).*UNet$' + '^(?!TF|Flax).*UNet$', '^(?!TF|Flax).*Scheduler$' ] if importlib.util.find_spec('transformers') is not None: import transformers From d507271a4f81b131330f84eb083219f0ff34bd27 Mon Sep 17 00:00:00 2001 From: Jintao Date: Tue, 8 Apr 2025 23:25:19 +0800 Subject: [PATCH 2/2] better error raise (#1301) --- modelscope/models/cv/nerf_recon_acc/network/nerf.py | 2 ++ modelscope/utils/registry.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modelscope/models/cv/nerf_recon_acc/network/nerf.py b/modelscope/models/cv/nerf_recon_acc/network/nerf.py index 64ffae14..8bf711e8 100644 --- a/modelscope/models/cv/nerf_recon_acc/network/nerf.py +++ b/modelscope/models/cv/nerf_recon_acc/network/nerf.py @@ -198,6 +198,8 @@ class VolumeDensity(nn.Module): class VolumeRadiance(nn.Module): def __init__(self, config): + import tinycudann as tcnn + super(VolumeRadiance, self).__init__() self.config = config self.n_dir_dims = 3 diff --git a/modelscope/utils/registry.py b/modelscope/utils/registry.py index e6556d9c..ae81cfc4 100644 --- a/modelscope/utils/registry.py +++ b/modelscope/utils/registry.py @@ -211,4 +211,4 @@ def build_from_cfg(cfg, return obj_cls(**args) except Exception as e: # Normal TypeError does not print class name. - raise type(e)(f'{obj_cls.__name__}: {e}') + raise type(e)(f'{obj_cls.__name__}: {e}') from e