Fixes for RTD build errors (deepspeedai#606)

jeffra · Shaden Smith · web-flow · commit 6380ee35116d · 2020-12-15T15:29:21.000-08:00
Co-authored-by: Shaden Smith &lt;Shaden.Smith@microsoft.com&gt;
diff --git 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]'
 
diff --git 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(*args, **kwargs):
+        return _sparse_softmax.apply(*args, **kwargs)
 
     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
@@ -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
@@ -1,2 +1 @@
 tqdm
-psutil

Original file line number	Diff line number	Diff line change
`@@ -79,4 +79,4 @@`
`79`	`79`
`80`	`80`	`autoclass_content = 'both'`
`81`	`81`
`82`		`-autodoc_mock_imports = ["torch", "apex", "mpi4py", "tensorboardX", "numpy"]`
	`82`	`+autodoc_mock_imports = ["torch", "apex", "mpi4py", "tensorboardX", "numpy", "cupy"]`