Merge branch 'master' into release/1.25

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

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

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