more cleanup

This commit is contained in:
Richard Guo 2023-06-02 11:19:39 -04:00 committed by AT
parent 46986d5f26
commit d051ac889c
2 changed files with 3 additions and 5 deletions

View File

@ -190,7 +190,6 @@ void llmodel_set_implementation_search_path(const char *path);
*/ */
const char *llmodel_get_implementation_search_path(); const char *llmodel_get_implementation_search_path();
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

View File

@ -5,7 +5,6 @@ import platform
import re import re
import subprocess import subprocess
import sys import sys
import glob
class DualStreamProcessor: class DualStreamProcessor:
def __init__(self, stream=None): def __init__(self, stream=None):
@ -21,6 +20,7 @@ class DualStreamProcessor:
# TODO: provide a config file to make this more robust # TODO: provide a config file to make this more robust
LLMODEL_PATH = os.path.join("llmodel_DO_NOT_MODIFY", "build").replace("\\", "\\\\") LLMODEL_PATH = os.path.join("llmodel_DO_NOT_MODIFY", "build").replace("\\", "\\\\")
MODEL_LIB_PATH = str(pkg_resources.resource_filename("gpt4all", LLMODEL_PATH)).replace("\\", "\\\\")
def load_llmodel_library(): def load_llmodel_library():
system = platform.system() system = platform.system()
@ -105,8 +105,7 @@ llmodel.llmodel_set_implementation_search_path.restype = None
llmodel.llmodel_threadCount.argtypes = [ctypes.c_void_p] llmodel.llmodel_threadCount.argtypes = [ctypes.c_void_p]
llmodel.llmodel_threadCount.restype = ctypes.c_int32 llmodel.llmodel_threadCount.restype = ctypes.c_int32
model_lib_path = str(pkg_resources.resource_filename("gpt4all", LLMODEL_PATH)).replace("\\", "\\\\") llmodel.llmodel_set_implementation_search_path(MODEL_LIB_PATH.encode('utf-8'))
llmodel.llmodel_set_implementation_search_path(model_lib_path.encode('utf-8'))
class LLModel: class LLModel:
@ -119,7 +118,7 @@ class LLModel:
model: llmodel_model model: llmodel_model
Ctype pointer to underlying model Ctype pointer to underlying model
model_name: str model_name: str
Model name. Model name
""" """
def __init__(self): def __init__(self):