Skip to content

Commit f082cae

Browse files
committed
Revert changes to loading logic
1 parent 3785308 commit f082cae

File tree

1 file changed

+1
-34
lines changed

1 file changed

+1
-34
lines changed

cebra/data/load.py

+1-34
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838

3939
import abc
4040
import pathlib
41-
import sys
4241
import warnings
4342
from typing import IO, List, Optional, Union
4443

@@ -734,36 +733,4 @@ def read_hdf(filename, key=None):
734733
RuntimeError: If both pandas and h5py fail to load the file
735734
"""
736735

737-
try:
738-
if key is not None:
739-
return pd.read_hdf(filename, key)
740-
else:
741-
return pd.read_hdf(filename)
742-
except Exception as e:
743-
with h5py.File(filename, "r") as f:
744-
try:
745-
if key is not None and key in f:
746-
hdf_key = key
747-
else:
748-
hdf_key = list(f.keys())[0]
749-
750-
data = f[hdf_key][()]
751-
column_names = f[hdf_key].attrs.get('column_names', None)
752-
753-
df = pd.DataFrame(data)
754-
if column_names is not None:
755-
df.columns = column_names
756-
757-
df.columns = pd.MultiIndex.from_tuples(
758-
[tuple(col.split('/')) for col in df.columns],
759-
names=['scorer', 'bodyparts', 'coords'])
760-
761-
return df
762-
763-
except Exception as inner_e:
764-
raise RuntimeError(
765-
f"Failed to load HDF5 file with both pandas and h5py: {str(e)} -> {str(inner_e)}"
766-
f"h5py version: {h5py.__version__}, "
767-
f"pandas version: {pd.__version__}, "
768-
f"numpy version: {np.__version__}, "
769-
f"python version: {sys.version}")
736+
return pd.read_hdf(filename, key=key)

0 commit comments

Comments
 (0)