Fix Build

- Update copyright year in lots of files. - Pinned Numpy, Dill, and Proto version to get build to run sucessfully. PiperOrigin-RevId: 527040716
magenta · Apr 25, 2023 · 86c7a35 · 86c7a35
1 parent 4c77f44
commit 86c7a35
Show file tree

Hide file tree

Showing 73 changed files with 83 additions and 79 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 # DDSP: Differentiable Digital Signal Processing
 [![Build Status](https://github.com/magenta/ddsp/workflows/build/badge.svg)](https://github.com/magenta/ddsp/actions?query=workflow%3Abuild)
-[![Downloads](https://static.pepy.tech/personalized-badge/crepe?period=total&units=international_system&left_color=grey&right_color=blue&left_text=Downloads)](https://pepy.tech/project/crepe)
+[![Downloads](https://static.pepy.tech/badge/ddsp)](https://pepy.tech/project/ddsp)
 
 [**Demos**](./ddsp/colab/demos)
 | [**Tutorials**](./ddsp/colab/tutorials)

diff --git a/ddsp/__init__.py b/ddsp/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/colab/__init__.py b/ddsp/colab/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/colab/colab_utils.py b/ddsp/colab/colab_utils.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/core.py b/ddsp/core.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/core_test.py b/ddsp/core_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/dags.py b/ddsp/dags.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/dags_test.py b/ddsp/dags_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/effects.py b/ddsp/effects.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/effects_test.py b/ddsp/effects_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/losses.py b/ddsp/losses.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/losses_test.py b/ddsp/losses_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/processors.py b/ddsp/processors.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/processors_test.py b/ddsp/processors_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/spectral_ops.py b/ddsp/spectral_ops.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/spectral_ops_test.py b/ddsp/spectral_ops_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/synths.py b/ddsp/synths.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/synths_test.py b/ddsp/synths_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/test_util.py b/ddsp/test_util.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/__init__.py b/ddsp/training/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/cloud.py b/ddsp/training/cloud.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/cloud_test.py b/ddsp/training/cloud_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/data.py b/ddsp/training/data.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/data_preparation/__init__.py b/ddsp/training/data_preparation/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/data_preparation/ddsp_generate_synthetic_dataset.py b/ddsp/training/data_preparation/ddsp_generate_synthetic_dataset.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/data_preparation/ddsp_prepare_tfrecord.py b/ddsp/training/data_preparation/ddsp_prepare_tfrecord.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/data_preparation/prepare_tfrecord_lib.py b/ddsp/training/data_preparation/prepare_tfrecord_lib.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/data_preparation/prepare_tfrecord_lib_test.py b/ddsp/training/data_preparation/prepare_tfrecord_lib_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/data_preparation/synthetic_data.py b/ddsp/training/data_preparation/synthetic_data.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/ddsp_export.py b/ddsp/training/ddsp_export.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/ddsp_run.py b/ddsp/training/ddsp_run.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/decoders.py b/ddsp/training/decoders.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/decoders_test.py b/ddsp/training/decoders_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/docker/__init__.py b/ddsp/training/docker/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/docker/ddsp_ai_platform.py b/ddsp/training/docker/ddsp_ai_platform.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/docker/task.py b/ddsp/training/docker/task.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/docker/task_test.py b/ddsp/training/docker/task_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/encoders.py b/ddsp/training/encoders.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/eval_util.py b/ddsp/training/eval_util.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/evaluators.py b/ddsp/training/evaluators.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/gin/__init__.py b/ddsp/training/gin/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/gin/datasets/__init__.py b/ddsp/training/gin/datasets/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/gin/eval/__init__.py b/ddsp/training/gin/eval/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/gin/models/__init__.py b/ddsp/training/gin/models/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/gin/models/vst/__init__.py b/ddsp/training/gin/models/vst/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/gin/optimization/__init__.py b/ddsp/training/gin/optimization/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/gin/papers/__init__.py b/ddsp/training/gin/papers/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/gin/papers/iclr2020/__init__.py b/ddsp/training/gin/papers/iclr2020/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/gin/papers/icml2020/__init__.py b/ddsp/training/gin/papers/icml2020/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/heuristics.py b/ddsp/training/heuristics.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/heuristics_test.py b/ddsp/training/heuristics_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/inference.py b/ddsp/training/inference.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/metrics.py b/ddsp/training/metrics.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/metrics_test.py b/ddsp/training/metrics_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/models/__init__.py b/ddsp/training/models/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/models/autoencoder.py b/ddsp/training/models/autoencoder.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/models/autoencoder_test.py b/ddsp/training/models/autoencoder_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/models/inverse_synthesis.py b/ddsp/training/models/inverse_synthesis.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/models/midi_autoencoder.py b/ddsp/training/models/midi_autoencoder.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/models/model.py b/ddsp/training/models/model.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/nn.py b/ddsp/training/nn.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 from ddsp import losses
 import gin
 import tensorflow as tf
-import tensorflow_addons as tfa
+from tensorflow_addons.layers import SpectralNormalization
 import tensorflow_probability as tfp
 
 tfk = tf.keras
@@ -1102,7 +1102,7 @@ def conv(ch, k, stride=1, dilation=1, transpose=False):
                           padding='same',
                           kernel_initializer=initializer)
       if spectral_norm:
-        return tfa.layers.SpectralNormalization(layer)
+        return SpectralNormalization(layer)
       else:
         return layer
 

diff --git a/ddsp/training/nn_test.py b/ddsp/training/nn_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/ddsp/training/plotting.py b/ddsp/training/plotting.py
@@ -1,4 +1,4 @@
-# Copyright 2022 The DDSP Authors.
+# Copyright 2023 The DDSP Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.