Skip to content
This repository was archived by the owner on Jun 26, 2021. It is now read-only.

Commit 64ce57b

Browse files
authored
Merge pull request #236 from delira-dev/fixed_logging
Fixed logging
2 parents bd6f4ca + 28d5fe5 commit 64ce57b

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

delira/logging/base_backend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def _log_item(self):
151151
152152
"""
153153
# get item from dict
154-
process_item = self._queue.get(timeout=0.5)
154+
process_item = self._queue.get(timeout=0.001)
155155
# log item if item is dict
156156
if isinstance(process_item, dict):
157157

delira/logging/base_logger.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
from multiprocessing import Queue, Event
2-
from queue import Full
1+
from multiprocessing.queues import Queue as MpQueue
2+
from threading import Event
3+
from queue import Queue, Full
34
from delira.logging.base_backend import BaseBackend
45
from delira.utils.dict_reductions import get_reduction, possible_reductions, \
56
reduce_dict
@@ -231,8 +232,9 @@ def close(self):
231232
232233
"""
233234
if hasattr(self, "_flush_queue"):
234-
self._flush_queue.close()
235-
self._flush_queue.join_thread()
235+
if isinstance(self._flush_queue, MpQueue):
236+
self._flush_queue.close()
237+
self._flush_queue.join_thread()
236238

237239
if hasattr(self, "abort_event"):
238240
self._abort_event.set()

delira/utils/dict_reductions.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,11 @@ def reduce_dict(items: list, reduce_fn) -> dict:
205205

206206
for k, v in result_dict.items():
207207
# check if all items are equal
208-
if all([_v == v[0] for _v in v[1:]]):
208+
equals = [_v == v[0] for _v in v[1:]]
209+
for idx, equality in enumerate(equals):
210+
if isinstance(equality, np.ndarray):
211+
equals[idx] = equality.all()
212+
if all(equals):
209213
# use first item since they are equal
210214
result_dict[k] = v[0]
211215
else:

0 commit comments

Comments
 (0)