dependency updates (gradio 5.x now works on my machine)

This commit is contained in:
mrq 2024-11-20 12:33:01 -06:00
parent efeb55e1b7
commit db64e6cb59
2 changed files with 14 additions and 11 deletions

View File

@ -40,14 +40,14 @@ setup(
["deepspeed>=0.7.7"] if not sys.platform.startswith("win") else ["psutil"]) ["deepspeed>=0.7.7"] if not sys.platform.startswith("win") else ["psutil"])
+ [ + [
# logging niceties # logging niceties
"coloredlogs>=15.0.1", "coloredlogs>=15.0.1", # barely required
"humanize>=4.4.0", "humanize>=4.4.0", # not really required
"matplotlib>=3.6.0", "matplotlib>=3.6.0", # only required for plotting
"pandas>=1.5.0", "pandas>=1.5.0", # not really required
# boiler plate niceties # boiler plate niceties
"diskcache>=5.4.0", #"diskcache>=5.4.0",
"einops>=0.6.0", "einops>=0.6.0", # could be replaced
"tqdm", "tqdm",
# HF bloat # HF bloat
@ -70,11 +70,9 @@ setup(
"phonemizer>=2.1.0", "phonemizer>=2.1.0",
"encodec>=0.1.1", "encodec>=0.1.1",
"vocos", "vocos",
"descript-audio-codec",
# gradio web UI (my linux install doesn't like 5.x, windows is fine) # for the web UI
f"gradio{'<5.0.0' if not sys.platform.startswith('win') else ''}" "gradio",
], ],
extras_require = { extras_require = {
"all": [ "all": [
@ -89,6 +87,9 @@ setup(
# attention helpers # attention helpers
"xformers", "xformers",
# "flash-attn" --no-build-isolation # commented out right now because I want to query this for Volta freaks like me who can't use it # "flash-attn" --no-build-isolation # commented out right now because I want to query this for Volta freaks like me who can't use it
# other audio backend that doesn't prove fruitful
"descript-audio-codec",
] ]
}, },
url="https://git.ecker.tech/mrq/vall-e", url="https://git.ecker.tech/mrq/vall-e",

View File

@ -1,5 +1,5 @@
import copy import copy
import diskcache #import diskcache
import h5py import h5py
import json import json
import os import os
@ -853,11 +853,13 @@ class Config(BaseConfig):
def get_spkr_group(self): def get_spkr_group(self):
return eval(self.dataset.speaker_group_getter) return eval(self.dataset.speaker_group_getter)
"""
@cached_property @cached_property
def diskcache(self): def diskcache(self):
if self.yaml_path is not None and self.dataset.cache: if self.yaml_path is not None and self.dataset.cache:
return diskcache.Cache(self.cache_dir).memoize return diskcache.Cache(self.cache_dir).memoize
return lambda: lambda x: x return lambda: lambda x: x
"""
# this gets called from vall_e.inference # this gets called from vall_e.inference
def load_yaml( self, config_path ): def load_yaml( self, config_path ):