From 66ce67d42f291bc5a960eb590236a2aa4f6804e5 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Fri, 24 Sep 2021 13:27:00 +0800 Subject: [PATCH 01/13] add googlenet --- .../api/paddle/vision/models/GoogLeNet_cn.rst | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 docs/api/paddle/vision/models/GoogLeNet_cn.rst diff --git a/docs/api/paddle/vision/models/GoogLeNet_cn.rst b/docs/api/paddle/vision/models/GoogLeNet_cn.rst new file mode 100644 index 00000000000..3f8cfc93567 --- /dev/null +++ b/docs/api/paddle/vision/models/GoogLeNet_cn.rst @@ -0,0 +1,34 @@ +.. _cn_api_paddle_vision_models_googlenet: + +GoogLeNet +------------------------------- + +.. py:function:: paddle.vision.models.GoogLeNet(pretrained=False, **kwargs) + + GoogLeNet模型，来自论文 `"Going Deeper with Convolutions" `_ 。 + +参数 +::::::::: + - **pretrained** (bool，可选) - 是否加载在imagenet数据集上的预训练权重。默认值：False。 + +返回 +::::::::: +GoogLeNet模型，Layer的实例。 + +代码示例 +::::::::: +.. code-block:: python + + import paddle + from paddle.vision.models import GoogLeNet + + # build model + model = GoogLeNet() + + # build model and load imagenet pretrained weight + # model = GoogLeNet(pretrained=True) + + x = paddle.rand([1, 3, 224, 224]) + out = model(x) + + print(out.shape) From 42e27f46f83e9f79aef687e0b1c07b2f8fd9b579 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Fri, 24 Sep 2021 22:51:57 +0800 Subject: [PATCH 02/13] update API name --- .../models/{GoogLeNet_cn.rst => googlenet_cn.rst} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename docs/api/paddle/vision/models/{GoogLeNet_cn.rst => googlenet_cn.rst} (76%) diff --git a/docs/api/paddle/vision/models/GoogLeNet_cn.rst b/docs/api/paddle/vision/models/googlenet_cn.rst similarity index 76% rename from docs/api/paddle/vision/models/GoogLeNet_cn.rst rename to docs/api/paddle/vision/models/googlenet_cn.rst index 3f8cfc93567..2aa0bbfd1b7 100644 --- a/docs/api/paddle/vision/models/GoogLeNet_cn.rst +++ b/docs/api/paddle/vision/models/googlenet_cn.rst @@ -1,9 +1,9 @@ .. _cn_api_paddle_vision_models_googlenet: -GoogLeNet +googlenet ------------------------------- -.. py:function:: paddle.vision.models.GoogLeNet(pretrained=False, **kwargs) +.. py:function:: paddle.vision.models.googlenet(pretrained=False, **kwargs) GoogLeNet模型，来自论文 `"Going Deeper with Convolutions" `_ 。 @@ -20,13 +20,13 @@ GoogLeNet模型，Layer的实例。 .. code-block:: python import paddle - from paddle.vision.models import GoogLeNet + from paddle.vision.models import googlenet # build model - model = GoogLeNet() + model = googlenet() # build model and load imagenet pretrained weight - # model = GoogLeNet(pretrained=True) + # model = googlenet(pretrained=True) x = paddle.rand([1, 3, 224, 224]) out = model(x) From 0b9d3b0559c020a6ebfcf55739ee7f1fbb25b621 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Sat, 25 Sep 2021 18:52:52 +0800 Subject: [PATCH 03/13] sync with en doc --- docs/api/paddle/vision/models/googlenet_cn.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api/paddle/vision/models/googlenet_cn.rst b/docs/api/paddle/vision/models/googlenet_cn.rst index 2aa0bbfd1b7..fed357469a8 100644 --- a/docs/api/paddle/vision/models/googlenet_cn.rst +++ b/docs/api/paddle/vision/models/googlenet_cn.rst @@ -5,7 +5,7 @@ googlenet .. py:function:: paddle.vision.models.googlenet(pretrained=False, **kwargs) - GoogLeNet模型，来自论文 `"Going Deeper with Convolutions" `_ 。 + GoogLeNet（Inception v1）模型，来自论文 `"Going Deeper with Convolutions" `_ 。 参数 ::::::::: From 102fb644e6664a326bb3c06821574825919bf073 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Sun, 26 Sep 2021 08:05:05 +0800 Subject: [PATCH 04/13] add googlenet into overview --- docs/api/paddle/vision/Overview_cn.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/api/paddle/vision/Overview_cn.rst b/docs/api/paddle/vision/Overview_cn.rst index ec955eb3d19..77859dcee87 100644 --- a/docs/api/paddle/vision/Overview_cn.rst +++ b/docs/api/paddle/vision/Overview_cn.rst @@ -69,6 +69,8 @@ paddle.vision 目录是飞桨在视觉领域的高层API。具体如下： " :ref:`densenet264 ` ", "264层的DenseNet模型" " :ref:`InceptionV3 ` ", "InceptionV3模型" " :ref:`inception_v3 ` ", "InceptionV3模型" + " :ref:`googlenet ` ", "GoogLeNet模型" + .. _about_ops: From 19999571ce14316ae7000316e05a50b0ebfe44a9 Mon Sep 17 00:00:00 2001 From: Nyakku Shigure Date: Mon, 27 Sep 2021 22:41:04 +0800 Subject: [PATCH 05/13] Create GoogLeNet_cn.rst --- docs/api/paddle/vision/models/GoogLeNet_cn.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/api/paddle/vision/models/GoogLeNet_cn.rst diff --git a/docs/api/paddle/vision/models/GoogLeNet_cn.rst b/docs/api/paddle/vision/models/GoogLeNet_cn.rst new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/docs/api/paddle/vision/models/GoogLeNet_cn.rst @@ -0,0 +1 @@ + From d353f5e9c13dca2a72ab00c76522206983e420e5 Mon Sep 17 00:00:00 2001 From: Nyakku Shigure Date: Mon, 27 Sep 2021 22:56:16 +0800 Subject: [PATCH 06/13] Update GoogLeNet_cn.rst --- .../api/paddle/vision/models/GoogLeNet_cn.rst | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/docs/api/paddle/vision/models/GoogLeNet_cn.rst b/docs/api/paddle/vision/models/GoogLeNet_cn.rst index 8b137891791..0b107cc1cfd 100644 --- a/docs/api/paddle/vision/models/GoogLeNet_cn.rst +++ b/docs/api/paddle/vision/models/GoogLeNet_cn.rst @@ -1 +1,31 @@ +.. _cn_api_paddle_vision_models_GoogLeNet: +GoogLeNet +------------------------------- + +.. py:function:: paddle.vision.models.GoogLeNet(num_classes=1000, **kwargs) + + GoogLeNet（Inception v1）模型，来自论文 `"Going Deeper with Convolutions" `_ 。 + +参数 +::::::::: + - **num_classes** (int, 可选) - 最后一个全连接层输出的维度。如果该值小于0，则不定义最后一个全连接层。默认值：1000。 + +返回 +::::::::: +GoogLeNet模型，Layer的实例。 + +代码示例 +::::::::: +.. code-block:: python + + import paddle + from paddle.vision.models import GoogLeNet + + # build model + model = GoogLeNet() + + x = paddle.rand([1, 3, 224, 224]) + out = model(x) + + print(out.shape) From 6eeed48cfb544382d1b12d45340e50fd6876bc27 Mon Sep 17 00:00:00 2001 From: Nyakku Shigure Date: Mon, 27 Sep 2021 23:09:07 +0800 Subject: [PATCH 07/13] Update Overview --- docs/api/paddle/vision/Overview_cn.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/api/paddle/vision/Overview_cn.rst b/docs/api/paddle/vision/Overview_cn.rst index 77859dcee87..84a446d4f69 100644 --- a/docs/api/paddle/vision/Overview_cn.rst +++ b/docs/api/paddle/vision/Overview_cn.rst @@ -61,6 +61,7 @@ paddle.vision 目录是飞桨在视觉领域的高层API。具体如下： " :ref:`vgg13 ` ", "13层的VGG模型" " :ref:`vgg16 ` ", "16层的VGG模型" " :ref:`vgg19 ` ", "19层的VGG模型" +<<<<<<< HEAD " :ref:`DenseNet ` ", "DenseNet模型" " :ref:`densenet121 ` ", "121层的DenseNet模型" " :ref:`densenet161 ` ", "161层的DenseNet模型" @@ -69,6 +70,9 @@ paddle.vision 目录是飞桨在视觉领域的高层API。具体如下： " :ref:`densenet264 ` ", "264层的DenseNet模型" " :ref:`InceptionV3 ` ", "InceptionV3模型" " :ref:`inception_v3 ` ", "InceptionV3模型" +======= + " :ref:`GoogLeNet ` ", "GoogLeNet模型" +>>>>>>> d161500d (Update Overview) " :ref:`googlenet ` ", "GoogLeNet模型" From 37d845761e0f3d8d5bd27e2446f77634f91811c0 Mon Sep 17 00:00:00 2001 From: Nyakku Shigure Date: Fri, 8 Oct 2021 07:31:35 +0000 Subject: [PATCH 08/13] add parameter with_pool --- docs/api/paddle/vision/models/GoogLeNet_cn.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/api/paddle/vision/models/GoogLeNet_cn.rst b/docs/api/paddle/vision/models/GoogLeNet_cn.rst index 0b107cc1cfd..62b34c4fcf0 100644 --- a/docs/api/paddle/vision/models/GoogLeNet_cn.rst +++ b/docs/api/paddle/vision/models/GoogLeNet_cn.rst @@ -3,13 +3,14 @@ GoogLeNet ------------------------------- -.. py:function:: paddle.vision.models.GoogLeNet(num_classes=1000, **kwargs) +.. py:function:: paddle.vision.models.GoogLeNet(num_classes=1000, with_pool=True) GoogLeNet（Inception v1）模型，来自论文 `"Going Deeper with Convolutions" `_ 。 参数 ::::::::: - **num_classes** (int, 可选) - 最后一个全连接层输出的维度。如果该值小于0，则不定义最后一个全连接层。默认值：1000。 + - **with_pool** (bool，可选) - 是否定义最后一个全连接层之前的池化层。默认值：True。 返回 ::::::::: From 2e19967d536bdd807e5edecfc0aea66ff569efed Mon Sep 17 00:00:00 2001 From: Nyakku Shigure Date: Wed, 20 Oct 2021 03:06:46 +0000 Subject: [PATCH 09/13] fix googlenet out shape --- docs/api/paddle/vision/models/GoogLeNet_cn.rst | 2 +- docs/api/paddle/vision/models/googlenet_cn.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api/paddle/vision/models/GoogLeNet_cn.rst b/docs/api/paddle/vision/models/GoogLeNet_cn.rst index 62b34c4fcf0..192ac999fa3 100644 --- a/docs/api/paddle/vision/models/GoogLeNet_cn.rst +++ b/docs/api/paddle/vision/models/GoogLeNet_cn.rst @@ -27,6 +27,6 @@ GoogLeNet模型，Layer的实例。 model = GoogLeNet() x = paddle.rand([1, 3, 224, 224]) - out = model(x) + out, out1, out2 = model(x) print(out.shape) diff --git a/docs/api/paddle/vision/models/googlenet_cn.rst b/docs/api/paddle/vision/models/googlenet_cn.rst index fed357469a8..e7aa1088d2b 100644 --- a/docs/api/paddle/vision/models/googlenet_cn.rst +++ b/docs/api/paddle/vision/models/googlenet_cn.rst @@ -29,6 +29,6 @@ GoogLeNet模型，Layer的实例。 # model = googlenet(pretrained=True) x = paddle.rand([1, 3, 224, 224]) - out = model(x) + out, out1, out2 = model(x) print(out.shape) From 5aa82d77bc8deabcaba3331f9c08c662ab2d17a9 Mon Sep 17 00:00:00 2001 From: Nyakku Shigure Date: Mon, 1 Nov 2021 02:09:29 +0000 Subject: [PATCH 10/13] resolve conflict --- docs/api/paddle/vision/Overview_cn.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/api/paddle/vision/Overview_cn.rst b/docs/api/paddle/vision/Overview_cn.rst index 84a446d4f69..4910625bbf4 100644 --- a/docs/api/paddle/vision/Overview_cn.rst +++ b/docs/api/paddle/vision/Overview_cn.rst @@ -61,7 +61,6 @@ paddle.vision 目录是飞桨在视觉领域的高层API。具体如下： " :ref:`vgg13 ` ", "13层的VGG模型" " :ref:`vgg16 ` ", "16层的VGG模型" " :ref:`vgg19 ` ", "19层的VGG模型" -<<<<<<< HEAD " :ref:`DenseNet ` ", "DenseNet模型" " :ref:`densenet121 ` ", "121层的DenseNet模型" " :ref:`densenet161 ` ", "161层的DenseNet模型" @@ -70,9 +69,7 @@ paddle.vision 目录是飞桨在视觉领域的高层API。具体如下： " :ref:`densenet264 ` ", "264层的DenseNet模型" " :ref:`InceptionV3 ` ", "InceptionV3模型" " :ref:`inception_v3 ` ", "InceptionV3模型" -======= " :ref:`GoogLeNet ` ", "GoogLeNet模型" ->>>>>>> d161500d (Update Overview) " :ref:`googlenet ` ", "GoogLeNet模型" From de04ffea92cc140ec9e92ce9de0898a8818b364f Mon Sep 17 00:00:00 2001 From: Nyakku Shigure Date: Mon, 1 Nov 2021 02:34:54 +0000 Subject: [PATCH 11/13] trigger CI From 406308abdebfcff2666a226e6e35e3861a488cd5 Mon Sep 17 00:00:00 2001 From: Nyakku Shigure Date: Mon, 1 Nov 2021 07:39:54 +0000 Subject: [PATCH 12/13] trigger CI From 5be997015507dc75ffe6583482b3f793cae130d4 Mon Sep 17 00:00:00 2001 From: Nyakku Shigure Date: Mon, 1 Nov 2021 10:46:36 +0000 Subject: [PATCH 13/13] trigger CI