From f7e920d2e2eb9648713b515215db5ed8c21eafea Mon Sep 17 00:00:00 2001 From: Julio Date: Wed, 1 Nov 2023 15:23:54 -0400 Subject: [PATCH 1/5] fix for isaligned ragged failure --- merlin/dataloader/tensorflow.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/merlin/dataloader/tensorflow.py b/merlin/dataloader/tensorflow.py index a84736f9..3102ce69 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 TensorColumn, TensorflowColumn, NumpyColumn, TensorTable, Device 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 raggedness isaligned check + 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 From 6719b409c2b8628eebe708a44cbdbf1002e758bf Mon Sep 17 00:00:00 2001 From: Julio Date: Wed, 1 Nov 2023 15:47:42 -0400 Subject: [PATCH 2/5] fix comment and signing --- merlin/dataloader/tensorflow.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/merlin/dataloader/tensorflow.py b/merlin/dataloader/tensorflow.py index 3102ce69..dfa68769 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, NumpyColumn, TensorTable, Device +from merlin.table import Device, NumpyColumn, TensorColumn, TensorflowColumn, TensorTable from merlin.table.conversions import _dispatch_dlpack_fns, convert_col @@ -135,7 +135,7 @@ 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 raggedness isaligned check + # fix for raggedness isaligned check failure if col.is_ragged: original_device = col.device col = self.convert_col(col, NumpyColumn) From 1c20c0ab12c6ee60bf6ce2b40dd1a41ff76f7bb1 Mon Sep 17 00:00:00 2001 From: Julio Date: Wed, 1 Nov 2023 15:48:42 -0400 Subject: [PATCH 3/5] fix comment and signing --- merlin/dataloader/tensorflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merlin/dataloader/tensorflow.py b/merlin/dataloader/tensorflow.py index dfa68769..c8ed822f 100644 --- a/merlin/dataloader/tensorflow.py +++ b/merlin/dataloader/tensorflow.py @@ -135,7 +135,7 @@ 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 raggedness isaligned check failure + # fix for ragged column isaligned check failure if col.is_ragged: original_device = col.device col = self.convert_col(col, NumpyColumn) From eee5a7a08154fb7a8fb1b199213a0f5f9be45ebc Mon Sep 17 00:00:00 2001 From: Julio Date: Thu, 9 Nov 2023 10:51:03 -0500 Subject: [PATCH 4/5] downgrade python version for pip install --- .github/workflows/lint.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ab1d5ef5..d59160d7 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.10 cache: "pip" cache-dependency-path: "**/**.txt" - uses: pre-commit/action@v2.0.3 From 0a3afd6607708af8f654f8dad43d6bd1dc145dd2 Mon Sep 17 00:00:00 2001 From: Julio Date: Thu, 9 Nov 2023 11:05:27 -0500 Subject: [PATCH 5/5] add a detectable version of python --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d59160d7..72550973 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: 3.10 + python-version: 3.11 cache: "pip" cache-dependency-path: "**/**.txt" - uses: pre-commit/action@v2.0.3