Skip to content

Commit 761d61a

Browse files
jesseengelMagenta Team
authored andcommitted
Fix Build Dependencies. Pin dependencies for more stable support of VST training.
PiperOrigin-RevId: 535042575
1 parent b2d180a commit 761d61a

File tree

4 files changed

+15
-25
lines changed

4 files changed

+15
-25
lines changed

ddsp/training/metrics.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
MIN_F0_CONFIDENCE = 0.85
3030
OUTLIER_MIDI_THRESH = 12
3131

32+
# pytype: disable=signature-mismatch # overriding-parameter-count-checks
33+
3234

3335
# ---------------------- Helper Functions --------------------------------------
3436
def squeeze(input_vector):
@@ -181,7 +183,7 @@ def __init__(self, sample_rate, frame_rate, name='loudness'):
181183
def metrics(self):
182184
return self._metrics
183185

184-
def update_state(self, batch, audio_gen): # pytype: disable=signature-mismatch # overriding-parameter-count-checks
186+
def update_state(self, batch, audio_gen):
185187
"""Update metrics based on a batch of audio.
186188
187189
Args:
@@ -228,7 +230,7 @@ def __init__(self, sample_rate, frame_rate, name='f0_crepe'):
228230
def metrics(self):
229231
return self._metrics
230232

231-
def update_state(self, batch, audio_gen): # pytype: disable=signature-mismatch # overriding-parameter-count-checks
233+
def update_state(self, batch, audio_gen):
232234
"""Update metrics based on a batch of audio.
233235
234236
Args:
@@ -293,7 +295,7 @@ def __init__(
293295
def metrics(self):
294296
return self._metrics
295297

296-
def update_state(self, batch, f0_hz_predict): # pytype: disable=signature-mismatch # overriding-parameter-count-checks
298+
def update_state(self, batch, f0_hz_predict):
297299
"""Update metrics based on a batch of audio.
298300
299301
Args:

ddsp/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
pulling in all the dependencies in __init__.py.
1919
"""
2020

21-
__version__ = '3.6.0'
21+
__version__ = '3.7.0'

pylintrc

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,6 @@ disable=abstract-method,
169169
# mypackage.mymodule.MyReporterClass.
170170
output-format=text
171171

172-
# Put messages in a separate file for each module / package specified on the
173-
# command line instead of printing them on stdout. Reports (if any) will be
174-
# written in a file name "pylint_global.[txt|html]". This option is deprecated
175-
# and it will be removed in Pylint 2.0.
176-
files-output=no
177-
178172
# Tells whether to display a full report or only the messages
179173
reports=no
180174

@@ -293,12 +287,6 @@ ignore-long-lines=(?x)(
293287
# else.
294288
single-line-if-stmt=yes
295289

296-
# List of optional constructs for which whitespace checking is disabled. `dict-
297-
# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}.
298-
# `trailing-comma` allows a space between comma and closing bracket: (a, ).
299-
# `empty-line` allows space-only lines.
300-
no-space-check=
301-
302290
# Maximum number of lines in a module
303291
max-module-lines=99999
304292

setup.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,26 @@
3838
scripts=[],
3939
install_requires=[
4040
'absl-py',
41-
'cloudml-hypertune',
41+
'cloudml-hypertune<=0.1.0.dev6',
4242
'crepe<=0.0.12',
4343
'dill<=0.3.4',
4444
'future',
4545
'gin-config>=0.3.0',
4646
'google-cloud-storage',
4747
'hmmlearn<=0.2.7',
48-
'librosa',
49-
'pydub',
48+
'librosa<=0.10',
49+
'pydub<=0.25.1',
5050
'protobuf<=3.20', # temporary fix for proto dependency bug
51-
'mir_eval',
51+
'mir_eval<=0.7',
5252
'note_seq<0.0.4',
5353
'numpy<1.24',
54-
'scipy',
54+
'scipy<=1.10.1',
5555
'six',
56-
'tensorflow',
56+
'tensorflow<=2.11',
5757
'tensorflowjs<3.19',
58-
'tensorflow-probability',
59-
'tensorflow-datasets',
60-
'tflite_support'
58+
'tensorflow-probability<=0.19',
59+
'tensorflow-datasets<=4.9',
60+
'tflite_support<=0.1'
6161
],
6262
extras_require={
6363
'gcp': [

0 commit comments

Comments
 (0)