Skip to content

refactor docs#952

Merged
amcadmus merged 15 commits into
deepmodeling:develfrom
njzjz:refactor-docs
Aug 16, 2021
Merged

refactor docs#952
amcadmus merged 15 commits into
deepmodeling:develfrom
njzjz:refactor-docs

Conversation

@njzjz

@njzjz njzjz commented Aug 12, 2021

Copy link
Copy Markdown
Member

@njzjz njzjz requested a review from amcadmus August 12, 2021 06:27
@codecov-commenter

codecov-commenter commented Aug 12, 2021

Copy link
Copy Markdown

Codecov Report

Merging #952 (9de2e1e) into devel (72aaa9b) will decrease coverage by 0.14%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##            devel     #952      +/-   ##
==========================================
- Coverage   75.51%   75.37%   -0.15%     
==========================================
  Files          85       85              
  Lines        6796     6801       +5     
==========================================
- Hits         5132     5126       -6     
- Misses       1664     1675      +11     
Impacted Files Coverage Δ
deepmd/calculator.py 79.41% <0.00%> (-10.25%) ⬇️
deepmd/utils/tabulate.py 86.18% <0.00%> (-1.66%) ⬇️
deepmd/descriptor/se_a.py 96.18% <0.00%> (-1.39%) ⬇️
source/lib/include/neighbor_list.h 100.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 72aaa9b...9de2e1e. Read the comment docs.

@amcadmus amcadmus requested a review from tuoping August 12, 2021 06:31

@amcadmus amcadmus left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. The links in the README.md at the deepmd-kit source root are broken.
  2. How a user conveniently read the doc locally or from the github website? or we only want to provide the doc through readthedoc?

Comment thread doc/train/training.md Outdated
Comment thread doc/train/training.md Outdated
Comment thread doc/getting-started/training.md
Comment thread doc/install/install-from-source.md Outdated
@njzjz

njzjz commented Aug 12, 2021

Copy link
Copy Markdown
Member Author

How a user conveniently read the doc locally or from the github website? or we only want to provide the doc through readthedoc?

It's hard to support all of them at the same time. However, I can provide a README under doc directory to give a guide how to build the website locally. For GitHub, I think one can easily visit our website if he can visit the GitHub?

@njzjz

njzjz commented Aug 12, 2021

Copy link
Copy Markdown
Member Author

Maybe I can provide a separated catalog for GitHub or Gitee users.

@njzjz njzjz added this to the v2.0.0 milestone Aug 12, 2021
@njzjz njzjz requested a review from amcadmus August 12, 2021 19:54
Comment thread doc/train/training-advanced.md
Comment thread doc/model/train-energy.md Outdated
Comment thread README.md Outdated
Comment thread doc/model/train-se-e2-a.md Outdated
Comment thread doc/model/train-se-e2-a.md Outdated
Comment thread doc/model/train-energy.md
@njzjz njzjz requested a review from amcadmus August 13, 2021 01:05

@tuoping tuoping left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can change this:

exhale_args = {
   ...
    "rootFileName":          "api_cc.rst",
   ...
}

to

exhale_args = {
   ...
    "rootFileName":          "../development/api_cc.rst",
   ...
}

Then the automatically built api_cc.rst will be in directory doc/development/

Comment thread doc/third-party/lammps-command.md Outdated

@tuoping tuoping left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, regarding @amcadmus 's comments, you can have both index.rst and index.md in the same directory, RST will go for index.rst automatically.

Comment thread doc/index.rst Outdated
:caption: Developer Guide

development/index
api

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And you can change here to

.. toctree
    :maxdepth: 3
    :caption: Developer Guide
    :glob:

    development/*

@njzjz njzjz Aug 13, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But, sections will be disordered?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The sections won't change much. Originally, the list was like this

.. toctree::
   :maxdepth: 3
   :caption: Developer Guide

   api
   API_CC/api_cc
   development/coding-conventions
   development/type-embedding

The automatically generated one with ":glob:" is exactly the same.


.. _trouble:

.. toctree::

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this directory to handle possible changes in the future, may we consider this:

.. toctree::
    :maxdepth: 1
    :caption: trouble shooting
    :glob:

    ./*

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This turned out to work out fine.

njzjz and others added 2 commits August 12, 2021 23:21
Co-authored-by: tuoping <80671886+tuoping@users.noreply.github.com>
@njzjz

njzjz commented Aug 13, 2021

Copy link
Copy Markdown
Member Author

You can change this:

exhale_args = {
   ...
    "rootFileName":          "api_cc.rst",
   ...
}

to

exhale_args = {
   ...
    "rootFileName":          "../development/api_cc.rst",
   ...
}

Then the automatically built api_cc.rst will be in directory doc/development/

Not work. api_cc.rst relies other files.

@amcadmus amcadmus requested a review from tuoping August 13, 2021 04:54
Comment thread doc/index.rst Outdated
:caption: Developer Guide

development/index
development/api

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works:

.. toctree::
   :maxdepth: 3
   :caption: Developer Guide
   :glob:

   development/*
   API_CC/api_cc

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The sections will be ordered like this:

Developer Guide

Python API
Coding Conventions
Atom Type Embedding
C++ API

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@njzjz njzjz requested a review from tuoping August 13, 2021 22:12
@amcadmus amcadmus merged commit 820b3ed into deepmodeling:devel Aug 16, 2021
gzq942560379 pushed a commit to HPC-AI-Team/deepmd-kit that referenced this pull request Sep 2, 2021
* refactor docs

* Update type-embedding.md

* fix typos

* Update lammps.md

* Update model-deviation.md

* fix typos

* fix links in readme; rewrite training

* refactor model part

* fix several typos; move sections

* Update doc/third-party/lammps-command.md

Co-authored-by: tuoping <80671886+tuoping@users.noreply.github.com>

* create markdown files

* revert api_cc

* update developer toxtree

* remove unexpected api_cc.rst

Co-authored-by: Han Wang <amcadmus@gmail.com>
Co-authored-by: tuoping <80671886+tuoping@users.noreply.github.com>
njzjz added a commit to njzjz/deepmd-kit that referenced this pull request Sep 21, 2023
Since there are lots of parameters still not added (deepmodeling#771, deepmodeling#773, deepmodeling#774,
deepmodeling#781, deepmodeling#782), we only enable loose check for `dpgen run` (i.e.
`strict_check=False`).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants