From 209c1d82e3facdccc7f84306ae321f4cc327b533 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Thu, 12 May 2022 22:28:37 +0900 Subject: [PATCH 01/18] =?UTF-8?q?=E5=90=84=E3=83=97=E3=83=A9=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E5=88=A5=E3=81=AB?= =?UTF-8?q?=E6=96=B0=E3=81=97=E3=81=8F=E6=B1=BA=E3=82=81=E3=82=89=E3=82=8C?= =?UTF-8?q?=E3=81=9F=E3=82=A2=E3=82=BB=E3=83=83=E3=83=88=E5=90=8D=E3=81=AE?= =?UTF-8?q?zip=E3=82=92=E3=83=80=E3=82=A6=E3=83=B3=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 30 +++++++++++++++++++++++------- Dockerfile | 9 +++++---- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed88830cd..64a67aa4e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ env: IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/voicevox_engine PYTHON_VERSION: "3.8.10" VOICEVOX_RESOURCE_VERSION: "0.11.4" - VOICEVOX_CORE_VERSION: "0.12.0-preview.2" + VOICEVOX_CORE_VERSION: "0.12.0-preview.3" VOICEVOX_ENGINE_VERSION: |- # releaseのときはタグが、それ以外はlatestがバージョン名に ${{ github.event.release.tag_name != '' && github.event.release.tag_name || 'latest' }} @@ -26,12 +26,16 @@ jobs: - os: macos-11 python_architecture: "x64" pip_cache_path: ~/Library/Caches/pip + voicevox_core_asset_prefix: voicevox_core-osx-universal2-cpu 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 }} + env: + VOICEVOX_CORE_ASSET_NAME: "${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }}" + steps: - uses: actions/checkout@v2 @@ -145,9 +149,9 @@ jobs: shell: bash run: | # extracted like download/core/metas.json - curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/core.zip" > download/core.zip - ditto -x -k --sequesterRsrc --rsrc download/core.zip download/ - rm download/core.zip + curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/core.zip + ditto -x -k --sequesterRsrc --rsrc download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip download/ + rm download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip - name: Download PyOpenJTalk dictionary shell: bash @@ -250,6 +254,7 @@ jobs: target: build-env base_image: ubuntu:bionic base_runtime_image: ubuntu:bionic + voicevox_core_asset_prefix: voicevox_core-linux-x64-cpu 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 @@ -259,6 +264,7 @@ jobs: target: build-env base_image: ubuntu:bionic base_runtime_image: nvidia/cuda:11.4.2-cudnn8-runtime-ubuntu18.04 + voicevox_core_asset_prefix: voicevox_core-linux-x64-gpu 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 @@ -266,6 +272,9 @@ jobs: runs-on: ${{ matrix.os }} + env: + VOICEVOX_CORE_ASSET_NAME: "${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }}" + steps: - uses: actions/checkout@v2 @@ -320,6 +329,7 @@ jobs: BASE_RUNTIME_IMAGE=${{ matrix.base_runtime_image }} PYTHON_VERSION=${{ env.PYTHON_VERSION }} VOICEVOX_ENGINE_VERSION=${{ env.VOICEVOX_ENGINE_VERSION }} + VOICEVOX_CORE_ASSET_NAME=${{ env.VOICEVOX_CORE_ASSET_NAME }} VOICEVOX_CORE_VERSION=${{ env.VOICEVOX_CORE_VERSION }} VOICEVOX_CORE_LIBRARY_NAME=${{ matrix.voicevox_core_library_name }} ONNXRUNTIME_URL=${{ matrix.onnxruntime_url }} @@ -372,6 +382,7 @@ jobs: # Windows CPU - os: windows-2019 architecture: "x64" + voicevox_core_asset_prefix: voicevox_core-windows-x64-cpu 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 @@ -381,6 +392,7 @@ jobs: # Windows DirectML - os: windows-2019 architecture: "x64" + voicevox_core_asset_prefix: voicevox_core-windows-x64-directml voicevox_core_dll_name: core_gpu_x64_directml.dll onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/Microsoft.ML.OnnxRuntime.DirectML.1.10.0.zip directml_url: https://www.nuget.org/api/v2/package/Microsoft.AI.DirectML/1.8.0 @@ -391,6 +403,7 @@ jobs: # Windows NVIDIA GPU - os: windows-2019 architecture: "x64" + voicevox_core_asset_prefix: voicevox_core-windows-x64-cuda 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" @@ -402,6 +415,9 @@ jobs: runs-on: ${{ matrix.os }} + env: + VOICEVOX_CORE_ASSET_NAME: "${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }}" + steps: - uses: actions/checkout@v2 @@ -660,9 +676,9 @@ jobs: if: steps.voicevox-core-cache.outputs.cache-hit != 'true' shell: bash run: | - curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/core.zip" > download/core.zip - unzip download/core.zip -d download/ - rm download/core.zip + curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/core.zip + unzip download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip -d download/ + rm download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip - name: Generate licenses.json shell: bash diff --git a/Dockerfile b/Dockerfile index 1458f40eb..5eaa2c22e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,15 +21,16 @@ RUN <= 0.11.0 (ONNX) -ARG VOICEVOX_CORE_VERSION=0.12.0-preview.2 +ARG VOICEVOX_CORE_ASSET_NAME=voicevox_core-linux-x64-cpu-0.12.0-preview.3 +ARG VOICEVOX_CORE_VERSION=0.12.0-preview.3 ARG VOICEVOX_CORE_LIBRARY_NAME=libcore_cpu_x64.so RUN < Date: Fri, 13 May 2022 00:15:06 +0900 Subject: [PATCH 02/18] =?UTF-8?q?=E5=85=B1=E6=9C=89=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=96=E3=83=A9=E3=83=AA=E3=81=AE=E5=90=8D=E7=A7=B0=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=82=84metas.json=E3=83=BB=E3=83=A2=E3=83=87?= =?UTF-8?q?=E3=83=AB=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=8C=E3=81=AA?= =?UTF-8?q?=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=9F=E3=81=93=E3=81=A8=E3=82=92?= =?UTF-8?q?=E5=8F=8D=E6=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 25 +++++++------------------ Dockerfile | 15 +++------------ 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64a67aa4e..7af79819a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,6 @@ jobs: python_architecture: "x64" pip_cache_path: ~/Library/Caches/pip voicevox_core_asset_prefix: voicevox_core-osx-universal2-cpu - 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 @@ -148,10 +147,10 @@ jobs: if: steps.voicevox-core-cache.outputs.cache-hit != 'true' shell: bash run: | - # extracted like download/core/metas.json + # extracted like download/core/libcore.dylib curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/core.zip - ditto -x -k --sequesterRsrc --rsrc download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip download/ - rm download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip + ditto -x -k --sequesterRsrc --rsrc download/core.zip download/ + rm download/core.zip - name: Download PyOpenJTalk dictionary shell: bash @@ -197,9 +196,7 @@ jobs: --include-data-file=../licenses.json=./ \ --include-data-file=../presets.yaml=./ \ --include-data-file=../default.csv=./ \ - --include-data-file=../download/core/*.bin=./ \ - --include-data-file=../download/core/metas.json=./ \ - --include-data-file=../download/core/${{ matrix.voicevox_core_library_name }}=./ \ + --include-data-file=../download/core/libcore.dylib=./ \ --include-data-file=../download/onnxruntime/lib/libonnxruntime.dylib=./ \ --include-data-file=${{ env.pythonLocation }}/lib/python*/site-packages/scipy/.dylibs/*.dylib=./scipy/.dylibs/ \ --include-data-file=${{ env.pythonLocation }}/lib/python*/site-packages/_soundfile_data/*=./_soundfile_data/ \ @@ -255,7 +252,6 @@ jobs: base_image: ubuntu:bionic base_runtime_image: ubuntu:bionic voicevox_core_asset_prefix: voicevox_core-linux-x64-cpu - 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 @@ -265,7 +261,6 @@ jobs: base_image: ubuntu:bionic base_runtime_image: nvidia/cuda:11.4.2-cudnn8-runtime-ubuntu18.04 voicevox_core_asset_prefix: voicevox_core-linux-x64-gpu - 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 @@ -331,7 +326,6 @@ jobs: VOICEVOX_ENGINE_VERSION=${{ env.VOICEVOX_ENGINE_VERSION }} VOICEVOX_CORE_ASSET_NAME=${{ env.VOICEVOX_CORE_ASSET_NAME }} VOICEVOX_CORE_VERSION=${{ env.VOICEVOX_CORE_VERSION }} - VOICEVOX_CORE_LIBRARY_NAME=${{ matrix.voicevox_core_library_name }} ONNXRUNTIME_URL=${{ matrix.onnxruntime_url }} target: ${{ matrix.target }} load: true @@ -383,7 +377,6 @@ jobs: - os: windows-2019 architecture: "x64" voicevox_core_asset_prefix: voicevox_core-windows-x64-cpu - 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 @@ -393,7 +386,6 @@ jobs: - os: windows-2019 architecture: "x64" voicevox_core_asset_prefix: voicevox_core-windows-x64-directml - voicevox_core_dll_name: core_gpu_x64_directml.dll onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/Microsoft.ML.OnnxRuntime.DirectML.1.10.0.zip directml_url: https://www.nuget.org/api/v2/package/Microsoft.AI.DirectML/1.8.0 ccache_url: https://github.com/ccache/ccache/releases/download/v4.4.1/ccache-4.4.1-windows-64.zip @@ -404,7 +396,6 @@ jobs: - os: windows-2019 architecture: "x64" voicevox_core_asset_prefix: voicevox_core-windows-x64-cuda - 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 @@ -677,8 +668,8 @@ jobs: shell: bash run: | curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/core.zip - unzip download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip -d download/ - rm download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip + unzip download/core.zip -d download/ + rm download/core.zip - name: Generate licenses.json shell: bash @@ -725,10 +716,8 @@ jobs: --include-data-file="licenses.json=./" \ --include-data-file="default.csv=./" \ --include-data-file="presets.yaml=./" \ - --include-data-file=download/core/*.bin=./ \ - --include-data-file="download/core/metas.json=./" \ --include-data-file="download/onnxruntime/lib/onnxruntime.dll=./" \ - --include-data-file="download/core/${{ matrix.voicevox_core_dll_name }}=./" \ + --include-data-file="download/core/core.dll=./" \ --include-data-dir="speaker_info=./speaker_info" \ --include-data-dir="manifest_assets=./manifest_assets" \ --msvc=14.2 \ diff --git a/Dockerfile b/Dockerfile index 5eaa2c22e..1e0bfbb1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,24 +23,17 @@ EOF # assert VOICEVOX_CORE_VERSION >= 0.11.0 (ONNX) ARG VOICEVOX_CORE_ASSET_NAME=voicevox_core-linux-x64-cpu-0.12.0-preview.3 ARG VOICEVOX_CORE_VERSION=0.12.0-preview.3 -ARG VOICEVOX_CORE_LIBRARY_NAME=libcore_cpu_x64.so RUN < Date: Fri, 13 May 2022 00:28:39 +0900 Subject: [PATCH 03/18] =?UTF-8?q?VOICEVOX=5FCORE=5FASSET=5FNAME=E3=81=AE?= =?UTF-8?q?=E5=AE=9A=E7=BE=A9=E5=A0=B4=E6=89=80=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit env.VOICEVOX_CORE_VERSIONを認識してくれなかったため --- .github/workflows/build.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7af79819a..75a2dfd60 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,9 +32,6 @@ jobs: runs-on: ${{ matrix.os }} - env: - VOICEVOX_CORE_ASSET_NAME: "${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }}" - steps: - uses: actions/checkout@v2 @@ -146,6 +143,8 @@ jobs: - name: Download VOICEVOX Core release if: steps.voicevox-core-cache.outputs.cache-hit != 'true' shell: bash + env: + VOICEVOX_CORE_ASSET_NAME: "${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }}" run: | # extracted like download/core/libcore.dylib curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/core.zip @@ -267,9 +266,6 @@ jobs: runs-on: ${{ matrix.os }} - env: - VOICEVOX_CORE_ASSET_NAME: "${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }}" - steps: - uses: actions/checkout@v2 @@ -315,6 +311,7 @@ jobs: env: IMAGE_TAG: ${{ env.IMAGE_NAME }}:${{ matrix.tag }}${{ (matrix.tag != '' && '-') || '' }}latest RUNTIME_IMAGE_TAG: ${{ env.IMAGE_NAME }}:${{ matrix.runtime_tag }}${{ (matrix.runtime_tag != '' && '-') || '' }}latest + VOICEVOX_CORE_ASSET_NAME: "${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }}" with: context: . builder: ${{ steps.buildx.outputs.name }} @@ -406,9 +403,6 @@ jobs: runs-on: ${{ matrix.os }} - env: - VOICEVOX_CORE_ASSET_NAME: "${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }}" - steps: - uses: actions/checkout@v2 @@ -666,6 +660,8 @@ jobs: - name: Download VOICEVOX Core if: steps.voicevox-core-cache.outputs.cache-hit != 'true' shell: bash + env: + VOICEVOX_CORE_ASSET_NAME: "${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }}" run: | curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/core.zip unzip download/core.zip -d download/ From 2a6e7dc837b64982287f7647b310fa4db8d4249e Mon Sep 17 00:00:00 2001 From: PickledChair Date: Fri, 13 May 2022 00:34:51 +0900 Subject: [PATCH 04/18] trivial change --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75a2dfd60..be7f35239 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -144,7 +144,7 @@ jobs: if: steps.voicevox-core-cache.outputs.cache-hit != 'true' shell: bash env: - VOICEVOX_CORE_ASSET_NAME: "${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }}" + VOICEVOX_CORE_ASSET_NAME: ${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }} run: | # extracted like download/core/libcore.dylib curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/core.zip @@ -311,7 +311,7 @@ jobs: env: IMAGE_TAG: ${{ env.IMAGE_NAME }}:${{ matrix.tag }}${{ (matrix.tag != '' && '-') || '' }}latest RUNTIME_IMAGE_TAG: ${{ env.IMAGE_NAME }}:${{ matrix.runtime_tag }}${{ (matrix.runtime_tag != '' && '-') || '' }}latest - VOICEVOX_CORE_ASSET_NAME: "${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }}" + VOICEVOX_CORE_ASSET_NAME: ${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }} with: context: . builder: ${{ steps.buildx.outputs.name }} @@ -661,7 +661,7 @@ jobs: if: steps.voicevox-core-cache.outputs.cache-hit != 'true' shell: bash env: - VOICEVOX_CORE_ASSET_NAME: "${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }}" + VOICEVOX_CORE_ASSET_NAME: ${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }} run: | curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/core.zip unzip download/core.zip -d download/ From 77cb4d47ffeb4e60d60e8f752cad787d2584e6cc Mon Sep 17 00:00:00 2001 From: PickledChair Date: Fri, 13 May 2022 01:35:34 +0900 Subject: [PATCH 05/18] =?UTF-8?q?zip=E8=A7=A3=E5=87=8D=E5=BE=8C=E3=81=AE?= =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E5=90=8D=E3=82=92=E6=AD=A3?= =?UTF-8?q?=E3=81=97=E3=81=8F=E6=8C=87=E5=AE=9A=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 18 ++++++++++++------ Dockerfile | 9 ++++++--- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c17fd8dc6..ffda243ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -147,9 +147,12 @@ jobs: VOICEVOX_CORE_ASSET_NAME: ${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }} run: | # extracted like download/core/libcore.dylib - curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/core.zip - ditto -x -k --sequesterRsrc --rsrc download/core.zip download/ - rm download/core.zip + curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip + ditto -x -k --sequesterRsrc --rsrc download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip download/ + mkdir -p download/core + mv download/${{ env.VOICEVOX_CORE_ASSET_NAME }}/* download/core + rm -rf download/${{ env.VOICEVOX_CORE_ASSET_NAME }} + rm download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip - name: Download PyOpenJTalk dictionary shell: bash @@ -663,9 +666,12 @@ jobs: env: VOICEVOX_CORE_ASSET_NAME: ${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }} run: | - curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/core.zip - unzip download/core.zip -d download/ - rm download/core.zip + curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip + unzip download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip -d download/ + mkdir -p download/core + mv download/${{ env.VOICEVOX_CORE_ASSET_NAME }}/* download/core + rm -rf download/${{ env.VOICEVOX_CORE_ASSET_NAME }} + rm download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip - name: Generate licenses.json shell: bash diff --git a/Dockerfile b/Dockerfile index 1e0bfbb1c..2e4c063ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,9 +27,12 @@ RUN < Date: Fri, 13 May 2022 02:50:15 +0900 Subject: [PATCH 06/18] =?UTF-8?q?glob=20=E3=83=91=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=B3=E3=81=AF=E3=83=80=E3=83=96=E3=83=AB=E3=82=AF=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=AE=E5=A4=96=E3=81=AB=E5=87=BA=E3=81=95?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=A8=E6=A9=9F=E8=83=BD=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2e4c063ca..fa993b4dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN < Date: Fri, 13 May 2022 03:37:39 +0900 Subject: [PATCH 07/18] =?UTF-8?q?core=E3=81=AE=E3=82=A2=E3=82=BB=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=81=AEzip=E8=A7=A3=E5=87=8D=E3=82=92unzip=E3=81=A7?= =?UTF-8?q?=E3=81=AF=E3=81=AA=E3=81=8F7z=E3=81=A7=E8=A1=8C=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ffda243ea..4dc762736 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -667,7 +667,8 @@ jobs: VOICEVOX_CORE_ASSET_NAME: ${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }} run: | curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip - unzip download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip -d download/ + # unzip download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip -d download/ + 7z x -o"download" download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip mkdir -p download/core mv download/${{ env.VOICEVOX_CORE_ASSET_NAME }}/* download/core rm -rf download/${{ env.VOICEVOX_CORE_ASSET_NAME }} From b354fcfb760586a0901e9cd7e7780cb3a43dda92 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Fri, 13 May 2022 03:53:41 +0900 Subject: [PATCH 08/18] =?UTF-8?q?VERSION=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E7=A7=BB=E5=8B=95=E3=82=92=E5=BE=A9=E6=B4=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index fa993b4dd..6f8b2c087 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,6 +38,9 @@ RUN < Date: Fri, 13 May 2022 04:09:36 +0900 Subject: [PATCH 09/18] =?UTF-8?q?=E7=8F=BE=E5=9C=A8=E3=81=AE=E3=82=A2?= =?UTF-8?q?=E3=82=BB=E3=83=83=E3=83=88=E3=81=AB=E3=81=AFREADME=E3=81=8C?= =?UTF-8?q?=E5=90=AB=E3=81=BE=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=81=AE=E3=81=A7README=E3=81=AEcat=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f8b2c087..3741ef06d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -249,8 +249,6 @@ COPY --chmod=775 < /dev/stderr - exec "\$@" EOF From 4b65a33070b64cdd9bb7603e371db952e34cc6f3 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Fri, 13 May 2022 04:25:47 +0900 Subject: [PATCH 10/18] =?UTF-8?q?Windows=E7=89=88=E3=81=AB=E3=81=8A?= =?UTF-8?q?=E3=81=91=E3=82=8B=E3=82=B3=E3=82=A2=E3=81=AEzip=E8=A7=A3?= =?UTF-8?q?=E5=87=8D=E6=96=B9=E6=B3=95=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4dc762736..31da6dd31 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -667,6 +667,10 @@ jobs: VOICEVOX_CORE_ASSET_NAME: ${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }} run: | curl -L "https://github.com/VOICEVOX/voicevox_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip + # NOTE: Windows 版コアのみ PowerShell の Compress-Archive コマンドレットを用いて zip を作成している（デフォルト状態では zip コマンドが存在していないため）。 + # このコマンドはバージョンによっては作成した zip 内のパスの区切り文字がバックスラッシュになる。 (cf. https://github.com/PowerShell/Microsoft.PowerShell.Archive/issues/48) + # unzip コマンドはこのような zip ファイルを解凍できるものの、終了コード 1 を報告して CI が落ちてしまう。 + # 回避策として、unzip コマンドの代わりに 7z コマンドを用いて zip ファイルを解凍する。 # unzip download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip -d download/ 7z x -o"download" download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip mkdir -p download/core From ed2549a64b0c9d7cf5a23cce91b6294bdc983c4a Mon Sep 17 00:00:00 2001 From: PickledChair Date: Fri, 13 May 2022 04:37:51 +0900 Subject: [PATCH 11/18] =?UTF-8?q?build-docker.yml=E3=82=92=E3=82=B3?= =?UTF-8?q?=E3=82=A20.12.0-preview.3=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=95?= =?UTF-8?q?=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-docker.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index ceeedf872..d00199d51 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -11,7 +11,7 @@ on: env: IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/voicevox_engine PYTHON_VERSION: "3.8.10" - VOICEVOX_CORE_VERSION: "0.11.4" + VOICEVOX_CORE_VERSION: "0.12.0-preview.3" VOICEVOX_ENGINE_VERSION: |- # releaseのときはタグが、それ以外はlatestがバージョン名に ${{ github.event.release.tag_name != '' && github.event.release.tag_name || 'latest' }} @@ -37,44 +37,44 @@ jobs: target: runtime-env base_image: ubuntu:focal base_runtime_image: ubuntu:focal - voicevox_core_library_name: libcore_cpu_x64.so + voicevox_core_asset_prefix: voicevox_core-linux-x64-cpu onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz - tag: cpu target: runtime-env base_image: ubuntu:focal base_runtime_image: ubuntu:focal - voicevox_core_library_name: libcore_cpu_x64.so + voicevox_core_asset_prefix: voicevox_core-linux-x64-cpu onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz - tag: cpu-ubuntu20.04 target: runtime-env base_image: ubuntu:focal base_runtime_image: ubuntu:focal - voicevox_core_library_name: libcore_cpu_x64.so + voicevox_core_asset_prefix: voicevox_core-linux-x64-cpu onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz - tag: nvidia target: runtime-nvidia-env base_image: ubuntu:focal base_runtime_image: nvidia/cuda:11.4.2-cudnn8-runtime-ubuntu20.04 - voicevox_core_library_name: libcore_gpu_x64_nvidia.so + voicevox_core_asset_prefix: voicevox_core-linux-x64-gpu onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-gpu-1.10.0.tgz - tag: nvidia-ubuntu20.04 target: runtime-nvidia-env base_image: ubuntu:focal base_runtime_image: nvidia/cuda:11.4.2-cudnn8-runtime-ubuntu20.04 - voicevox_core_library_name: libcore_gpu_x64_nvidia.so + voicevox_core_asset_prefix: voicevox_core-linux-x64-gpu onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-gpu-1.10.0.tgz # Ubuntu 18.04 - tag: cpu-ubuntu18.04 target: runtime-env base_image: ubuntu:bionic base_runtime_image: ubuntu:bionic - voicevox_core_library_name: libcore_cpu_x64.so + voicevox_core_asset_prefix: voicevox_core-linux-x64-cpu onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz - tag: nvidia-ubuntu18.04 target: runtime-nvidia-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 + voicevox_core_asset_prefix: voicevox_core-linux-x64-gpu onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-gpu-1.10.0.tgz steps: @@ -100,6 +100,7 @@ jobs: format('{0}:{1}-{2}', env.IMAGE_NAME, matrix.tag, env.VOICEVOX_ENGINE_VERSION) ) || format('{0}:{1}', env.IMAGE_NAME, env.VOICEVOX_ENGINE_VERSION) ) }} + VOICEVOX_CORE_ASSET_NAME: ${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }} with: context: . builder: ${{ steps.buildx.outputs.name }} @@ -109,8 +110,8 @@ jobs: BASE_RUNTIME_IMAGE=${{ matrix.base_runtime_image }} PYTHON_VERSION=${{ env.PYTHON_VERSION }} VOICEVOX_ENGINE_VERSION=${{ env.VOICEVOX_ENGINE_VERSION }} + VOICEVOX_CORE_ASSET_NAME=${{ env.VOICEVOX_CORE_ASSET_NAME }} VOICEVOX_CORE_VERSION=${{ env.VOICEVOX_CORE_VERSION }} - VOICEVOX_CORE_LIBRARY_NAME=${{ matrix.voicevox_core_library_name }} ONNXRUNTIME_URL=${{ matrix.onnxruntime_url }} target: ${{ matrix.target }} push: true From 14b16eecb9c6d673c417149430b403147a700e1a Mon Sep 17 00:00:00 2001 From: PickledChair Date: Fri, 13 May 2022 13:45:28 +0900 Subject: [PATCH 12/18] =?UTF-8?q?version=200.12=20=E4=BB=A5=E9=99=8D?= =?UTF-8?q?=E3=81=AE=E3=82=B3=E3=82=A2=E3=81=AE=E8=AA=AD=E3=81=BF=E8=BE=BC?= =?UTF-8?q?=E3=81=BF=E6=99=82=E3=81=ABPath=E3=82=92str=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=8F=9B=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- voicevox_engine/synthesis_engine/core_wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voicevox_engine/synthesis_engine/core_wrapper.py b/voicevox_engine/synthesis_engine/core_wrapper.py index d6c72c2b7..abca4a44e 100644 --- a/voicevox_engine/synthesis_engine/core_wrapper.py +++ b/voicevox_engine/synthesis_engine/core_wrapper.py @@ -292,7 +292,7 @@ def check_core_type(core_dir: Path) -> Optional[str]: def load_core(core_dir: Path, use_gpu: bool) -> CDLL: if is_version_0_12_core_or_later(core_dir): try: - return CDLL((core_dir / CORENAME_DICT[platform.system()]).resolve(True)) + return CDLL(str((core_dir / CORENAME_DICT[platform.system()]).resolve(strict=True))) except OSError as err: raise RuntimeError(f"コアの読み込みに失敗しました：{err}") From a910098a67f6d32f848447567f90c95d7b6d7fa2 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Fri, 13 May 2022 13:50:14 +0900 Subject: [PATCH 13/18] format --- voicevox_engine/synthesis_engine/core_wrapper.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/voicevox_engine/synthesis_engine/core_wrapper.py b/voicevox_engine/synthesis_engine/core_wrapper.py index abca4a44e..20387ab9b 100644 --- a/voicevox_engine/synthesis_engine/core_wrapper.py +++ b/voicevox_engine/synthesis_engine/core_wrapper.py @@ -292,7 +292,9 @@ def check_core_type(core_dir: Path) -> Optional[str]: def load_core(core_dir: Path, use_gpu: bool) -> CDLL: if is_version_0_12_core_or_later(core_dir): try: - return CDLL(str((core_dir / CORENAME_DICT[platform.system()]).resolve(strict=True))) + return CDLL( + str((core_dir / CORENAME_DICT[platform.system()]).resolve(strict=True)) + ) except OSError as err: raise RuntimeError(f"コアの読み込みに失敗しました：{err}") From 027f2d2681ad081f1af922e2babd3cde99832819 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Fri, 13 May 2022 17:17:46 +0900 Subject: [PATCH 14/18] =?UTF-8?q?CDLL=E3=82=AF=E3=83=A9=E3=82=B9=E3=81=AE?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=82=B9=E3=83=88=E3=83=A9=E3=82=AF=E3=82=BF?= =?UTF-8?q?=E3=81=AE=E5=BC=95=E6=95=B0=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6?= =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- voicevox_engine/synthesis_engine/core_wrapper.py | 1 + 1 file changed, 1 insertion(+) diff --git a/voicevox_engine/synthesis_engine/core_wrapper.py b/voicevox_engine/synthesis_engine/core_wrapper.py index 20387ab9b..914f95638 100644 --- a/voicevox_engine/synthesis_engine/core_wrapper.py +++ b/voicevox_engine/synthesis_engine/core_wrapper.py @@ -292,6 +292,7 @@ def check_core_type(core_dir: Path) -> Optional[str]: def load_core(core_dir: Path, use_gpu: bool) -> CDLL: if is_version_0_12_core_or_later(core_dir): try: + # NOTE: CDLL クラスのコンストラクタの引数 name には文字列を渡す必要がある return CDLL( str((core_dir / CORENAME_DICT[platform.system()]).resolve(strict=True)) ) From 1d69a6964187d2a457a43e3673853ad97708b7db Mon Sep 17 00:00:00 2001 From: PickledChair Date: Fri, 13 May 2022 17:31:49 +0900 Subject: [PATCH 15/18] =?UTF-8?q?CDLL=E3=81=AE=E5=BC=95=E6=95=B0=E3=81=AB?= =?UTF-8?q?=E3=81=A4=E3=81=84=E3=81=A6=E3=81=95=E3=82=89=E3=81=AB=E8=BF=BD?= =?UTF-8?q?=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- voicevox_engine/synthesis_engine/core_wrapper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/voicevox_engine/synthesis_engine/core_wrapper.py b/voicevox_engine/synthesis_engine/core_wrapper.py index 914f95638..7521724ab 100644 --- a/voicevox_engine/synthesis_engine/core_wrapper.py +++ b/voicevox_engine/synthesis_engine/core_wrapper.py @@ -292,7 +292,8 @@ def check_core_type(core_dir: Path) -> Optional[str]: def load_core(core_dir: Path, use_gpu: bool) -> CDLL: if is_version_0_12_core_or_later(core_dir): try: - # NOTE: CDLL クラスのコンストラクタの引数 name には文字列を渡す必要がある + # NOTE: CDLL クラスのコンストラクタの引数 name には文字列を渡す必要がある。 + # Windows 環境では PathLike オブジェクトを引数として渡すと初期化に失敗する。 return CDLL( str((core_dir / CORENAME_DICT[platform.system()]).resolve(strict=True)) ) From a44f48e6d19d332b51d295fb8d208059a54035ec Mon Sep 17 00:00:00 2001 From: PickledChair Date: Sat, 14 May 2022 09:37:24 +0900 Subject: [PATCH 16/18] =?UTF-8?q?=E5=BE=8C=E3=81=A7README=E3=81=AE?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=83=BB=E8=A1=A8=E7=A4=BA=E3=82=92=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=81=84=E6=97=A8=E3=82=92=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index 3741ef06d..f756ae50f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,6 +39,8 @@ RUN < /dev/stderr + exec "\$@" EOF From cb659542a6ab17aa94262f8f65691bf55e882e86 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Sat, 14 May 2022 10:45:08 +0900 Subject: [PATCH 17/18] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f756ae50f..beee3b725 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,8 +39,6 @@ RUN < /dev/stderr exec "\$@" From ac5ce92659a81833120b3174993607202a02cc3b Mon Sep 17 00:00:00 2001 From: PickledChair Date: Sat, 14 May 2022 16:03:01 +0900 Subject: [PATCH 18/18] =?UTF-8?q?README=E3=81=AE=E3=83=93=E3=83=AB?= =?UTF-8?q?=E3=83=89=E6=96=B9=E6=B3=95=E3=81=AE=E8=A8=98=E8=BC=89=E3=82=92?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 8ca584fe6..3d28645a2 100644 --- a/README.md +++ b/README.md @@ -457,8 +457,6 @@ python -m nuitka \ --include-data-file=default.csv=./ \ --include-data-file=C:/path/to/cuda/*.dll=./ \ --include-data-file=C:/path/to/onnxruntime/lib/*.dll=./ \ - --include-data-file=C:/音声ライブラリへのパス/*.bin=./ \ - --include-data-file=C:/音声ライブラリへのパス/metas.json=./ \ --include-data-dir=.venv/Lib/site-packages/_soundfile_data=./_soundfile_data \ --include-data-dir=speaker_info=./speaker_info \ --msvc=14.2 \