Skip to content
Merged
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
3 changes: 1 addition & 2 deletions merlin/dataloader/tensorflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from merlin.core.compat import tensorflow as tf
from merlin.dataloader.array import ArrayLoader
from merlin.table import Device, NumpyColumn, TensorColumn, TensorflowColumn, TensorTable
from merlin.table import TensorColumn, TensorflowColumn, TensorTable
from merlin.table.conversions import _dispatch_dlpack_fns, convert_col


Expand Down Expand Up @@ -104,7 +104,6 @@ def convert_batch(self, batch):
tf_inputs = {}
if inputs is not None:
inputs_table = self.create_table(inputs)
column_type = TensorflowColumn if Device.GPU == inputs_table.device else NumpyColumn
for col_name, col in inputs_table.items():
tf_inputs[col_name] = self.convert_col(col, column_type)

Expand Down