Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding loader for CompMusic Carnatic Varnam #579

Merged
merged 34 commits into from
Mar 27, 2023
Merged

Adding loader for CompMusic Carnatic Varnam #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a4e66dd
Create script and index
genisplaja Jan 21, 2021
bd611ca
Create loader and fix index
genisplaja Jan 21, 2021
86c17bf
Create tests and undo index fix
genisplaja Jan 21, 2021
4c03add
Add test resources and fix index again
genisplaja Jan 21, 2021
dbbdb44
Fix test resources
genisplaja Jan 21, 2021
d40ac48
Add loaders and tests for taala and tonic
genisplaja Jan 21, 2021
72ce747
Loader finished
genisplaja Jan 22, 2021
4026195
Merge branch 'master' of https://github.com/mir-dataset-loaders/mirda…
genisplaja Jan 22, 2021
8c90414
Update loader with new dataset
genisplaja Jan 26, 2021
0d6b1a6
Merge remote-tracking branch 'origin/master' into genis/carnatic_varnam
genisplaja Oct 9, 2022
7083152
fix loader with new updates
genisplaja Oct 11, 2022
d7a2f57
add testing files and structre function
genisplaja Feb 27, 2023
e8c755d
core fixes to get the tests passing
genisplaja Feb 28, 2023
fc253d6
fix carnatic varnam with new dataset updates
genisplaja Feb 28, 2023
295f8e0
black formatting
genisplaja Feb 28, 2023
bfd898e
remove unused function
genisplaja Feb 28, 2023
baf9dc6
Merge branch 'master' into genis/carnatic_varnam
genisplaja Feb 28, 2023
9a9cbc6
new version 1.1 [wip]
genisplaja Mar 7, 2023
d3e763d
remove prints, loader good
genisplaja Mar 8, 2023
1c2bf6e
add load notation as exception
genisplaja Mar 8, 2023
eb4628f
index updated with new version 1.1
genisplaja Mar 8, 2023
fd2a018
update setup
genisplaja Mar 8, 2023
0464380
fix problem in _metadata
genisplaja Mar 8, 2023
85db0f5
Merge remote-tracking branch 'origin/master' into genis/carnatic_varnam
genisplaja Mar 8, 2023
34fd45d
merging...
genisplaja Mar 8, 2023
5c03fd7
adding testing file and smart open
genisplaja Mar 8, 2023
a1b896f
shorten test file name
genisplaja Mar 8, 2023
5a98d2b
add Exception is load_notation
genisplaja Mar 12, 2023
beff0c4
fix problem with exception
genisplaja Mar 12, 2023
6c00106
add test coverage
genisplaja Mar 12, 2023
a2e0087
update remotes, improve docs
genisplaja Mar 12, 2023
a215c12
fix remotes
genisplaja Mar 12, 2023
baedf43
fix data folder naming in dataset
genisplaja Mar 13, 2023
d39b732
merge master
genisplaja Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions mirdata/datasets/acousticbrainz_genre.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,21 +189,8 @@ class Track(core.Track):

"""

def __init__(
self,
track_id,
data_home,
dataset_name,
index,
metadata,
):
super().__init__(
track_id,
data_home,
dataset_name,
index,
metadata,
)
def __init__(self, track_id, data_home, dataset_name, index, metadata):
super().__init__(track_id, data_home, dataset_name, index, metadata)

self.path = os.path.normpath(self.get_path("data"))
self.genre = [genre for genre in self.track_id.split("#")[4:] if genre != ""]
Expand Down
37 changes: 6 additions & 31 deletions mirdata/datasets/beatles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,21 +86,8 @@ class Track(core.Track):

"""

def __init__(
self,
track_id,
data_home,
dataset_name,
index,
metadata,
):
super().__init__(
track_id,
data_home,
dataset_name,
index,
metadata,
)
def __init__(self, track_id, data_home, dataset_name, index, metadata):
super().__init__(track_id, data_home, dataset_name, index, metadata)

self.beats_path = self.get_path("beat")
self.chords_path = self.get_path("chords")
Expand Down Expand Up @@ -310,30 +297,18 @@ def __init__(self, data_home=None, version="default"):
license_info=LICENSE_INFO,
)

@deprecated(
reason="Use mirdata.datasets.beatles.load_audio",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.beatles.load_audio", version="0.3.4")
def load_audio(self, *args, **kwargs):
return load_audio(*args, **kwargs)

@deprecated(
reason="Use mirdata.datasets.beatles.load_beats",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.beatles.load_beats", version="0.3.4")
def load_beats(self, *args, **kwargs):
return load_beats(*args, **kwargs)

@deprecated(
reason="Use mirdata.datasets.beatles.load_chords",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.beatles.load_chords", version="0.3.4")
def load_chords(self, *args, **kwargs):
return load_chords(*args, **kwargs)

@deprecated(
reason="Use mirdata.datasets.beatles.load_sections",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.beatles.load_sections", version="0.3.4")
def load_sections(self, *args, **kwargs):
return load_sections(*args, **kwargs)
42 changes: 7 additions & 35 deletions mirdata/datasets/beatport_key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,8 @@ class Track(core.Track):

"""

def __init__(
self,
track_id,
data_home,
dataset_name,
index,
metadata,
):
super().__init__(
track_id,
data_home,
dataset_name,
index,
metadata,
)
def __init__(self, track_id, data_home, dataset_name, index, metadata):
super().__init__(track_id, data_home, dataset_name, index, metadata)

self.keys_path = self.get_path("key")
self.metadata_path = self.get_path("meta")
Expand Down Expand Up @@ -270,38 +257,23 @@ def __init__(self, data_home=None, version="default"):
license_info=LICENSE_INFO,
)

@deprecated(
reason="Use mirdata.datasets.beatport_key.load_audio",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.beatport_key.load_audio", version="0.3.4")
def load_audio(self, *args, **kwargs):
return load_audio(*args, **kwargs)

@deprecated(
reason="Use mirdata.datasets.beatport_key.load_key",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.beatport_key.load_key", version="0.3.4")
def load_key(self, *args, **kwargs):
return load_key(*args, **kwargs)

@deprecated(
reason="Use mirdata.datasets.beatport_key.load_tempo",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.beatport_key.load_tempo", version="0.3.4")
def load_tempo(self, *args, **kwargs):
return load_tempo(*args, **kwargs)

@deprecated(
reason="Use mirdata.datasets.beatport_key.load_genre",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.beatport_key.load_genre", version="0.3.4")
def load_genre(self, *args, **kwargs):
return load_genre(*args, **kwargs)

@deprecated(
reason="Use mirdata.datasets.beatport_key.load_artist",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.beatport_key.load_artist", version="0.3.4")
def load_artist(self, *args, **kwargs):
return load_artist(*args, **kwargs)

Expand Down
35 changes: 6 additions & 29 deletions mirdata/datasets/billboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,21 +112,8 @@ class Track(core.Track):
salami_metadata (dict): Metadata of the Salami LAB file
"""

def __init__(
self,
track_id,
data_home,
dataset_name,
index,
metadata,
):
super().__init__(
track_id,
data_home,
dataset_name,
index,
metadata,
)
def __init__(self, track_id, data_home, dataset_name, index, metadata):
super().__init__(track_id, data_home, dataset_name, index, metadata)

self.audio_path = self.get_path("audio")
self.salami_path = self.get_path("salami")
Expand Down Expand Up @@ -516,30 +503,20 @@ def _metadata(self):
}
return metadata_index

@deprecated(
reason="Use mirdata.datasets.billboard.load_audio",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.billboard.load_audio", version="0.3.4")
def load_audio(self, *args, **kwargs):
return load_audio(*args, **kwargs)

@deprecated(
reason="Use mirdata.datasets.billboard.load_sections",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.billboard.load_sections", version="0.3.4")
def load_sections(self, *args, **kwargs):
return load_sections(*args, **kwargs)

@deprecated(
reason="Use mirdata.datasets.billboard.load_named_sections",
version="0.3.4",
reason="Use mirdata.datasets.billboard.load_named_sections", version="0.3.4"
)
def load_named_sections(self, *args, **kwargs):
return load_named_sections(*args, **kwargs)

@deprecated(
reason="Use mirdata.datasets.billboard.load_chords",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.billboard.load_chords", version="0.3.4")
def load_chords(self, *args, **kwargs):
return load_chords(*args, **kwargs)
35 changes: 6 additions & 29 deletions mirdata/datasets/cante100.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,21 +173,8 @@ class Track(core.Track):

"""

def __init__(
self,
track_id,
data_home,
dataset_name,
index,
metadata,
):
super().__init__(
track_id,
data_home,
dataset_name,
index,
metadata,
)
def __init__(self, track_id, data_home, dataset_name, index, metadata):
super().__init__(track_id, data_home, dataset_name, index, metadata)

self.spectrogram_path = self.get_path("spectrum")
self.f0_path = self.get_path("f0")
Expand Down Expand Up @@ -424,30 +411,20 @@ def _metadata(self):

return metadata

@deprecated(
reason="Use mirdata.datasets.cante100.load_audio",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.cante100.load_audio", version="0.3.4")
def load_audio(self, *args, **kwargs):
return load_audio(*args, **kwargs)

@deprecated(
reason="Use mirdata.datasets.cante100.load_spectrogram",
version="0.3.4",
reason="Use mirdata.datasets.cante100.load_spectrogram", version="0.3.4"
)
def load_spectrogram(self, *args, **kwargs):
return load_spectrogram(*args, **kwargs)

@deprecated(
reason="Use mirdata.datasets.cante100.load_melody",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.cante100.load_melody", version="0.3.4")
def load_melody(self, *args, **kwargs):
return load_melody(*args, **kwargs)

@deprecated(
reason="Use mirdata.datasets.cante100.load_notes",
version="0.3.4",
)
@deprecated(reason="Use mirdata.datasets.cante100.load_notes", version="0.3.4")
def load_notes(self, *args, **kwargs):
return load_notes(*args, **kwargs)
Loading