Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
9b8451cc
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
12 个月 前同步成功
通知
692
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9b8451cc
编写于
7月 14, 2017
作者:
G
gangliao
提交者:
GitHub
7月 14, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2888 from gangliao/cpplint
FIX: cpplint code style
上级
57a62125
ab8c7f11
变更
21
隐藏空白更改
内联
并排
Showing
21 changed file
with
180 addition
and
84 deletion
+180
-84
cmake/cpplint.cmake
cmake/cpplint.cmake
+7
-7
cmake/generic.cmake
cmake/generic.cmake
+4
-0
paddle/framework/ddim.cc
paddle/framework/ddim.cc
+28
-14
paddle/framework/ddim.h
paddle/framework/ddim.h
+1
-1
paddle/framework/net.cc
paddle/framework/net.cc
+16
-0
paddle/framework/op_registry.cc
paddle/framework/op_registry.cc
+15
-1
paddle/framework/operator.cc
paddle/framework/operator.cc
+1
-1
paddle/function/GemmConvOp.cpp
paddle/function/GemmConvOp.cpp
+3
-6
paddle/function/NaiveConvOp.cpp
paddle/function/NaiveConvOp.cpp
+1
-2
paddle/gserver/gradientmachines/NeuralNetwork.cpp
paddle/gserver/gradientmachines/NeuralNetwork.cpp
+1
-1
paddle/gserver/gradientmachines/RecurrentGradientMachine.cpp
paddle/gserver/gradientmachines/RecurrentGradientMachine.cpp
+1
-1
paddle/gserver/layers/AgentLayer.cpp
paddle/gserver/layers/AgentLayer.cpp
+1
-1
paddle/memory/detail/memory_block.cc
paddle/memory/detail/memory_block.cc
+3
-3
paddle/memory/memory.cc
paddle/memory/memory.cc
+0
-2
paddle/operators/add_op.cc
paddle/operators/add_op.cc
+16
-2
paddle/optimizer/parameter_optimizer_test.cpp
paddle/optimizer/parameter_optimizer_test.cpp
+38
-22
paddle/optimizer/serialization_test.cpp
paddle/optimizer/serialization_test.cpp
+20
-7
paddle/platform/cpu_info.cc
paddle/platform/cpu_info.cc
+2
-2
paddle/platform/place.cc
paddle/platform/place.cc
+15
-1
paddle/utils/DynamicLoader.h
paddle/utils/DynamicLoader.h
+1
-4
paddle/utils/ThreadLocal.h
paddle/utils/ThreadLocal.h
+6
-6
未找到文件。
cmake/cpplint.cmake
浏览文件 @
9b8451cc
...
...
@@ -27,7 +27,8 @@ set(IGNORE_PATTERN
.*cblas\\.h.*
.*\\.pb\\.txt
.*LtrDataProvider.*
.*MultiDataProvider.*
)
.*MultiDataProvider.*
.*pb.*
)
# add_style_check_target
#
...
...
@@ -52,14 +53,13 @@ macro(add_style_check_target TARGET_NAME)
endif
()
endforeach
()
if
(
LINT MATCHES ON
)
# cpplint code style
get_filename_component
(
base_filename
${
filename
}
NAME
)
set
(
CUR_GEN
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
base_filename
}
.cpplint
)
add_custom_command
(
OUTPUT
${
CUR_GEN
}
PRE_BUILD
COMMAND env
${
py_env
}
"
${
PYTHON_EXECUTABLE
}
"
"
${
PROJ_ROOT
}
/paddle/scripts/cpplint.py"
"--filter=
${
STYLE_FILTER
}
"
"--write-success=
${
CUR_GEN
}
"
${
filename
}
DEPENDS
${
filename
}
add_custom_command
(
TARGET
${
TARGET_NAME
}
PRE_BUILD
COMMAND
"
${
PYTHON_EXECUTABLE
}
"
"
${
PROJ_ROOT
}
/paddle/scripts/cpplint.py"
"--filter=
${
STYLE_FILTER
}
"
"--write-success=
${
CUR_GEN
}
"
${
filename
}
WORKING_DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
)
endif
()
endforeach
()
...
...
cmake/generic.cmake
浏览文件 @
9b8451cc
...
...
@@ -185,6 +185,10 @@ function(cc_library TARGET_NAME)
add_dependencies
(
${
TARGET_NAME
}
${
cc_library_DEPS
}
)
target_link_libraries
(
${
TARGET_NAME
}
${
cc_library_DEPS
}
)
endif
()
# cpplint code style
add_style_check_target
(
${
TARGET_NAME
}
${
cc_library_SRCS
}
)
else
(
cc_library_SRCS
)
if
(
cc_library_DEPS
)
merge_static_libs
(
${
TARGET_NAME
}
${
cc_library_DEPS
}
)
...
...
paddle/framework/ddim.cc
浏览文件 @
9b8451cc
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include "paddle/framework/ddim.h"
namespace
paddle
{
namespace
framework
{
///@cond HIDDEN
///
@cond HIDDEN
template
<
int
i
>
Dim
<
i
>
make_dim
(
const
int
*
d
)
{
...
...
@@ -50,7 +64,7 @@ void make_ddim(DDim& ddim, const int* dims, int n) {
}
}
///@endcond
///
@endcond
DDim
make_ddim
(
std
::
initializer_list
<
int
>
dims
)
{
DDim
result
(
make_dim
(
0
));
...
...
@@ -64,11 +78,11 @@ DDim make_ddim(const std::vector<int>& dims) {
return
result
;
}
///@cond HIDDEN
///
@cond HIDDEN
// XXX For some reason, putting this in an anonymous namespace causes errors
class
DynamicMutableIndexer
:
public
boost
::
static_visitor
<
int
&>
{
public:
DynamicMutableIndexer
(
int
idx
)
:
idx_
(
idx
)
{}
explicit
DynamicMutableIndexer
(
int
idx
)
:
idx_
(
idx
)
{}
template
<
int
D
>
int
&
operator
()(
Dim
<
D
>&
dim
)
const
{
...
...
@@ -81,7 +95,7 @@ class DynamicMutableIndexer : public boost::static_visitor<int&> {
class
DynamicConstIndexer
:
public
boost
::
static_visitor
<
int
>
{
public:
DynamicConstIndexer
(
int
idx
)
:
idx_
(
idx
)
{}
explicit
DynamicConstIndexer
(
int
idx
)
:
idx_
(
idx
)
{}
template
<
int
D
>
int
operator
()(
const
Dim
<
D
>&
dim
)
const
{
...
...
@@ -92,7 +106,7 @@ class DynamicConstIndexer : public boost::static_visitor<int> {
int
idx_
;
};
///@endcond
///
@endcond
int
&
DDim
::
operator
[](
int
idx
)
{
return
boost
::
apply_visitor
(
DynamicMutableIndexer
(
idx
),
var
);
...
...
@@ -155,11 +169,11 @@ int get(const DDim& ddim, int idx) { return ddim[idx]; }
void
set
(
DDim
&
ddim
,
int
idx
,
int
value
)
{
ddim
[
idx
]
=
value
;
}
///@cond HIDDEN
///
@cond HIDDEN
struct
VectorizeVisitor
:
public
boost
::
static_visitor
<>
{
std
::
vector
<
int
>&
vector
;
VectorizeVisitor
(
std
::
vector
<
int
>&
v
)
:
vector
(
v
)
{}
explicit
VectorizeVisitor
(
std
::
vector
<
int
>&
v
)
:
vector
(
v
)
{}
template
<
typename
T
>
void
operator
()(
const
T
&
t
)
{
...
...
@@ -169,7 +183,7 @@ struct VectorizeVisitor : public boost::static_visitor<> {
void
operator
()(
const
Dim
<
1
>&
t
)
{
vector
.
push_back
(
t
.
head
);
}
};
///@endcond
///
@endcond
std
::
vector
<
int
>
vectorize
(
const
DDim
&
ddim
)
{
std
::
vector
<
int
>
result
;
...
...
@@ -187,7 +201,7 @@ ssize_t product(const DDim& ddim) {
return
result
;
}
///\cond HIDDEN
///
\cond HIDDEN
struct
ArityVisitor
:
boost
::
static_visitor
<
int
>
{
template
<
int
D
>
...
...
@@ -196,15 +210,15 @@ struct ArityVisitor : boost::static_visitor<int> {
}
};
///\endcond
///
\endcond
int
arity
(
const
DDim
&
d
)
{
return
boost
::
apply_visitor
(
ArityVisitor
(),
d
);
}
///\cond HIDDEN
///
\cond HIDDEN
struct
DDimPrinter
:
boost
::
static_visitor
<
void
>
{
std
::
ostream
&
os
;
DDimPrinter
(
std
::
ostream
&
os_
)
:
os
(
os_
)
{}
explicit
DDimPrinter
(
std
::
ostream
&
os_
)
:
os
(
os_
)
{}
template
<
typename
T
>
void
operator
()(
const
T
&
t
)
{
...
...
@@ -212,7 +226,7 @@ struct DDimPrinter : boost::static_visitor<void> {
}
};
///\endcond
///
\endcond
std
::
ostream
&
operator
<<
(
std
::
ostream
&
os
,
const
DDim
&
ddim
)
{
DDimPrinter
printer
(
os
);
...
...
paddle/framework/ddim.h
浏览文件 @
9b8451cc
...
...
@@ -27,7 +27,7 @@ struct DDim {
DDim
()
:
var
(
Dim
<
1
>
())
{}
template
<
int
D
>
DDim
(
const
Dim
<
D
>&
in
)
:
var
(
in
)
{}
explicit
DDim
(
const
Dim
<
D
>&
in
)
:
var
(
in
)
{}
template
<
int
D
>
DDim
&
operator
=
(
const
Dim
<
D
>&
in
)
{
...
...
paddle/framework/net.cc
浏览文件 @
9b8451cc
/*
Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#include "paddle/framework/net.h"
namespace
paddle
{
...
...
paddle/framework/op_registry.cc
浏览文件 @
9b8451cc
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include <paddle/framework/op_registry.h>
namespace
paddle
{
...
...
@@ -33,4 +47,4 @@ void AttrTypeHelper::SetAttrType<std::vector<std::string>>(AttrProto* attr) {
attr
->
set_type
(
paddle
::
framework
::
AttrType
::
STRINGS
);
}
}
// namespace framework
}
// namespace paddle
\ No newline at end of file
}
// namespace paddle
paddle/framework/operator.cc
浏览文件 @
9b8451cc
...
...
@@ -40,4 +40,4 @@ std::string OperatorBase::DebugString() const {
}
}
// namespace framework
}
// namespace paddle
\ No newline at end of file
}
// namespace paddle
paddle/function/GemmConvOp.cpp
浏览文件 @
9b8451cc
...
...
@@ -117,8 +117,7 @@ public:
ConvFunctionBase
::
init
(
config
);
}
virtual
void
check
(
const
BufferArgs
&
inputs
,
const
BufferArgs
&
outputs
)
override
{
void
check
(
const
BufferArgs
&
inputs
,
const
BufferArgs
&
outputs
)
override
{
const
TensorShape
&
input
=
inputs
[
0
].
shape
();
const
TensorShape
&
filter
=
inputs
[
1
].
shape
();
const
TensorShape
&
output
=
outputs
[
0
].
shape
();
...
...
@@ -217,8 +216,7 @@ public:
ConvFunctionBase
::
init
(
config
);
}
virtual
void
check
(
const
BufferArgs
&
inputs
,
const
BufferArgs
&
outputs
)
override
{
void
check
(
const
BufferArgs
&
inputs
,
const
BufferArgs
&
outputs
)
override
{
const
TensorShape
&
output
=
inputs
[
0
].
shape
();
const
TensorShape
&
filter
=
inputs
[
1
].
shape
();
const
TensorShape
&
input
=
outputs
[
0
].
shape
();
...
...
@@ -311,8 +309,7 @@ public:
ConvFunctionBase
::
init
(
config
);
}
virtual
void
check
(
const
BufferArgs
&
inputs
,
const
BufferArgs
&
outputs
)
override
{
void
check
(
const
BufferArgs
&
inputs
,
const
BufferArgs
&
outputs
)
override
{
const
TensorShape
&
output
=
inputs
[
0
].
shape
();
const
TensorShape
&
input
=
inputs
[
1
].
shape
();
const
TensorShape
&
filter
=
outputs
[
0
].
shape
();
...
...
paddle/function/NaiveConvOp.cpp
浏览文件 @
9b8451cc
...
...
@@ -90,8 +90,7 @@ public:
ConvFunctionBase
::
init
(
config
);
}
virtual
void
check
(
const
BufferArgs
&
inputs
,
const
BufferArgs
&
outputs
)
override
{
void
check
(
const
BufferArgs
&
inputs
,
const
BufferArgs
&
outputs
)
override
{
const
TensorShape
&
input
=
inputs
[
0
].
shape
();
const
TensorShape
&
filter
=
inputs
[
1
].
shape
();
const
TensorShape
&
output
=
outputs
[
0
].
shape
();
...
...
paddle/gserver/gradientmachines/NeuralNetwork.cpp
浏览文件 @
9b8451cc
...
...
@@ -403,7 +403,7 @@ public:
:
layerName_
(
layerName
)
{
addEvaluator
(
std
::
move
(
evaluator
));
}
v
irtual
v
oid
eval
(
const
NeuralNetwork
&
nn
)
override
{
void
eval
(
const
NeuralNetwork
&
nn
)
override
{
const
LayerPtr
&
layer
=
nn
.
getLayer
(
layerName_
);
CHECK
(
layer
)
<<
"Nonexisted layer: "
<<
layerName_
<<
" in submodel "
<<
nn
.
getName
();
...
...
paddle/gserver/gradientmachines/RecurrentGradientMachine.cpp
浏览文件 @
9b8451cc
...
...
@@ -636,7 +636,7 @@ void lenToStarts(std::vector<int>& starts) {
}
starts
.
back
()
=
pos
;
}
}
}
// namespace
void
RecurrentGradientMachine
::
calcSequenceStartPositions
()
{
std
::
vector
<
int
>
starts
(
commonSeqInfo_
.
size
()
+
1
);
...
...
paddle/gserver/layers/AgentLayer.cpp
浏览文件 @
9b8451cc
...
...
@@ -124,7 +124,7 @@ void copyElements(const IVector& srcVec,
dest
[
index
[
i
]]
=
src
[
i
];
}
}
}
}
// namespace
void
GatherAgentLayer
::
forwardIds
(
PassType
passType
)
{
IVectorPtr
realId
=
realLayers_
[
0
]
->
getOutputLabel
();
...
...
paddle/memory/detail/memory_block.cc
浏览文件 @
9b8451cc
...
...
@@ -152,6 +152,6 @@ MemoryBlock* MemoryBlock::metadata() const {
reinterpret_cast
<
const
Metadata
*>
(
this
)
-
1
));
}
}
// detail
}
// memory
}
// paddle
}
//
namespace
detail
}
//
namespace
memory
}
//
namespace
paddle
paddle/memory/memory.cc
浏览文件 @
9b8451cc
...
...
@@ -17,8 +17,6 @@ limitations under the License. */
#include "paddle/memory/detail/system_allocator.h"
#include "paddle/platform/assert.h"
#include <boost/variant.hpp>
namespace
paddle
{
namespace
memory
{
...
...
paddle/operators/add_op.cc
浏览文件 @
9b8451cc
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include <paddle/framework/op_registry.h>
#include <paddle/framework/tensor.h>
#include <paddle/operators/add_op.h>
...
...
@@ -36,9 +50,9 @@ The equation is: Out = X + Y
)DOC"
);
}
};
}
// namespace op
}
// namespace op
erators
}
// namespace paddle
REGISTER_OP
(
add_two
,
paddle
::
operators
::
AddOp
,
paddle
::
operators
::
AddOpMaker
);
REGISTER_OP_CPU_KERNEL
(
add_two
,
::
paddle
::
operators
::
AddKernel
<::
paddle
::
platform
::
CPUPlace
>
);
\ No newline at end of file
add_two
,
::
paddle
::
operators
::
AddKernel
<::
paddle
::
platform
::
CPUPlace
>
);
paddle/optimizer/parameter_optimizer_test.cpp
浏览文件 @
9b8451cc
/*
Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#include "parameter_optimizer.h"
#include <cmath>
#include <map>
...
...
@@ -5,21 +21,18 @@
#include "gtest/gtest.h"
#include "lr_policy.h"
using
namespace
paddle
;
using
namespace
paddle
::
optimizer
;
Tensor
*
FillTensor
(
size_t
size
)
{
Tensor
*
param
=
new
Tensor
(
size
);
Tensor
&
p
=
*
param
;
paddle
::
optimizer
::
Tensor
*
FillTensor
(
size_t
size
)
{
paddle
::
optimizer
::
Tensor
*
param
=
new
paddle
::
optimizer
::
Tensor
(
size
);
paddle
::
optimizer
::
Tensor
&
p
=
*
param
;
for
(
size_t
i
=
0
;
i
<
p
.
size
();
++
i
)
{
p
[
i
]
=
(
float
)
rand
()
/
(
float
)
RAND_MAX
;
}
return
param
;
}
Tensor
*
FixedTensor
(
size_t
size
)
{
Tensor
*
param
=
new
Tensor
(
size
);
Tensor
&
p
=
*
param
;
paddle
::
optimizer
::
Tensor
*
FixedTensor
(
size_t
size
)
{
paddle
::
optimizer
::
Tensor
*
param
=
new
paddle
::
optimizer
::
Tensor
(
size
);
paddle
::
optimizer
::
Tensor
&
p
=
*
param
;
for
(
size_t
i
=
0
;
i
<
p
.
size
();
++
i
)
{
p
[
i
]
=
i
;
}
...
...
@@ -28,7 +41,8 @@ Tensor* FixedTensor(size_t size) {
class
OptimizerTest
:
public
testing
::
Test
{
public:
// init tensor shape
virtual
~
OptimizerTest
()
{}
// init paddle::optimizer::Tensor shape
const
size_t
kSize
=
5
;
virtual
void
SetUp
()
{
...
...
@@ -38,34 +52,36 @@ public:
virtual
void
TearDown
()
{}
void
CreateSGD
()
{
Tensor
*
parameter
=
FixedTensor
(
kSize
);
config_
.
set_optimizer
(
OptimizerConfig
::
SGD
);
paddle
::
optimizer
::
Tensor
*
parameter
=
FixedTensor
(
kSize
);
config_
.
set_optimizer
(
paddle
::
OptimizerConfig
::
SGD
);
config_
.
mutable_sgd
()
->
set_momentum
(
0.0
);
config_
.
mutable_sgd
()
->
set_decay
(
0.0
);
config_
.
mutable_sgd
()
->
set_nesterov
(
false
);
config_
.
set_lr_policy
(
OptimizerConfig
::
Const
);
config_
.
set_lr_policy
(
paddle
::
OptimizerConfig
::
Const
);
config_
.
mutable_const_lr
()
->
set_learning_rate
(
0.1
);
std
::
string
str
=
config_
.
SerializeAsString
();
ParameterOptimizer
*
opt
=
ParameterOptimizer
::
Create
(
str
,
parameter
);
paddle
::
optimizer
::
ParameterOptimizer
*
opt
=
paddle
::
optimizer
::
ParameterOptimizer
::
Create
(
str
,
parameter
);
opts_
.
push_back
(
opt
);
}
void
CreateAdam
()
{
Tensor
*
parameter
=
FixedTensor
(
kSize
);
config_
.
set_optimizer
(
OptimizerConfig
::
Adam
);
paddle
::
optimizer
::
Tensor
*
parameter
=
FixedTensor
(
kSize
);
config_
.
set_optimizer
(
paddle
::
OptimizerConfig
::
Adam
);
config_
.
mutable_adam
()
->
set_beta_1
(
0.9
);
config_
.
mutable_adam
()
->
set_beta_2
(
0.1
);
config_
.
mutable_adam
()
->
set_epsilon
(
1e-3
);
config_
.
mutable_adam
()
->
set_decay
(
0.0
);
config_
.
set_lr_policy
(
OptimizerConfig
::
Const
);
config_
.
set_lr_policy
(
paddle
::
OptimizerConfig
::
Const
);
config_
.
mutable_const_lr
()
->
set_learning_rate
(
0.1
);
std
::
string
str
=
config_
.
SerializeAsString
();
ParameterOptimizer
*
opt
=
ParameterOptimizer
::
Create
(
str
,
parameter
);
paddle
::
optimizer
::
ParameterOptimizer
*
opt
=
paddle
::
optimizer
::
ParameterOptimizer
::
Create
(
str
,
parameter
);
opts_
.
push_back
(
opt
);
}
void
TestGetWeight
()
{
Tensor
*
p
=
FixedTensor
(
kSize
);
paddle
::
optimizer
::
Tensor
*
p
=
FixedTensor
(
kSize
);
for
(
size_t
i
=
0
;
i
<
opts_
.
size
();
++
i
)
{
int
s
=
0
;
float
*
newp
=
(
float
*
)
opts_
[
i
]
->
get_weight
(
&
s
);
...
...
@@ -76,7 +92,7 @@ public:
}
void
TestUpdate
()
{
Tensor
*
g
=
FixedTensor
(
kSize
);
paddle
::
optimizer
::
Tensor
*
g
=
FixedTensor
(
kSize
);
for
(
size_t
i
=
0
;
i
<
opts_
.
size
();
++
i
)
{
opts_
[
i
]
->
Update
(
g
);
}
...
...
@@ -91,8 +107,8 @@ public:
}
private:
std
::
vector
<
ParameterOptimizer
*>
opts_
;
OptimizerConfig
config_
;
std
::
vector
<
paddle
::
optimizer
::
ParameterOptimizer
*>
opts_
;
paddle
::
OptimizerConfig
config_
;
};
TEST_F
(
OptimizerTest
,
TestGetWeight
)
{
TestGetWeight
();
}
...
...
paddle/optimizer/serialization_test.cpp
浏览文件 @
9b8451cc
/*
Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#include "serialization.h"
#include "gtest/gtest.h"
using
namespace
paddle
;
using
namespace
paddle
::
optimizer
;
TEST
(
TensorToProto
,
Case1
)
{
Tensor
t
(
3
),
t1
(
3
);
paddle
::
optimizer
::
Tensor
t
(
3
),
t1
(
3
);
for
(
size_t
i
=
0
;
i
<
t
.
size
();
++
i
)
{
t
[
i
]
=
i
;
t1
[
i
]
=
0
;
}
TensorProto
proto
;
TensorToProto
(
t
,
&
proto
);
ProtoToTensor
(
proto
,
&
t1
);
paddle
::
TensorProto
proto
;
paddle
::
optimizer
::
TensorToProto
(
t
,
&
proto
);
paddle
::
optimizer
::
ProtoToTensor
(
proto
,
&
t1
);
for
(
size_t
i
=
0
;
i
<
t1
.
size
();
++
i
)
{
EXPECT_EQ
(
t1
[
i
],
t
[
i
]);
}
...
...
paddle/platform/cpu_info.cc
浏览文件 @
9b8451cc
...
...
@@ -41,8 +41,8 @@ inline size_t CpuTotalPhysicalMemory() {
if
(
sysctl
(
mib
,
2
,
&
size
,
&
len
,
NULL
,
0
)
==
0
)
return
(
size_t
)
size
;
return
0L
;
#else
long
pages
=
sysconf
(
_SC_PHYS_PAGES
);
long
page_size
=
sysconf
(
_SC_PAGE_SIZE
);
int64_t
pages
=
sysconf
(
_SC_PHYS_PAGES
);
int64_t
page_size
=
sysconf
(
_SC_PAGE_SIZE
);
return
pages
*
page_size
;
#endif
}
...
...
paddle/platform/place.cc
浏览文件 @
9b8451cc
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include "paddle/platform/place.h"
namespace
paddle
{
...
...
@@ -7,7 +21,7 @@ namespace detail {
class
PlacePrinter
:
public
boost
::
static_visitor
<>
{
public:
PlacePrinter
(
std
::
ostream
&
os
)
:
os_
(
os
)
{}
explicit
PlacePrinter
(
std
::
ostream
&
os
)
:
os_
(
os
)
{}
void
operator
()(
const
CPUPlace
&
)
{
os_
<<
"CPUPlace"
;
}
void
operator
()(
const
GPUPlace
&
p
)
{
os_
<<
"GPUPlace("
<<
p
.
device
<<
")"
;
}
...
...
paddle/utils/DynamicLoader.h
浏览文件 @
9b8451cc
...
...
@@ -12,8 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#ifndef DYNAMIC_LOAD_H_
#define DYNAMIC_LOAD_H_
#pragma once
#include <dlfcn.h>
#include <memory>
...
...
@@ -59,5 +58,3 @@ void GetWarpCTCDsoHandle(void** dso_handle);
*
*/
void
GetLapackDsoHandle
(
void
**
dso_handle
);
#endif // DYNAMIC_LOAD_H_
paddle/utils/ThreadLocal.h
浏览文件 @
9b8451cc
...
...
@@ -51,7 +51,7 @@ template <class T>
class
ThreadLocal
{
public:
ThreadLocal
()
{
CHECK
(
pthread_key_create
(
&
threadSpecificKey_
,
dataDestructor
)
==
0
);
CHECK
_EQ
(
pthread_key_create
(
&
threadSpecificKey_
,
dataDestructor
),
0
);
}
~
ThreadLocal
()
{
pthread_key_delete
(
threadSpecificKey_
);
}
...
...
@@ -65,7 +65,7 @@ public:
if
(
!
p
&&
createLocal
)
{
p
=
new
T
();
int
ret
=
pthread_setspecific
(
threadSpecificKey_
,
p
);
CHECK
(
ret
==
0
);
CHECK
_EQ
(
ret
,
0
);
}
return
p
;
}
...
...
@@ -79,7 +79,7 @@ public:
if
(
T
*
q
=
get
(
false
))
{
dataDestructor
(
q
);
}
CHECK
(
pthread_setspecific
(
threadSpecificKey_
,
p
)
==
0
);
CHECK
_EQ
(
pthread_setspecific
(
threadSpecificKey_
,
p
),
0
);
}
/**
...
...
@@ -112,7 +112,7 @@ private:
template
<
class
T
>
class
ThreadLocalD
{
public:
ThreadLocalD
()
{
CHECK
(
pthread_key_create
(
&
threadSpecificKey_
,
NULL
)
==
0
);
}
ThreadLocalD
()
{
CHECK
_EQ
(
pthread_key_create
(
&
threadSpecificKey_
,
NULL
),
0
);
}
~
ThreadLocalD
()
{
pthread_key_delete
(
threadSpecificKey_
);
for
(
auto
t
:
threadMap_
)
{
...
...
@@ -127,7 +127,7 @@ public:
T
*
p
=
(
T
*
)
pthread_getspecific
(
threadSpecificKey_
);
if
(
!
p
)
{
p
=
new
T
();
CHECK
(
pthread_setspecific
(
threadSpecificKey_
,
p
)
==
0
);
CHECK
_EQ
(
pthread_setspecific
(
threadSpecificKey_
,
p
),
0
);
updateMap
(
p
);
}
return
p
;
...
...
@@ -141,7 +141,7 @@ public:
if
(
T
*
q
=
(
T
*
)
pthread_getspecific
(
threadSpecificKey_
))
{
dataDestructor
(
q
);
}
CHECK
(
pthread_setspecific
(
threadSpecificKey_
,
p
)
==
0
);
CHECK
_EQ
(
pthread_setspecific
(
threadSpecificKey_
,
p
),
0
);
updateMap
(
p
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录