diff --git a/data/testing_data/impulses/create_impulses.py b/data/testing_data/impulses/create_impulses.py index e94c642..311627a 100644 --- a/data/testing_data/impulses/create_impulses.py +++ b/data/testing_data/impulses/create_impulses.py @@ -3,7 +3,7 @@ import numpy as np from pydub import AudioSegment from pydub.generators import Sine -from wam import IMPULSE_DIR, CODA_DIR +from wham import IMPULSE_DIR, CODA_DIR MIN_NUM_CLICKS = 4 MAX_NUM_CLICKS = 8 diff --git a/wham/embedding/__init__.py b/wham/embedding/__init__.py index e757674..1422f39 100644 --- a/wham/embedding/__init__.py +++ b/wham/embedding/__init__.py @@ -1,4 +1,4 @@ -from wam import VAMPNET_DIR +from wham import VAMPNET_DIR from pathlib import Path VAMPNET_MDL_PATH = VAMPNET_DIR / "models" diff --git a/wham/embedding/generate_embeddings.py b/wham/embedding/generate_embeddings.py index ae4d32e..47d3536 100644 --- a/wham/embedding/generate_embeddings.py +++ b/wham/embedding/generate_embeddings.py @@ -1,8 +1,9 @@ from collections import Counter from pathlib import Path import pandas as pd -from wam import VAMPNET_DIR, EMBEDDING_PLOTS_DIR, SNIPPETS_DIR, DENOISED_DATA_DIR, CSV_PATH -from wam.utils import pathify +from codatools.codatools import SNIPPETS_DIR +from wham import VAMPNET_DIR, EMBEDDING_PLOTS_DIR, DENOISED_DATA_DIR, CSV_PATH +from wham.utils import pathify import argparse import logging from shutil import rmtree diff --git a/wham/embedding/models.py b/wham/embedding/models.py index 1e8011d..a911c8d 100644 --- a/wham/embedding/models.py +++ b/wham/embedding/models.py @@ -9,7 +9,7 @@ from preprocessing import preprocess_audio from audiotools import AudioSignal from vampnet.interface import Interface -from wam import VAMPNET_DIR +from wham import VAMPNET_DIR import wandb from pathlib import Path diff --git a/wham/generation/eval/calculate_custom_fad.py b/wham/generation/eval/calculate_custom_fad.py index 9c8c0b9..6e3ba95 100644 --- a/wham/generation/eval/calculate_custom_fad.py +++ b/wham/generation/eval/calculate_custom_fad.py @@ -1,7 +1,7 @@ import os import numpy as np from scipy.linalg import sqrtm -from wam import CODA_EMBEDDING_DIR, EVALUATE_EMBEDDING_DIR +from wham import CODA_EMBEDDING_DIR, EVALUATE_EMBEDDING_DIR import argparse """ diff --git a/wham/generation/eval/mse_error_by_freq.py b/wham/generation/eval/mse_error_by_freq.py index 0f2ecb6..dd99508 100644 --- a/wham/generation/eval/mse_error_by_freq.py +++ b/wham/generation/eval/mse_error_by_freq.py @@ -5,7 +5,7 @@ import scipy.signal as signal from collections import defaultdict -from wam import CODA_DIR, REGEN_CODA_DIR +from wham import CODA_DIR, REGEN_CODA_DIR TARGET_SAMPLERATE = 44100 diff --git a/wham/generation/generate_output_snippets.py b/wham/generation/generate_output_snippets.py index f54a98f..f2266d0 100644 --- a/wham/generation/generate_output_snippets.py +++ b/wham/generation/generate_output_snippets.py @@ -11,10 +11,10 @@ from vampnet.interface import Interface from vampnet import mask as pmask from prompt_configs import CONFIGS -from wam.utils import move_wav_files +from wham.utils import move_wav_files import torch -from wam import GENERATED_MARINE_PATH, GENERATED_MARINE_PATH_TEMP, MARINE_TEST_DIR, VAMPNET_DIR +from wham import GENERATED_MARINE_PATH, GENERATED_MARINE_PATH_TEMP, MARINE_TEST_DIR, VAMPNET_DIR import os diff --git a/wham/generation/tokenizer_only_generation.py b/wham/generation/tokenizer_only_generation.py index 8486f25..5cd9b37 100644 --- a/wham/generation/tokenizer_only_generation.py +++ b/wham/generation/tokenizer_only_generation.py @@ -13,9 +13,9 @@ from vampnet.interface import Interface from vampnet import mask as pmask from prompt_configs import CONFIGS -from wam.utils import move_wav_files +from wham.utils import move_wav_files -from wam import GENERATED_MARINE_PATH_TEMP, MARINE_TEST_DIR, VAMPNET_DIR, REGEN_CODA_DIR +from wham import GENERATED_MARINE_PATH_TEMP, MARINE_TEST_DIR, VAMPNET_DIR, REGEN_CODA_DIR import os