Skip to content

Commit 5b61144

Browse files
authored
Big doc revamp - simplify and improve the subpackage pages (#4783)
1 parent 57b3b42 commit 5b61144

File tree

17 files changed

+484
-522
lines changed

17 files changed

+484
-522
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ docs/build
1414
# sphinx-gallery
1515
docs/source/auto_examples/
1616
docs/source/gen_modules/
17+
docs/source/generated/
1718
# pytorch-sphinx-theme gets installed here
1819
docs/src
1920

docs/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ clean:
3232
rm -rf $(BUILDDIR)/*
3333
rm -rf $(SOURCEDIR)/auto_examples/ # sphinx-gallery
3434
rm -rf $(SOURCEDIR)/gen_modules/ # sphinx-gallery
35+
rm -rf $(SOURCEDIR)/generated/ # autosummary
3536

3637
.PHONY: help Makefile docset
3738

docs/source/_templates/class.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.. role:: hidden
2+
:class: hidden-section
3+
.. currentmodule:: {{ module }}
4+
5+
6+
{{ name | underline}}
7+
8+
.. autoclass:: {{ name }}
9+
:members:
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.. role:: hidden
2+
:class: hidden-section
3+
.. currentmodule:: {{ module }}
4+
5+
6+
{{ name | underline}}
7+
8+
.. autoclass:: {{ name }}
9+
:members:
10+
__getitem__,
11+
{% if "category_name" in methods %} category_name {% endif %}
12+
:special-members:

docs/source/_templates/function.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.. role:: hidden
2+
:class: hidden-section
3+
.. currentmodule:: {{ module }}
4+
5+
6+
{{ name | underline}}
7+
8+
.. autofunction:: {{ name }}

docs/source/conf.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@
144144
htmlhelp_basename = "PyTorchdoc"
145145

146146

147+
autosummary_generate = True
148+
149+
147150
# -- Options for LaTeX output ---------------------------------------------
148151
latex_elements = {
149152
# The paper size ('letterpaper' or 'a4paper').

docs/source/datasets.rst

Lines changed: 55 additions & 254 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
torchvision.datasets
2-
====================
1+
Datasets
2+
========
3+
4+
Torchvision provides many built-in datasets in the ``torchvision.datasets``
5+
module, as well as utility classes for building your own datasets.
6+
7+
Built-in datasets
8+
~~~~~~~~~~~~~~~~~
39

410
All datasets are subclasses of :class:`torch.utils.data.Dataset`
511
i.e, they have ``__getitem__`` and ``__len__`` methods implemented.
@@ -19,263 +25,58 @@ All the datasets have almost similar API. They all have two common arguments:
1925
``transform`` and ``target_transform`` to transform the input and target respectively.
2026
You can also create your own datasets using the provided :ref:`base classes <base_classes_datasets>`.
2127

22-
Caltech
23-
~~~~~~~
24-
25-
.. autoclass:: Caltech101
26-
:members: __getitem__
27-
:special-members:
28-
29-
.. autoclass:: Caltech256
30-
:members: __getitem__
31-
:special-members:
32-
33-
CelebA
34-
~~~~~~
35-
36-
.. autoclass:: CelebA
37-
:members: __getitem__
38-
:special-members:
39-
40-
CIFAR
41-
~~~~~
42-
43-
.. autoclass:: CIFAR10
44-
:members: __getitem__
45-
:special-members:
46-
47-
.. autoclass:: CIFAR100
48-
49-
Cityscapes
50-
~~~~~~~~~~
51-
52-
.. note ::
53-
Requires Cityscape to be downloaded.
54-
55-
.. autoclass:: Cityscapes
56-
:members: __getitem__
57-
:special-members:
58-
59-
COCO
60-
~~~~
61-
62-
.. note ::
63-
These require the `COCO API to be installed`_
64-
65-
.. _COCO API to be installed: https://github.com/pdollar/coco/tree/master/PythonAPI
66-
67-
68-
Captions
69-
^^^^^^^^
70-
71-
.. autoclass:: CocoCaptions
72-
:members: __getitem__
73-
:special-members:
74-
75-
76-
Detection
77-
^^^^^^^^^
78-
79-
.. autoclass:: CocoDetection
80-
:members: __getitem__
81-
:special-members:
82-
83-
84-
EMNIST
85-
~~~~~~
86-
87-
.. autoclass:: EMNIST
88-
89-
FakeData
90-
~~~~~~~~
91-
92-
.. autoclass:: FakeData
93-
94-
Fashion-MNIST
95-
~~~~~~~~~~~~~
96-
97-
.. autoclass:: FashionMNIST
98-
99-
Flickr
100-
~~~~~~
101-
102-
.. autoclass:: Flickr8k
103-
:members: __getitem__
104-
:special-members:
105-
106-
.. autoclass:: Flickr30k
107-
:members: __getitem__
108-
:special-members:
109-
110-
HMDB51
111-
~~~~~~~
112-
113-
.. autoclass:: HMDB51
114-
:members: __getitem__
115-
:special-members:
116-
117-
ImageNet
118-
~~~~~~~~~~~
119-
120-
.. autoclass:: ImageNet
121-
122-
.. note ::
123-
This requires `scipy` to be installed
124-
125-
iNaturalist
126-
~~~~~~~~~~~
127-
128-
.. autoclass:: INaturalist
129-
:members: __getitem__, category_name
130-
131-
Kinetics-400
132-
~~~~~~~~~~~~
133-
134-
.. autoclass:: Kinetics400
135-
:members: __getitem__
136-
:special-members:
137-
138-
KITTI
139-
~~~~~~~~~
140-
141-
.. autoclass:: Kitti
142-
:members: __getitem__
143-
:special-members:
144-
145-
KMNIST
146-
~~~~~~~~~~~~~
147-
148-
.. autoclass:: KMNIST
149-
150-
LFW
151-
~~~~~
152-
153-
.. autoclass:: LFWPeople
154-
:members: __getitem__
155-
:special-members:
156-
157-
.. autoclass:: LFWPairs
158-
:members: __getitem__
159-
:special-members:
160-
161-
LSUN
162-
~~~~
163-
164-
.. autoclass:: LSUN
165-
:members: __getitem__
166-
:special-members:
167-
168-
MNIST
169-
~~~~~
170-
171-
.. autoclass:: MNIST
172-
173-
Omniglot
174-
~~~~~~~~
175-
176-
.. autoclass:: Omniglot
177-
178-
PhotoTour
179-
~~~~~~~~~
180-
181-
.. autoclass:: PhotoTour
182-
:members: __getitem__
183-
:special-members:
184-
185-
Places365
186-
~~~~~~~~~
187-
188-
.. autoclass:: Places365
189-
:members: __getitem__
190-
:special-members:
191-
192-
QMNIST
193-
~~~~~~
194-
195-
.. autoclass:: QMNIST
196-
197-
SBD
198-
~~~~~~
199-
200-
.. autoclass:: SBDataset
201-
:members: __getitem__
202-
:special-members:
203-
204-
SBU
205-
~~~
206-
207-
.. autoclass:: SBU
208-
:members: __getitem__
209-
:special-members:
210-
211-
SEMEION
212-
~~~~~~~
213-
214-
.. autoclass:: SEMEION
215-
:members: __getitem__
216-
:special-members:
217-
218-
STL10
219-
~~~~~
220-
221-
.. autoclass:: STL10
222-
:members: __getitem__
223-
:special-members:
224-
225-
SVHN
226-
~~~~~
227-
228-
.. autoclass:: SVHN
229-
:members: __getitem__
230-
:special-members:
231-
232-
UCF101
233-
~~~~~~~
234-
235-
.. autoclass:: UCF101
236-
:members: __getitem__
237-
:special-members:
238-
239-
USPS
240-
~~~~~
241-
242-
.. autoclass:: USPS
243-
:members: __getitem__
244-
:special-members:
245-
246-
VOC
247-
~~~~~~
248-
249-
.. autoclass:: VOCSegmentation
250-
:members: __getitem__
251-
:special-members:
252-
253-
.. autoclass:: VOCDetection
254-
:members: __getitem__
255-
:special-members:
256-
257-
WIDERFace
258-
~~~~~~~~~
259-
260-
.. autoclass:: WIDERFace
261-
:members: __getitem__
262-
:special-members:
26328

29+
.. autosummary::
30+
:toctree: generated/
31+
:template: class_dataset.rst
32+
33+
Caltech101
34+
Caltech256
35+
CelebA
36+
CIFAR10
37+
CIFAR100
38+
Cityscapes
39+
CocoCaptions
40+
CocoDetection
41+
EMNIST
42+
FakeData
43+
FashionMNIST
44+
Flickr8k
45+
Flickr30k
46+
HMDB51
47+
ImageNet
48+
INaturalist
49+
Kinetics400
50+
Kitti
51+
KMNIST
52+
LFWPeople
53+
LFWPairs
54+
LSUN
55+
MNIST
56+
Omniglot
57+
PhotoTour
58+
Places365
59+
QMNIST
60+
SBDataset
61+
SBU
62+
SEMEION
63+
STL10
64+
SVHN
65+
UCF101
66+
USPS
67+
VOCSegmentation
68+
VOCDetection
69+
WIDERFace
26470

26571
.. _base_classes_datasets:
26672

26773
Base classes for custom datasets
26874
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
26975

270-
.. autoclass:: DatasetFolder
271-
:members: __getitem__, find_classes, make_dataset
272-
:special-members:
273-
274-
275-
.. autoclass:: ImageFolder
276-
:members: __getitem__
277-
:special-members:
76+
.. autosummary::
77+
:toctree: generated/
78+
:template: class.rst
27879

279-
.. autoclass:: VisionDataset
280-
:members: __getitem__
281-
:special-members:
80+
DatasetFolder
81+
ImageFolder
82+
VisionDataset

docs/source/docutils.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[html writers]
2+
table_style: colwidths-auto # Necessary for the table generated by autosummary to look decent

0 commit comments

Comments
 (0)