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.

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

8201 Fix DataFrame subsets indexing in CSVDataset() #8351

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions monai/data/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -1484,7 +1484,7 @@ def convert_tables_to_dicts(
rows.append(i)

# convert to a list of dictionaries corresponding to every row
data_ = df.loc[rows] if col_names is None else df.loc[rows, col_names]
data_ = df.iloc[rows] if col_names is None else df.iloc[rows][col_names]
if isinstance(col_types, dict):
# fill default values for NaN
defaults = {k: v["default"] for k, v in col_types.items() if v is not None and v.get("default") is not None}
Expand All @@ -1500,7 +1500,7 @@ def convert_tables_to_dicts(
if col_groups is not None:
groups: dict[str, list] = {}
for name, cols in col_groups.items():
groups[name] = df.loc[rows, cols].values
groups[name] = df.iloc[rows][cols].values
# invert items of groups to every row of data
data = [dict(d, **{k: v[i] for k, v in groups.items()}) for i, d in enumerate(data)]

Expand Down
7 changes: 7 additions & 0 deletions tests/data/test_csv_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,13 @@ def prepare_csv_file(data, filepath):
},
)

# test pre-loaded DataFrame subset
df = pd.read_csv(filepath1)
df_subset = df.iloc[[1, 3, 4]]
dataset = CSVDataset(src=df_subset, col_groups={"ehr": [f"ehr_{i}" for i in range(3)]})
self.assertEqual(len(dataset), 3)
np.testing.assert_allclose([round(i, 4) for i in dataset[1]["ehr"]], [3.3333, 3.2353, 3.4000])

# test pre-loaded multiple DataFrames, join tables with kwargs
dfs = [pd.read_csv(i) for i in filepaths]
dataset = CSVDataset(src=dfs, on="subject_id")
Expand Down
Loading