Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions jDAS/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import sys
import os
import keras
os.environ.setdefault("TF_USE_LEGACY_KERAS", "1")
import tensorflow as tf
import numpy as np
import gc

Expand Down Expand Up @@ -32,7 +33,7 @@ def load_model(self, model_path=None):
if model_path is None:
model_path = os.path.join(cwd, "..", "models", "pretrained_model.h5")

self.model = keras.models.load_model(model_path)
self.model = tf.keras.models.load_model(model_path, compile=False)
return self.model


Expand Down
9 changes: 7 additions & 2 deletions jDAS/filters.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
from scipy.signal import tukey, butter, filtfilt, sosfiltfilt
from scipy.signal import butter, filtfilt, sosfiltfilt
try:
# SciPy >= 1.12 keeps window functions under scipy.signal.windows
from scipy.signal.windows import tukey
except ImportError: # pragma: no cover - fallback for older SciPy
from scipy.signal import tukey
import scipy.fft # Scipy's FFT package is faster than Numpy's


Expand Down Expand Up @@ -108,4 +113,4 @@ def taper_filter(arr, fmin, fmax, samp, order=2, mode="sos"):
sos = _butter_bandpass(fmin, fmax, samp, order, mode)
arr_filt = sosfiltfilt(sos, arr_wind, axis=-1)

return arr_filt
return arr_filt