upd mel

README.md

@@ -144,7 +144,7 @@ SOFTWARE.
 ### Citation Information
 ```
 @dataset{zhaorui_liu_2021_5676893,
-  author       = {Zhaorui Liu, Monan Zhou, Shenyang Xu and Zijin Li},
+  author       = {Zhaorui Liu, Monan Zhou, Shenyang Xu, Zhaowen Wang, Wei Li and Zijin Li},
   title        = {CCMUSIC DATABASE: A Music Data Sharing Platform for Computational Musicology Research},
   month        = {nov},
   year         = {2021},

data/mel.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84bd6ee179a3bb59a18c1aed7f896c9016f8058452f5988ba2cfef2455e69a5b
-size 77047276
+oid sha256:eb6bb316d1fd7cd43737f30fba0aeaa81475daaa8f0b0e2c56b341e69465209b
+size 1424507306

music_genre.py

@@ -3,40 +3,46 @@ import random
 import datasets
 from datasets.tasks import ImageClassification
 
-_NAMES = [
-    "None",
-    "Classic",
-    "Non_classic",
-    "Symphony",
-    "Opera",
-    "Solo",
-    "Chamber",
-    "Pop",
-    "Dance_and_house",
-    "Indie",
-    "Soul_or_r_and_b",
-    "Rock",
-    "Pop_vocal_ballad",
-    "Adult_contemporary",
-    "Teen_pop",
-    "Contemporary_dance_pop",
-    "Dance_pop",
-    "Classic_indie_pop",
-    "Chamber_cabaret_and_art_pop",
-    "Adult_alternative_rock",
-    "Uplifting_anthemic_rock",
-    "Soft_rock",
-    "Acoustic_pop"
-]
+_NAMES_1 = {
+    1: "Classic",
+    2: "Non_classic"
+}
+
+_NAMES_2 = {
+    3: "Symphony",
+    4: "Opera",
+    5: "Solo",
+    6: "Chamber",
+    7: "Pop",
+    8: "Dance_and_house",
+    9: "Indie",
+    10: "Soul_or_r_and_b",
+    11: "Rock"
+}
+
+_NAMES_3 = {
+    0: "None",
+    12: "Pop_vocal_ballad",
+    13: "Adult_contemporary",
+    14: "Teen_pop",
+    15: "Contemporary_dance_pop",
+    16: "Dance_pop",
+    17: "Classic_indie_pop",
+    18: "Chamber_cabaret_and_art_pop",
+    19: "Adult_alternative_rock",
+    20: "Uplifting_anthemic_rock",
+    21: "Soft_rock",
+    22: "Acoustic_pop"
+}
 
 _HOMEPAGE = f"https://huggingface.co/datasets/ccmusic-database/{os.path.basename(__file__).split('.')[0]}"
 
 _CITATION = """\
 @dataset{zhaorui_liu_2021_5676893,
-  author       = {Zhaorui Liu, Monan Zhou, Shenyang Xu and Zijin Li},
-  title        = {{Music Data Sharing Platform for Computational Musicology Research (CCMUSIC DATASET)}},
-  month        = nov,
-  year         = 2021,
+  author       = {Zhaorui Liu, Monan Zhou, Shenyang Xu, Zhaowen Wang, Wei Li and Zijin Li},
+  title        = {CCMUSIC DATABASE: A Music Data Sharing Platform for Computational Musicology Research},
+  month        = {nov},
+  year         = {2021},
   publisher    = {Zenodo},
   version      = {1.1},
   doi          = {10.5281/zenodo.5676893},
@@ -57,14 +63,13 @@ class music_genre(datasets.GeneratorBasedBuilder):
         return datasets.DatasetInfo(
             features=datasets.Features(
                 {
-                    "image": datasets.Image(),
-                    "fst_level_label": datasets.features.ClassLabel(names=_NAMES),
-                    "sec_level_label": datasets.features.ClassLabel(names=_NAMES),
-                    "thr_level_label": datasets.features.ClassLabel(names=_NAMES),
-                    "duration": datasets.Value('float64')
+                    "mel": datasets.Image(),
+                    "fst_level_label": datasets.features.ClassLabel(names=list(_NAMES_1.values())),
+                    "sec_level_label": datasets.features.ClassLabel(names=list(_NAMES_2.values())),
+                    "thr_level_label": datasets.features.ClassLabel(names=list(_NAMES_3.values()))
                 }
             ),
-            supervised_keys=("image", "fst_level_label"),
+            supervised_keys=("mel", "sec_level_label"),
             homepage=_HOMEPAGE,
             license="mit",
             citation=_CITATION,
@@ -72,8 +77,8 @@ class music_genre(datasets.GeneratorBasedBuilder):
             task_templates=[
                 ImageClassification(
                     task="image-classification",
-                    image_column="image",
-                    label_column="fst_level_label",
+                    image_column="mel",
+                    label_column="sec_level_label",
                 )
             ]
         )
@@ -127,16 +132,15 @@ class music_genre(datasets.GeneratorBasedBuilder):
             labs = labstr.split('\\')
 
         if depth <= len(labs):
-            return int(labs[depth - 1].split('_')[0])
+            return 0
         else:
             return int(labs[-1].split('_')[0])
 
     def _generate_examples(self, files):
         for i, path in enumerate(files):
             yield i, {
-                "image": path,
-                "fst_level_label": _NAMES[self._calc_label(path, 1)],
-                "sec_level_label": _NAMES[self._calc_label(path, 2)],
-                "thr_level_label": _NAMES[self._calc_label(path, 3)],
-                "duration": float(os.path.basename(path).split('_')[1].split('.jp')[0])
+                "mel": path,
+                "fst_level_label": _NAMES_1[self._calc_label(path, 1)],
+                "sec_level_label": _NAMES_2[self._calc_label(path, 2)],
+                "thr_level_label": _NAMES_3[self._calc_label(path, 3)]
             }