Merge branch 'master' into msaroufim/fixk8deadlink

pytorch · Feb 27, 2023 · 15303a8 · 15303a8
2 parents 961ddf2 + b05c0ea
commit 15303a8
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/model-archiver/model_archiver/model_packaging_utils.py b/model-archiver/model_archiver/model_packaging_utils.py
@@ -2,6 +2,7 @@
 Helper utils for Model Export tool
 """
 
+import glob
 import logging
 import os
 import re
@@ -156,20 +157,20 @@ def copy_artifacts(model_name, **kwargs):
                         path = (path.split(":")[0] if ":" in path else path) + ".py"
 
                 if file_type == "extra_files":
-                    for file in path.split(","):
-                        file = file.strip()
-                        if os.path.isfile(file):
-                            shutil.copy2(file, model_path)
-                        elif os.path.isdir(file) and file != model_path:
-                            for item in os.listdir(file):
-                                src = os.path.join(file, item)
-                                dst = os.path.join(model_path, item)
-                                if os.path.isfile(src):
-                                    shutil.copy2(src, dst)
-                                elif os.path.isdir(src):
-                                    shutil.copytree(src, dst, False, None)
-                        else:
-                            raise ValueError(f"Invalid extra file given {file}")
+                    for path_or_wildcard in path.split(","):
+                        for file in glob.glob(path_or_wildcard.strip()):
+                            if os.path.isfile(file):
+                                shutil.copy2(file, model_path)
+                            elif os.path.isdir(file) and file != model_path:
+                                for item in os.listdir(file):
+                                    src = os.path.join(file, item)
+                                    dst = os.path.join(model_path, item)
+                                    if os.path.isfile(src):
+                                        shutil.copy2(src, dst)
+                                    elif os.path.isdir(src):
+                                        shutil.copytree(src, dst, False, None)
+                            else:
+                                raise ValueError(f"Invalid extra file given {file}")
                 else:
                     shutil.copy(path, model_path)