Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into rename_rpc_ops
typhoonzero
7 years ago
commit
85d5f8e234
@ -0,0 +1,26 @@
|
||||
/* 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/channel.h"
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
TEST(Channel, MakeAndClose) {
|
||||
using paddle::framework::Channel;
|
||||
using paddle::framework::MakeChannel;
|
||||
using paddle::framework::CloseChannel;
|
||||
|
||||
Channel<int>* ch = MakeChannel<int>(10);
|
||||
CloseChannel(ch);
|
||||
}
|
||||
@ -0,0 +1,82 @@
|
||||
/* 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 <condition_variable>
|
||||
#include <deque>
|
||||
#include <mutex>
|
||||
|
||||
#include "paddle/framework/channel.h"
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
namespace details {
|
||||
|
||||
template <typename T>
|
||||
class Buffered : public paddle::framework::Channel<T> {
|
||||
friend Channel<T>* paddle::framework::MakeChannel<T>(size_t);
|
||||
friend void paddle::framework::CloseChannel<T>(Channel<T>*);
|
||||
|
||||
public:
|
||||
virtual void Send(T*);
|
||||
virtual void Receive(T*);
|
||||
virtual size_t Cap() { return cap_; }
|
||||
|
||||
private:
|
||||
size_t cap_;
|
||||
std::mutex mu_;
|
||||
std::condition_variable empty_cond_var_;
|
||||
std::condition_variable full_cond_var_;
|
||||
std::deque<T> channel_;
|
||||
|
||||
Buffered(size_t cap) : cap_(cap) {}
|
||||
virtual ~Buffered();
|
||||
|
||||
void NotifyAllSenders(std::unique_lock<std::mutex>*);
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
void Buffered<T>::Send(T* item) {
|
||||
std::unique_lock<std::mutex> lock(mu_);
|
||||
full_cond_var_.wait(lock, [this]() { return channel_.size() < cap_; });
|
||||
channel_.push_back(std::move(*item));
|
||||
lock.unlock();
|
||||
empty_cond_var_.notify_one();
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void Buffered<T>::Receive(T* item) {
|
||||
std::unique_lock<std::mutex> lock(mu_);
|
||||
empty_cond_var_.wait(lock, [this]() { return !channel_.empty(); });
|
||||
*item = std::move(channel_.front());
|
||||
channel_.pop_front();
|
||||
NotifyAllSenders(&lock);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
Buffered<T>::~Buffered() {
|
||||
std::unique_lock<std::mutex> lock(mu_);
|
||||
channel_.clear();
|
||||
NotifyAllSenders(&lock);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void Buffered<T>::NotifyAllSenders(std::unique_lock<std::mutex>* lock) {
|
||||
lock->unlock();
|
||||
full_cond_var_.notify_one();
|
||||
}
|
||||
|
||||
} // namespace details
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
@ -0,0 +1,52 @@
|
||||
/* 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 <condition_variable>
|
||||
#include <deque>
|
||||
#include <mutex>
|
||||
|
||||
#include "paddle/framework/channel.h"
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
namespace details {
|
||||
|
||||
template <typename T>
|
||||
class UnBuffered : public paddle::framework::Channel<T> {
|
||||
friend Channel<T>* paddle::framework::MakeChannel<T>(size_t);
|
||||
friend void paddle::framework::CloseChannel<T>(Channel<T>*);
|
||||
|
||||
public:
|
||||
virtual void Send(T*);
|
||||
virtual void Receive(T*);
|
||||
virtual size_t Cap() { return 0; }
|
||||
|
||||
private:
|
||||
UnBuffered() {}
|
||||
virtual ~UnBuffered();
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
void UnBuffered<T>::Send(T* channel_element) {}
|
||||
|
||||
template <typename T>
|
||||
void UnBuffered<T>::Receive(T*) {}
|
||||
|
||||
template <typename T>
|
||||
UnBuffered<T>::~UnBuffered() {}
|
||||
|
||||
} // namespace details
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue