Remove m4 when generate protobuf #846
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
Also fix compile issues
hedaoyuan
approved these changes
Dec 13, 2016
| @@ -618,6 +611,11 @@ void PreparedOperations::addOperationHelper(Operation* op, CpuMatrixPtr mat) { | |||
| pmat.mutable_values(), mat->getData(), pmat.num_cols() * pmat.num_rows()); | |||
| } | |||
|
|
|||
| template <typename T1, typename T2> | |||
| static inline auto add(T1 a, T2 b) -> decltype(a + b) { | |||
There was a problem hiding this comment.
return 类型不是T1？decltype的话不对吧。
There was a problem hiding this comment.
不是T1。也有可能是T2吧。。这个decltype反正可以返回a+b应该的类型。
There was a problem hiding this comment.
你这里是确定的吧，结果最终存储的数据类型是T1指定的类型。
|
哦。。对。。有道理。。我改成不用模版的吧
发自 Smartisan T2
hedaoyuan <notifications@github.com> 于 2016年12月13日，上午11:29写道：
@hedaoyuan commented on this pull request.
________________________________
In paddle/pserver/ParameterClient2.cpp<#846>:
@@ -618,6 +611,11 @@ void PreparedOperations::addOperationHelper(Operation* op, CpuMatrixPtr mat) {
pmat.mutable_values(), mat->getData(), pmat.num_cols() * pmat.num_rows());
}
+template <typename T1, typename T2>
+static inline auto add(T1 a, T2 b) -> decltype(a + b) {
你这里是确定的吧，结果最终存储的数据类型是T1指定的类型。
―
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub<#846>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AAsee7MVpD2nje6iLXhcuhxE3RS2Z733ks5rHhEUgaJpZM4LLRYt>.
|
* Also fix a protential bug in WarpCTCLayer.cpp
reyoung
commented
Dec 13, 2016
| @@ -31,7 +31,6 @@ bool WarpCTCLayer::init(const LayerMap& layerMap, | |||
| CHECK_EQ(numClasses_, inputLayers_[0]->getSize()); | |||
|
|
|||
| blank_ = config_.blank(); | |||
| CHECK_GE(blank_, 0UL); | |||
There was a problem hiding this comment.
这个check是没有必要，并且永远为真的。
因为blank_是size_t，也是unsigned int。永远大于0。
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.
Remove m4 macro language in protobuf generation. Always use
doublewhen serializing in protobuf, but use float or double in Paddle C++.Because of the implicit conversion between
floatanddouble, most of C++ code do not need to change.