From d39a15522bd12d44b00a32981366b558c9a93562 Mon Sep 17 00:00:00 2001
From: Christopher Rhodes <christopher.rhodes@embl.de>
Date: Mon, 23 Sep 2024 16:25:00 +0200
Subject: [PATCH] Short-circuit around object classification for null
dataframes was dropped during merge; re-insert
---
model_server/base/roiset.py | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/model_server/base/roiset.py b/model_server/base/roiset.py
index a429b61f..96162c95 100644
--- a/model_server/base/roiset.py
+++ b/model_server/base/roiset.py
@@ -580,17 +580,9 @@ class RoiSet(object):
that return a single-channel PatchStack accessor of the same shape
:return: None
"""
-
- raw_acc = self.get_patches_acc(channels=channels, expanded=False, pad_to=None) # all channels
- if derived_channel_functions is not None:
- mono_data = [raw_acc.get_mono(c).data for c in range(0, raw_acc.chroma)]
- for fcn in derived_channel_functions:
- der = fcn(raw_acc) # returns patch stack
- if der.shape != mono_data[0].shape or der.dtype not in ['uint8', 'uint16']:
- raise DerivedChannelError(
- f'Error processing derived channel {der} with shape {der.shape_dict} and dtype {der.dtype}'
- )
- self.accs_derived.append(der)
+ if self.count == 0:
+ self._df['classify_by_' + name] = None
+ return True
# combine channels
data_derived = [acc.data for acc in self.accs_derived]
--
GitLab