Add common.h and remove DisableCopy and Typedefs #1004
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gangliao
commented
Dec 23, 2016
| 图像分类教程 | ||
| ========== | ||
|
|
||
| 在本教程中，我们将使用CIFAR-10数据集训练一个卷积神经网络，并使用这个神经网络来对图片进行分类。如下图所示，卷积神经网络可以辨识图片中的主体，并给出分类结果。 |
gangliao
commented
Dec 23, 2016
| @@ -147,7 +147,7 @@ for classification. A description of VGG network can be found here [http://www.r | |||
| # small_vgg is predined in trainer_config_helpers.network | |||
| predict = small_vgg(input_image=img, num_channels=3) | |||
| ``` | |||
| After writing the config, we can train the model by running the script train.sh. Notice that the following script assumes the you run the script in the `./demo/image_classification` folder. If you run the script in a different folder, you need to change the paths of the scripts and the configuration files accordingly. | |||
| After writing the config, we can train the model by running the script train.sh. | |||
gangliao
commented
Dec 23, 2016
| @@ -58,6 +58,8 @@ class BatchNormalizationLayer : public BatchNormBaseLayer { | |||
| /// to batch, channels* imagePixels. | |||
| void shrinkMat(const MatrixPtr& in, MatrixPtr& out); | |||
|
|
|||
| void onPassEnd() { firstTest_ = true; } | |||
wangkuiyi
reviewed
Dec 27, 2016
| /** | ||
| * Disable copy macro. | ||
| */ | ||
| #define DISABLE_COPY(class_name) \ |
There was a problem hiding this comment.
所以这个macro实际做的还是 DISABLE_COPY_AND_ASSIGN，只是希望有个短一点儿的名字？
There was a problem hiding this comment.
@wangkuiyi
paddle里面有冗余 有个地方叫做 DISABLE_COPY_AND_ASSIGN https://github.com/PaddlePaddle/Paddle/pull/1004/files/c8d0791accb7fbceda308756e6271e12e233c063#diff-115063b195553537162a362f6784ceb1L28
其他地方都用的是DISABLE_COPY这个头文件。
https://github.com/PaddlePaddle/Paddle/pull/1004/files/c8d0791accb7fbceda308756e6271e12e233c063#diff-af4f409b1f461e14cd371f23d15bb2feL20
DISABLE_COPY_AND_ASSIGN和DISABLE_COPY 都挺通用的。本质上都是copy。只是这里去掉DISABLE_COPY_AND_ASSIGN, 是因为改动影响更小
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.