Skip to content

Bring over use_cpctools patch. #6

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

Merged
merged 4 commits into from
Nov 30, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/publish_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: "3.10"
cache: "pip"
- run: pip install -e '.[dev]'
- run: python -m build
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: "3.10"
cache: "pip"
- run: pip install -e '.[dev]'
- run: ruff .
Expand All @@ -22,7 +22,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: "3.10"
cache: "pip"
- run: pip install -e '.[dev]'
- run: mypy .
Expand All @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: "3.10"
cache: "pip"
- run: pip install -e '.[dev]'
- run: ruff format --check .
Expand All @@ -42,7 +42,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: "3.10"
cache: "pip"
- run: pip install -e '.[dev]'
- run: pytest --cov=src --cov-report term-missing
Expand All @@ -52,7 +52,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: "3.10"
cache: "pip"
- run: pip install -e '.[dev]'
- run: make -C docs doctest
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.11"
python: "3.10"

sphinx:
configuration: docs/source/conf.py
Expand Down
24 changes: 20 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ To get ``dynsight``, you can install it with pip::

$ pip install dynsight


Examples
========

There are examples available in the ``examples/`` directory of this repository.

There are also examples available in the ``cpctools`` repository
`here <https://github.com/GMPavanLab/cpctools/tree/main/Examples>`

How To Cite
===========

Expand All @@ -27,7 +36,14 @@ Publications
Acknowledgements
================

Developed in GMP
ERC
NextGenEU
Daniele Rapetti
We developed this code when working in the Pavan group,
https://www.gmpavanlab.com/, whose members often provide very valuable
feedback, which we gratefully acknowledge.

Much of the original code in ``cpctools`` was written by Daniele Rapetti (Iximiel).

The work was funded by the European Union and ERC under projects DYNAPOL and the
NextGenerationEU project, CAGEX.

.. figure:: docs/source/_static/EU_image.png

Binary file added docs/source/_static/EU_image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions docs/source/data_processing.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Data processing
===============


SOAP distances
--------------

.. toctree::
:maxdepth: 1


kernelsoap <_autosummary/dynsight.data_processing.kernelsoap>
simplekernelsoap <_autosummary/dynsight.data_processing.simplekernelsoap>
soapdistance <_autosummary/dynsight.data_processing.soapdistance>
soapdistancenormalized <_autosummary/dynsight.data_processing.soapdistancenormalized>
simplesoapdistance <_autosummary/dynsight.data_processing.simplesoapdistance>

Classification
--------------

.. toctree::
:maxdepth: 1

createreferencesfromtrajectory <_autosummary/dynsight.data_processing.createreferencesfromtrajectory>
getdistancebetween <_autosummary/dynsight.data_processing.getdistancebetween>
getdistancesfromref <_autosummary/dynsight.data_processing.getdistancesfromref>
getdistancesfromrefnormalized <_autosummary/dynsight.data_processing.getdistancesfromrefnormalized>
mergereferences <_autosummary/dynsight.data_processing.mergereferences>
savereferences <_autosummary/dynsight.data_processing.savereferences>
getreferencesfromdataset <_autosummary/dynsight.data_processing.getreferencesfromdataset>
applyclassification <_autosummary/dynsight.data_processing.applyclassification>
10 changes: 10 additions & 0 deletions docs/source/hdf5er.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
HDF5er
======


.. toctree::
:maxdepth: 1

mda_to_hdf5 <_autosummary/dynsight.hdf5er.mda_to_hdf5>
universe_to_hdf5 <_autosummary/dynsight.hdf5er.universe_to_hdf5>
create_universe_from_slice <_autosummary/dynsight.hdf5er.create_universe_from_slice>
42 changes: 42 additions & 0 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.

.. toctree::
:hidden:
:caption: dynsight
:maxdepth: 2

SOAPify <soapify>
timeSOAP <time_soap>
LENS <lens>
data processing <data_processing>
HDF5er <hdf5er>

.. toctree::
:hidden:
Expand Down Expand Up @@ -35,6 +45,14 @@ To get :mod:`.dynsight`, you can install it with pip::

$ pip install dynsight

Dependencies
............

The main dependancies are for SOAP analysis:

* `cpctools <https://github.com/GMPavanLab/cpctools>`_
* `dscribe (1.2.0 - 1.2.2) <https://singroup.github.io/dscribe/latest/>`_

Developer Setup
...............

Expand All @@ -57,6 +75,30 @@ Overview

To be written.

Examples
--------

There are simplified examples available in the
`examples <https://github.com/GMPavanLab/dynsight/tree/main/examples>`_
directory of this repository.

There are also examples available in the ``cpctools`` repository
`here <https://github.com/GMPavanLab/cpctools/tree/main/Examples>`_.



Acknowledgements
----------------

We developed this code when working in the Pavan group,
https://www.gmpavanlab.com/, whose members often provide very valuable
feedback, which we gratefully acknowledge.

Much of the original code in ``cpctools`` was written by Daniele Rapetti (Iximiel).

The work was funded by the European Union and ERC under projects DYNAPOL and the
NextGenerationEU project, CAGEX.

Indices and tables
------------------

Expand Down
9 changes: 9 additions & 0 deletions docs/source/lens.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
LENS
====


.. toctree::
:maxdepth: 1

list_neighbours_along_trajectory <_autosummary/dynsight.lens.list_neighbours_along_trajectory>
neighbour_change_in_time <_autosummary/dynsight.lens.neighbour_change_in_time>
24 changes: 24 additions & 0 deletions docs/source/soapify.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
SOAPify
=======

This package uses `cpctools` to run SOAP (add citation) analysis on molecular
systems.

Saponify
--------

.. toctree::
:maxdepth: 1

saponify_trajectory <_autosummary/dynsight.soapify.saponify_trajectory>
saponify_multiple_trajectories <_autosummary/dynsight.soapify.saponify_multiple_trajectories>


Utilities
---------

.. toctree::
:maxdepth: 1

get_soap_settings <_autosummary/dynsight.soapify.get_soap_settings>
fill_soap_vector_from_dscribe <_autosummary/dynsight.soapify.fill_soap_vector_from_dscribe>
9 changes: 9 additions & 0 deletions docs/source/time_soap.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
timeSOAP
========

.. toctree::
:maxdepth: 1

timesoap <_autosummary/dynsight.time_soap.timesoap>
timesoapsimple <_autosummary/dynsight.time_soap.timesoapsimple>
gettimesoapsimple <_autosummary/dynsight.time_soap.gettimesoapsimple>
Loading