Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker Linux: VOICEVOX CORE 0.6.0に追従 #114

Merged
merged 23 commits into from
Sep 23, 2021

Conversation

aoirint
Copy link
Member

@aoirint aoirint commented Sep 21, 2021

  • Jobの変数・Dockerのbuild-argを変更
    • INFERENCE_DEVICEを廃止(複数の目的に使われないようにするため)
    • VOICEVOX_CORE_LIBRARY_NAMEを追加(core_cpuまたはcore
  • VOICEVOX CORE 0.6.0に追従
    • CPU版イメージでは、CPU版共有ライブラリ(libcore_cpu.so)を使用

VOICEVOX_CORE_LIBRARY_NAME

  • CPU・GPUどちらの共有ライブラリ(libcore_cpu.solibcore.so)を使うか選択
  • イメージ内では、VOICEVOX COREの共有ライブラリ名をlibcore.soに統一
    • ldconfig がCPU・GPUの共有ライブラリを重複したライブラリとして扱い、一方を認識しない問題が起きたため
    • エラー内容: /sbin/ldconfig.real: /opt/voicevox_core/libcore.so is not a symbolic link

@aoirint aoirint marked this pull request as draft September 21, 2021 15:22
@aoirint aoirint marked this pull request as ready for review September 21, 2021 15:40
@aoirint aoirint changed the title Dockerfile (Linux): VOICEVOX CORE 0.6.0に追従 Docker Linux: VOICEVOX CORE 0.6.0に追従 Sep 21, 2021
aoirint added a commit to aoirint/voicevox_engine that referenced this pull request Sep 21, 2021
@aoirint aoirint marked this pull request as draft September 21, 2021 15:59
@aoirint aoirint marked this pull request as ready for review September 21, 2021 16:00
@aoirint aoirint marked this pull request as draft September 21, 2021 16:02
@aoirint aoirint marked this pull request as ready for review September 21, 2021 16:11
Copy link
Member

@Hiroshiba Hiroshiba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

一箇所だけ気になったのでコメントしました!

Copy link
Member

@Hiroshiba Hiroshiba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@Hiroshiba Hiroshiba merged commit 0ad3d57 into VOICEVOX:master Sep 23, 2021
Hiroshiba pushed a commit that referenced this pull request Sep 23, 2021
* docker: add BASE_IMAGE arg

* build-docker: support BASE_IMAGE arg

* build-docker: add ubuntu18.04 images

* fix duplicated docker image tags

* Makefile: build-linux-docker-ubuntu18.04

* linux: sort workflow job matrix

* linux docker: upgrade to VOICEVOX CORE 0.6.0

* linux docker: overwrite gpu so with cpu so

* linux docker: rewrite setup.py to use libcore_cpu for cpu image

* remove unused core shared object (prevent ldconfig error)

* swap build arg order (core library name -> core example version)

* revert swap

* fix yaml string

* fix yaml string

* fix matrix

* fix matrix

* reduce diff

* revert matrix build.yml

* on push master

* split workaround layer

* follow voicevox core 0.6.0

* Makefile: follow #114

* reset workaround: rename libcore_cpu to libcore

* rm -f instead rm

* reorder entrypoint.sh dump to fast debug rebuild

* logic to determine old glibc is used or not

* replace glibc version check logic with build arg flag

* add use_glibc_229_workaround build-arg to workflow

* workflow: commonize voicevox_core_version, voicevox_core_example_version

* add os in matrix

* add tag to matrix

* commonize os

* fix matrix for build.yml

* fix matrix for build.yml

* rm os in include

* add tag in matrix

* use cpu core for cpu-ubuntu18.04

* rename GLIBC_229_WORKAROUND to GLIBC_231_WORKAROUND

* fix indent

* remove redundant versions

* replace retry logic (unsupported feature for old gnu parallel)

* fix indent

* revert ldconfig location
Hiroshiba pushed a commit that referenced this pull request Sep 23, 2021
* docker: add BASE_IMAGE arg

* build-docker: support BASE_IMAGE arg

* build-docker: add ubuntu18.04 images

* fix duplicated docker image tags

* Makefile: build-linux-docker-ubuntu18.04

* linux: sort workflow job matrix

* linux docker: upgrade to VOICEVOX CORE 0.6.0

* linux docker: overwrite gpu so with cpu so

* linux docker: rewrite setup.py to use libcore_cpu for cpu image

* remove unused core shared object (prevent ldconfig error)

* swap build arg order (core library name -> core example version)

* revert swap

* fix yaml string

* fix yaml string

* fix matrix

* fix matrix

* reduce diff

* revert matrix build.yml

* on push master

* split workaround layer

* follow voicevox core 0.6.0

* Makefile: follow #114

* reset workaround: rename libcore_cpu to libcore

* rm -f instead rm

* reorder entrypoint.sh dump to fast debug rebuild

* logic to determine old glibc is used or not

* replace glibc version check logic with build arg flag

* add use_glibc_229_workaround build-arg to workflow

* workflow: commonize voicevox_core_version, voicevox_core_example_version

* add os in matrix

* add tag to matrix

* commonize os

* fix matrix for build.yml

* fix matrix for build.yml

* rm os in include

* add tag in matrix

* use cpu core for cpu-ubuntu18.04

* rename GLIBC_229_WORKAROUND to GLIBC_231_WORKAROUND

* fix indent

* remove redundant versions

* replace retry logic (unsupported feature for old gnu parallel)

* fix indent

* revert ldconfig location

* build linux build on ubuntu 18.04

* change nuitka cache key to use tag

* Makefile: download env target

* use pre-cxx11 abi libtorch for ubuntu 18.04

* use pre-cxx11 abi libtorch for ubuntu 18.04

* revert to cxx11-abi

* rm ld.so.conf.d/libtorch.conf for GLIBC_231_WORKAROUND

* add --show-progress for nuitka build

* Makefile: binary build on ubuntu 18.04

* rm show progress

* use glibc 231 flag for binary build
@aoirint aoirint deleted the patch-linux-voicevox-core-0.6.0 branch October 9, 2023 03:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants