diff options
author | Rémi Flamary <remi.flamary@gmail.com> | 2018-09-28 15:32:53 +0200 |
---|---|---|
committer | Rémi Flamary <remi.flamary@gmail.com> | 2018-09-28 15:32:53 +0200 |
commit | c18f73739fdd8e8ca0ef88dddcf2ba039a85dacf (patch) | |
tree | 9f00d6baa9d68457917190cdad807c027fc85b56 /docs | |
parent | c531fba46d9ea703a8a5ae270efe44466d54a593 (diff) | |
parent | 8f6c45534dcdd6e8f80a31205be28481fc79c533 (diff) |
merge with new gpu stuff
Diffstat (limited to 'docs')
-rw-r--r-- | docs/source/all.rst | 6 | ||||
-rw-r--r-- | docs/source/conf.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/docs/source/all.rst b/docs/source/all.rst index 94da2ed..32930fd 100644 --- a/docs/source/all.rst +++ b/docs/source/all.rst @@ -43,6 +43,12 @@ ot.da .. automodule:: ot.da :members: + +ot.gpu +-------- + +.. automodule:: ot.gpu + :members: ot.dr -------- diff --git a/docs/source/conf.py b/docs/source/conf.py index 114245d..433eca6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -31,7 +31,7 @@ class Mock(MagicMock): @classmethod def __getattr__(cls, name): return MagicMock() -MOCK_MODULES = ['ot.lp.emd_wrap','autograd','pymanopt','cudamat','autograd.numpy','pymanopt.manifolds','pymanopt.solvers'] +MOCK_MODULES = ['ot.lp.emd_wrap','autograd','pymanopt','cupy','autograd.numpy','pymanopt.manifolds','pymanopt.solvers'] # 'autograd.numpy','pymanopt.manifolds','pymanopt.solvers', sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES) # !!!! |