Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve docs #92

Merged
merged 25 commits into from
Mar 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ The following table list some core packages in XenonPy images.
| -------------- | ---------- |
| `PyTorch` | 1.0.1 |
| `tensorly` | 0.4.3 |
| `pymatgen` | 2019.2.4 |
| `pymatgen` | 2019.3.13 |
| `matminer` | 0.5.1 |
| `mordred` | 1.1.2 |
| `scipy` | 1.2.1 |
| `scikit-learn` | 0.20.2 |
| `pandas` | 0.24.1 |
| `rdkit` | 2018.09.1 |
| `pandas` | 0.24.2 |
| `rdkit` | 2018.09.2 |
| `jupyter` | 1.0.0 |
| `seaborn` | 0.9.0 |
| `matplotlib` | 3.0.2 |
Expand Down
25 changes: 25 additions & 0 deletions conda_env/xepy36_cpu_linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: xepy36_cpu_linux
channels:
- defaults
- pytorch
- rdkit
dependencies:
- python=3.6
- pandas=0.24.2
- scikit-learn=0.20.3
- scipy=1.2.1
- pytorch-cpu=1.0.1
- torchvision-cpu
- rdkit=2018.09.2
- jupyter=1.0.0
- seaborn
- requests
- plotly
- pip:
- ruamel.yaml
- pymatgen==2019.3.13
- jupyterlab
- pybtex
- mordred
- tqdm
- xenonpy
27 changes: 27 additions & 0 deletions conda_env/xepy36_cuda10.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: xepy36_cuda10
channels:
- defaults
- pytorch
- rdkit
dependencies:
- python=3.6
- pandas=0.24.2
- scikit-learn=0.20.3
- scipy=1.2.1
- pytorch=1.0.1
- cudatoolkit=10.0
- torchvision
- magma-cuda100=2.5.0
- rdkit=2018.09.2
- jupyter=1.0.0
- seaborn
- requests
- plotly
- pip:
- ruamel.yaml
- pymatgen==2019.3.13
- jupyterlab
- pybtex
- mordred
- tqdm
- xenonpy
27 changes: 27 additions & 0 deletions conda_env/xepy36_cuda9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: xepy36_cuda9
channels:
- defaults
- pytorch
- rdkit
dependencies:
- python=3.6
- pandas=0.24.2
- scikit-learn=0.20.3
- scipy=1.2.1
- pytorch=1.0.1
- cudatoolkit=9.0
- torchvision
- magma-cuda90=2.5.0
- rdkit=2018.09.2
- jupyter=1.0.0
- seaborn
- requests
- plotly
- pip:
- ruamel.yaml
- pymatgen==2019.3.13
- jupyterlab
- pybtex
- mordred
- tqdm
- xenonpy
25 changes: 25 additions & 0 deletions conda_env/xepy36_osx.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: xepy36_osx
channels:
- defaults
- pytorch
- rdkit
dependencies:
- python=3.6
- pandas=0.24.2
- scikit-learn=0.20.3
- scipy=1.2.1
- pytorch=1.0.1
- torchvision
- rdkit=2018.09.2
- jupyter=1.0.0
- seaborn
- requests
- plotly
- pip:
- ruamel.yaml
- pymatgen==2019.3.13
- jupyterlab
- pybtex
- mordred
- tqdm
- xenonpy
25 changes: 25 additions & 0 deletions conda_env/xepy37_cpu_linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: xepy37_cpu_linux
channels:
- defaults
- pytorch
- rdkit
dependencies:
- python=3.7
- pandas=0.24.2
- scikit-learn=0.20.3
- scipy=1.2.1
- pytorch-cpu=1.0.1
- torchvision-cpu
- rdkit=2018.09.2
- jupyter=1.0.0
- seaborn
- requests
- plotly
- pip:
- ruamel.yaml
- pymatgen==2019.3.13
- jupyterlab
- pybtex
- mordred
- tqdm
- xenonpy
27 changes: 27 additions & 0 deletions conda_env/xepy37_cuda10.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: xepy37_cuda10
channels:
- defaults
- pytorch
- rdkit
dependencies:
- python=3.7
- pandas=0.24.2
- scikit-learn=0.20.3
- scipy=1.2.1
- pytorch=1.0.1
- cudatoolkit=10.0
- torchvision
- magma-cuda100=2.5.0
- rdkit=2018.09.2
- jupyter=1.0.0
- seaborn
- requests
- plotly
- pip:
- ruamel.yaml
- pymatgen==2019.3.13
- jupyterlab
- pybtex
- mordred
- tqdm
- xenonpy
27 changes: 27 additions & 0 deletions conda_env/xepy37_cuda9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: xepy37_cuda9
channels:
- defaults
- pytorch
- rdkit
dependencies:
- python=3.7
- pandas=0.24.2
- scikit-learn=0.20.3
- scipy=1.2.1
- pytorch=1.0.1
- cudatoolkit=9.0
- torchvision
- magma-cuda90=2.5.0
- rdkit=2018.09.2
- jupyter=1.0.0
- seaborn
- requests
- plotly
- pip:
- ruamel.yaml
- pymatgen==2019.3.13
- jupyterlab
- pybtex
- mordred
- tqdm
- xenonpy
25 changes: 25 additions & 0 deletions conda_env/xepy37_osx.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: xepy37_osx
channels:
- defaults
- pytorch
- rdkit
dependencies:
- python=3.7
- pandas=0.24.2
- scikit-learn=0.20.3
- scipy=1.2.1
- pytorch=1.0.1
- torchvision
- rdkit=2018.09.2
- jupyter=1.0.0
- seaborn
- requests
- plotly
- pip:
- ruamel.yaml
- pymatgen==2019.3.13
- jupyterlab
- pybtex
- mordred
- tqdm
- xenonpy
Binary file added docs/source/_static/heatmap_density.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions docs/source/api.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
------------------
Indices and tables
------------------
* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`
18 changes: 9 additions & 9 deletions docs/source/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ v0.3.0

**Breaking changes**:

* Remove Built-in data ``mp_inorganic``, ``mp_structure``, ``oqmd_inorganic`` and ``oqmd_structure``. `#12`_ `#20`_
* Remove Built-in data ``mp_inorganic``, ``mp_structure``, ``oqmd_inorganic`` and ``oqmd_structure``. ( `#12`_ `#20`_ )
* Change name of ``LocalStorage`` to ``Storage``.

**Enhanced**

* Add error handling for ``NGram`` training. (`#75`_ `#86`_)
* Add error handling for ``IQSPR``. (`#69`_)
* Add error handling for ``BaseDescriptor`` and ``BaseFeaturizer``. (`#73`_)
* Add featurizer selection function. (`#47`_)
* Add error handling for ``NGram`` training. ( `#75`_ `#86`_ )
* Add error handling for ``IQSPR``. ( `#69`_ )
* Add error handling for ``BaseDescriptor`` and ``BaseFeaturizer``. ( `#73`_ )
* Add featurizer selection function. ( `#47`_ )

**New Features**

* Add sample data building function for ``preset``. (`#81`_ `#84`_)
* Add sample data building function for ``preset``. ( `#81`_ `#84`_ )


.. _#12: https://github.com/yoshida-lab/XenonPy/issues/12
Expand All @@ -44,13 +44,13 @@ v0.2.0

**Descriptor Generator**:

* Added ``xenonpy.descriptor.Fingerprint`` descriptor generator. (`#21`_)
* Added ``xenonpy.descriptor.OrbitalFieldMatrix`` descriptor generator. (`#22`_)
* Added ``xenonpy.descriptor.Fingerprint`` descriptor generator. ( `#21`_ )
* Added ``xenonpy.descriptor.OrbitalFieldMatrix`` descriptor generator. ( `#22`_ )


**API Changes**:

* Allowed ``BaseDescriptor`` class to use anonymous/renamed input. (`#10`_)
* Allowed ``BaseDescriptor`` class to use anonymous/renamed input. ( `#10`_ )

.. _#10: https://github.com/yoshida-lab/XenonPy/issues/10
.. _#21: https://github.com/yoshida-lab/XenonPy/issues/21
Expand Down
15 changes: 12 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@
'sphinx.ext.coverage',
'sphinx.ext.mathjax',
'sphinx.ext.viewcode',
'sphinx.ext.githubpages']
'sphinx.ext.githubpages',
'sphinx.ext.autosectionlabel'
]

# config autosectionlabel
autosectionlabel_prefix_document = True

# config autodoc
autoclass_content = 'both'
Expand All @@ -66,7 +71,7 @@

# General information about the project.
project = package.__name__
copyright = '2018, TsumiNa'
copyright = '2019, yoshida-lab'
author = 'TsumiNa'

# The version info for the project you're documenting, acts as replacement for
Expand Down Expand Up @@ -181,7 +186,11 @@
]

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'https://docs.python.org/': None}
intersphinx_mapping = {'https://docs.python.org/': None,
'pandas': ('http://pandas.pydata.org/pandas-docs/version/0.24', None),
'numpy': ('http://docs.scipy.org/doc/numpy', None),
'scipy': ('http://docs.scipy.org/doc/scipy/reference', None),
'matplotlib': ('http://matplotlib.org', None)}


def skip(app, what, name, obj, skip, options):
Expand Down
9 changes: 9 additions & 0 deletions docs/source/copyright.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
=========
Copyright
=========

Copyright © 2019 The XenonPy task force, all rights reserved.
Released under the `BSD-3 license`_.

.. _BSD-3 license: https://opensource.org/licenses/BSD-3-Clause

Loading