Skip to content

Commit

Permalink
fix(api): use Torch JIT and fallback loading
Browse files Browse the repository at this point in the history
  • Loading branch information
ssube committed Mar 19, 2023
1 parent b797b3d commit 0762269
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions api/onnx_web/convert/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,6 @@ def load_torch(name: str, map_location=None) -> Optional[Dict]:


def load_tensor(name: str, map_location=None) -> Optional[Dict]:
if not path.exists(name):
logger.warning("tensor does not exist: %s", name)
return None

logger.debug("loading tensor: %s", name)
_, extension = path.splitext(name)
extension = extension[1:].lower()
Expand All @@ -239,13 +235,13 @@ def load_tensor(name: str, map_location=None) -> Optional[Dict]:
checkpoint = safetensors.torch.load_file(name, device="cpu")
elif extension in ["bin", "ckpt", "pt"]:
logger.debug("loading pickle tensor")
checkpoint = torch.load(name, map_location=map_location)
checkpoint = load_torch(name, map_location=map_location)
elif extension in ["onnx", "pt"]:
logger.warning("tensor has ONNX extension, falling back to PyTorch: %s", extension)
checkpoint = torch.load(name, map_location=map_location)
checkpoint = load_torch(name, map_location=map_location)
else:
logger.warning("unknown tensor type, falling back to PyTorch: %s", extension)
checkpoint = torch.load(name, map_location=map_location)
checkpoint = load_torch(name, map_location=map_location)

if "state_dict" in checkpoint:
checkpoint = checkpoint["state_dict"]
Expand Down

0 comments on commit 0762269

Please sign in to comment.