Merge branch 'facebookresearch:main' into patch-2

facebookresearch · Nov 21, 2023 · b31ad05 · b31ad05
2 parents ab95eeb + 258ba98
commit b31ad05
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -72,11 +72,11 @@ Finally, if you use a model that relies on Demucs (e.g. `musicgen-melody`) and w
 
 For the general framework of AudioCraft, please cite the following.
 ```
-@article{copet2023simple,
+@inproceedings{copet2023simple,
     title={Simple and Controllable Music Generation},
     author={Jade Copet and Felix Kreuk and Itai Gat and Tal Remez and David Kant and Gabriel Synnaeve and Yossi Adi and Alexandre Défossez},
+    booktitle={Thirty-seventh Conference on Neural Information Processing Systems},
     year={2023},
-    journal={arXiv preprint arXiv:2306.05284},
 }
 ```
 

diff --git a/audiocraft/utils/cache.py b/audiocraft/utils/cache.py
@@ -287,6 +287,7 @@ def _load_one(self, index: int):
                     if isinstance(part[0], torch.Tensor):
                         out.append(torch.stack(part))
                     else:
+                        assert isinstance(part, torch.Tensor)
                         out.append(part)
                 return out
         except Exception:

diff --git a/docs/MUSICGEN.md b/docs/MUSICGEN.md
@@ -340,9 +340,9 @@ Once you have launched some experiments, you can easily get access
 to the Solver with the latest trained model using the following snippet.
 
 ```python
-from audiocraft.solvers.musicgen import MusicGen
+from audiocraft.solvers.musicgen import MusicGenSolver
 
-solver = MusicGen.get_eval_solver_from_sig('SIG', device='cpu', batch_size=8)
+solver = MusicGenSolver.get_eval_solver_from_sig('SIG', device='cpu', batch_size=8)
 solver.model
 solver.dataloaders
 ```
@@ -401,11 +401,11 @@ activations by sharding the optimizer state.
 
 ## Citation
 ```
-@article{copet2023simple,
+@inproceedings{copet2023simple,
     title={Simple and Controllable Music Generation},
     author={Jade Copet and Felix Kreuk and Itai Gat and Tal Remez and David Kant and Gabriel Synnaeve and Yossi Adi and Alexandre Défossez},
+    booktitle={Thirty-seventh Conference on Neural Information Processing Systems},
     year={2023},
-    journal={arXiv preprint arXiv:2306.05284},
 }
 ```
 

diff --git a/requirements.txt b/requirements.txt
@@ -9,7 +9,7 @@ num2words
 numpy
 sentencepiece
 spacy==3.5.2
-torch>=2.0.0
+torch==2.1.0
 torchaudio>=2.0.0
 huggingface_hub
 tqdm
@@ -20,4 +20,4 @@ librosa
 gradio
 torchmetrics
 encodec
-protobuf
+protobuf