Skip to content

Refactor data loading/storing #1018

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

Merged
mfeurer merged 6 commits into from
Jan 19, 2021
Merged

Refactor data loading/storing #1018

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d1d0f91
Refactor flow of loading/compressing data
PGijsbers Jan 15, 2021
60d602b
Only set data file members for files that exist
PGijsbers Jan 15, 2021
1bcb7d3
Call get_data to create compressed pickle
PGijsbers Jan 15, 2021
0cffe57
Add data load refactor
PGijsbers Jan 15, 2021
9453fee
Revert aggressive text replacement from PyCharm
PGijsbers Jan 15, 2021
77ab46d
Avoid duplicate exists/isdir
PGijsbers Jan 19, 2021
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
Prev Previous commit
Next Next commit
Only set data file members for files that exist
  • Loading branch information
@PGijsbers
PGijsbers committed Jan 15, 2021
commit 60d602b7417f453265578f623594406abd32f0f3
15 changes: 6 additions & 9 deletions openml/datasets/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,16 +218,13 @@ def find_invalid_characters(string, pattern):

if data_file is not None:
rval = self._compressed_cache_file_paths(data_file)
self.data_pickle_file = rval[0] # type: Optional[str]
self.data_feather_file = rval[1] # type: Optional[str]
self.feather_attribute_file = rval[2] # type: Optional[str]
self._cache_compressed_file_from_arff(self.data_file)
self.data_pickle_file = rval[0] if os.path.exists(rval[0]) else None
Comment thread
mfeurer marked this conversation as resolved.
self.data_feather_file = rval[1] if os.path.exists(rval[1]) else None
self.feather_attribute_file = rval[2] if os.path.exists(rval[2]) else None
else:
self.data_pickle_file, self.data_feather_file, self.feather_attribute_file = (
None,
None,
None,
)
self.data_pickle_file = None
self.data_feather_file = None
self.feather_attribute_file = None

@property
def id(self) -> Optional[int]:
Expand Down
1 change: 1 addition & 0 deletions tests/test_datasets/test_dataset_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,6 +1272,7 @@ def test_get_dataset_cache_format_pickle(self):
def test_get_dataset_cache_format_feather(self):

dataset = openml.datasets.get_dataset(128, cache_format="feather")
dataset.get_data()

# Check if dataset is written to cache directory using feather
cache_dir = openml.config.get_cache_directory()
Expand Down