Skip to content

Fix TorchScript model loading and temp directory creation #772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rwfraser wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix TorchScript model loading and temp directory creation #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion audio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def _linear_to_mel(spectogram):

def _build_mel_basis():
assert hp.fmax <= hp.sample_rate // 2
return librosa.filters.mel(hp.sample_rate, hp.n_fft, n_mels=hp.num_mels,
return librosa.filters.mel(sr=hp.sample_rate, n_fft=hp.n_fft, n_mels=hp.num_mels,
fmin=hp.fmin, fmax=hp.fmax)

def _amp_to_db(x):
Expand Down
27 changes: 19 additions & 8 deletions inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,21 +159,29 @@ def datagen(frames, mels):

def _load(checkpoint_path):
if device == 'cuda':
checkpoint = torch.load(checkpoint_path)
checkpoint = torch.load(checkpoint_path, weights_only=False)
else:
checkpoint = torch.load(checkpoint_path,
map_location=lambda storage, loc: storage)
map_location='cpu',
weights_only=False)
return checkpoint

def load_model(path):
model = Wav2Lip()
print("Load checkpoint from: {}".format(path))
checkpoint = _load(path)
s = checkpoint["state_dict"]
new_s = {}
for k, v in s.items():
new_s[k.replace('module.', '')] = v
model.load_state_dict(new_s)

# Check if it's a TorchScript model
if isinstance(checkpoint, torch.jit.ScriptModule):
print("Detected TorchScript model, loading directly...")
model = checkpoint
else:
# Regular checkpoint with state_dict
model = Wav2Lip()
s = checkpoint["state_dict"]
new_s = {}
for k, v in s.items():
new_s[k.replace('module.', '')] = v
model.load_state_dict(new_s)

model = model.to(device)
return model.eval()
Expand Down Expand Up @@ -252,6 +260,9 @@ def main():
model = load_model(args.checkpoint_path)
print ("Model loaded")

# Ensure temp directory exists
os.makedirs('temp', exist_ok=True)

frame_h, frame_w = full_frames[0].shape[:-1]
out = cv2.VideoWriter('temp/result.avi',
cv2.VideoWriter_fourcc(*'DIVX'), fps, (frame_w, frame_h))
Expand Down