Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into fixdownloadbug
gongweibao
8 years ago
commit
5b2f9939c2
@ -1,6 +1,7 @@
|
||||
# ddim lib
|
||||
cc_library(ddim SRCS ddim.cc)
|
||||
cc_test(ddim_test SRCS ddim_test.cc DEPS ddim)
|
||||
|
||||
nv_test(dim_test SRCS dim_test.cu DEPS ddim)
|
||||
|
||||
cc_test(variable_test SRCS variable_test.cc)
|
||||
cc_test(scope_test SRCS scope_test.cc)
|
||||
cc_test(enforce_test SRCS enforce_test.cc)
|
||||
|
||||
@ -0,0 +1,69 @@
|
||||
/* 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/string/printf.h>
|
||||
#include <exception>
|
||||
#include <sstream>
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
|
||||
/**
|
||||
* @brief Enforce exception. Inherits std::exception
|
||||
*
|
||||
* All enforce condition not met, will throw an EnforceNotMet exception.
|
||||
*/
|
||||
class EnforceNotMet : public std::exception {
|
||||
public:
|
||||
EnforceNotMet(const std::string& msg, const char* file, int fileline) {
|
||||
std::ostringstream sout;
|
||||
sout << msg << " at [" << file << ":" << fileline << "];";
|
||||
all_msg_ = sout.str();
|
||||
}
|
||||
|
||||
const char* what() const noexcept override { return all_msg_.c_str(); }
|
||||
|
||||
private:
|
||||
std::string all_msg_;
|
||||
};
|
||||
|
||||
// From https://stackoverflow.com/questions/30130930/
|
||||
// __buildin_expect is in C++ 11 standard. Since the condition which enforced
|
||||
// should be true in most situation, it will make the compiler generate faster
|
||||
// code by adding `UNLIKELY` macro.
|
||||
#define UNLIKELY(condition) __builtin_expect(static_cast<bool>(condition), 0)
|
||||
|
||||
/**
|
||||
* @brief Throw a EnforceNotMet exception, automatically filled __FILE__ &
|
||||
* __LINE__
|
||||
*
|
||||
* This macro take __VA_ARGS__, user can pass any type if that type can
|
||||
* serialize to std::ostream
|
||||
*/
|
||||
#define PADDLE_THROW(...) \
|
||||
do { \
|
||||
throw ::paddle::framework::EnforceNotMet( \
|
||||
::paddle::string::Sprintf(__VA_ARGS__), __FILE__, __LINE__); \
|
||||
} while (0)
|
||||
|
||||
/**
|
||||
* @brief Enforce a condition, otherwise throw an EnforceNotMet
|
||||
*/
|
||||
#define PADDLE_ENFORCE(condition, ...) \
|
||||
do { \
|
||||
if (UNLIKELY(!(condition))) { \
|
||||
PADDLE_THROW(__VA_ARGS__); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
@ -0,0 +1,35 @@
|
||||
/* 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 <gtest/gtest.h>
|
||||
#include <paddle/framework/enforce.h>
|
||||
|
||||
TEST(ENFORCE, OK) {
|
||||
PADDLE_ENFORCE(true, "Enforce is ok %d now %f", 123, 0.345);
|
||||
size_t val = 1;
|
||||
const size_t limit = 10;
|
||||
PADDLE_ENFORCE(val < limit, "Enforce is OK too");
|
||||
}
|
||||
|
||||
TEST(ENFORCE, FAILED) {
|
||||
bool in_catch = false;
|
||||
try {
|
||||
PADDLE_ENFORCE(false, "Enforce is not ok %d at all", 123);
|
||||
} catch (paddle::framework::EnforceNotMet err) {
|
||||
in_catch = true;
|
||||
std::string msg = "Enforce is not ok 123 at all";
|
||||
const char* what = err.what();
|
||||
for (size_t i = 0; i < msg.length(); ++i) {
|
||||
ASSERT_EQ(what[i], msg[i]);
|
||||
}
|
||||
}
|
||||
ASSERT_TRUE(in_catch);
|
||||
}
|
||||
@ -0,0 +1,95 @@
|
||||
/* 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 <string>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include "paddle/framework/variable.h"
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
|
||||
/**
|
||||
* @brief Scope that manage all variables.
|
||||
*
|
||||
* Scope is an association of a name to Variable. All variables belong to
|
||||
* Scope. You need to specify a scope to run a Net, i.e., `net.Run(&scope)`.
|
||||
* One net can run in different scopes and update different variable in the
|
||||
* scope.
|
||||
*/
|
||||
class Scope {
|
||||
public:
|
||||
/**
|
||||
* @brief Initialize s Scope without parent.
|
||||
*/
|
||||
Scope() {}
|
||||
|
||||
/**
|
||||
* @brief Initialize a Scope with parent.
|
||||
*/
|
||||
explicit Scope(const std::shared_ptr<Scope>& parent) : parent_(parent) {}
|
||||
|
||||
/**
|
||||
* @brief Create Variable
|
||||
*
|
||||
* Create Variable in this Scope. Return the exist one if Variable already
|
||||
* been created.
|
||||
*/
|
||||
Variable* CreateVariable(const std::string& name) {
|
||||
auto var = GetVariable(name);
|
||||
if (var) {
|
||||
return var;
|
||||
} else {
|
||||
vars_[name] = std::unique_ptr<Variable>(new Variable());
|
||||
return GetVariable(name);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get Variable.
|
||||
*
|
||||
* Get Variable from this Scope, this function will recursive find Variable
|
||||
* from it's parent scope. Return nullptr if not found.
|
||||
*/
|
||||
Variable* GetVariable(const std::string& name) const {
|
||||
auto it = vars_.find(name);
|
||||
if (it != vars_.end()) {
|
||||
return it->second.get();
|
||||
} else if (parent_ != nullptr) {
|
||||
return parent_->GetVariable(name);
|
||||
} else {
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief If this scope has a Var named name.
|
||||
*
|
||||
* Find if there is a Variable in this scope and it's parent scope
|
||||
*/
|
||||
bool HasVariable(const std::string& name) const {
|
||||
return (vars_.find(name) != vars_.end() ||
|
||||
(parent_ && parent_->HasVariable(name)));
|
||||
}
|
||||
|
||||
private:
|
||||
std::unordered_map<std::string, std::unique_ptr<Variable>> vars_;
|
||||
std::shared_ptr<Scope> parent_{nullptr};
|
||||
};
|
||||
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
@ -0,0 +1,58 @@
|
||||
/* 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/scope.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
TEST(Scope, Create) {
|
||||
using paddle::framework::Scope;
|
||||
using paddle::framework::Variable;
|
||||
|
||||
auto scope = std::make_shared<Scope>();
|
||||
|
||||
Variable* var0 = scope->CreateVariable("");
|
||||
EXPECT_NE(var0, nullptr);
|
||||
|
||||
/// GetVariable will return nullptr if not exist.
|
||||
Variable* var1 = scope->GetVariable("a");
|
||||
EXPECT_EQ(var1, nullptr);
|
||||
|
||||
/// CreateVariable will return one.
|
||||
Variable* var2 = scope->CreateVariable("a");
|
||||
EXPECT_NE(var2, nullptr);
|
||||
|
||||
/// Get the created variable.
|
||||
Variable* var3 = scope->GetVariable("a");
|
||||
EXPECT_EQ(var2, var3);
|
||||
|
||||
/// CreateVariable will just return the variable if it's
|
||||
/// already exist.
|
||||
Variable* var4 = scope->CreateVariable("a");
|
||||
EXPECT_EQ(var4, var2);
|
||||
}
|
||||
|
||||
TEST(Scope, Parent) {
|
||||
using paddle::framework::Scope;
|
||||
using paddle::framework::Variable;
|
||||
|
||||
auto parent_scope = std::make_shared<Scope>();
|
||||
auto scope = std::make_shared<Scope>(parent_scope);
|
||||
|
||||
Variable* var0 = parent_scope->CreateVariable("a");
|
||||
EXPECT_NE(var0, nullptr);
|
||||
|
||||
/// GetVariable will get Variable from parent scope if exist.
|
||||
Variable* var1 = scope->GetVariable("a");
|
||||
EXPECT_EQ(var0, var1);
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue