Merge pull request #179381 from Mic92/coqui-trainer

main
Martin Weinelt 2 years ago committed by GitHub
commit c8a42929b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 17
      pkgs/development/python-modules/coqui-trainer/default.nix
  2. 1
      pkgs/development/python-modules/python-crfsuite/default.nix
  3. 50
      pkgs/development/python-modules/tensorflow/binary-hashes.nix
  4. 4
      pkgs/development/python-modules/tensorflow/default.nix
  5. 2
      pkgs/development/python-modules/tensorflow/prefetcher.sh
  6. 8
      pkgs/tools/audio/tts/default.nix

@ -7,6 +7,8 @@
, coqpit , coqpit
, fsspec , fsspec
, pytorch-bin , pytorch-bin
, tensorboardx
, protobuf
, pytestCheckHook , pytestCheckHook
, soundfile , soundfile
@ -15,33 +17,26 @@
let let
pname = "coqui-trainer"; pname = "coqui-trainer";
version = "0.0.11"; version = "0.0.12";
in in
buildPythonPackage { 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";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ujuQ9l6NOpDb2TdQbRcOM+j91RfbE8wCL9C0PID8g8Q="; hash = "sha256-MSB3XbQALEKQi6Jtr/d2K8cIqyZryebYEcewGG48HV0=";
}; };
patches = [
(fetchpatch {
url = "https://github.com/coqui-ai/Trainer/commit/07b447abf3290c8f2e5e723687b8a480b7382265.patch";
sha256 = "0v1hl784d9rghkblcfwgzp0gg9d6r5r0yv2kapzdz2qymiajy7y2";
})
];
propagatedBuildInputs = [ propagatedBuildInputs = [
coqpit coqpit
fsspec fsspec
pytorch-bin pytorch-bin
soundfile soundfile
tensorboardx
protobuf
]; ];
# only one test and that requires training data from the internet # only one test and that requires training data from the internet

@ -33,6 +33,5 @@ buildPythonPackage rec {
homepage = "https://github.com/scrapinghub/python-crfsuite"; homepage = "https://github.com/scrapinghub/python-crfsuite";
license = licenses.mit; license = licenses.mit;
maintainers = teams.tts.members; maintainers = teams.tts.members;
broken = pythonAtLeast "3.10"; # https://github.com/scrapinghub/python-crfsuite/issues/130
}; };
} }

@ -1,51 +1,51 @@
{ {
version = "2.9.0"; version = "2.9.1";
linux_py_37_cpu = { linux_py_37_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1gs10w8hm47lmp4hln8qw02x7c018lxmcxs4i8dj3z5h2k64nx75"; sha256 = "1wpqjqx3zfyrclhs6kkqhq76kmb45h2jv2jdi89jrk8pfk3mcf2k";
}; };
linux_py_38_cpu = { linux_py_38_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "01jz7vsinbzznzh6dv5bcz0yf8v050wd0axpn9z2jakkh5bwskhp"; sha256 = "1np06xy18z8k29q8vg5a8kmvxpbcz0grjjww3hcpb4kvy9rx01sw";
}; };
linux_py_39_cpu = { linux_py_39_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "0458w6p567pm9xs1n5x4z5qygmlwy752d8livvn98p3j0lzccnhy"; sha256 = "1gy258wfgjf2f1lcpayvgx5cnncnqjcp2mj70mz50bm9mhmzl4kd";
}; };
linux_py_310_cpu = { linux_py_310_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "136d7hjdsks7gvgz54vl9riq1xdqpiamjp449myy9a768vz2xghp"; sha256 = "0bh5xg4wfc86q1x7ph8bvdpa3arm6kmbvd4cg3d427sywkmdsrk6";
}; };
linux_py_37_gpu = { linux_py_37_gpu = {
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "11w1jrz9x6c8kzqfv14snp9djrwy17qc74h5kdiphhprm9ikkikz"; sha256 = "1qsq7la0fpmk2hych7sy9k8mza1q7w05c4nmgq92cxgkmpa7d17x";
}; };
linux_py_38_gpu = { linux_py_38_gpu = {
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "0vszrrnm706cqqv7b0726dd9ql3pcd08almqk8w0bcfk3fz05d3w"; sha256 = "0913znz5mg6mkryi24xhz4s7rwhxbx172fsk26lxl6w6qx219pfd";
}; };
linux_py_39_gpu = { linux_py_39_gpu = {
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "18mgv36kdpx4q39qm708abfcjxy4gppv9ray0f418q0jlmfy2fi0"; sha256 = "01srcvpcwpgpvb9inlc2mwsmf5sj13rqb695rvm50ybkjrrac7l4";
}; };
linux_py_310_gpu = { linux_py_310_gpu = {
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "17wnvfgj9vynq1ibylfqw2cngnjawsxw1mvphdl3g57i92mqsn2x"; sha256 = "19g93jig1x389ybc25ifsh1grrsghn3w2xgk029289432bnlpzp4";
}; };
mac_py_37_cpu = { mac_py_37_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.0-cp37-cp37m-macosx_10_14_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.1-cp37-cp37m-macosx_10_14_x86_64.whl";
sha256 = "1lvc8rp0a0snjz5cgw6m5nk9qdnl6h7v2cc2pmxssp5c0flqzx4j"; sha256 = "0b2hirjhqw4jl75h0ik1a9hgbkkq0b3gj4wkkp9vb6mi4116gxxi";
}; };
mac_py_38_cpu = { mac_py_38_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.0-cp38-cp38-macosx_10_14_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.1-cp38-cp38-macosx_10_14_x86_64.whl";
sha256 = "1lgpgbasmc1av9njz3i1654qkbw2c99x8c7vb2yslnw63s79j774"; sha256 = "0da6csvldvxg47r932wbx5z6w3hf1d107p9blayzrjchdwhqs16z";
}; };
mac_py_39_cpu = { mac_py_39_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.0-cp39-cp39-macosx_10_14_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.1-cp39-cp39-macosx_10_14_x86_64.whl";
sha256 = "07dd3srqx78aq7w0g6k1x6l7zphwhm29lv9ai3gyqszi99cpn5pr"; sha256 = "1fa0nf4pj5sl5shifaahr8n30q86k6hdsg0qwvan0hyg75fh9bc1";
}; };
mac_py_310_cpu = { mac_py_310_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.0-cp310-cp310-macosx_10_14_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.1-cp310-cp310-macosx_10_14_x86_64.whl";
sha256 = "14fz1id9clcbcrq4y8i1ij1nrk6dz36cqxb88ilip0jj36vfy991"; sha256 = "0baq0djx8vhn8d75wyf82m6iqgfxwcrgg4xcvlr20m4x9bmysxrc";
}; };
} }

@ -76,7 +76,7 @@ let
tfFeature = x: if x then "1" else "0"; tfFeature = x: if x then "1" else "0";
version = "2.9.0"; version = "2.9.1";
variant = if cudaSupport then "-gpu" else ""; variant = if cudaSupport then "-gpu" else "";
pname = "tensorflow${variant}"; pname = "tensorflow${variant}";
@ -190,7 +190,7 @@ let
owner = "tensorflow"; owner = "tensorflow";
repo = "tensorflow"; repo = "tensorflow";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-9VsgNvl+2gxxkC4F+pq4ABuOONpcf96Qbk46shDRpVY="; hash = "sha256-kILNvwHi29F8BClYsZw+7RT2t6x57AsAHURVTfs5uOE=";
}; };
# On update, it can be useful to steal the changes from gentoo # On update, it can be useful to steal the changes from gentoo

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
version="2.9.0" version="2.9.1"
bucket="https://storage.googleapis.com/tensorflow" bucket="https://storage.googleapis.com/tensorflow"

@ -31,14 +31,14 @@ let
in in
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
pname = "tts"; pname = "tts";
version = "0.6.2"; version = "0.7.1";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coqui-ai"; owner = "coqui-ai";
repo = "TTS"; repo = "TTS";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-n27a1s3Dpe5Hd3JryD4fPAjRcNc0YR1fpop+uhYA6sQ="; sha256 = "sha256-ch+711soRfZj1egyaF0+6NrUJtf7JqfZuxQ4eDf1zas=";
}; };
postPatch = let postPatch = let
@ -50,6 +50,7 @@ python.pkgs.buildPythonApplication rec {
"numpy" "numpy"
"umap-learn" "umap-learn"
"unidic-lite" "unidic-lite"
"pyworld"
]; ];
in '' in ''
sed -r -i \ sed -r -i \
@ -129,6 +130,9 @@ python.pkgs.buildPythonApplication rec {
"test_text_to_ids_phonemes_with_eos_bos_and_blank" "test_text_to_ids_phonemes_with_eos_bos_and_blank"
# Takes too long # Takes too long
"test_parametrized_wavernn_dataset" "test_parametrized_wavernn_dataset"
# requires network
"test_voice_conversion"
]; ];
disabledTestPaths = [ disabledTestPaths = [

Loading…
Cancel
Save