[mob][photos] Resolve merge errors

This commit is contained in:
laurenspriem 2024-07-26 11:39:22 +02:00
parent 892e50b358
commit 739235836e

View File

@ -1,11 +1,8 @@
import "dart:async";
import "dart:developer" as dev show log;
import "dart:io" show File, Platform;
import "dart:isolate";
import "dart:io" show Platform;
import "dart:math" show min;
import "dart:typed_data" show Uint8List;
import "package:dart_ui_isolate/dart_ui_isolate.dart";
import "package:flutter/foundation.dart" show debugPrint, kDebugMode;
import "package:logging/logging.dart";
import "package:package_info_plus/package_info_plus.dart";
@ -32,10 +29,7 @@ import 'package:photos/services/machine_learning/ml_exceptions.dart';
import "package:photos/services/machine_learning/ml_indexing_isolate.dart";
import 'package:photos/services/machine_learning/ml_result.dart';
import "package:photos/services/machine_learning/semantic_search/clip/clip_image_encoder.dart";
import "package:photos/services/machine_learning/semantic_search/clip/clip_text_tokenizer.dart";
import "package:photos/services/machine_learning/semantic_search/semantic_search_service.dart";
import "package:photos/utils/image_ml_util.dart";
import "package:photos/utils/local_settings.dart";
import "package:photos/utils/ml_util.dart";
import "package:photos/utils/network_util.dart";
import "package:synchronized/synchronized.dart";
@ -45,9 +39,7 @@ class MLService {
// Singleton pattern
MLService._privateConstructor();
static final instance = MLService._privateConstructor();
factory MLService() => instance;
final _initModelLock = Lock();