Merge branch 'master' into Pedro/bug/cancel_download

mir-dataset-loaders · Dec 12, 2020 · d197e40 · d197e40
2 parents 7616683 + 881f30a
commit d197e40
Show file tree

Hide file tree

Showing 74 changed files with 241,125 additions and 218,111 deletions.
diff --git a/README.md b/README.md
@@ -39,6 +39,7 @@ See the Examples section below for more details, or the [documentation](https://
 
 ### Currently supported datasets
 
+* [AcousticBrainz genre](https://zenodo.org/record/2553414#.X8jTgulKhhE)
 * [Beatles](http://isophonics.net/content/reference-annotations-beatles)
 * [Beatport EDM key](https://zenodo.org/record/1101082/export/xd#.X4NCfC3FQUE)
 * [cante100](http://www.cofla-project.com/?page_id=529&lang=es)
@@ -60,7 +61,8 @@ See the Examples section below for more details, or the [documentation](https://
 * [RWC Jazz](https://staff.aist.go.jp/m.goto/RWC-MDB/rwc-mdb-j.html)
 * [RWC Popular](https://staff.aist.go.jp/m.goto/RWC-MDB/rwc-mdb-p.html)
 * [Salami](https://github.com/bmcfee/salami-data-public/tree/hierarchy-corrections)
-* [Saraga](https://mtg.github.io/saraga/)
+* [Saraga Carnatic](https://mtg.github.io/saraga/)
+* [Saraga Hindustani](https://mtg.github.io/saraga/)
 * [TinySOL](https://www.orch-idea.org/)
 
 For more information about these datasets see [this table](https://mirdata.readthedocs.io/en/latest/source/datasets.html).

diff --git a/docs/source/datasets.rst b/docs/source/datasets.rst
diff --git a/docs/source/mirdata.rst b/docs/source/mirdata.rst
@@ -13,6 +13,12 @@ API documentation
 Datasets
 --------
 
+ab_genre
+^^^^^^^
+
+.. automodule:: mirdata.datasets.acousticbrainz_genre
+   :members:
+
 beatles
 ^^^^^^^
 
@@ -160,10 +166,17 @@ salami
    :members:
 
 
-saraga
-^^^^^^
+saraga_carnatic
+^^^^^^^^^^^^^^
+
+.. automodule:: mirdata.datasets.saraga_carnatic
+   :members:
+
+
+saraga_hindustani
+^^^^^^^^^^^^^^^^
 
-.. automodule:: mirdata.datasets.saraga
+.. automodule:: mirdata.datasets.saraga_hindustani
    :members:
 
 

diff --git a/mirdata/__init__.py b/mirdata/__init__.py
@@ -3,6 +3,7 @@
 from .version import version as __version__
 
 DATASETS = [
+    "acousticbrainz_genre",
     "beatles",
     "beatport_key",
     "cante100",
@@ -24,7 +25,8 @@
     "rwc_jazz",
     "rwc_popular",
     "salami",
-    "saraga",
+    "saraga_carnatic",
+    "saraga_hindustani",
     "tinysol",
 ]
 

diff --git a/mirdata/core.py b/mirdata/core.py
@@ -38,7 +38,7 @@ class Dataset(object):
 
     """
 
-    def __init__(self, dataset, data_home=None):
+    def __init__(self, dataset, data_home=None, index=None):
         """Inits a dataset by name and data location"""
         if dataset not in DATASETS:
             raise ValueError(
@@ -50,7 +50,7 @@ def __init__(self, dataset, data_home=None):
         self.name = dataset
         self.bibtex = getattr(module, "BIBTEX", None)
         self._remotes = getattr(module, "REMOTES", None)
-        self._index = module.DATA.index
+        self._index = module.DATA.index if index is None else index
         self._download_info = getattr(module, "DOWNLOAD_INFO", None)
         self._track_object = getattr(module, "Track", None)
         self._download_fn = getattr(module, "_download", download_utils.downloader)