From 91646a809b1429cd16c4e1232dac2b618199813f Mon Sep 17 00:00:00 2001 From: laurenspriem Date: Fri, 30 Aug 2024 12:07:06 +0200 Subject: [PATCH] [mob][photos] Actual logging in ML Computer --- mobile/lib/services/machine_learning/ml_computer.dart | 4 ++++ .../semantic_search/clip/clip_text_encoder.dart | 4 +++- mobile/lib/utils/image_ml_util.dart | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mobile/lib/services/machine_learning/ml_computer.dart b/mobile/lib/services/machine_learning/ml_computer.dart index afbd511c62..8f27dfb3d4 100644 --- a/mobile/lib/services/machine_learning/ml_computer.dart +++ b/mobile/lib/services/machine_learning/ml_computer.dart @@ -4,7 +4,9 @@ import 'dart:isolate'; import 'dart:typed_data' show Uint8List; import "package:dart_ui_isolate/dart_ui_isolate.dart"; +import "package:flutter/foundation.dart" show kDebugMode; import "package:logging/logging.dart"; +import "package:photos/core/error-reporting/super_logging.dart"; import "package:photos/models/ml/face/box.dart"; import "package:photos/services/machine_learning/ml_model.dart"; import "package:photos/services/machine_learning/semantic_search/clip/clip_text_encoder.dart"; @@ -59,6 +61,8 @@ class MLComputer { @pragma('vm:entry-point') static void _isolateMain(SendPort mainSendPort) async { + Logger.root.level = kDebugMode ? Level.ALL : Level.INFO; + Logger.root.onRecord.listen(SuperLogging.onLogRecord); final receivePort = ReceivePort(); mainSendPort.send(receivePort.sendPort); diff --git a/mobile/lib/services/machine_learning/semantic_search/clip/clip_text_encoder.dart b/mobile/lib/services/machine_learning/semantic_search/clip/clip_text_encoder.dart index ff75a9028e..cd59fd1aa5 100644 --- a/mobile/lib/services/machine_learning/semantic_search/clip/clip_text_encoder.dart +++ b/mobile/lib/services/machine_learning/semantic_search/clip/clip_text_encoder.dart @@ -56,7 +56,9 @@ class ClipTextEncoder extends MlModel { final embedding = (outputs[0]?.value as List>)[0]; inputOrt.release(); runOptions.release(); - outputs.forEach((element) => element?.release()); + for (var element in outputs) { + element?.release(); + } normalizeEmbedding(embedding); return embedding; } diff --git a/mobile/lib/utils/image_ml_util.dart b/mobile/lib/utils/image_ml_util.dart index ee259dd8af..e8eb3e7312 100644 --- a/mobile/lib/utils/image_ml_util.dart +++ b/mobile/lib/utils/image_ml_util.dart @@ -150,8 +150,8 @@ Future> generateFaceThumbnailsUsingCanvas( await Future.wait(futureFaceThumbnails); return faceThumbnails; } catch (e) { - log('[ImageMlUtils] Error generating face thumbnails: $e'); - log('[ImageMlUtils] cropImage problematic input argument: ${faceBoxes[i]}'); + _logger.severe('Error generating face thumbnails: $e'); + _logger.severe('cropImage problematic input argument: ${faceBoxes[i]}'); return []; } }