Skip to content

Commit

Permalink
Merge branch 'josStorer:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Xaiat authored Oct 13, 2024
2 parents 300a015 + 119aa16 commit 3c9de1d
Show file tree
Hide file tree
Showing 87 changed files with 10,601 additions and 6,325 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
del ./backend-python/rwkv_pip/cpp/librwkv.so
(Get-Content -Path ./backend-golang/app.go) -replace "//go:custom_build windows ", "" | Set-Content -Path ./backend-golang/app.go
(Get-Content -Path ./backend-golang/utils.go) -replace "//go:custom_build windows ", "" | Set-Content -Path ./backend-golang/utils.go
go install mvdan.cc/[email protected]
make
Rename-Item -Path "build/bin/RWKV-Runner.exe" -NewName "RWKV-Runner_windows_x64.exe"
Expand Down Expand Up @@ -75,6 +76,7 @@ jobs:
rm ./backend-python/rwkv_pip/cpp/librwkv.dylib
rm ./backend-python/rwkv_pip/cpp/rwkv.dll
rm ./backend-python/rwkv_pip/webgpu/web_rwkv_py.cp310-win_amd64.pyd
go install mvdan.cc/[email protected]
make
mv build/bin/RWKV-Runner build/bin/RWKV-Runner_linux_x64
Expand Down Expand Up @@ -103,6 +105,7 @@ jobs:
rm ./backend-python/rwkv_pip/cpp/rwkv.dll
rm ./backend-python/rwkv_pip/cpp/librwkv.so
rm ./backend-python/rwkv_pip/webgpu/web_rwkv_py.cp310-win_amd64.pyd
go install mvdan.cc/[email protected]
make
cp build/darwin/Readme_Install.txt build/bin/Readme_Install.txt
cp build/bin/RWKV-Runner.app/Contents/MacOS/RWKV-Runner build/bin/RWKV-Runner_darwin_universal
Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,17 @@ jobs:
ref: master
- uses: actions/setup-go@v5
with:
go-version: "1.22.5"
go-version: "1.20.5"
- uses: actions/setup-python@v5
id: cp310
with:
python-version: "3.10"
- uses: crazy-max/ghaction-chocolatey@v3
with:
args: install upx
- uses: crazy-max/ghaction-chocolatey@v3
with:
args: install nsis
- run: |
Start-BitsTransfer https://github.com/josStorer/ai00_rwkv_server/releases/latest/download/webgpu_server_windows_x86_64.exe ./backend-rust/webgpu_server.exe
Start-BitsTransfer https://github.com/josStorer/web-rwkv-converter/releases/latest/download/web-rwkv-converter_windows_x86_64.exe ./backend-rust/web-rwkv-converter.exe
Expand All @@ -69,10 +72,11 @@ jobs:
del ./backend-python/rwkv_pip/cpp/librwkv.so
(Get-Content -Path ./backend-golang/app.go) -replace "//go:custom_build windows ", "" | Set-Content -Path ./backend-golang/app.go
(Get-Content -Path ./backend-golang/utils.go) -replace "//go:custom_build windows ", "" | Set-Content -Path ./backend-golang/utils.go
go install mvdan.cc/[email protected]
make
Rename-Item -Path "build/bin/RWKV-Runner.exe" -NewName "RWKV-Runner_windows_x64.exe"
- run: gh release upload ${{github.ref_name}} build/bin/RWKV-Runner_windows_x64.exe
- run: gh release upload ${{github.ref_name}} build/bin/RWKV-Runner_windows_x64.exe build/bin/RWKV-Runner-amd64-installer.exe

linux:
runs-on: ubuntu-20.04
Expand All @@ -83,7 +87,7 @@ jobs:
ref: master
- uses: actions/setup-go@v5
with:
go-version: "1.22.5"
go-version: "1.20.5"
- run: |
wget https://github.com/josStorer/ai00_rwkv_server/releases/latest/download/webgpu_server_linux_x86_64 -O ./backend-rust/webgpu_server
wget https://github.com/josStorer/web-rwkv-converter/releases/latest/download/web-rwkv-converter_linux_x86_64 -O ./backend-rust/web-rwkv-converter
Expand All @@ -98,6 +102,7 @@ jobs:
rm ./backend-python/rwkv_pip/cpp/librwkv.dylib
rm ./backend-python/rwkv_pip/cpp/rwkv.dll
rm ./backend-python/rwkv_pip/webgpu/web_rwkv_py.cp310-win_amd64.pyd
go install mvdan.cc/[email protected]
make
mv build/bin/RWKV-Runner build/bin/RWKV-Runner_linux_x64
Expand All @@ -112,7 +117,7 @@ jobs:
ref: master
- uses: actions/setup-go@v5
with:
go-version: "1.22.5"
go-version: "1.20.5"
- run: |
wget https://github.com/josStorer/ai00_rwkv_server/releases/latest/download/webgpu_server_darwin_aarch64 -O ./backend-rust/webgpu_server
wget https://github.com/josStorer/web-rwkv-converter/releases/latest/download/web-rwkv-converter_darwin_aarch64 -O ./backend-rust/web-rwkv-converter
Expand All @@ -124,12 +129,14 @@ jobs:
rm ./backend-python/rwkv_pip/cpp/rwkv.dll
rm ./backend-python/rwkv_pip/cpp/librwkv.so
rm ./backend-python/rwkv_pip/webgpu/web_rwkv_py.cp310-win_amd64.pyd
go install mvdan.cc/[email protected]
make
cp build/darwin/Readme_Install.txt build/bin/Readme_Install.txt
cp build/bin/RWKV-Runner.app/Contents/MacOS/RWKV-Runner build/bin/RWKV-Runner_darwin_universal
cd build/bin && zip -r RWKV-Runner_macos_universal.zip RWKV-Runner.app Readme_Install.txt
cd ../../frontend && zip -r html-webui.zip dist
- run: gh release upload ${{github.ref_name}} build/bin/RWKV-Runner_macos_universal.zip build/bin/RWKV-Runner_darwin_universal
- run: gh release upload ${{github.ref_name}} build/bin/RWKV-Runner_macos_universal.zip frontend/html-webui.zip

publish-release:
runs-on: ubuntu-22.04
Expand Down
17 changes: 12 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
{
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter"
},
"python.formatting.provider": "none",
"editor.formatOnSave": true
"prettier.configPath": "./frontend/prettier.config.js",
"prettier.prettierPath": "./frontend/node_modules/prettier",
"prettier.requireConfig": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[go]": {
"editor.defaultFormatter": "golang.go"
},
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter"
},
"python.formatting.provider": "none",
"editor.formatOnSave": true
}
28 changes: 18 additions & 10 deletions CURRENT_CHANGE.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
## Changes
## v1.8.7

- withdrawing the obfuscated tiny package, as it caused some exceptions in the html webui

## v1.8.6

### Features

- allow the use of the devtools (Ctrl/Cmd+Shift+F12)
- allow custom user avatar image of presets
- feat(python backend): function call support (#368) Great thanks to @EliwiiKeeya

![image](https://github.com/user-attachments/assets/d1686c4a-4b35-4482-b7d6-ad206b93f20e)

- feat(ui): add navigator for web on narrow screen (#376) Great thanks to @HaloWang

### Upgrades
<img src="https://github.com/user-attachments/assets/72fa06a4-7b36-4eb5-a5dc-e1ab140adb20" width="256"/>

- bump webgpu(python) (https://github.com/cryscan/web-rwkv-py)
- bump rwkv.cpp (rwkv6 support) (https://github.com/RWKV/rwkv.cpp)
- windows installer support: https://github.com/josStorer/RWKV-Runner/releases/latest/download/RWKV-Runner-amd64-installer.exe
- add penalty_decay to the Completion Page

### Improvements

- improve prompts
- improve error notifications during fine-tuning
- improve WSL installation condition detection

### Fixes
### Chores

- fix: #353, numpy2.0 error when fine-tuning
- downgrade to golang1.20 for compatibility with windows7 (#377)
- update manifest.json (hide old models and add new models)
- html-webui.zip is now added to the release

## Install

Expand Down
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@ endif

build-windows:
@echo ---- build for windows
wails build -ldflags '-s -w -extldflags "-static"' -platform windows/amd64 -devtools
upx -9 --lzma ./build/bin/RWKV-Runner.exe
wails build -ldflags '-s -w -extldflags "-static"' -platform windows/amd64 -devtools -upx -upxflags "-9 --lzma" -nsis

build-macos:
@echo ---- build for macos
wails build -ldflags '-s -w' -platform darwin/universal -devtools

build-linux:
@echo ---- build for linux
wails build -ldflags '-s -w' -platform linux/amd64 -devtools
upx -9 --lzma ./build/bin/RWKV-Runner
wails build -ldflags '-s -w' -platform linux/amd64 -devtools -upx -upxflags "-9 --lzma"

build-web:
@echo ---- build for web
Expand Down
Loading

0 comments on commit 3c9de1d

Please sign in to comment.