Merge pull request #79 from danemadsen/main

Fix crash
Mobile-Artificial-Intelligence · Nov 9, 2023 · ca8f3b9 · ca8f3b9
2 parents 08d19f9 + d5f6f40
commit ca8f3b9
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 32 deletions.
diff --git a/core/llama.cpp b/core/llama.cpp
diff --git a/lib/core/core.dart → lib/core/local_generation.dart b/lib/core/core.dart → lib/core/local_generation.dart
@@ -11,18 +11,18 @@ import 'package:maid/utilities/character.dart';
 import 'package:maid/utilities/model.dart';
 import 'package:maid/utilities/memory_manager.dart';
 
-class Core {
+class LocalGeneration {
   static SendPort? _sendPort;
   late NativeLibrary _nativeLibrary;
 
   // Make the default constructor private
-  Core._();
+  LocalGeneration._();
 
   // Private reference to the global instance
-  static final Core _instance = Core._();
+  static final LocalGeneration _instance = LocalGeneration._();
 
   // Public accessor to the global instance
-  static Core get instance {
+  static LocalGeneration get instance {
     _instance._initialize();
     return _instance;
   }
@@ -64,11 +64,11 @@ class Core {
     }
   }
 
-  static promptIsolate(Map<String, dynamic> args) async {
+  static _promptIsolate(Map<String, dynamic> args) async {
     _sendPort = args['port'] as SendPort?;
     String input = args['input'];
     Pointer<Char> text = input.trim().toNativeUtf8().cast<Char>();
-    Core.instance._nativeLibrary.core_prompt(text, Pointer.fromFunction(_maidOutputBridge));
+    LocalGeneration.instance._nativeLibrary.core_prompt(text, Pointer.fromFunction(_maidOutputBridge));
   }
 
 
@@ -129,14 +129,14 @@ class Core {
     await completer.future;
   }
 
-  void prompt(String input) {
+  void prompt(String input) async {
     MessageManager.busy = true;
     if (!_hasStarted) {
-      MemoryManager.save();
+      await MemoryManager.asave();
       _init(input);
     } else {
       Logger.log("Input: $input");
-      Isolate.spawn(promptIsolate, {
+      Isolate.spawn(_promptIsolate, {
         'input': input,
         'port': _sendPort
       });

diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
@@ -7,7 +7,7 @@ import 'package:maid/utilities/message_manager.dart';
 import 'package:system_info2/system_info2.dart';
 
 import 'package:maid/utilities/model.dart';
-import 'package:maid/core/core.dart';
+import 'package:maid/core/local_generation.dart';
 
 import 'package:maid/pages/character_page.dart';
 import 'package:maid/pages/model_page.dart';
@@ -89,7 +89,7 @@ class MaidHomePageState extends State<MaidHomePage> {
     MessageManager.add(UniqueKey());
 
     if (MemoryManager.checkFileExists(model.parameters["model_path"]))  {
-      Core.instance.prompt(promptController.text.trim());
+      LocalGeneration.instance.prompt(promptController.text.trim());
       setState(() {
         model.busy = true;
         promptController.clear();
@@ -247,7 +247,7 @@ class MaidHomePageState extends State<MaidHomePage> {
                       children: [
                         if (model.busy)
                           IconButton(
-                              onPressed: Core.instance.stop,
+                              onPressed: LocalGeneration.instance.stop,
                               iconSize: 50,
                               icon: const Icon(
                                 Icons.stop_circle_sharp,

diff --git a/lib/utilities/memory_manager.dart b/lib/utilities/memory_manager.dart
@@ -4,7 +4,7 @@ import 'dart:io';
 import 'package:maid/utilities/logger.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import 'package:maid/core/core.dart';
+import 'package:maid/core/local_generation.dart';
 import 'package:maid/utilities/model.dart';
 import 'package:maid/utilities/character.dart';
 
@@ -33,24 +33,33 @@ class MemoryManager {
     });
   }
 
-  static void save() {
-    SharedPreferences.getInstance().then((prefs) {
-      prefs.clear();
+  static void _save(SharedPreferences prefs) {
+    prefs.clear();
 
-      _models[model.nameController.text] = model.toMap();
-      Logger.log("Model Saved: ${model.nameController.text}");
-      _characters[character.nameController.text] = character.toMap();
-      Logger.log("Character Saved: ${character.nameController.text}");
+    _models[model.nameController.text] = model.toMap();
+    Logger.log("Model Saved: ${model.nameController.text}");
+    _characters[character.nameController.text] = character.toMap();
+    Logger.log("Character Saved: ${character.nameController.text}");
 
-      prefs.setString("models", json.encode(_models));
-      prefs.setString("characters", json.encode(_characters));
-      prefs.setString("current_model", model.nameController.text);
-      prefs.setString("current_character", character.nameController.text);
+    prefs.setString("models", json.encode(_models));
+    prefs.setString("characters", json.encode(_characters));
+    prefs.setString("current_model", model.nameController.text);
+    prefs.setString("current_character", character.nameController.text);
+
+    LocalGeneration.instance.cleanup();
+  }
 
-      Core.instance.cleanup();
+  static void save() {
+    SharedPreferences.getInstance().then((prefs) {
+      _save(prefs);
     });
   }
 
+  static Future<void> asave() async {
+    var prefs = await SharedPreferences.getInstance();
+    _save(prefs);
+  }
+
   static void updateModel(String newName) {
     String oldName = model.nameController.text;
     Logger.log("Updating model $oldName ====> $newName");

diff --git a/lib/utilities/message_manager.dart b/lib/utilities/message_manager.dart
@@ -3,7 +3,7 @@ import 'dart:collection';
 
 import 'package:flutter/material.dart';
 import 'package:maid/utilities/model.dart';
-import 'package:maid/core/core.dart';
+import 'package:maid/core/local_generation.dart';
 
 class MessageManager {
   static void Function()? _callback;
@@ -47,7 +47,7 @@ class MessageManager {
       parent.children.removeWhere((element) => element.key == key);
       _tail = _root.findTail();
     }
-    Core.instance.cleanup();
+    LocalGeneration.instance.cleanup();
     _callback?.call();
   }
 
@@ -68,7 +68,7 @@ class MessageManager {
     } else {
       branch(key, false);
       model.busy = true;
-      Core.instance.prompt(parent.message);
+      LocalGeneration.instance.prompt(parent.message);
     }
   }
 
@@ -79,7 +79,7 @@ class MessageManager {
       _tail = _root.findTail();
     }
     add(UniqueKey(), userGenerated: userGenerated);
-    Core.instance.cleanup();
+    LocalGeneration.instance.cleanup();
     _callback?.call();
   }
 
@@ -102,7 +102,7 @@ class MessageManager {
       }
     }
 
-    Core.instance.cleanup();
+    LocalGeneration.instance.cleanup();
     _callback?.call();
   }
 
@@ -120,7 +120,7 @@ class MessageManager {
       }
     }
 
-    Core.instance.cleanup();
+    LocalGeneration.instance.cleanup();
     _callback?.call();
   }
+1 −1		Makefile
+0 −247		convert-bloom-hf-to-gguf.py
+0 −253		convert-falcon-hf-to-gguf.py
+0 −221		convert-gptneox-hf-to-gguf.py
+890 −0		convert-hf-to-gguf.py
+0 −227		convert-mpt-hf-to-gguf.py
+0 −272		convert-refact-hf-to-gguf.py
+0 −210		convert-starcoder-hf-to-gguf.py
+2 −2		convert.py
+1 −1		examples/finetune/finetune.cpp
+3 −5		examples/llava/llava-cli.cpp
+2 −0		examples/server/README.md
+2,185 −2,171		examples/server/index.html.hpp
+2 −0		examples/server/public/index.html
+2 −0		examples/server/server.cpp
+12 −9		ggml-alloc.c
+16 −1		ggml-cuda.cu
+5 −0		ggml-cuda.h
+78 −252		ggml.c
+5 −0		ggml.h
+53 −29		gguf-py/gguf/gguf.py
+1 −1		gguf-py/pyproject.toml
+105 −74		llama.cpp
+1 −0		mypy.ini