More robust with tied weight keys (#41)

- More robust with tied weight keys (843addb2c0b07af224d9a3a98fef76059d40ebef)
- Update convert.py (5c59f9a20bf82e23b6d7fe8a772c85e218b9563b)
- Update convert.py (385ed6892301c6c3ec71498dbedcce550dedd7a3)


Co-authored-by: Cyril Vallez <cyrilvallez@users.noreply.huggingface.co>

convert.py

@@ -241,7 +241,7 @@ def previous_pr(api: "HfApi", model_id: str, pr_title: str, revision=Optional[st
 
 
 def convert_generic(
-    model_id: str, *, revision=Optional[str], folder: str, filenames: Set[str], token: Optional[str]
+    model_id: str, *, revision=Optional[str], folder: str, filenames: Set[str], token: Optional[str], discard_names: List[str],
 ) -> ConversionResult:
     operations = []
     errors = []
@@ -262,7 +262,7 @@ def convert_generic(
                 sf_in_repo = f"{prefix}.safetensors"
             sf_filename = os.path.join(folder, sf_in_repo)
             try:
-                convert_file(pt_filename, sf_filename, discard_names=[])
+                convert_file(pt_filename, sf_filename, discard_names=discard_names)
                 operations.append(CommitOperationAdd(path_in_repo=sf_in_repo, path_or_fileobj=sf_filename))
             except Exception as e:
                 errors.append((pt_filename, e))
@@ -280,11 +280,13 @@ def convert(
         folder = os.path.join(d, repo_folder_name(repo_id=model_id, repo_type="models"))
         os.makedirs(folder)
         new_pr = None
+        # Exception handling already happen inside this function
+        discard_names = get_discard_names(model_id, revision=revision, folder=folder, token=api.token)
         try:
             operations = None
             pr = previous_pr(api, model_id, pr_title, revision=revision)
-
             library_name = getattr(info, "library_name", None)
+
             if any(filename.endswith(".safetensors") for filename in filenames) and not force:
                 raise AlreadyExists(f"Model {model_id} is already converted, skipping..")
             elif pr is not None and not force:
@@ -293,7 +295,6 @@ def convert(
                 raise AlreadyExists(f"Model {model_id} already has an open PR check out {url}")
             elif library_name == "transformers":
 
-                discard_names = get_discard_names(model_id, revision=revision, folder=folder, token=api.token)
                 if "pytorch_model.bin" in filenames:
                     operations, errors = convert_single(
                         model_id, revision=revision, folder=folder, token=api.token, discard_names=discard_names
@@ -306,7 +307,7 @@ def convert(
                     raise RuntimeError(f"Model {model_id} doesn't seem to be a valid pytorch model. Cannot convert")
             else:
                 operations, errors = convert_generic(
-                    model_id, revision=revision, folder=folder, filenames=filenames, token=api.token
+                    model_id, revision=revision, folder=folder, filenames=filenames, token=api.token, discard_names=discard_names
                 )
 
             if operations: