add web-rwkv-converter (Safetensors Convert no longer depends on Python)

This commit is contained in:
josc146 2023-12-07 23:26:39 +08:00
parent 1c683087f4
commit 5ce84edc3d
8 changed files with 16 additions and 30 deletions

View File

@ -46,6 +46,7 @@ func (a *App) OnStartup(ctx context.Context) {
} }
os.Chmod(a.exDir+"backend-rust/webgpu_server", 0777) os.Chmod(a.exDir+"backend-rust/webgpu_server", 0777)
os.Chmod(a.exDir+"backend-rust/web-rwkv-converter", 0777)
os.Mkdir(a.exDir+"models", os.ModePerm) os.Mkdir(a.exDir+"models", os.ModePerm)
os.Mkdir(a.exDir+"lora-models", os.ModePerm) os.Mkdir(a.exDir+"lora-models", os.ModePerm)
os.Mkdir(a.exDir+"finetune/json2binidx_tool/data", os.ModePerm) os.Mkdir(a.exDir+"finetune/json2binidx_tool/data", os.ModePerm)

View File

@ -46,15 +46,10 @@ func (a *App) ConvertModel(python string, modelPath string, strategy string, out
return Cmd(python, "./backend-python/convert_model.py", "--in", modelPath, "--out", outPath, "--strategy", strategy) return Cmd(python, "./backend-python/convert_model.py", "--in", modelPath, "--out", outPath, "--strategy", strategy)
} }
func (a *App) ConvertSafetensors(python string, modelPath string, outPath string) (string, error) { func (a *App) ConvertSafetensors(modelPath string, outPath string) (string, error) {
var err error args := []string{"./backend-rust/web-rwkv-converter"}
if python == "" { args = append(args, "--input", modelPath, "--output", outPath)
python, err = GetPython() return Cmd(args...)
}
if err != nil {
return "", err
}
return Cmd(python, "./backend-python/convert_safetensors.py", "--input", modelPath, "--output", outPath)
} }
func (a *App) ConvertData(python string, input string, outputPrefix string, vocab string) (string, error) { func (a *App) ConvertData(python string, input string, outputPrefix string, vocab string) (string, error) {

View File

@ -90,7 +90,7 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
return; return;
} else { } else {
toastWithButton(t('Please convert model to safe tensors format first'), t('Convert'), () => { toastWithButton(t('Please convert model to safe tensors format first'), t('Convert'), () => {
convertToSt(navigate, modelConfig); convertToSt(modelConfig);
}); });
commonStore.setStatus({ status: ModelStatus.Offline }); commonStore.setStatus({ status: ModelStatus.Offline });
return; return;

View File

@ -273,7 +273,7 @@ const Configs: FC = observer(() => {
}} /> : }} /> :
<ToolTipButton text={t('Convert To Safe Tensors Format')} <ToolTipButton text={t('Convert To Safe Tensors Format')}
desc="" desc=""
onClick={() => convertToSt(navigate, selectedConfig)} /> onClick={() => convertToSt(selectedConfig)} />
} }
<Labeled label={t('Strategy')} content={ <Labeled label={t('Strategy')} content={
<Dropdown style={{ minWidth: 0 }} className="grow" value={t(selectedConfig.modelParameters.device)!} <Dropdown style={{ minWidth: 0 }} className="grow" value={t(selectedConfig.modelParameters.device)!}

View File

@ -474,6 +474,7 @@ const LoraFinetune: FC = observer(() => {
'models/' + loraParams.baseModel, 'lora-models/' + loraParams.loraLoad, 'models/' + loraParams.baseModel, 'lora-models/' + loraParams.loraLoad,
outputPath).then(async () => { outputPath).then(async () => {
if (!await FileExists(outputPath)) { if (!await FileExists(outputPath)) {
if (commonStore.platform === 'windows' || commonStore.platform === 'linux')
toast(t('Failed to merge model') + ' - ' + await GetPyError(), { type: 'error' }); toast(t('Failed to merge model') + ' - ' + await GetPyError(), { type: 'error' });
} else { } else {
toast(t('Merge model successfully'), { type: 'success' }); toast(t('Merge model successfully'), { type: 'success' });

View File

@ -1,29 +1,18 @@
import { toast } from 'react-toastify'; import { toast } from 'react-toastify';
import commonStore from '../stores/commonStore'; import commonStore from '../stores/commonStore';
import { t } from 'i18next'; import { t } from 'i18next';
import { checkDependencies } from './index';
import { ConvertSafetensors, FileExists, GetPyError } from '../../wailsjs/go/backend_golang/App'; import { ConvertSafetensors, FileExists, GetPyError } from '../../wailsjs/go/backend_golang/App';
import { WindowShow } from '../../wailsjs/runtime'; import { WindowShow } from '../../wailsjs/runtime';
import { NavigateFunction } from 'react-router';
import { ModelConfig } from '../types/configs'; import { ModelConfig } from '../types/configs';
export const convertToSt = async (navigate: NavigateFunction, selectedConfig: ModelConfig) => { export const convertToSt = async (selectedConfig: ModelConfig) => {
if (commonStore.platform === 'linux') {
toast(t('Linux is not yet supported for performing this operation, please do it manually.') + ' (backend-python/convert_safetensors.py)', { type: 'info' });
return;
}
const ok = await checkDependencies(navigate);
if (!ok)
return;
const modelPath = `${commonStore.settings.customModelsPath}/${selectedConfig.modelParameters.modelName}`; const modelPath = `${commonStore.settings.customModelsPath}/${selectedConfig.modelParameters.modelName}`;
if (await FileExists(modelPath)) { if (await FileExists(modelPath)) {
toast(t('Start Converting'), { autoClose: 1000, type: 'info' }); toast(t('Start Converting'), { autoClose: 2000, type: 'info' });
const newModelPath = modelPath.replace(/\.pth$/, '.st'); const newModelPath = modelPath.replace(/\.pth$/, '.st');
ConvertSafetensors(commonStore.settings.customPythonPath, modelPath, newModelPath).then(async () => { ConvertSafetensors(modelPath, newModelPath).then(async () => {
if (!await FileExists(newModelPath)) { if (!await FileExists(newModelPath)) {
if (commonStore.platform === 'windows') if (commonStore.platform === 'windows' || commonStore.platform === 'linux')
toast(t('Convert Failed') + ' - ' + await GetPyError(), { type: 'error' }); toast(t('Convert Failed') + ' - ' + await GetPyError(), { type: 'error' });
} else { } else {
toast(`${t('Convert Success')} - ${newModelPath}`, { type: 'success' }); toast(`${t('Convert Success')} - ${newModelPath}`, { type: 'success' });

View File

@ -12,7 +12,7 @@ export function ConvertData(arg1:string,arg2:string,arg3:string,arg4:string):Pro
export function ConvertModel(arg1:string,arg2:string,arg3:string,arg4:string):Promise<string>; export function ConvertModel(arg1:string,arg2:string,arg3:string,arg4:string):Promise<string>;
export function ConvertSafetensors(arg1:string,arg2:string,arg3:string):Promise<string>; export function ConvertSafetensors(arg1:string,arg2:string):Promise<string>;
export function CopyFile(arg1:string,arg2:string):Promise<void>; export function CopyFile(arg1:string,arg2:string):Promise<void>;

View File

@ -22,8 +22,8 @@ export function ConvertModel(arg1, arg2, arg3, arg4) {
return window['go']['backend_golang']['App']['ConvertModel'](arg1, arg2, arg3, arg4); return window['go']['backend_golang']['App']['ConvertModel'](arg1, arg2, arg3, arg4);
} }
export function ConvertSafetensors(arg1, arg2, arg3) { export function ConvertSafetensors(arg1, arg2) {
return window['go']['backend_golang']['App']['ConvertSafetensors'](arg1, arg2, arg3); return window['go']['backend_golang']['App']['ConvertSafetensors'](arg1, arg2);
} }
export function CopyFile(arg1, arg2) { export function CopyFile(arg1, arg2) {