Skip to content

Commit

Permalink
Fix docs
Browse files Browse the repository at this point in the history
  • Loading branch information
adosar committed May 7, 2024
1 parent b52ed1e commit 0a954cf
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 6 deletions.
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,14 @@ If you use ΜΟΧελ in your research, please consider citing the following wor
publisher = {Springer Science and Business Media LLC},
author = {Sarikas, Antonios P. and Gkagkas, Konstantinos and Froudakis, George E.},
year = {2024},
month = jan
month = jan
}

## 📇 TODO
* Improve modeling of interactions
* Improve voxelization scheme
* Improve performance
1. CLI for training [RetNet](https://www.nature.com/articles/s41598-023-50309-8).
2. Improve performance
3. Improve voxelization scheme
4. Improve modeling of interactions

## 📑 License
MOXελ is released under the [GNU General Public License v3.0 only](https://spdx.org/licenses/GPL-3.0-only.html).
1 change: 1 addition & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ sphinxcontrib-jsmath
sphinxcontrib-qthelp
sphinxcontrib-serializinghtml
sphinxemoji
sphinx-issues
6 changes: 6 additions & 0 deletions docs/source/changes.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
|:pushpin:| Changes
===================

Version 0.1.1
-------------

* Add performance enhancements proposed by :user:`fxcoudert`. See PR :pr:`2, 3`.
* Fix bug in :mod:`moxel.visualize` where plots didn't render.

Version 0.1.0
-------------

Expand Down
14 changes: 14 additions & 0 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
'sphinx_copybutton',
'sphinxarg.ext',
'sphinx_code_tabs',
'sphinx_issues',
]

templates_path = ['_templates']
Expand All @@ -40,3 +41,16 @@

html_theme = 'sphinx_rtd_theme'
#html_static_path = ['_static']

# Path to GitHub repo {group}/{project} (note that `group` is the GitHub user or organization)
issues_github_path = "adosar/moxel"

# which is the equivalent to:
issues_uri = "https://github.com/{group}/{project}/issues/{issue}"
issues_prefix = "#"
issues_pr_uri = "https://github.com/{group}/{project}/pull/{pr}"
issues_pr_prefix = "#"
issues_commit_uri = "https://github.com/{group}/{project}/commit/{commit}"
issues_commit_prefix = "@"
issues_user_uri = "https://github.com/{user}"
issues_user_prefix = "@"
4 changes: 2 additions & 2 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ If you use ΜΟΧελ in your research, please consider citing the following wor
TODO
----

1. Improve performance
2. CLI for training `RetNet <https://www.nature.com/articles/s41598-023-50309-8>`_
1. CLI for training `RetNet <https://www.nature.com/articles/s41598-023-50309-8>`_
2. Improve performance
3. Improve voxelization scheme
4. Improve modeling of interactions

Expand Down
14 changes: 14 additions & 0 deletions docs/source/tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,20 @@ In all cases, :func:`moxel.utils.Grid.calculate` is used under the hood to calcu
voxels (all other functions are just wrappers). To better understand how to use
them: :ref:`documentation`.

.. attention::
Consider playing with the ``n_jobs`` parameter to get the best performance
for your system::

from timeit import timeit

setup = 'from moxel.utils import voxels_from_file'
n_jobs = [1, 2, 8, 16] # Modify this according to your system.

for n in n_jobs:
stmt = f'voxels_from_file("path/to/cif", n_jobs={n})'
time = timeit(stmt=stmt, setup=setup, number=1)
print(f'Time with {n} jobs: {time:.3f} s')

Visualization
^^^^^^^^^^^^^

Expand Down
14 changes: 14 additions & 0 deletions src/moxel/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,20 @@
.. note::
Currently, interactions are modelled with the Lennard-Jones (LJ) potential.
.. attention::
Consider playing with the ``n_jobs`` parameter to get the best performance
for your system::
from timeit import timeit
setup = 'from moxel.utils import voxels_from_file'
n_jobs = [1, 2, 8, 16] # Modify this according to your system.
for n in n_jobs:
stmt = f'voxels_from_file("path/to/cif", n_jobs={n})'
time = timeit(stmt=stmt, setup=setup, number=1)
print(f'Time with {n} jobs: {time:.3f} s')
"""

import os
Expand Down

0 comments on commit 0a954cf

Please sign in to comment.