Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

fixing imports for tf and torch in dataloader #127

Merged
merged 2 commits into from
Apr 5, 2023
Merged

fixing imports for tf and torch in dataloader #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c26a6a7
fixing imports for tf and torch in dataloader
jperez999 Apr 5, 2023
faf3c08
fix tests imports of frameworks
jperez999 Apr 5, 2023
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
2 changes: 1 addition & 1 deletion merlin/dataloader/tensorflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
from functools import partial

from merlin.core.compat import tensorflow as tf
from merlin.core.compat.tensorflow import tensorflow as tf
from merlin.dataloader.loader_base import LoaderBase
from merlin.table import TensorColumn, TensorflowColumn, TensorTable
from merlin.table.conversions import _dispatch_dlpack_fns, convert_col
Expand Down
2 changes: 1 addition & 1 deletion merlin/dataloader/torch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
from functools import partial

from merlin.core.compat import torch as th
from merlin.core.compat.torch import torch as th
from merlin.dataloader.loader_base import LoaderBase
from merlin.table import TensorColumn, TensorTable, TorchColumn
from merlin.table.conversions import _dispatch_dlpack_fns, convert_col
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/dataloader/test_array_to_tensorflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import pytest

from merlin.core.compat import tensorflow as tf
from merlin.core.compat.tensorflow import tensorflow as tf
from merlin.core.dispatch import make_df
from merlin.io import Dataset
from merlin.schema import Tags
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/dataloader/test_array_to_torch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
import pytest

from merlin.core.compat import torch as th
from merlin.core.compat.torch import torch as th
from merlin.core.dispatch import make_df
from merlin.io import Dataset
from merlin.schema import Tags
Expand Down