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.

Sign up for GitHub

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

Jump to bottom

共有ライブラリのロードでアーキテクチャを考慮する機能を追加 #327

Merged
merged 4 commits into from
Feb 18, 2022
Merged

共有ライブラリのロードでアーキテクチャを考慮する機能を追加 #327

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94a6184
change os detection method
HyodaKazuaki Feb 14, 2022
3e59989
add machine type check
HyodaKazuaki Feb 16, 2022
6bbbe9c
add new cores to check_core_type
HyodaKazuaki Feb 16, 2022
d942fb1
change error message when model_type is None
HyodaKazuaki Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 58 additions & 19 deletions voicevox_engine/synthesis_engine/core_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import os
import sys
import platform
from ctypes import CDLL, POINTER, c_bool, c_char_p, c_float, c_int, c_long
from ctypes.util import find_library
from pathlib import Path
Expand All @@ -9,13 +9,13 @@


def load_runtime_lib(runtime_dirs: List[Path]):
if sys.platform == "win32":
if platform.system() == "Windows":
lib_file_names = ["torch_cpu.dll", "torch_cuda.dll", "onnxruntime.dll"]
lib_names = ["torch_cpu", "torch_cuda", "onnxruntime"]
elif sys.platform == "linux":
elif platform.system() == "Linux":
lib_file_names = ["libtorch.so", "libonnxruntime.so"]
lib_names = ["torch", "onnxruntime"]
elif sys.platform == "darwin":
elif platform.system() == "Darwin":
lib_file_names = ["libonnxruntime.dylib"]
lib_names = ["onnxruntime"]
else:
Expand All @@ -34,23 +34,30 @@ def load_runtime_lib(runtime_dirs: List[Path]):


def check_core_type(core_dir: Path) -> Optional[str]:
if sys.platform == "win32":
if platform.system() == "Windows":
if (core_dir / "core.dll").is_file() or (core_dir / "core_cpu.dll").is_file():
return "libtorch"
elif (core_dir / "core_gpu_x64_nvidia.dll").is_file() or (
core_dir / "core_cpu_x64.dll"
).is_file():
elif (
(core_dir / "core_gpu_x64_nvidia.dll").is_file()
or (core_dir / "core_cpu_x64.dll").is_file()
or (core_dir / "core_cpu_x86.dll").is_file()
or (core_dir / "core_cpu_arm.dll").is_file()
or (core_dir / "core_cpu_arm64.dll").is_file()
):
return "onnxruntime"
elif sys.platform == "linux":
elif platform.system() == "Linux":
if (core_dir / "libcore.so").is_file() or (
core_dir / "libcore_cpu.so"
).is_file():
return "libtorch"
elif (core_dir / "libcore_gpu_x64_nvidia.so").is_file() or (
core_dir / "libcore_cpu_x64.so"
).is_file():
elif (
(core_dir / "libcore_gpu_x64_nvidia.so").is_file()
or (core_dir / "libcore_cpu_x64.so").is_file()
or (core_dir / "libcore_cpu_armhf.so").is_file()
or (core_dir / "libcore_cpu_arm64.so").is_file()
):
return "onnxruntime"
elif sys.platform == "darwin":
elif platform.system() == "Darwin":
if (core_dir / "libcore_cpu_universal2.dylib").is_file():
return "onnxruntime"
return None
Expand All @@ -59,8 +66,8 @@ def check_core_type(core_dir: Path) -> Optional[str]:
def load_core(core_dir: Path, use_gpu: bool) -> CDLL:
model_type = check_core_type(core_dir)
if model_type is None:
raise RuntimeError("コアが見つかりません")
if sys.platform == "win32":
raise RuntimeError("コアのタイプを判別できませんでした")
if platform.system() == "Windows":
if model_type == "libtorch":
if use_gpu:
try:
Expand All @@ -77,8 +84,26 @@ def load_core(core_dir: Path, use_gpu: bool) -> CDLL:
str((core_dir / "core_gpu_x64_nvidia.dll").resolve(strict=True))
)
except OSError:
return CDLL(str((core_dir / "core_cpu_x64.dll").resolve(strict=True)))
elif sys.platform == "linux":
machine = platform.machine()
if machine == "x86_64" or machine == "x64" or machine == "AMD64":
return CDLL(
str((core_dir / "core_cpu_x64.dll").resolve(strict=True))
)
elif machine == "i386" or machine == "x86":
return CDLL(
str((core_dir / "core_cpu_x86.dll").resolve(strict=True))
)
elif machine == "armv7l":
return CDLL(
str((core_dir / "core_cpu_arm.dll").resolve(strict=True))
)
elif machine == "aarch64":
return CDLL(
str((core_dir / "core_cpu_arm64.dll").resolve(strict=True))
)
else:
raise RuntimeError(f"このコンピュータのアーキテクチャ {machine} で利用可能なコアがありません")
elif platform.system() == "Linux":
if model_type == "libtorch":
if use_gpu:
try:
Expand All @@ -95,8 +120,22 @@ def load_core(core_dir: Path, use_gpu: bool) -> CDLL:
str((core_dir / "libcore_gpu_x64_nvidia.so").resolve(strict=True))
)
except OSError:
return CDLL(str((core_dir / "libcore_cpu_x64.so").resolve(strict=True)))
elif sys.platform == "darwin":
machine = platform.machine()
if machine == "x86_64" or machine == "x64" or machine == "AMD64":
return CDLL(
str((core_dir / "libcore_cpu_x64.so").resolve(strict=True))
)
elif machine == "armv7l":
return CDLL(
str((core_dir / "libcore_cpu_armhf.so").resolve(strict=True))
)
elif machine == "aarch64":
return CDLL(
str((core_dir / "libcore_cpu_arm64.so").resolve(strict=True))
)
else:
raise RuntimeError(f"このコンピュータのアーキテクチャ {machine} で利用可能なコアがありません")
elif platform.system() == "Darwin":
if model_type == "onnxruntime":
try:
return CDLL(
Expand Down