diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ab1d5ef5..72550973 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,6 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: + python-version: 3.11 cache: "pip" cache-dependency-path: "**/**.txt" - uses: pre-commit/action@v2.0.3 diff --git a/merlin/dataloader/tensorflow.py b/merlin/dataloader/tensorflow.py index a84736f9..c8ed822f 100644 --- a/merlin/dataloader/tensorflow.py +++ b/merlin/dataloader/tensorflow.py @@ -18,7 +18,7 @@ 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 import Device, NumpyColumn, TensorColumn, TensorflowColumn, TensorTable from merlin.table.conversions import _dispatch_dlpack_fns, convert_col @@ -135,6 +135,12 @@ def convert_batch(self, batch): if inputs is not None: inputs_table = self.create_table(inputs) for col_name, col in inputs_table.items(): + # fix for ragged column isaligned check failure + if col.is_ragged: + original_device = col.device + col = self.convert_col(col, NumpyColumn) + if original_device == Device.GPU: + col = col.gpu() tf_inputs[col_name] = self.convert_col(col, column_type) tf_target = None