Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into ssd_target_assign
commit
53b6ee1954
@ -0,0 +1,104 @@
|
|||||||
|
/* Copyright (c) 2018 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/lod_tensor.h"
|
||||||
|
#include "paddle/inference/io.h"
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
void SetupTensor(paddle::framework::LoDTensor& input,
|
||||||
|
paddle::framework::DDim dims,
|
||||||
|
T lower,
|
||||||
|
T upper) {
|
||||||
|
srand(time(0));
|
||||||
|
T* input_ptr = input.mutable_data<T>(dims, paddle::platform::CPUPlace());
|
||||||
|
for (int i = 0; i < input.numel(); ++i) {
|
||||||
|
input_ptr[i] =
|
||||||
|
(static_cast<T>(rand()) / static_cast<T>(RAND_MAX)) * (upper - lower) +
|
||||||
|
lower;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
void SetupLoDTensor(paddle::framework::LoDTensor& input,
|
||||||
|
paddle::framework::LoD& lod,
|
||||||
|
T lower,
|
||||||
|
T upper) {
|
||||||
|
input.set_lod(lod);
|
||||||
|
int dim = lod[0][lod[0].size() - 1];
|
||||||
|
SetupTensor(input, {dim, 1}, lower, upper);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
void CheckError(paddle::framework::LoDTensor& output1,
|
||||||
|
paddle::framework::LoDTensor& output2) {
|
||||||
|
// Check lod information
|
||||||
|
EXPECT_EQ(output1.lod(), output2.lod());
|
||||||
|
|
||||||
|
EXPECT_EQ(output1.dims(), output2.dims());
|
||||||
|
EXPECT_EQ(output1.numel(), output2.numel());
|
||||||
|
|
||||||
|
T err = static_cast<T>(0);
|
||||||
|
if (typeid(T) == typeid(float)) {
|
||||||
|
err = 1E-3;
|
||||||
|
} else if (typeid(T) == typeid(double)) {
|
||||||
|
err = 1E-6;
|
||||||
|
} else {
|
||||||
|
err = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t count = 0;
|
||||||
|
for (int64_t i = 0; i < output1.numel(); ++i) {
|
||||||
|
if (fabs(output1.data<T>()[i] - output2.data<T>()[i]) > err) {
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
EXPECT_EQ(count, 0) << "There are " << count << " different elements.";
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename Place, typename T>
|
||||||
|
void TestInference(const std::string& dirname,
|
||||||
|
const std::vector<paddle::framework::LoDTensor*>& cpu_feeds,
|
||||||
|
std::vector<paddle::framework::LoDTensor*>& cpu_fetchs) {
|
||||||
|
// 1. Define place, executor and scope
|
||||||
|
auto place = Place();
|
||||||
|
auto executor = paddle::framework::Executor(place);
|
||||||
|
auto* scope = new paddle::framework::Scope();
|
||||||
|
|
||||||
|
// 2. Initialize the inference_program and load all parameters from file
|
||||||
|
auto inference_program = paddle::inference::Load(executor, *scope, dirname);
|
||||||
|
|
||||||
|
// 3. Get the feed_target_names and fetch_target_names
|
||||||
|
const std::vector<std::string>& feed_target_names =
|
||||||
|
inference_program->GetFeedTargetNames();
|
||||||
|
const std::vector<std::string>& fetch_target_names =
|
||||||
|
inference_program->GetFetchTargetNames();
|
||||||
|
|
||||||
|
// 4. Prepare inputs: set up maps for feed targets
|
||||||
|
std::map<std::string, const paddle::framework::LoDTensor*> feed_targets;
|
||||||
|
for (size_t i = 0; i < feed_target_names.size(); ++i) {
|
||||||
|
// Please make sure that cpu_feeds[i] is right for feed_target_names[i]
|
||||||
|
feed_targets[feed_target_names[i]] = cpu_feeds[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
// 5. Define Tensor to get the outputs: set up maps for fetch targets
|
||||||
|
std::map<std::string, paddle::framework::LoDTensor*> fetch_targets;
|
||||||
|
for (size_t i = 0; i < fetch_target_names.size(); ++i) {
|
||||||
|
fetch_targets[fetch_target_names[i]] = cpu_fetchs[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
// 6. Run the inference program
|
||||||
|
executor.Run(*inference_program, scope, feed_targets, fetch_targets);
|
||||||
|
|
||||||
|
delete scope;
|
||||||
|
}
|
@ -0,0 +1,81 @@
|
|||||||
|
/* Copyright (c) 2018 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 <gtest/gtest.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <sstream>
|
||||||
|
#include "gflags/gflags.h"
|
||||||
|
#include "test_helper.h"
|
||||||
|
|
||||||
|
DEFINE_string(dirname, "", "Directory of the inference model.");
|
||||||
|
|
||||||
|
TEST(inference, label_semantic_roles) {
|
||||||
|
if (FLAGS_dirname.empty()) {
|
||||||
|
LOG(FATAL) << "Usage: ./example --dirname=path/to/your/model";
|
||||||
|
}
|
||||||
|
|
||||||
|
LOG(INFO) << "FLAGS_dirname: " << FLAGS_dirname << std::endl;
|
||||||
|
std::string dirname = FLAGS_dirname;
|
||||||
|
|
||||||
|
// 0. Call `paddle::framework::InitDevices()` initialize all the devices
|
||||||
|
// In unittests, this is done in paddle/testing/paddle_gtest_main.cc
|
||||||
|
|
||||||
|
paddle::framework::LoDTensor word, predicate, ctx_n2, ctx_n1, ctx_0, ctx_p1,
|
||||||
|
ctx_p2, mark;
|
||||||
|
paddle::framework::LoD lod{{0, 4, 10}};
|
||||||
|
|
||||||
|
SetupLoDTensor(word, lod, static_cast<int64_t>(0), static_cast<int64_t>(1));
|
||||||
|
SetupLoDTensor(
|
||||||
|
predicate, lod, static_cast<int64_t>(0), static_cast<int64_t>(1));
|
||||||
|
SetupLoDTensor(ctx_n2, lod, static_cast<int64_t>(0), static_cast<int64_t>(1));
|
||||||
|
SetupLoDTensor(ctx_n1, lod, static_cast<int64_t>(0), static_cast<int64_t>(1));
|
||||||
|
SetupLoDTensor(ctx_0, lod, static_cast<int64_t>(0), static_cast<int64_t>(1));
|
||||||
|
SetupLoDTensor(ctx_p1, lod, static_cast<int64_t>(0), static_cast<int64_t>(1));
|
||||||
|
SetupLoDTensor(ctx_p2, lod, static_cast<int64_t>(0), static_cast<int64_t>(1));
|
||||||
|
SetupLoDTensor(mark, lod, static_cast<int64_t>(0), static_cast<int64_t>(1));
|
||||||
|
|
||||||
|
std::vector<paddle::framework::LoDTensor*> cpu_feeds;
|
||||||
|
cpu_feeds.push_back(&word);
|
||||||
|
cpu_feeds.push_back(&predicate);
|
||||||
|
cpu_feeds.push_back(&ctx_n2);
|
||||||
|
cpu_feeds.push_back(&ctx_n1);
|
||||||
|
cpu_feeds.push_back(&ctx_0);
|
||||||
|
cpu_feeds.push_back(&ctx_p1);
|
||||||
|
cpu_feeds.push_back(&ctx_p2);
|
||||||
|
cpu_feeds.push_back(&mark);
|
||||||
|
|
||||||
|
paddle::framework::LoDTensor output1;
|
||||||
|
std::vector<paddle::framework::LoDTensor*> cpu_fetchs1;
|
||||||
|
cpu_fetchs1.push_back(&output1);
|
||||||
|
|
||||||
|
// Run inference on CPU
|
||||||
|
TestInference<paddle::platform::CPUPlace, float>(
|
||||||
|
dirname, cpu_feeds, cpu_fetchs1);
|
||||||
|
LOG(INFO) << output1.lod();
|
||||||
|
LOG(INFO) << output1.dims();
|
||||||
|
|
||||||
|
#ifdef PADDLE_WITH_CUDA
|
||||||
|
paddle::framework::LoDTensor output2;
|
||||||
|
std::vector<paddle::framework::LoDTensor*> cpu_fetchs2;
|
||||||
|
cpu_fetchs2.push_back(&output2);
|
||||||
|
|
||||||
|
// Run inference on CUDA GPU
|
||||||
|
TestInference<paddle::platform::CUDAPlace, float>(
|
||||||
|
dirname, cpu_feeds, cpu_fetchs2);
|
||||||
|
LOG(INFO) << output2.lod();
|
||||||
|
LOG(INFO) << output2.dims();
|
||||||
|
|
||||||
|
CheckError<float>(output1, output2);
|
||||||
|
#endif
|
||||||
|
}
|
@ -0,0 +1,64 @@
|
|||||||
|
# Copyright (c) 2018 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.
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
import paddle.v2.fluid.core as core
|
||||||
|
import paddle.v2.fluid.layers as layers
|
||||||
|
import paddle.v2.fluid.framework as framework
|
||||||
|
from paddle.v2.fluid.executor import Executor
|
||||||
|
from paddle.v2.fluid.framework import default_startup_program
|
||||||
|
|
||||||
|
|
||||||
|
class TestSwitch(unittest.TestCase):
|
||||||
|
def check_switch(self, value):
|
||||||
|
x = layers.fill_constant(shape=[1], dtype='float32', value=value)
|
||||||
|
|
||||||
|
zero_var = layers.fill_constant(shape=[1], dtype='float32', value=0.0)
|
||||||
|
one_var = layers.fill_constant(shape=[1], dtype='float32', value=1.0)
|
||||||
|
two_var = layers.fill_constant(shape=[1], dtype='float32', value=2.0)
|
||||||
|
three_var = layers.fill_constant(shape=[1], dtype='float32', value=3.0)
|
||||||
|
|
||||||
|
result = layers.create_global_var(
|
||||||
|
shape=[1], value=-1.0, dtype='float32', persistable=True)
|
||||||
|
|
||||||
|
with layers.Switch() as switch:
|
||||||
|
with switch.case(layers.less_than(x, zero_var)):
|
||||||
|
layers.assign(zero_var, result)
|
||||||
|
with switch.case(layers.less_than(x, one_var)):
|
||||||
|
layers.assign(one_var, result)
|
||||||
|
with switch.case(layers.less_than(x, two_var)):
|
||||||
|
layers.assign(two_var, result)
|
||||||
|
with switch.default():
|
||||||
|
layers.assign(three_var, result)
|
||||||
|
|
||||||
|
cpu = core.CPUPlace()
|
||||||
|
exe = Executor(cpu)
|
||||||
|
exe.run(default_startup_program())
|
||||||
|
|
||||||
|
out = exe.run(feed={}, fetch_list=[result])[0][0]
|
||||||
|
return out
|
||||||
|
|
||||||
|
def test_switch(self):
|
||||||
|
test_data = {(-0.1, 0), (0.1, 1), (1.1, 2), (2.1, 3)}
|
||||||
|
for x, expected_result in test_data:
|
||||||
|
main_program = framework.Program()
|
||||||
|
startup_program = framework.Program()
|
||||||
|
with framework.program_guard(main_program, startup_program):
|
||||||
|
result = self.check_switch(x)
|
||||||
|
self.assertEqual(result, expected_result)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
unittest.main()
|
Loading…
Reference in new issue