Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wmsofts
Paddle
提交
c85ac61a
P
Paddle
项目概览
wmsofts
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c85ac61a
编写于
4月 06, 2017
作者:
Y
Yu Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Using linb::any/std::any instead of FunctionConfig
上级
d94e1f51
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
63 addition
and
71 deletion
+63
-71
CMakeLists.txt
CMakeLists.txt
+1
-0
cmake/external/any.cmake
cmake/external/any.cmake
+20
-0
paddle/function/Function.cpp
paddle/function/Function.cpp
+0
-60
paddle/function/Function.h
paddle/function/Function.h
+9
-11
paddle/utils/Any.h
paddle/utils/Any.h
+33
-0
未找到文件。
CMakeLists.txt
浏览文件 @
c85ac61a
...
@@ -64,6 +64,7 @@ include(external/python) # download, build, install python
...
@@ -64,6 +64,7 @@ include(external/python) # download, build, install python
include
(
external/openblas
)
# download, build, install openblas
include
(
external/openblas
)
# download, build, install openblas
include
(
external/swig
)
# download, build, install swig
include
(
external/swig
)
# download, build, install swig
include
(
external/warpctc
)
# download, build, install warpctc
include
(
external/warpctc
)
# download, build, install warpctc
include
(
external/any
)
# download libn::any
include
(
package
)
# set paddle packages
include
(
package
)
# set paddle packages
include
(
cpplint
)
# set paddle c++ style
include
(
cpplint
)
# set paddle c++ style
...
...
cmake/external/any.cmake
0 → 100644
浏览文件 @
c85ac61a
INCLUDE
(
ExternalProject
)
SET
(
ANY_SOURCE_DIR
${
THIRD_PARTY_PATH
}
/any
)
INCLUDE_DIRECTORIES
(
${
ANY_SOURCE_DIR
}
/src/linb_any
)
ExternalProject_Add
(
linb_any
${
EXTERNAL_PROJECT_LOG_ARGS
}
GIT_REPOSITORY
"https://github.com/thelink2012/any.git"
GIT_TAG
"8fef1e93710a0edf8d7658999e284a1142c4c020"
PREFIX
${
ANY_SOURCE_DIR
}
UPDATE_COMMAND
""
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
INSTALL_COMMAND
""
TEST_COMMAND
""
)
add_definitions
(
-DANY_IMPL_ANY_CAST_MOVEABLE
)
paddle/function/Function.cpp
浏览文件 @
c85ac61a
...
@@ -16,66 +16,6 @@ limitations under the License. */
...
@@ -16,66 +16,6 @@ limitations under the License. */
namespace
paddle
{
namespace
paddle
{
template
<
>
size_t
FuncConfig
::
get
<
size_t
>
(
const
std
::
string
&
key
)
const
{
auto
it
=
valueMap_
.
find
(
key
);
CHECK
(
it
!=
valueMap_
.
end
())
<<
"Cannot find value: '"
<<
key
<<
"'"
;
return
it
->
second
.
s
;
}
template
<
>
real
FuncConfig
::
get
<
real
>
(
const
std
::
string
&
key
)
const
{
auto
it
=
valueMap_
.
find
(
key
);
CHECK
(
it
!=
valueMap_
.
end
())
<<
"Cannot find value: '"
<<
key
<<
"'"
;
return
it
->
second
.
r
;
}
template
<
>
int
FuncConfig
::
get
<
int
>
(
const
std
::
string
&
key
)
const
{
auto
it
=
valueMap_
.
find
(
key
);
CHECK
(
it
!=
valueMap_
.
end
())
<<
"Cannot find value: '"
<<
key
<<
"'"
;
return
it
->
second
.
i
;
}
template
<
>
bool
FuncConfig
::
get
<
bool
>
(
const
std
::
string
&
key
)
const
{
auto
it
=
valueMap_
.
find
(
key
);
CHECK
(
it
!=
valueMap_
.
end
())
<<
"Cannot find value: '"
<<
key
<<
"'"
;
return
it
->
second
.
b
;
}
template
<
>
FuncConfig
&
FuncConfig
::
set
<
size_t
>
(
const
std
::
string
&
key
,
size_t
v
)
{
CHECK_EQ
(
static_cast
<
int
>
(
valueMap_
.
count
(
key
)),
0
)
<<
"Duplicated value: "
<<
key
;
valueMap_
[
key
].
s
=
v
;
return
*
this
;
}
template
<
>
FuncConfig
&
FuncConfig
::
set
<
real
>
(
const
std
::
string
&
key
,
real
v
)
{
CHECK_EQ
(
static_cast
<
int
>
(
valueMap_
.
count
(
key
)),
0
)
<<
"Duplicated value: "
<<
key
;
valueMap_
[
key
].
r
=
v
;
return
*
this
;
}
template
<
>
FuncConfig
&
FuncConfig
::
set
<
int
>
(
const
std
::
string
&
key
,
int
v
)
{
CHECK_EQ
(
static_cast
<
int
>
(
valueMap_
.
count
(
key
)),
0
)
<<
"Duplicated value: "
<<
key
;
valueMap_
[
key
].
i
=
v
;
return
*
this
;
}
template
<
>
FuncConfig
&
FuncConfig
::
set
<
bool
>
(
const
std
::
string
&
key
,
bool
v
)
{
CHECK_EQ
(
static_cast
<
int
>
(
valueMap_
.
count
(
key
)),
0
)
<<
"Duplicated value: "
<<
key
;
valueMap_
[
key
].
b
=
v
;
return
*
this
;
}
void
BufferArgs
::
addArg
(
const
Matrix
&
arg
,
void
BufferArgs
::
addArg
(
const
Matrix
&
arg
,
const
TensorShape
&
shape
,
const
TensorShape
&
shape
,
ArgType
argType
)
{
ArgType
argType
)
{
...
...
paddle/function/Function.h
浏览文件 @
c85ac61a
...
@@ -18,6 +18,7 @@ limitations under the License. */
...
@@ -18,6 +18,7 @@ limitations under the License. */
#include <vector>
#include <vector>
#include "BufferArg.h"
#include "BufferArg.h"
#include "paddle/math/Matrix.h"
#include "paddle/math/Matrix.h"
#include "paddle/utils/Any.h"
#include "paddle/utils/ClassRegistrar.h"
#include "paddle/utils/ClassRegistrar.h"
namespace
paddle
{
namespace
paddle
{
...
@@ -25,25 +26,22 @@ namespace paddle {
...
@@ -25,25 +26,22 @@ namespace paddle {
/**
/**
* Function Configuration.
* Function Configuration.
* The argument type of Function::init.
* The argument type of Function::init.
* Follow-up will consider moving this data structure to Proto inside.
*/
*/
class
FuncConfig
{
class
FuncConfig
{
public:
public:
union
value
{
size_t
s
;
real
r
;
int
i
;
bool
b
;
};
template
<
typename
T
>
template
<
typename
T
>
T
get
(
const
std
::
string
&
key
)
const
;
T
get
(
const
std
::
string
&
key
)
const
{
return
any_cast
<
T
>
(
valueMap_
[
key
]);
}
template
<
typename
T
>
template
<
typename
T
>
FuncConfig
&
set
(
const
std
::
string
&
key
,
T
v
);
FuncConfig
&
set
(
const
std
::
string
&
key
,
T
v
)
{
valueMap_
[
key
]
=
any
(
v
);
return
*
this
;
}
protected:
protected:
std
::
map
<
std
::
string
,
value
>
valueMap_
;
mutable
std
::
unordered_map
<
std
::
string
,
any
>
valueMap_
;
};
};
/**
/**
...
...
paddle/utils/Any.h
0 → 100644
浏览文件 @
c85ac61a
/* 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. */
#pragma once
#if __cplusplus > 201402L
#include <any>
namespace
paddle
{
// using std::any for C++ 17
using
std
::
any
;
using
std
::
any_cast
;
}
// namespace paddle
#else
#include <any.hpp>
namespace
paddle
{
// use linb::any for C++ 11
using
linb
::
any
;
using
linb
::
any_cast
;
}
// namespace paddle
#endif
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录