lionel/batdetect2
1
0
Fork 0
mirror of https://github.com/macaodha/batdetect2.git synced 2026-04-04 15:20:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create separate preproc/postproc/target instances for model in api

Browse Source
This commit is contained in:
Santiago Martinez Balvanera 2026-03-19 00:23:55 +00:00
parent fb3dc3eaf0
commit 32d8c4a9e5
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/batdetect2/api_v2.py
View File

@ -484,11 +484,19 @@ class BatDetect2API:
transform=output_transform, transform=output_transform,
) )
# NOTE: Build separate instances of preprocessor and postprocessor
# to avoid device mismatch errors
model = build_model( model = build_model(
config=config.model, config=config.model,
targets=targets, targets=build_targets(config=config.model.targets),
preprocessor=preprocessor, preprocessor=build_preprocessor(
postprocessor=postprocessor, input_samplerate=audio_loader.samplerate,
config=config.model.preprocess,
),
postprocessor=build_postprocessor(
preprocessor,
config=config.model.postprocess,
),
) )
return cls( return cls(

3
src/batdetect2/preprocess/types.py
View File

@ -29,6 +29,3 @@ class PreprocessorProtocol(Protocol):
def process_numpy(self, wav: np.ndarray) -> np.ndarray: def process_numpy(self, wav: np.ndarray) -> np.ndarray:
return self(torch.tensor(wav)).numpy() return self(torch.tensor(wav)).numpy()
def cpu(self) -> "PreprocessorProtocol":
return self

4
src/batdetect2/train/dataset.py
View File

@ -272,7 +272,7 @@ def build_train_dataset(
audio_loader=audio_loader, audio_loader=audio_loader,
labeller=labeller, labeller=labeller,
clipper=clipper, clipper=clipper,
preprocessor=preprocessor.cpu(), preprocessor=preprocessor,
audio_augmentation=audio_augmentation, audio_augmentation=audio_augmentation,
spectrogram_augmentation=spectrogram_augmentation, spectrogram_augmentation=spectrogram_augmentation,
) )
@ -305,7 +305,7 @@ def build_val_dataset(
clip_annotations, clip_annotations,
audio_loader=audio_loader, audio_loader=audio_loader,
labeller=labeller, labeller=labeller,
preprocessor=preprocessor.cpu(), preprocessor=preprocessor,
clipper=clipper, clipper=clipper,
) )

3
src/batdetect2/train/train.py
View File

@ -73,9 +73,6 @@ def run_train(
audio_loader = audio_loader or build_audio_loader(config=audio_config) audio_loader = audio_loader or build_audio_loader(config=audio_config)
if model is not None:
preprocessor = preprocessor or model.preprocessor
preprocessor = preprocessor or build_preprocessor( preprocessor = preprocessor or build_preprocessor(
input_samplerate=audio_loader.samplerate, input_samplerate=audio_loader.samplerate,
config=model_config.preprocess, config=model_config.preprocess,