revert-12469-sum_op_dim_fix
tangwei12
7 years ago
commit
c24a9263ba
@ -0,0 +1,48 @@
|
|||||||
|
/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
|
||||||
|
|
||||||
|
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 <pthread.h>
|
||||||
|
|
||||||
|
#include "paddle/fluid/platform/enforce.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace framework {
|
||||||
|
|
||||||
|
struct RWLock {
|
||||||
|
RWLock() { pthread_rwlock_init(&lock_, nullptr); }
|
||||||
|
|
||||||
|
~RWLock() { pthread_rwlock_destroy(&lock_); }
|
||||||
|
|
||||||
|
void RDLock() {
|
||||||
|
PADDLE_ENFORCE_EQ(pthread_rwlock_rdlock(&lock_), 0,
|
||||||
|
"acquire read lock failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
void WRLock() {
|
||||||
|
PADDLE_ENFORCE_EQ(pthread_rwlock_wrlock(&lock_), 0,
|
||||||
|
"acquire write lock failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
void UNLock() {
|
||||||
|
PADDLE_ENFORCE_EQ(pthread_rwlock_unlock(&lock_), 0, "unlock failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
pthread_rwlock_t lock_;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace framework
|
||||||
|
} // namespace paddle
|
||||||
@ -0,0 +1,81 @@
|
|||||||
|
/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
|
||||||
|
|
||||||
|
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/fluid/framework/rw_lock.h"
|
||||||
|
#include <gtest/gtest.h>
|
||||||
|
#include <chrono> // NOLINT
|
||||||
|
#include <thread> // NOLINT
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
namespace f = paddle::framework;
|
||||||
|
|
||||||
|
void f1(f::RWLock *lock) {
|
||||||
|
lock->RDLock();
|
||||||
|
lock->UNLock();
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(RWLOCK, read_read) {
|
||||||
|
f::RWLock lock;
|
||||||
|
lock.RDLock();
|
||||||
|
std::thread t1(f1, &lock);
|
||||||
|
std::thread t2(f1, &lock);
|
||||||
|
t1.join();
|
||||||
|
t2.join();
|
||||||
|
lock.UNLock();
|
||||||
|
}
|
||||||
|
|
||||||
|
void f2(f::RWLock *lock, std::vector<int> *result) {
|
||||||
|
lock->RDLock();
|
||||||
|
ASSERT_EQ(result->size(), 0UL);
|
||||||
|
lock->UNLock();
|
||||||
|
}
|
||||||
|
|
||||||
|
void f3(f::RWLock *lock, std::vector<int> *result) {
|
||||||
|
lock->WRLock();
|
||||||
|
result->push_back(1);
|
||||||
|
lock->UNLock();
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(RWLOCK, read_write) {
|
||||||
|
f::RWLock lock;
|
||||||
|
std::vector<int> result;
|
||||||
|
|
||||||
|
lock.RDLock();
|
||||||
|
std::thread t1(f2, &lock, &result);
|
||||||
|
t1.join();
|
||||||
|
std::thread t2(f3, &lock, &result);
|
||||||
|
std::this_thread::sleep_for(std::chrono::seconds(1));
|
||||||
|
ASSERT_EQ(result.size(), 0UL);
|
||||||
|
lock.UNLock();
|
||||||
|
t2.join();
|
||||||
|
ASSERT_EQ(result.size(), 1UL);
|
||||||
|
}
|
||||||
|
|
||||||
|
void f4(f::RWLock *lock, std::vector<int> *result) {
|
||||||
|
lock->RDLock();
|
||||||
|
ASSERT_EQ(result->size(), 1UL);
|
||||||
|
lock->UNLock();
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(RWLOCK, write_read) {
|
||||||
|
f::RWLock lock;
|
||||||
|
std::vector<int> result;
|
||||||
|
|
||||||
|
lock.WRLock();
|
||||||
|
std::thread t1(f4, &lock, &result);
|
||||||
|
std::this_thread::sleep_for(std::chrono::seconds(1));
|
||||||
|
result.push_back(1);
|
||||||
|
lock.UNLock();
|
||||||
|
t1.join();
|
||||||
|
}
|
||||||
@ -1,26 +0,0 @@
|
|||||||
// Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
|
|
||||||
//
|
|
||||||
// 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/fluid/operators/fill_constant_op.h"
|
|
||||||
#include "paddle/fluid/platform/float16.h"
|
|
||||||
|
|
||||||
namespace ops = paddle::operators;
|
|
||||||
REGISTER_OP_CUDA_KERNEL(
|
|
||||||
fill_constant,
|
|
||||||
ops::FillConstantOpKernel<paddle::platform::CUDADeviceContext, float>,
|
|
||||||
ops::FillConstantOpKernel<paddle::platform::CUDADeviceContext, double>,
|
|
||||||
ops::FillConstantOpKernel<paddle::platform::CUDADeviceContext, int>,
|
|
||||||
ops::FillConstantOpKernel<paddle::platform::CUDADeviceContext, int64_t>,
|
|
||||||
ops::FillConstantOpKernel<paddle::platform::CUDADeviceContext,
|
|
||||||
paddle::platform::float16>)
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue