From c2b9ef90061938acc42503a7939bc50038ab0edd Mon Sep 17 00:00:00 2001 From: Shaden Smith Date: Wed, 2 Dec 2020 16:34:19 -0800 Subject: [PATCH 1/3] fixes import error in RTD --- deepspeed/ops/sparse_attention/softmax.py | 4 ++-- docs/code-docs/source/conf.py | 2 +- requirements/requirements-readthedocs.txt | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/deepspeed/ops/sparse_attention/softmax.py b/deepspeed/ops/sparse_attention/softmax.py index cd18fbcae71f..92055177d2cb 100644 --- a/deepspeed/ops/sparse_attention/softmax.py +++ b/deepspeed/ops/sparse_attention/softmax.py @@ -224,8 +224,8 @@ class Softmax: For more details about sparsity config, please see `Generative Modeling with Sparse Transformers`: https://arxiv.org/abs/1904.10509 """ - - sparse_softmax = _sparse_softmax.apply + def sparse_softmax(): + return _sparse_softmax.apply def make_lut(self, device): """Generates the sparsity layout used in block-sparse softmax diff --git a/docs/code-docs/source/conf.py b/docs/code-docs/source/conf.py index 167f6427d7b4..eb9a412d8a4a 100644 --- a/docs/code-docs/source/conf.py +++ b/docs/code-docs/source/conf.py @@ -79,4 +79,4 @@ autoclass_content = 'both' -autodoc_mock_imports = ["torch", "apex", "mpi4py", "tensorboardX", "numpy"] +autodoc_mock_imports = ["torch", "apex", "mpi4py", "tensorboardX", "numpy", "cupy"] diff --git a/requirements/requirements-readthedocs.txt b/requirements/requirements-readthedocs.txt index c032a8c9fdad..78620c472c9d 100644 --- a/requirements/requirements-readthedocs.txt +++ b/requirements/requirements-readthedocs.txt @@ -1,2 +1 @@ tqdm -psutil From 061cfd44ebe7aaceffa2ec4e4284f19cc04786da Mon Sep 17 00:00:00 2001 From: Jeff Rasley Date: Tue, 15 Dec 2020 14:46:45 -0800 Subject: [PATCH 2/3] rtd unable to read version.txt --- deepspeed/git_version_info.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deepspeed/git_version_info.py b/deepspeed/git_version_info.py index d17948ae41a7..f04982c74f0d 100644 --- a/deepspeed/git_version_info.py +++ b/deepspeed/git_version_info.py @@ -2,8 +2,12 @@ # This is populated by setup.py from .git_version_info_installed import * except ModuleNotFoundError: - # Will be missing from checkouts that haven't been installed (e.g., readthedocs) - version = open('version.txt', 'r').read().strip() + import os + if os.path.isfile('version.txt'): + # Will be missing from checkouts that haven't been installed (e.g., readthedocs) + version = open('version.txt', 'r').read().strip() + else: + version = "0.0.0" git_hash = '[none]' git_branch = '[none]' From bbd2a757ced8121a1099e21e4c472723f488739a Mon Sep 17 00:00:00 2001 From: Jeff Rasley Date: Tue, 15 Dec 2020 14:57:25 -0800 Subject: [PATCH 3/3] rtd fix for sparse attn softmax --- deepspeed/ops/sparse_attention/softmax.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deepspeed/ops/sparse_attention/softmax.py b/deepspeed/ops/sparse_attention/softmax.py index 92055177d2cb..a0805ada4bc0 100644 --- a/deepspeed/ops/sparse_attention/softmax.py +++ b/deepspeed/ops/sparse_attention/softmax.py @@ -224,8 +224,8 @@ class Softmax: For more details about sparsity config, please see `Generative Modeling with Sparse Transformers`: https://arxiv.org/abs/1904.10509 """ - def sparse_softmax(): - return _sparse_softmax.apply + def sparse_softmax(*args, **kwargs): + return _sparse_softmax.apply(*args, **kwargs) def make_lut(self, device): """Generates the sparsity layout used in block-sparse softmax