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

Fix validate_input_col for nn.Module or Callable #96213

Closed
wants to merge 2 commits into from
Closed

Fix validate_input_col for nn.Module or Callable #96213

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b325ef
Fix validate_input_col for nn.Module or Callable
ejguan Mar 7, 2023
6c293ae
Fix the same problem with partial
ejguan Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions test/test_datapipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import numpy as np

import torch
import torch.nn as nn
import torch.utils.data.datapipes as dp
import torch.utils.data.graph
import torch.utils.data.graph_settings
Expand Down Expand Up @@ -663,6 +664,16 @@ def _mod_3_test(x):
lambda_fn3 = lambda x: x >= 5 # noqa: E731


class Add1Module(nn.Module):
def forward(self, x):
return x + 1


class Add1Callable:
def __call__(self, x):
return x + 1


class TestFunctionalIterDataPipe(TestCase):

def _serialization_test_helper(self, datapipe, use_dill):
Expand Down Expand Up @@ -1326,6 +1337,10 @@ def _helper(ref_fn, fn, input_col=None, output_col=None, error=None):
_helper(lambda data: (str(data[0]), data[1], data[2]), str, 0)
_helper(lambda data: (data[0], data[1], int(data[2])), int, 2)

# Handle nn.Module and Callable (without __name__ implemented)
_helper(lambda data: (data[0] + 1, data[1], data[2]), Add1Module(), 0)
_helper(lambda data: (data[0] + 1, data[1], data[2]), Add1Callable(), 0)

@suppress_warnings # Suppress warning for lambda fn
def test_map_dict_with_col_iterdatapipe(self):
def fn_11(d):
Expand Down
2 changes: 1 addition & 1 deletion torch/utils/data/datapipes/utils/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def validate_input_col(fn: Callable, input_col: Optional[Union[int, tuple, list]
if isinstance(fn, functools.partial):
fn_name = fn.func.__name__
else:
fn_name = fn.__name__
fn_name = getattr(fn, "__name__", repr(fn))

if len(non_default_kw_only) > 0:
raise ValueError(
Expand Down