declare the stream::Priority as enum class, test=develop (#24013)

revert-22778-infer_var_type
石晓伟 5 years ago committed by GitHub
parent 96491e43b7
commit 34d7d6aef0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -234,7 +234,7 @@ void CUDAContext::InitEigenContext() {
}
CUDAContext::CUDAContext(const CUDAPlace& place,
const enum stream::Priority& priority) {
const stream::Priority& priority) {
place_ = place;
CUDADeviceGuard guard(place_.device);
stream_.reset(new stream::CUDAStream(place, priority));

@ -85,7 +85,7 @@ class CUDAContext {
CUDAContext() = default;
explicit CUDAContext(
const CUDAPlace& place,
const enum stream::Priority& priority = stream::Priority::kNormal);
const stream::Priority& priority = stream::Priority::kNormal);
~CUDAContext();
@ -274,11 +274,11 @@ class CUDADeviceContext : public DeviceContext {
return context()->Stream()->WaitCallback();
}
void ResetDefaultContext(const enum stream::Priority& priority) {
void ResetDefaultContext(const stream::Priority& priority) {
default_ctx_.reset(new CUDAContext(place_, priority));
}
void ResetThreadContext(const enum stream::Priority& priority) {
void ResetThreadContext(const stream::Priority& priority) {
std::lock_guard<std::mutex> guard(ctx_mtx_);
thread_ctx_[this].reset(new CUDAContext(place_, priority));
}

@ -22,7 +22,7 @@ namespace stream {
constexpr unsigned int kDefaultFlag = cudaStreamDefault;
bool CUDAStream::Init(const Place& place, const enum Priority& priority) {
bool CUDAStream::Init(const Place& place, const Priority& priority) {
PADDLE_ENFORCE_EQ(is_gpu_place(place), true,
platform::errors::InvalidArgument(
"Cuda stream must be created using cuda place."));

@ -36,14 +36,13 @@ enum class Priority : uint8_t {
class CUDAStream final {
public:
CUDAStream() = default;
CUDAStream(const Place& place,
const enum Priority& priority = Priority::kNormal) {
explicit CUDAStream(const Place& place,
const Priority& priority = Priority::kNormal) {
Init(place, priority);
}
virtual ~CUDAStream() { Destroy(); }
bool Init(const Place& place,
const enum Priority& priority = Priority::kNormal);
bool Init(const Place& place, const Priority& priority = Priority::kNormal);
template <typename Callback>
void AddCallback(Callback&& callback) const {

Loading…
Cancel
Save