Skip to content
This repository has been archived by the owner on Oct 9, 2023. It is now read-only.

fix: set inputs as optional #109

Merged
merged 18 commits into from
Feb 13, 2021
Merged

fix: set inputs as optional #109

Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a5542e3
set inputs as optional
Feb 12, 2021
ed13008
fro_csv and from_df args are optional
Feb 12, 2021
39623bd
Apply suggestions from code review
Borda Feb 12, 2021
96bc0ec
converted None to empty tuple
Feb 12, 2021
276b89a
ValueError -> RuntimeError
Feb 12, 2021
cadaa8b
test for TabularData empty inputs
Feb 12, 2021
df29656
fixed pep
Feb 12, 2021
3f06322
isort fixed
Feb 12, 2021
84b8010
raise error cond
Feb 12, 2021
71ab8a8
updated test
Feb 12, 2021
0f294c9
Merge branch 'master' into optional_input_108
Borda Feb 12, 2021
fe8d9d0
yapf formatted
Feb 12, 2021
0b72e4c
Merge branch 'optional_input_108' of https://github.com/aniketmaurya/…
Feb 12, 2021
101cee1
empty tuple to None
Feb 12, 2021
b033748
Merge branch 'master' into optional_input_108
aniketmaurya Feb 12, 2021
2f8e716
empty tuple to None
Feb 12, 2021
f4e8750
Merge branch 'optional_input_108' of https://github.com/aniketmaurya/…
Feb 12, 2021
8d03c0d
minor enhancements
kaushikb11 Feb 13, 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
21 changes: 15 additions & 6 deletions flash/tabular/classification/data/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ class TabularData(DataModule):
def __init__(
self,
train_df: DataFrame,
categorical_input: List,
numerical_input: List,
target: str,
categorical_input: Optional[List] = None,
numerical_input: Optional[List] = None,
valid_df: Optional[DataFrame] = None,
test_df: Optional[DataFrame] = None,
batch_size: int = 2,
Expand All @@ -82,6 +82,15 @@ def __init__(
dfs = [train_df]
self._test_df = None

if categorical_input is None and numerical_input is None:
raise TypeError('Both categorical_input and numerical_input are None!')
kaushikb11 marked this conversation as resolved.
Show resolved Hide resolved
Borda marked this conversation as resolved.
Show resolved Hide resolved

if categorical_input is None:
categorical_input = []

if numerical_input is None:
aniketmaurya marked this conversation as resolved.
Show resolved Hide resolved
numerical_input = []

if valid_df is not None:
dfs.append(valid_df)

Expand Down Expand Up @@ -133,8 +142,8 @@ def from_df(
cls,
train_df: DataFrame,
target: str,
categorical_input: List,
numerical_input: List,
categorical_input: Optional[List] = None,
numerical_input: Optional[List] = None,
valid_df: Optional[DataFrame] = None,
test_df: Optional[DataFrame] = None,
batch_size: int = 8,
Expand Down Expand Up @@ -194,8 +203,8 @@ def from_csv(
cls,
train_csv: str,
target: str,
categorical_input: List,
numerical_input: List,
categorical_input: Optional[List] = None,
numerical_input: Optional[List] = None,
valid_csv: Optional[str] = None,
test_csv: Optional[str] = None,
batch_size: int = 8,
Expand Down