Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
afeixing77
Paddle
提交
c87e060c
P
Paddle
项目概览
afeixing77
/
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,发现更多精彩内容 >>
提交
c87e060c
编写于
10月 16, 2017
作者:
Q
qijun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
export feed/fetch method to Python
上级
517e3c79
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
72 addition
and
104 deletion
+72
-104
paddle/framework/feed_fetch_method.h
paddle/framework/feed_fetch_method.h
+50
-0
paddle/framework/scope.h
paddle/framework/scope.h
+0
-60
paddle/pybind/pybind.cc
paddle/pybind/pybind.cc
+7
-9
python/paddle/v2/framework/tests/test_feed_fetch_method.py
python/paddle/v2/framework/tests/test_feed_fetch_method.py
+15
-35
未找到文件。
paddle/framework/feed_fetch_method.h
0 → 100644
浏览文件 @
c87e060c
/* 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
#include "paddle/framework/scope.h"
#include "paddle/framework/variable.h"
namespace
paddle
{
namespace
framework
{
template
<
typename
T
>
void
SetFeedVariable
(
const
LoDTensor
&
input
,
const
std
::
string
&
var_name
,
size_t
index
)
{
// If var_name Variable is not found in GlobalScope, a new variable will
// be created.
Variable
*
g_feed_value
=
GetGlobalScope
().
Var
(
var_name
);
auto
&
feed_inputs
=
*
(
g_feed_value
->
GetMutable
<
std
::
vector
<
paddle
::
framework
::
LoDTensor
>>
());
if
(
index
>=
feed_inputs
.
size
())
{
feed_inputs
.
resize
(
index
+
1
);
}
// shared data with input tensor
feed_inputs
[
index
].
ShareDataWith
<
T
>
(
input
);
// set lod
feed_inputs
[
index
].
set_lod
(
input
.
lod
());
}
LoDTensor
&
GetFetchVariable
(
const
std
::
string
&
var_name
,
size_t
index
)
{
// If var_name Variable is not found in GlobalScope, a new variable will
// be created.
Variable
*
g_fetch_value
=
GetGlobalScope
().
Var
(
var_name
);
auto
&
fetch_outputs
=
*
(
g_fetch_value
->
GetMutable
<
std
::
vector
<
paddle
::
framework
::
LoDTensor
>>
());
PADDLE_ENFORCE_LT
(
index
,
fetch_outputs
.
size
());
return
fetch_outputs
[
index
];
}
}
// namespace framework
}
// namespace paddle
paddle/framework/scope.h
浏览文件 @
c87e060c
...
...
@@ -77,65 +77,5 @@ class Scope {
framework
::
Scope
&
GetGlobalScope
();
// template <typename T>
// void SetFeedVariable(const std::vector<T>& input, const Lod& lod,
// const std::vector<int64_t>& dims,
// const std::string& var_name, size_t index) {
// Variable* g_feed_value = GetGlobalScope().Var("var_name");
// // feed variable holds vector<LodTensor>
// auto& feed_inputs =
// *(g_feed_value->GetMutable<
// std::vector<paddle::framework::LoDTensor>>());
// if (index >= feed_inputs.size()) {
// feed_inputs.resize(index);
// }
// // copy tensor
// T* dst = feed_inputs[index].mutable_data<T>(make_ddim(dims),
// platform::CPUPlace());
// memcpy(dst, inputs[i].data(), inputs[i].size() * sizeof(T));
// // copy lod
// feed_inputs[index].set_lod(lod);
// }
template
<
typename
T
>
void
SetFeedVariable
(
const
LoDTensor
&
input
,
const
std
::
string
&
var_name
,
size_t
index
)
{
std
::
cout
<<
"into SetFeedVariable"
<<
std
::
endl
;
std
::
cout
<<
var_name
<<
std
::
endl
;
std
::
cout
<<
index
<<
std
::
endl
;
Variable
*
g_feed_value
=
GetGlobalScope
().
Var
(
var_name
);
auto
&
feed_inputs
=
*
(
g_feed_value
->
GetMutable
<
std
::
vector
<
paddle
::
framework
::
LoDTensor
>>
());
if
(
index
>=
feed_inputs
.
size
())
{
feed_inputs
.
resize
(
index
+
1
);
}
// shared data with input tensor
feed_inputs
[
index
].
ShareDataWith
<
T
>
(
input
);
// set lod
feed_inputs
[
index
].
set_lod
(
input
.
lod
());
}
// template <typename T>
// std::vector<T> GetFetchVariable(const std::string& var_name, size_t index) {
// Variable* g_fetch_value = GetGlobalScope().Var(var_name);
// auto& fetch_outputs =
// *(g_fetch_value->GetMutable<
// std::vector<paddle::framework::LoDTensor>>());
// std::vector<T> result;
// result.resize(fetch_outputs[index].numel());
// memcpy(result.data(), fetch_outputs[i].data<T>(),
// fetch_outputs[i].numel() * sizeof(T));
// }
template
<
typename
T
>
LoDTensor
&
GetFetchVariable
(
const
std
::
string
&
var_name
,
size_t
index
)
{
Variable
*
g_fetch_value
=
GetGlobalScope
().
Var
(
var_name
);
auto
&
fetch_outputs
=
*
(
g_fetch_value
->
GetMutable
<
std
::
vector
<
paddle
::
framework
::
LoDTensor
>>
());
std
::
cout
<<
"into GetFetchVariable"
<<
std
::
endl
;
PADDLE_ENFORCE_LT
(
index
,
fetch_outputs
.
size
());
return
fetch_outputs
[
index
];
}
}
// namespace framework
}
// namespace paddle
paddle/pybind/pybind.cc
浏览文件 @
c87e060c
...
...
@@ -12,10 +12,10 @@ 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/pybind/protobuf.h"
#include "paddle/pybind/pybind.h"
#include "paddle/framework/backward.h"
#include "paddle/framework/executor.h"
#include "paddle/framework/feed_fetch_method.h"
#include "paddle/framework/lod_tensor.h"
#include "paddle/framework/tensor_array.h"
#include "paddle/operators/cond_op.h"
...
...
@@ -25,7 +25,7 @@ limitations under the License. */
#include "paddle/platform/enforce.h"
#include "paddle/platform/place.h"
#include "paddle/pybind/exception.h"
#include "paddle/pybind/p
ybind
.h"
#include "paddle/pybind/p
rotobuf
.h"
#include "paddle/pybind/tensor_py.h"
#include "paddle/string/to_string.h"
...
...
@@ -403,12 +403,10 @@ All parameter, weight, gradient are variables in Paddle.
m
.
def
(
"unique_integer"
,
UniqueIntegerGenerator
);
m
.
def
(
"is_compile_gpu"
,
IsCompileGPU
);
m
.
def
(
"set_feed_variable"
,
SetFeedVariable
<
float
>
);
// m.def("set_feed_variable", SetFeedVariable<double>);
// m.def("set_feed_variable", SetFeedVariable<int>);
m
.
def
(
"get_fetch_variable"
,
GetFetchVariable
<
float
>
);
// m.def("get_fetch_variable", GetFetchVariable<double>);
// m.def("get_fetch_variable", GetFetchVariable<int>);
m
.
def
(
"set_feed_variable_float"
,
framework
::
SetFeedVariable
<
float
>
);
m
.
def
(
"set_feed_variable_double"
,
framework
::
SetFeedVariable
<
double
>
);
m
.
def
(
"set_feed_variable_int"
,
framework
::
SetFeedVariable
<
int
>
);
m
.
def
(
"get_fetch_variable"
,
framework
::
GetFetchVariable
);
BindProgramDesc
(
m
);
BindBlockDesc
(
m
);
...
...
python/paddle/v2/framework/tests/test_feed_fetch_method.py
浏览文件 @
c87e060c
...
...
@@ -2,49 +2,29 @@ import paddle.v2.framework.core as core
import
unittest
import
numpy
as
np
# class TestFeedFetch(unittest.TestCase):
# def test_feed_fetch(self):
# place = core.CPUPlace()
# input_tensor = core.LoDTensor([[0, 2, 4]])
# input_tensor.set_dims([4, 4, 6])
# input_tensor.alloc_int(place)
# input_array = np.array(input_tensor)
# input_array[0, 0, 0] = 3
# input_array[3, 3, 5] = 10
# input_tensor.set(input_array, place)
# core.set_feed_variable(input_tensor, "feed", 0)
# output_tensor = core.get_fetch_variable("feed", 0)
# print type(output_tensor)
# output_lod = output_tensor.lod()
# print type(output_lod)
# print output_lod[0]
# print output_lod[0][0]
# print output_lod[0][1]
# print output_lod[0][2]
# # self.assertEqual(0, output_lod[0][0])
# # self.assertEqual(0, output_lod[0][0])
# # self.assertEqual(2, output_lod[0][1])
# # self.assertEqual(4, output_lod[0][2])
# # output_array = np.array(output_tensor)
# # self.assertEqual(3, output_array[0, 0, 0])
# # self.assertEqual(10, output_array[3, 3, 5]);
class
TestFeedFetch
(
unittest
.
TestCase
):
def
test_feed_fetch
(
self
):
place
=
core
.
CPUPlace
()
input_tensor
=
core
.
LoDTensor
([[
0
,
2
,
4
]])
input_tensor
.
set_dims
([
4
,
4
,
6
])
input_tensor
.
alloc_float
(
place
)
input_array
=
np
.
array
(
input_tensor
)
input_array
=
np
.
ones
((
4
,
4
,
6
)).
astype
(
"float32"
)
input_array
[
0
,
0
,
0
]
=
3
input_array
[
3
,
3
,
5
]
=
10
input_tensor
=
core
.
LoDTensor
([[
0
,
2
,
4
]])
input_tensor
.
set
(
input_array
,
place
)
core
.
set_feed_variable_float
(
input_tensor
,
"feed"
,
0
)
output_tensor
=
core
.
get_fetch_variable
(
"feed"
,
0
)
output_lod
=
output_tensor
.
lod
()
self
.
assertEqual
(
0
,
output_lod
[
0
][
0
])
self
.
assertEqual
(
2
,
output_lod
[
0
][
1
])
self
.
assertEqual
(
4
,
output_lod
[
0
][
2
])
output_array
=
np
.
array
(
output_tensor
)
self
.
assertEqual
(
3
,
output_array
[
0
,
0
,
0
])
self
.
assertEqual
(
10
,
output_array
[
3
,
3
,
5
])
if
__name__
==
"__main__"
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录