Skip to content

Fix three failures when exporting on Windows #702

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
svaningelgem wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix three failures when exporting on Windows #702

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
8 changes: 5 additions & 3 deletions DeepFilterNet/df/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,14 @@ def resample(audio: Tensor, orig_sr: int, new_sr: int, method="sinc_fast"):

def get_test_sample(sr: int = 48000) -> Tensor:
dir = get_git_root()
file_path = os.path.join("assets", "clean_freesound_33711.wav")
rel_path = ("assets", "clean_freesound_33711.wav")
if dir is None:
url = "https://github.com/Rikorose/DeepFilterNet/raw/main/" + file_path
# Join with "/" rather than os.path.join: on Windows the latter yields
# ".../raw/main/assets\clean_freesound_33711.wav", which 404s.
url = "https://github.com/Rikorose/DeepFilterNet/raw/main/" + "/".join(rel_path)
save_dir = get_cache_dir()
path = download_file(url, save_dir)
else:
path = os.path.join(dir, file_path)
path = os.path.join(dir, *rel_path)
sample, _ = load_audio(path, sr=sr)
return sample
12 changes: 7 additions & 5 deletions DeepFilterNet/df/scripts/export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,11 +330,13 @@ def main(args):
f.write(f"{model_name}_epoch_{epoch}")
tar_name = export_dir / (Path(model_base_dir).name + "_onnx.tar.gz")
with tarfile.open(tar_name, mode="w:gz") as f:
f.add(os.path.join(args.export_dir, "enc.onnx"))
f.add(os.path.join(args.export_dir, "erb_dec.onnx"))
f.add(os.path.join(args.export_dir, "df_dec.onnx"))
f.add(os.path.join(args.export_dir, "config.ini"))
f.add(os.path.join(args.export_dir, "version.txt"))
for name in ("enc.onnx", "erb_dec.onnx", "df_dec.onnx", "config.ini", "version.txt"):
# arcname, so the archive holds bare filenames. Without it every
# entry carries the exporter's own export_dir — "tmp/foo/enc.onnx",
# or on Windows "Users/<name>/AppData/Local/Temp/.../enc.onnx" —
# which recreates that tree on extraction and puts the builder's
# username in the released artefact.
f.add(os.path.join(args.export_dir, name), arcname=name)


if __name__ == "__main__":
Expand Down
4 changes: 4 additions & 0 deletions DeepFilterNet/df/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,10 @@ def download_file(url: str, download_dir: str, extract: bool = False):
import requests

local_filename = url.split("/")[-1]
# get_cache_dir() names a directory but does not create it, so on a machine
# that has not downloaded anything before, the open() below raises
# FileNotFoundError instead of downloading.
os.makedirs(download_dir, exist_ok=True)
local_filename = os.path.join(download_dir, local_filename)
with requests.get(url, stream=True) as r:
if r.status_code >= 400:
Expand Down