Fix: problem with test failures
Style-Bert-VITS2 has been reported to not work with some PyTorch 2.2 series, but Python 3.12 is only supported in Torch >= 2.2, so Python 3.12 support is not provided for the time being
This commit is contained in:
@@ -19,7 +19,6 @@ classifiers = [
|
|||||||
"Programming Language :: Python :: 3.9",
|
"Programming Language :: Python :: 3.9",
|
||||||
"Programming Language :: Python :: 3.10",
|
"Programming Language :: Python :: 3.10",
|
||||||
"Programming Language :: Python :: 3.11",
|
"Programming Language :: Python :: 3.11",
|
||||||
"Programming Language :: Python :: 3.12",
|
|
||||||
"Programming Language :: Python :: Implementation :: CPython",
|
"Programming Language :: Python :: Implementation :: CPython",
|
||||||
]
|
]
|
||||||
dependencies = [
|
dependencies = [
|
||||||
@@ -37,7 +36,7 @@ dependencies = [
|
|||||||
'pydantic',
|
'pydantic',
|
||||||
'pyopenjtalk-dict',
|
'pyopenjtalk-dict',
|
||||||
'pypinyin',
|
'pypinyin',
|
||||||
'pyworld',
|
# 'pyworld',
|
||||||
'safetensors',
|
'safetensors',
|
||||||
'scipy',
|
'scipy',
|
||||||
'torch>=2.1,<2.2',
|
'torch>=2.1,<2.2',
|
||||||
@@ -74,7 +73,7 @@ cov = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[tool.hatch.envs.test.matrix]]
|
[[tool.hatch.envs.test.matrix]]
|
||||||
python = ["3.9", "3.10", "3.11", "3.12"]
|
python = ["3.9", "3.10", "3.11"]
|
||||||
|
|
||||||
[tool.coverage.run]
|
[tool.coverage.run]
|
||||||
source_pkgs = ["style_bert_vits2", "tests"]
|
source_pkgs = ["style_bert_vits2", "tests"]
|
||||||
|
|||||||
@@ -4,24 +4,27 @@ import os
|
|||||||
import re
|
import re
|
||||||
import subprocess
|
import subprocess
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any, Optional, Union
|
from typing import Any, Optional, Union, TYPE_CHECKING
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import torch
|
import torch
|
||||||
from numpy.typing import NDArray
|
from numpy.typing import NDArray
|
||||||
from scipy.io.wavfile import read
|
from scipy.io.wavfile import read
|
||||||
from torch.utils.tensorboard import SummaryWriter
|
|
||||||
|
|
||||||
from style_bert_vits2.logging import logger
|
from style_bert_vits2.logging import logger
|
||||||
from style_bert_vits2.models.utils import checkpoints # type: ignore
|
from style_bert_vits2.models.utils import checkpoints # type: ignore
|
||||||
from style_bert_vits2.models.utils import safetensors # type: ignore
|
from style_bert_vits2.models.utils import safetensors # type: ignore
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
# tensorboard はライブラリとしてインストールされている場合は依存関係に含まれないため、型チェック時のみインポートする
|
||||||
|
from torch.utils.tensorboard import SummaryWriter
|
||||||
|
|
||||||
|
|
||||||
__is_matplotlib_imported = False
|
__is_matplotlib_imported = False
|
||||||
|
|
||||||
|
|
||||||
def summarize(
|
def summarize(
|
||||||
writer: SummaryWriter,
|
writer: "SummaryWriter",
|
||||||
global_step: int,
|
global_step: int,
|
||||||
scalars: dict[str, float] = {},
|
scalars: dict[str, float] = {},
|
||||||
histograms: dict[str, Any] = {},
|
histograms: dict[str, Any] = {},
|
||||||
|
|||||||
Reference in New Issue
Block a user