Skip to content

Commit

Permalink
fixing imports for tf and torch in dataloader (#127)
Browse files Browse the repository at this point in the history
* fixing imports for tf and torch in dataloader

* fix tests imports of frameworks
  • Loading branch information
jperez999 authored Apr 5, 2023
1 parent 4cd8f12 commit 699ca7b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion merlin/dataloader/tensorflow.py
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
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
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
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

0 comments on commit 699ca7b

Please # to comment.