From 162f4984b9b20619f7d504400801bddb8c3ca199 Mon Sep 17 00:00:00 2001 From: Emma Date: Sun, 7 Jan 2024 15:00:00 +0800 Subject: [PATCH 1/2] Fix sok import error in ut (#1232) * Fix sok import error in ut * Update SOK import in backend.py --- merlin/models/tf/distributed/backend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merlin/models/tf/distributed/backend.py b/merlin/models/tf/distributed/backend.py index 78445d3b44..91f9d7707c 100644 --- a/merlin/models/tf/distributed/backend.py +++ b/merlin/models/tf/distributed/backend.py @@ -22,7 +22,7 @@ if HAS_GPU: try: - from sparse_operation_kit import experiment as sok # noqa: F401 + import sparse_operation_kit as sok # noqa: F401 sok_installed = True except (ImportError, tf.errors.NotFoundError): From 2bec1a5b27e0277bad4b7292d1cfa26ac215b13b Mon Sep 17 00:00:00 2001 From: edknv <109497216+edknv@users.noreply.github.com> Date: Mon, 8 Jan 2024 12:16:52 -0800 Subject: [PATCH 2/2] fix dependencies in docs build (#1236) --- requirements/docs.txt | 4 +++- tox.ini | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements/docs.txt b/requirements/docs.txt index 6f335f911f..0092cf5ca8 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,7 +1,9 @@ attrs==21.4.0 Jinja2<3.1 linkify-it-py==1.0.3 -myst-nb +myst-nb==0.17.2 +nbformat==5.9.2 +jsonschema==4.17.3 natsort==8.1.0 recommonmark==0.7.1 sphinx_book_theme~=1.0.1 diff --git a/tox.ini b/tox.ini index e35a7dcc78..a6c20fa764 100644 --- a/tox.ini +++ b/tox.ini @@ -121,7 +121,7 @@ commands = changedir = {toxinidir} deps = -rrequirements/docs.txt - -rrequirements/test.txt + -rrequirements/dev.txt git+https://github.com/NVIDIA-Merlin/core.git git+https://github.com/NVIDIA-Merlin/dataloader.git git+https://github.com/NVIDIA-Merlin/NVTabular.git