github/gpt4all
1
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all.git synced 2025-09-06 19:10:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up implementation management (#787)

Browse Source 
* Cleaned up implementation management

* Initialize LLModel::m_implementation to nullptr

* llmodel.h: Moved dlhandle fwd declare above LLModel class
This commit is contained in:
niansa/tuxifan
2023-06-01 16:51:46 +02:00
committed by GitHub
parent ddb5fa718d
commit fc60f0c09c
2 changed files with 29 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gpt4all-backend/llmodel.h
View File

@@ -1,8 +1,6 @@
#ifndef LLMODEL_H
#define LLMODEL_H
#include "dlhandle.h" // FIXME: would be nice to move this into implementation file
#include <string>
#include <functional>
#include <vector>
@@ -10,24 +8,27 @@
#include <fstream>
#include <cstdint>
class Dlhandle;
class LLModel {
public:
class Implementation {
LLModel *(*construct_)();
public:
// FIXME: Move the whole implementation details to cpp file
Implementation(Dlhandle&&);
~Implementation();
static bool isImplementation(const Dlhandle&);
std::string_view modelType, buildVariant;
bool (*magicMatch)(std::ifstream& f);
Dlhandle dlhandle;
Dlhandle *dlhandle;
// The only way an implementation should be constructed
LLModel *construct() const {
auto fres = construct_();
fres->implementation = this;
fres->m_implementation = this;
return fres;
}
};
@@ -64,20 +65,16 @@ public:
virtual void setThreadCount(int32_t /*n_threads*/) {}
virtual int32_t threadCount() const { return 1; }
// FIXME: This is unused??
const Implementation& getImplementation() const {
return *implementation;
const Implementation& implementation() const {
return *m_implementation;
}
// FIXME: Maybe have an 'ImplementationInfo' class for the GUI here, but the DLHandle stuff should
// be hidden in cpp file
// FIXME: Avoid usage of 'get' for getters
static const std::vector<Implementation>& getImplementationList();
static const Implementation *getImplementation(std::ifstream& f, const std::string& buildVariant);
static const std::vector<Implementation>& implementationList();
static const Implementation *implementation(std::ifstream& f, const std::string& buildVariant);
static LLModel *construct(const std::string &modelPath, std::string buildVariant = "default");
protected:
const Implementation *implementation; // FIXME: This is dangling! You don't initialize it in ctor either
const Implementation *m_implementation = nullptr;
virtual void recalculateContext(PromptContext &promptCtx,
std::function<bool(bool)> recalculate) = 0;