Refactor state.dart (part 2)

flutter/integration_test/utils.dart

@@ -2,10 +2,10 @@ import 'dart:convert';
 
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:mlperfbench/ui/root/main_screen.dart';
+import 'package:mlperfbench/ui/root/main_screen/ready.dart';
 import 'package:mlperfbench/ui/run/result_screen.dart';
 import 'package:mlperfbench_common/data/extended_result.dart';
-import 'package:mlperfbench/resources/result_manager.dart' as result_manager;
+import 'package:mlperfbench/resources/result_manager.dart';
 import 'package:mlperfbench/resources/resource_manager.dart'
     as resource_manager;
 import 'package:mlperfbench/main.dart' as app;
@@ -18,12 +18,12 @@ Future<void> runBenchmark(WidgetTester tester) async {
   await app.main();
   await tester.pumpAndSettle(const Duration(seconds: splashPauseSeconds));
 
-  var goButtonIsPresented = await waitFor(
-      tester, downloadTimeLimitMinutes, const Key(MainKeys.goButton));
+  var goButtonIsPresented = await waitFor(tester, downloadTimeLimitMinutes,
+      const Key(MainScreenReadyKeys.goButton));
 
   expect(goButtonIsPresented, true,
       reason: 'Problems with downloading of datasets or models');
-  final goButton = find.byKey(const Key(MainKeys.goButton));
+  final goButton = find.byKey(const Key(MainScreenReadyKeys.goButton));
   await tester.tap(goButton);
 
   var scrollButtonIsPresented = await waitFor(
@@ -36,9 +36,7 @@ Future<ExtendedResult> obtainResult() async {
   final applicationDirectory =
       await resource_manager.ResourceManager.getApplicationDirectory();
 
-  final rm = result_manager.ResultManager(applicationDirectory);
-  await rm.init();
-
+  final rm = await ResultManager.create(resultDir: applicationDirectory);
   return rm.getLastResult();
 }
 

flutter/lib/backend/bridge/run_result.dart

@@ -1,5 +1,6 @@
 import 'package:mlperfbench_common/data/results/benchmark_result.dart';
 
+// Contains raw data obtained from the dart_ffi_run_benchmark method,
 class NativeRunResult {
   final Accuracy? accuracy1;
   final Accuracy? accuracy2;

flutter/lib/backend/bridge/run_settings.dart

@@ -2,6 +2,7 @@
 
 import 'package:mlperfbench/protos/backend_setting.pb.dart' as pb;
 
+// Input parameters for the dart_ffi_run_benchmark method
 class RunSettings {
   static int single_stream_expected_latency_ns_max = 1000000;
 

flutter/lib/benchmark/benchmark.dart

@@ -1,5 +1,6 @@
+import 'dart:convert';
+
 import 'package:collection/collection.dart';
-import 'package:mlperfbench_common/data/results/benchmark_result.dart';
 
 import 'package:mlperfbench/app_constants.dart';
 import 'package:mlperfbench/backend/bridge/run_settings.dart';
@@ -11,56 +12,6 @@ import 'package:mlperfbench/resources/resource_manager.dart';
 import 'info.dart';
 import 'run_mode.dart';
 
-class BenchmarkResult {
-  final double throughput;
-  final Accuracy? accuracy;
-  final Accuracy? accuracy2;
-  final String backendName;
-  final String acceleratorName;
-  final int batchSize;
-  final bool validity;
-
-  BenchmarkResult(
-      {required this.throughput,
-      required this.accuracy,
-      required this.accuracy2,
-      required this.backendName,
-      required this.acceleratorName,
-      required this.batchSize,
-      required this.validity});
-
-  static const _tagThroughput = 'throughput';
-  static const _tagAccuracy = 'accuracy';
-  static const _tagAccuracy2 = 'accuracy2';
-  static const _tagBackendName = 'backend_name';
-  static const _tagAcceleratorName = 'accelerator_name';
-  static const _tagBatchSize = 'batch_size';
-  static const _tagValidity = 'validity';
-
-  static BenchmarkResult? fromJson(Map<String, dynamic>? json) {
-    if (json == null) return null;
-    return BenchmarkResult(
-      throughput: json[_tagThroughput] as double,
-      accuracy: Accuracy.fromJson(json[_tagAccuracy] as Map<String, dynamic>),
-      accuracy2: Accuracy.fromJson(json[_tagAccuracy2] as Map<String, dynamic>),
-      backendName: json[_tagBackendName] as String,
-      acceleratorName: json[_tagAcceleratorName] as String,
-      batchSize: json[_tagBatchSize] as int,
-      validity: json[_tagValidity] as bool,
-    );
-  }
-
-  Map<String, dynamic> toJson() => {
-        _tagThroughput: throughput,
-        _tagAccuracy: accuracy,
-        _tagAccuracy2: accuracy2,
-        _tagBackendName: backendName,
-        _tagAcceleratorName: acceleratorName,
-        _tagBatchSize: batchSize,
-        _tagValidity: validity,
-      };
-}
-
 class Benchmark {
   final pb.BenchmarkSetting benchmarkSettings;
   final pb.TaskConfig taskConfig;
@@ -72,9 +23,6 @@ class Benchmark {
   // which may not represent what backend actually used for computations
   final String backendRequestDescription;
 
-  BenchmarkResult? performanceModeResult;
-  BenchmarkResult? accuracyModeResult;
-
   Benchmark({
     required this.benchmarkSettings,
     required this.taskConfig,
@@ -141,7 +89,6 @@ class BenchmarkList {
   BenchmarkList({
     required pb.MLPerfConfig appConfig,
     required List<pb.BenchmarkSetting> backendConfig,
-    required Map<String, bool> taskSelection,
   }) {
     for (final task in appConfig.task) {
       final backendSettings = backendConfig
@@ -151,11 +98,10 @@ class BenchmarkList {
         continue;
       }
 
-      final enabled = taskSelection[task.id] ?? true;
       benchmarks.add(Benchmark(
         taskConfig: task,
         benchmarkSettings: backendSettings,
-        isActive: enabled,
+        isActive: true,
       ));
     }
   }
@@ -195,11 +141,41 @@ class BenchmarkList {
     return result.where((element) => element.path.isNotEmpty).toList();
   }
 
-  Map<String, bool> get selection {
-    Map<String, bool> result = {};
+  static String serializeTaskSelection(Map<String, bool> selection) {
+    return jsonEncode(selection);
+  }
+
+  static Map<String, bool> deserializeTaskSelection(String serialized) {
+    if (serialized.isEmpty) {
+      return {};
+    }
+    try {
+      final json = jsonDecode(serialized) as Map<String, dynamic>;
+      Map<String, bool> result = {};
+      for (final e in json.entries) {
+        result[e.key] = e.value as bool;
+      }
+      return result;
+    } catch (e, t) {
+      print('task selection parse fail: $e');
+      print(t);
+      return {};
+    }
+  }
+
+  Map<String, bool> getTaskSelection() {
+    Map<String, bool> selection = {};
     for (var item in benchmarks) {
-      result[item.id] = item.isActive;
+      selection[item.id] = item.isActive;
+    }
+    return selection;
+  }
+
+  void restoreSelection(Map<String, bool> selection) {
+    const stateForUnknown = true;
+
+    for (var task in benchmarks) {
+      task.isActive = selection[task.id] ?? stateForUnknown;
     }
-    return result;
   }
 }

flutter/lib/benchmark/run_mode.dart

@@ -8,39 +8,39 @@ class BenchmarkRunMode {
   static const _accuracyLogSuffix = 'accuracy';
 
   final String loadgenMode;
-  final String readable;
+  final String logSuffix;
   final pb.OneDatasetConfig Function(pb.TaskConfig taskConfig) chooseDataset;
 
   BenchmarkRunMode._({
     required this.loadgenMode,
-    required this.readable,
+    required this.logSuffix,
     required this.chooseDataset,
   });
 
   static BenchmarkRunMode performance = BenchmarkRunMode._(
     loadgenMode: _performanceModeString,
-    readable: _perfLogSuffix,
+    logSuffix: _perfLogSuffix,
     chooseDataset: (task) => task.datasets.lite,
   );
   static BenchmarkRunMode accuracy = BenchmarkRunMode._(
     loadgenMode: _accuracyModeString,
-    readable: _accuracyLogSuffix,
+    logSuffix: _accuracyLogSuffix,
     chooseDataset: (task) => task.datasets.full,
   );
 
   static BenchmarkRunMode performanceTest = BenchmarkRunMode._(
     loadgenMode: _performanceModeString,
-    readable: _perfLogSuffix,
+    logSuffix: _perfLogSuffix,
     chooseDataset: (task) => task.datasets.tiny,
   );
   static BenchmarkRunMode accuracyTest = BenchmarkRunMode._(
     loadgenMode: _accuracyModeString,
-    readable: _accuracyLogSuffix,
+    logSuffix: _accuracyLogSuffix,
     chooseDataset: (task) => task.datasets.tiny,
   );
 
   @override
   String toString() {
-    return readable;
+    return logSuffix;
   }
 }