From 5e590cd3bf5124d301987776f766f3e4164c57da Mon Sep 17 00:00:00 2001 From: frederik Date: Wed, 27 Dec 2023 18:51:22 +0100 Subject: [PATCH] optimize --- scripts/server.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/server.py b/scripts/server.py index 0516335..248dc5e 100755 --- a/scripts/server.py +++ b/scripts/server.py @@ -42,6 +42,8 @@ INTERPRETER, INCLUDE_LIST, EXCLUDE_LIST = (None, None, None) PREDICTED_SPECIES_LIST = [] model, priv_thresh, sf_thresh = (None, None, None) +mdata, mdata_params = (None, None) + server = socket.socket(socket.AF_INET, socket.SOCK_STREAM) server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) @@ -289,9 +291,7 @@ def analyzeAudioData(chunks, lat, lon, week, sens, overlap,): if len(PREDICTED_SPECIES_LIST) == 0 or len(INCLUDE_LIST) != 0: predictSpeciesList(lat, lon, week) - # Convert and prepare metadata - mdata = convertMetadata(np.array([lat, lon, week])) - mdata = np.expand_dims(mdata, 0) + mdata = get_metadata(lat, lon, week) # Parse every chunk pred_start = 0.0 @@ -321,11 +321,21 @@ def analyzeAudioData(chunks, lat, lon, week, sens, overlap,): pred_start = pred_end - overlap - print('DONE! Time', int((time.time() - start) * 10) / 10.0, 'SECONDS') -# print('DETECTIONS:::::',detections) + print(f'DONE! Time {time.time() - start:.2f} SECONDS') return detections +def get_metadata(lat, lon, week): + global mdata, mdata_params + if mdata_params != [lat, lon, week]: + mdata_params = [lat, lon, week] + # Convert and prepare metadata + mdata = convertMetadata(np.array([lat, lon, week])) + mdata = np.expand_dims(mdata, 0) + + return mdata + + def writeResultsToFile(detections, min_conf, path): print('WRITING RESULTS TO', path, '...', end=' ')