tts: Switch from tensorboardx to torch.util.tensorboard

This commit is contained in:
Junji Hashimoto 2022-03-23 11:56:47 +09:00 committed by Rehno Lindeque
parent 5be16692c0
commit 163450e362
2 changed files with 16 additions and 7 deletions

View file

@ -1,15 +1,16 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchpatch
, fetchFromGitHub , fetchFromGitHub
, pythonAtLeast
, coqpit , coqpit
, fsspec , fsspec
, pytorch , pytorch-bin
, pytestCheckHook , pytestCheckHook
, soundfile , soundfile
, tensorboardx , torchvision-bin
, torchvision
}: }:
let let
@ -20,6 +21,8 @@ buildPythonPackage {
inherit pname version; inherit pname version;
format = "pyproject"; format = "pyproject";
disabled = pythonAtLeast "3.10"; # https://github.com/coqui-ai/Trainer/issues/22
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coqui-ai"; owner = "coqui-ai";
repo = "Trainer"; repo = "Trainer";
@ -27,12 +30,18 @@ buildPythonPackage {
hash = "sha256-NsgCh+N2qWmRkTOjXqisVCP5aInH2zcNz6lsnIfVLiY="; hash = "sha256-NsgCh+N2qWmRkTOjXqisVCP5aInH2zcNz6lsnIfVLiY=";
}; };
patches = [
(fetchpatch {
url = "https://github.com/coqui-ai/Trainer/commit/07b447abf3290c8f2e5e723687b8a480b7382265.patch";
sha256 = "0v1hl784d9rghkblcfwgzp0gg9d6r5r0yv2kapzdz2qymiajy7y2";
})
];
propagatedBuildInputs = [ propagatedBuildInputs = [
coqpit coqpit
fsspec fsspec
pytorch pytorch-bin
soundfile soundfile
tensorboardx
]; ];
# only one test and that requires training data from the internet # only one test and that requires training data from the internet
@ -40,7 +49,7 @@ buildPythonPackage {
checkInputs = [ checkInputs = [
pytestCheckHook pytestCheckHook
torchvision torchvision-bin
]; ];
pythonImportsCheck = [ pythonImportsCheck = [

View file

@ -57,6 +57,7 @@ python.pkgs.buildPythonApplication rec {
''-e 's/${package}.*[<>=]+.*/${package}/g' \'' ''-e 's/${package}.*[<>=]+.*/${package}/g' \''
) relaxedConstraints)} ) relaxedConstraints)}
requirements.txt requirements.txt
sed -i '/tensorboardX/d' requirements.txt
''; '';
nativeBuildInputs = with python.pkgs; [ nativeBuildInputs = with python.pkgs; [
@ -84,7 +85,6 @@ python.pkgs.buildPythonApplication rec {
pyworld pyworld
scipy scipy
soundfile soundfile
tensorboardx
tensorflow tensorflow
torchaudio-bin torchaudio-bin
tqdm tqdm