diff --git a/.gitignore b/.gitignore index 6ca81da..61ed004 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,10 @@ -target +target/ models/ !models/.gitkeep venv/ .env -output.wav -node_modules +*.wav +node_modules/ dist/ *.csv *.bin \ No newline at end of file diff --git a/crates/sbv2_api/Cargo.toml b/crates/sbv2_api/Cargo.toml index 44f5b29..5679be5 100644 --- a/crates/sbv2_api/Cargo.toml +++ b/crates/sbv2_api/Cargo.toml @@ -6,6 +6,7 @@ description.workspace = true readme.workspace = true repository.workspace = true documentation.workspace = true +license.workspace = true [dependencies] anyhow.workspace = true diff --git a/crates/sbv2_bindings/Cargo.toml b/crates/sbv2_bindings/Cargo.toml index 65a345e..ec2d04e 100644 --- a/crates/sbv2_bindings/Cargo.toml +++ b/crates/sbv2_bindings/Cargo.toml @@ -6,6 +6,7 @@ description.workspace = true readme.workspace = true repository.workspace = true documentation.workspace = true +license.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [lib] diff --git a/crates/sbv2_core/Cargo.toml b/crates/sbv2_core/Cargo.toml index e3d018a..bf752dc 100644 --- a/crates/sbv2_core/Cargo.toml +++ b/crates/sbv2_core/Cargo.toml @@ -6,6 +6,7 @@ description.workspace = true readme.workspace = true repository.workspace = true documentation.workspace = true +license.workspace = true [dependencies] anyhow.workspace = true diff --git a/crates/sbv2_wasm/Cargo.toml b/crates/sbv2_wasm/Cargo.toml index 2424681..4e78d69 100644 --- a/crates/sbv2_wasm/Cargo.toml +++ b/crates/sbv2_wasm/Cargo.toml @@ -6,6 +6,7 @@ description.workspace = true readme.workspace = true repository.workspace = true documentation.workspace = true +license.workspace = true [lib] crate-type = ["cdylib", "rlib"] diff --git a/crates/sbv2_wasm/build.sh b/crates/sbv2_wasm/build.sh index 0db915a..2550d53 100755 --- a/crates/sbv2_wasm/build.sh +++ b/crates/sbv2_wasm/build.sh @@ -1,5 +1,8 @@ -wasm-pack build --target web sbv2_wasm -wasm-opt -O3 -o ./sbv2_wasm/pkg/sbv2_wasm_bg.wasm ./sbv2_wasm/pkg/sbv2_wasm_bg.wasm -wasm-strip ./sbv2_wasm/pkg/sbv2_wasm_bg.wasm -mkdir -p ./sbv2_wasm/dist -cp ./sbv2_wasm/sbv2_wasm/pkg/sbv2_wasm_bg.wasm ./sbv2_wasm/dist/sbv2_wasm_bg.wasm \ No newline at end of file +#!/bin/sh +wasm-pack build --target web ./crates/sbv2_wasm --release +wasm-opt -O3 -o ./crates/sbv2_wasm/pkg/sbv2_wasm_bg.wasm ./crates/sbv2_wasm/pkg/sbv2_wasm_bg.wasm +wasm-strip ./crates/sbv2_wasm/pkg/sbv2_wasm_bg.wasm +mkdir -p ./crates/sbv2_wasm/dist +cp ./crates/sbv2_wasm/pkg/sbv2_wasm_bg.wasm ./crates/sbv2_wasm/dist/sbv2_wasm_bg.wasm +cd ./crates/sbv2_wasm +pnpm build \ No newline at end of file diff --git a/crates/sbv2_wasm/example.js b/crates/sbv2_wasm/example.js index 1c4fdc6..005e2c4 100644 --- a/crates/sbv2_wasm/example.js +++ b/crates/sbv2_wasm/example.js @@ -3,9 +3,12 @@ import fs from "node:fs/promises"; ModelHolder.globalInit(await fs.readFile("./dist/sbv2_wasm_bg.wasm")); const holder = await ModelHolder.create( - (await fs.readFile("../models/tokenizer.json")).toString("utf-8"), - await fs.readFile("../models/deberta.onnx"), + (await fs.readFile("../../models/tokenizer.json")).toString("utf-8"), + await fs.readFile("../../models/deberta.onnx"), +); +await holder.load( + "tsukuyomi", + await fs.readFile("../../models/tsukuyomi.sbv2"), ); -await holder.load("tsukuyomi", await fs.readFile("../models/iroha2.sbv2")); await fs.writeFile("out.wav", await holder.synthesize("tsukuyomi", "おはよう")); holder.unload("tsukuyomi"); diff --git a/crates/sbv2_wasm/package.json b/crates/sbv2_wasm/package.json index c1c6e03..e7b0529 100644 --- a/crates/sbv2_wasm/package.json +++ b/crates/sbv2_wasm/package.json @@ -1,6 +1,6 @@ { "name": "sbv2", - "version": "0.1.1", + "version": "0.2.0-alpha6", "description": "Style Bert VITS2 wasm", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -21,9 +21,5 @@ "dependencies": { "onnxruntime-web": "^1.20.1" }, - "files": [ - "dist/*", - "package.json", - "README.md" - ] + "files": ["dist/*", "package.json", "README.md", "pkg/*.ts", "pkg/*.js"] } diff --git a/crates/sbv2_wasm/src-js/index.ts b/crates/sbv2_wasm/src-js/index.ts index c3f138b..c6bba33 100644 --- a/crates/sbv2_wasm/src-js/index.ts +++ b/crates/sbv2_wasm/src-js/index.ts @@ -74,6 +74,8 @@ export class ModelHolder { style_vec: e, sdp_ratio: new Tensor("float32", [f]), length_scale: new Tensor("float32", [g]), + noise_scale: new Tensor("float32", [0.677]), + noise_scale_w: new Tensor("float32", [0.8]), }) ).output; return [new Uint32Array(res.dims), await res.getData(true)];