From 5a22d736513124fb03fab1fb792a35739d2dd333 Mon Sep 17 00:00:00 2001 From: Yi Wang Date: Fri, 23 Jun 2017 15:09:42 -0700 Subject: [PATCH] Add variable.h and test --- paddle/framework/CMakeLists.txt | 2 + paddle/framework/ddim_test.cc | 2 - paddle/framework/variable.h | 88 +++++++++++++++++++++++++++++++ paddle/framework/variable_test.cc | 40 ++++++++++++++ 4 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 paddle/framework/variable.h create mode 100644 paddle/framework/variable_test.cc diff --git a/paddle/framework/CMakeLists.txt b/paddle/framework/CMakeLists.txt index 673cfa19ac..e3c3155aa9 100644 --- a/paddle/framework/CMakeLists.txt +++ b/paddle/framework/CMakeLists.txt @@ -2,3 +2,5 @@ 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) diff --git a/paddle/framework/ddim_test.cc b/paddle/framework/ddim_test.cc index e5c84d7abe..36eef02370 100644 --- a/paddle/framework/ddim_test.cc +++ b/paddle/framework/ddim_test.cc @@ -1,5 +1,3 @@ -//#include -//#include #include #include diff --git a/paddle/framework/variable.h b/paddle/framework/variable.h new file mode 100644 index 0000000000..249b9b1b37 --- /dev/null +++ b/paddle/framework/variable.h @@ -0,0 +1,88 @@ +/* + 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 + +namespace paddle { +namespace framework { + +class Variable { + public: + template + const T& Get() const { + return *static_cast(holder_->Ptr()); + } + + template + T* GetMutable() { + if (holder_ != nullptr && typeid(T) == holder_->Type()) { + return static_cast(holder_->Ptr()); + } else { + return Reset(new T(), DefaultDeleter()); + } + } + + ~Variable() { + if (holder_ != nullptr) delete holder_; + } + + private: + // DefaultDeleter is functor which uses C++'s delete(T*). + template + struct DefaultDeleter { + void operator()(T* ptr) { delete ptr; } + }; + + struct Placeholder { + virtual ~Placeholder() {} + virtual const std::type_info& Type() const = 0; + virtual void* Ptr() const = 0; + }; + + // Placeholder hides type T, so it doesn't appear as a template + // parameter of Variable. + template + struct PlaceholderImpl : public Placeholder { + typedef std::function Deleter; + + PlaceholderImpl(T* ptr) : ptr_(ptr), type_(typeid(T)) {} + PlaceholderImpl(T* ptr, Deleter d) + : ptr_(ptr), type_(typeid(T)), deleter_(d) {} + + virtual ~PlaceholderImpl() { + deleter_(ptr_); + ptr_ = nullptr; + } + virtual const std::type_info& Type() const { return type_; } + virtual void* Ptr() const { return ptr_; } + + T* ptr_ = nullptr; + const std::type_info& type_; + std::function deleter_ = DefaultDeleter(); + }; + + template + T* Reset(T* allocated, typename PlaceholderImpl::Deleter deleter) { + if (holder_ != nullptr) { + delete holder_; + } + holder_ = new PlaceholderImpl(allocated, deleter); + return allocated; + } + + Placeholder* holder_; // pointers to a PlaceholderImpl object indeed. +}; + +} // namespace framework +} // namespace paddle diff --git a/paddle/framework/variable_test.cc b/paddle/framework/variable_test.cc new file mode 100644 index 0000000000..aea03bcf57 --- /dev/null +++ b/paddle/framework/variable_test.cc @@ -0,0 +1,40 @@ +/* + 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 +#include + +#include "gtest/gtest.h" +#include "paddle/framework/variable.h" + +TEST(Variable, GetMutable) { + using paddle::framework::Variable; + + struct Tensor { + int content_; + }; + + std::unique_ptr v(new Variable()); + + Tensor* t = v->GetMutable(); + t->content_ = 1234; + + const Tensor& tt = v->Get(); + EXPECT_EQ(1234, tt.content_); + + std::string* s = v->GetMutable(); + *s = "hello"; + + const std::string& ss = v->Get(); + EXPECT_EQ("hello", ss); +} -- GitLab