Skip to content

Commit

Permalink
pythonのバージョンを上げ、onnxruntimeのバージョンもあげた
Browse files Browse the repository at this point in the history
  • Loading branch information
Hiroshiba committed Aug 15, 2024
1 parent 8361c18 commit 8b2aa1d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
wget https://github.com/Hiroshiba/vv_core_inference/releases/download/0.0.1/model.zip
unzip model.zip
- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.10
cache: "pip"

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ onnxモデルをそのまま改良するのはかなり専門的な知識が必

## 環境構築

Python 3.7.2 で開発しました。 3.7 台なら動くと思います。
Python 3.10.14 で開発しました。 3.10 台なら動くと思います。

```bash
# 5分くらいかかります
Expand Down
1 change: 0 additions & 1 deletion convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ def convert_intonation(model_dir: Path, device: str, offset: int, working_dir: P
"end_accent_phrase_list",
"speaker_id",
],
example_outputs=output,
output_names=["f0_list"],
dynamic_axes={
"vowel_phoneme_list": {0: "length"},
Expand Down
16 changes: 8 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
numpy<1.24.0
numpy
pyyaml
soundfile
torch==1.9.0
onnx==1.14.0
onnxruntime==1.15.1
git+https://github.com/Hiroshiba/yukarin_s@553c256874a5f2604bdb08f78797a0d3b83e8b7e
git+https://github.com/Hiroshiba/yukarin_sa@7d6eede06782c49a18ede1a67a49d969973650af
git+https://github.com/Hiroshiba/yukarin_sosf@2f8915b4e7499541d44f170fb93e46f616e6009d
git+https://github.com/Hiroshiba/yukarin_sosoa@4e37ef9629109b5fc63f4bc0a1470ff9a9ccd932
torch==1.13.1
onnx==1.16.2
onnxruntime==1.18.1
git+https://github.com/Hiroshiba/yukarin_s@41ac963d29986effeee8e615be9b8e49a16c26d6
git+https://github.com/Hiroshiba/yukarin_sa@f99eb4446dd4ad5728e7a9639bcd55eeb5afc759
git+https://github.com/Hiroshiba/yukarin_sosf@bcc24a3bf630aacc50231243b60aba6a9378e19a
git+https://github.com/Hiroshiba/yukarin_sosoa@61dabc15f6515f26d4de3262e7b0829772096036
git+https://github.com/Hiroshiba/hifi-gan@265da0f0f71923336615d6657f195ffdc6df25e4#egg=hifi_gan
git+https://github.com/VOICEVOX/pyopenjtalk@b35fc89fe42948a28e33aed886ea145a51113f88#egg=pyopenjtalk
6 changes: 4 additions & 2 deletions vv_core_inference/utility.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
import numpy
import torch
from torch import Tensor
from torch.onnx.symbolic_helper import _onnx_main_opset, _onnx_stable_opsets
OPSET = _onnx_stable_opsets[-1]
from torch.onnx import _constants

OPSET = _constants.ONNX_DEFAULT_OPSET


def extract_number(f):
s = re.findall(r"\d+", str(f))
Expand Down

0 comments on commit 8b2aa1d

Please sign in to comment.