To 0.11.0 (#346)

* ドキュメントの更新 * a * a * to 0.11.0
VOICEVOX · Feb 27, 2022 · 3ac57f0 · 3ac57f0
1 parent 46127a0
commit 3ac57f0
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 64 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -10,10 +10,10 @@ on:
 
 env:
   IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/voicevox_engine
-  PYTHON_VERSION: '3.8.10'
-  VOICEVOX_CORE_VERSION: '0.10.0'
-  VOICEVOX_CORE_SOURCE_VERSION: '0.10.0'
-  VOICEVOX_ENGINE_VERSION: |- # releaseのときはタグが、それ以外はlatestがバージョン名に
+  PYTHON_VERSION: "3.8.10"
+  VOICEVOX_CORE_VERSION: "0.11.0"
+  VOICEVOX_ENGINE_VERSION:
+    |- # releaseのときはタグが、それ以外はlatestがバージョン名に
     ${{ github.event.release.tag_name != '' && github.event.release.tag_name || 'latest' }}
 
 jobs:
@@ -24,7 +24,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         tag:
-          - ''
+          - ""
           - cpu
           - cpu-ubuntu20.04
           - nvidia
@@ -93,7 +93,8 @@ jobs:
       - name: Build and Deploy Docker image
         uses: docker/build-push-action@v2
         env:
-          IMAGE_TAG: |- # If it's a release, add the version, otherwise add the `latest`
+          IMAGE_TAG:
+            |- # If it's a release, add the version, otherwise add the `latest`
             ${{ (
               matrix.tag != '' && (
                 format('{0}:{1}-{2}', env.IMAGE_NAME, matrix.tag, env.VOICEVOX_ENGINE_VERSION)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,10 +10,11 @@ on:
 
 env:
   IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/voicevox_engine
-  PYTHON_VERSION: '3.8.10'
-  VOICEVOX_RESOURCE_VERSION: '0.10.0'
-  VOICEVOX_CORE_VERSION: '0.10.0'
-  VOICEVOX_ENGINE_VERSION: |- # releaseのときはタグが、それ以外はlatestがバージョン名に
+  PYTHON_VERSION: "3.8.10"
+  VOICEVOX_RESOURCE_VERSION: "0.11.0"
+  VOICEVOX_CORE_VERSION: "0.11.0"
+  VOICEVOX_ENGINE_VERSION:
+    |- # releaseのときはタグが、それ以外はlatestがバージョン名に
     ${{ github.event.release.tag_name != '' && github.event.release.tag_name || 'latest' }}
 
 jobs:
@@ -22,12 +23,12 @@ jobs:
     strategy:
       matrix:
         include:
-        - os: macos-11
-          python_architecture: "x64"
-          pip_cache_path: ~/Library/Caches/pip
-          voicevox_core_library_name: libcore_cpu_universal2.dylib
-          onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-osx-universal2-1.10.0.tgz
-          artifact_name: macos-x64
+          - os: macos-11
+            python_architecture: "x64"
+            pip_cache_path: ~/Library/Caches/pip
+            voicevox_core_library_name: libcore_cpu_universal2.dylib
+            onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-osx-universal2-1.10.0.tgz
+            artifact_name: macos-x64
 
     runs-on: ${{ matrix.os }}
 
@@ -240,24 +241,24 @@ jobs:
           - build-cpu-ubuntu18.04
           - build-nvidia-ubuntu18.04
         include:
-        - tag: build-cpu-ubuntu18.04
-          runtime_tag: cpu-ubuntu18.04 # for cache use
-          target: build-env
-          base_image: ubuntu:bionic
-          base_runtime_image: ubuntu:bionic
-          voicevox_core_library_name: libcore_cpu_x64.so
-          onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz
-          artifact_name: linux-cpu
-          nuitka_cache_path: nuitka_cache
-        - tag: build-nvidia-ubuntu18.04
-          runtime_tag: nvidia-ubuntu18.04 # for cache use
-          target: build-env
-          base_image: ubuntu:bionic
-          base_runtime_image: nvidia/cuda:11.4.2-cudnn8-runtime-ubuntu18.04
-          voicevox_core_library_name: libcore_gpu_x64_nvidia.so
-          onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-gpu-1.10.0.tgz
-          artifact_name: linux-nvidia
-          nuitka_cache_path: nuitka_cache
+          - tag: build-cpu-ubuntu18.04
+            runtime_tag: cpu-ubuntu18.04 # for cache use
+            target: build-env
+            base_image: ubuntu:bionic
+            base_runtime_image: ubuntu:bionic
+            voicevox_core_library_name: libcore_cpu_x64.so
+            onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz
+            artifact_name: linux-cpu
+            nuitka_cache_path: nuitka_cache
+          - tag: build-nvidia-ubuntu18.04
+            runtime_tag: nvidia-ubuntu18.04 # for cache use
+            target: build-env
+            base_image: ubuntu:bionic
+            base_runtime_image: nvidia/cuda:11.4.2-cudnn8-runtime-ubuntu18.04
+            voicevox_core_library_name: libcore_gpu_x64_nvidia.so
+            onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-gpu-1.10.0.tgz
+            artifact_name: linux-nvidia
+            nuitka_cache_path: nuitka_cache
 
     runs-on: ${{ matrix.os }}
 
@@ -363,26 +364,26 @@ jobs:
     strategy:
       matrix:
         include:
-        # Windows CPU
-        - os: windows-2019
-          python_architecture: 'x64'
-          voicevox_core_dll_name: core_cpu_x64.dll
-          onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-win-x64-1.10.0.zip
-          ccache_url: https://github.com/ccache/ccache/releases/download/v4.4.1/ccache-4.4.1-windows-64.zip
-          artifact_name: windows-cpu
-          nuitka_cache_path: nuitka_cache
-          pip_cache_path: ~\AppData\Local\pip\Cache
-        # Windows NVIDIA GPU
-        - os: windows-2019
-          python_architecture: 'x64'
-          voicevox_core_dll_name: core_gpu_x64_nvidia.dll
-          onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-win-x64-gpu-1.10.0.zip
-          cuda_version: '11.4.2'
-          cudnn_url: https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-11.4-windows-x64-v8.2.4.15.zip
-          ccache_url: https://github.com/ccache/ccache/releases/download/v4.4.1/ccache-4.4.1-windows-64.zip
-          artifact_name: windows-nvidia
-          nuitka_cache_path: nuitka_cache
-          pip_cache_path: ~\AppData\Local\pip\Cache
+          # Windows CPU
+          - os: windows-2019
+            python_architecture: "x64"
+            voicevox_core_dll_name: core_cpu_x64.dll
+            onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-win-x64-1.10.0.zip
+            ccache_url: https://github.com/ccache/ccache/releases/download/v4.4.1/ccache-4.4.1-windows-64.zip
+            artifact_name: windows-cpu
+            nuitka_cache_path: nuitka_cache
+            pip_cache_path: ~\AppData\Local\pip\Cache
+          # Windows NVIDIA GPU
+          - os: windows-2019
+            python_architecture: "x64"
+            voicevox_core_dll_name: core_gpu_x64_nvidia.dll
+            onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-win-x64-gpu-1.10.0.zip
+            cuda_version: "11.4.2"
+            cudnn_url: https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-11.4-windows-x64-v8.2.4.15.zip
+            ccache_url: https://github.com/ccache/ccache/releases/download/v4.4.1/ccache-4.4.1-windows-64.zip
+            artifact_name: windows-nvidia
+            nuitka_cache_path: nuitka_cache
+            pip_cache_path: ~\AppData\Local\pip\Cache
 
     runs-on: ${{ matrix.os }}
 
@@ -770,4 +771,4 @@ jobs:
     uses: ./.github/workflows/release-test.yml
     with:
       version: ${{ github.ref }} # == github.event.release.tag_name
-      repo_url: ${{ format('{0}/{1}', github.server_url, github.repository) }}  # このリポジトリのURL
+      repo_url: ${{ format('{0}/{1}', github.server_url, github.repository) }} # このリポジトリのURL
diff --git a/Dockerfile b/Dockerfile
@@ -20,8 +20,8 @@ RUN <<EOF
     rm -rf /var/lib/apt/lists/*
 EOF
 
-# assert VOICEVOX_CORE_VERSION >= 0.10.0 (ONNX)
-ARG VOICEVOX_CORE_VERSION=0.10.0
+# assert VOICEVOX_CORE_VERSION >= 0.11.0 (ONNX)
+ARG VOICEVOX_CORE_VERSION=0.11.0
 ARG VOICEVOX_CORE_LIBRARY_NAME=libcore_cpu_x64.so
 RUN <<EOF
     set -eux

diff --git a/docs/api/index.html b/docs/api/index.html
diff --git a/make_docs.py b/make_docs.py
@@ -1,12 +1,15 @@
 import json
 
-import run
-
 from voicevox_engine.dev.core import mock as core
 from voicevox_engine.dev.synthesis_engine.mock import MockSynthesisEngine
 
 if __name__ == "__main__":
-    app = run.generate_app(MockSynthesisEngine(speakers=core.metas()))
+    import run
+
+    app = run.generate_app(
+        synthesis_engines={"mock": MockSynthesisEngine(speakers=core.metas())},
+        latest_core_version="mock",
+    )
     with open("docs/api/index.html", "w") as f:
         f.write(
             """<!DOCTYPE html>

diff --git a/voicevox_engine/dev/synthesis_engine/mock.py b/voicevox_engine/dev/synthesis_engine/mock.py
@@ -15,14 +15,18 @@ class MockSynthesisEngine(SynthesisEngineBase):
     SynthesisEngine [Mock]
     """
 
-    def __init__(self, **kwargs):
+    def __init__(
+        self,
+        speakers: str,
+        supported_devices: Optional[str] = None,
+    ):
         """
         __init__ [Mock]
         """
         super().__init__()
 
-        self._speakers = kwargs["speakers"]
-        self._supported_devices = kwargs["supported_devices"]
+        self._speakers = speakers
+        self._supported_devices = supported_devices
         self.default_sampling_rate = 24000
 
     @property