Skip to content

optimize code in phi/common tests #78859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
co63oc wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

optimize code in phi/common tests #78859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions test/cpp/phi/common/test_backend.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,53 +24,53 @@ namespace tests {

TEST(Backend, OStream) {
std::ostringstream oss;
oss << phi::Backend::UNDEFINED;
oss << Backend::UNDEFINED;
EXPECT_EQ(oss.str(), "Undefined");
oss.str("");
oss << phi::Backend::CPU;
oss << Backend::CPU;
EXPECT_EQ(oss.str(), "CPU");
oss.str("");
oss << phi::Backend::GPU;
oss << Backend::GPU;
EXPECT_EQ(oss.str(), "GPU");
oss.str("");
oss << phi::Backend::XPU;
oss << Backend::XPU;
EXPECT_EQ(oss.str(), "XPU");
oss.str("");
oss << phi::Backend::ONEDNN;
oss << Backend::ONEDNN;
EXPECT_EQ(oss.str(), "ONEDNN");
oss.str("");
oss << phi::Backend::GPUDNN;
oss << Backend::GPUDNN;
EXPECT_EQ(oss.str(), "GPUDNN");
oss.str("");
oss << phi::Backend::KPS;
oss << Backend::KPS;
EXPECT_EQ(oss.str(), "KPS");
oss.str("");
try {
oss << phi::Backend::NUM_BACKENDS;
oss << Backend::NUM_BACKENDS;
} catch (const std::exception& exception) {
std::string ex_msg = exception.what();
EXPECT_TRUE(ex_msg.find("Invalid enum backend type") != std::string::npos);
}
}

TEST(Backend, StringToBackend) {
namespace pexp = paddle::experimental;
EXPECT_EQ(phi::Backend::UNDEFINED, pexp::StringToBackend("Undefined"));
EXPECT_EQ(phi::Backend::CPU, pexp::StringToBackend("CPU"));
EXPECT_EQ(phi::Backend::GPU, pexp::StringToBackend("GPU"));
EXPECT_EQ(phi::Backend::XPU, pexp::StringToBackend("XPU"));
EXPECT_EQ(phi::Backend::ONEDNN, pexp::StringToBackend("OneDNN"));
EXPECT_EQ(phi::Backend::GPUDNN, pexp::StringToBackend("GPUDNN"));
using paddle::experimental::StringToBackend;
EXPECT_EQ(Backend::UNDEFINED, StringToBackend("Undefined"));
EXPECT_EQ(Backend::CPU, StringToBackend("CPU"));
EXPECT_EQ(Backend::GPU, StringToBackend("GPU"));
EXPECT_EQ(Backend::XPU, StringToBackend("XPU"));
EXPECT_EQ(Backend::ONEDNN, StringToBackend("OneDNN"));
EXPECT_EQ(Backend::GPUDNN, StringToBackend("GPUDNN"));
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
EXPECT_EQ(phi::Backend::GPU, pexp::StringToBackend("KPS"));
EXPECT_EQ(Backend::GPU, StringToBackend("KPS"));
#else
EXPECT_EQ(phi::Backend::KPS, pexp::StringToBackend("KPS"));
EXPECT_EQ(Backend::KPS, StringToBackend("KPS"));
#endif
EXPECT_EQ(static_cast<Backend>(
static_cast<size_t>(Backend::NUM_BACKENDS) +
phi::CustomRegisteredDeviceMap::Instance()
.GetOrRegisterGlobalDeviceTypeId("CustomBackend")),
pexp::StringToBackend("CustomBackend"));
StringToBackend("CustomBackend"));
}

} // namespace tests
Expand Down
12 changes: 6 additions & 6 deletions test/cpp/phi/common/test_data_layout.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@ namespace tests {

TEST(DataLayout, OStream) {
std::ostringstream oss;
oss << phi::DataLayout::UNDEFINED;
oss << DataLayout::UNDEFINED;
EXPECT_EQ(oss.str(), "Undefined(AnyLayout)");
oss.str("");
oss << phi::DataLayout::ANY;
oss << DataLayout::ANY;
EXPECT_EQ(oss.str(), "Undefined(AnyLayout)");
oss.str("");
oss << phi::DataLayout::NHWC;
oss << DataLayout::NHWC;
EXPECT_EQ(oss.str(), "NHWC");
oss.str("");
oss << phi::DataLayout::NCHW;
oss << DataLayout::NCHW;
EXPECT_EQ(oss.str(), "NCHW");
oss.str("");
oss << phi::DataLayout::ONEDNN;
oss << DataLayout::ONEDNN;
EXPECT_EQ(oss.str(), "ONEDNN");
oss.str("");
try {
oss << phi::DataLayout::NUM_DATA_LAYOUTS;
oss << DataLayout::NUM_DATA_LAYOUTS;
} catch (const std::exception& exception) {
std::string ex_msg = exception.what();
EXPECT_TRUE(ex_msg.find("Unknown Data Layout type") != std::string::npos);
Expand Down
47 changes: 21 additions & 26 deletions test/cpp/phi/common/test_data_type.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,69 +26,64 @@ namespace tests {

TEST(DataType, OStream) {
std::ostringstream oss;
oss << phi::DataType::UNDEFINED;
oss << DataType::UNDEFINED;
EXPECT_EQ(oss.str(), "Undefined");
oss.str("");
oss << phi::DataType::BOOL;
oss << DataType::BOOL;
EXPECT_EQ(oss.str(), "bool");
oss.str("");
oss << phi::DataType::INT8;
oss << DataType::INT8;
EXPECT_EQ(oss.str(), "int8");
oss.str("");
oss << phi::DataType::UINT8;
oss << DataType::UINT8;
EXPECT_EQ(oss.str(), "uint8");
oss.str("");
oss << phi::DataType::INT16;
oss << DataType::INT16;
EXPECT_EQ(oss.str(), "int16");
oss.str("");
oss << phi::DataType::INT32;
oss << DataType::INT32;
EXPECT_EQ(oss.str(), "int32");
oss.str("");
oss << phi::DataType::INT64;
oss << DataType::INT64;
EXPECT_EQ(oss.str(), "int64");
oss.str("");
oss << phi::DataType::BFLOAT16;
oss << DataType::BFLOAT16;
EXPECT_EQ(oss.str(), "bfloat16");
oss.str("");
oss << phi::DataType::FLOAT16;
oss << DataType::FLOAT16;
EXPECT_EQ(oss.str(), "float16");
oss.str("");
oss << phi::DataType::FLOAT32;
oss << DataType::FLOAT32;
EXPECT_EQ(oss.str(), "float32");
oss.str("");
oss << phi::DataType::FLOAT64;
oss << DataType::FLOAT64;
EXPECT_EQ(oss.str(), "float64");
oss.str("");
oss << phi::DataType::COMPLEX64;
oss << DataType::COMPLEX64;
EXPECT_EQ(oss.str(), "complex64");
oss.str("");
oss << phi::DataType::COMPLEX128;
oss << DataType::COMPLEX128;
EXPECT_EQ(oss.str(), "complex128");
oss.str("");
oss << phi::DataType::PSTRING;
oss << DataType::PSTRING;
EXPECT_EQ(oss.str(), "pstring");
oss.str("");
try {
oss << phi::DataType::NUM_DATA_TYPES;
oss << DataType::NUM_DATA_TYPES;
} catch (const std::exception& exception) {
std::string ex_msg = exception.what();
EXPECT_TRUE(ex_msg.find("Invalid enum data type") != std::string::npos);
}
}

TEST(TypeTraits, Complex) {
EXPECT_EQ(phi::dtype::ToReal(phi::DataType::COMPLEX64),
phi::DataType::FLOAT32);
EXPECT_EQ(phi::dtype::ToReal(phi::DataType::COMPLEX128),
phi::DataType::FLOAT64);
EXPECT_EQ(phi::dtype::ToReal(phi::DataType::FLOAT32), phi::DataType::FLOAT32);
EXPECT_EQ(dtype::ToReal(DataType::COMPLEX64), DataType::FLOAT32);
EXPECT_EQ(dtype::ToReal(DataType::COMPLEX128), DataType::FLOAT64);
EXPECT_EQ(dtype::ToReal(DataType::FLOAT32), DataType::FLOAT32);

EXPECT_EQ(phi::dtype::ToComplex(phi::DataType::FLOAT32),
phi::DataType::COMPLEX64);
EXPECT_EQ(phi::dtype::ToComplex(phi::DataType::FLOAT64),
phi::DataType::COMPLEX128);
EXPECT_EQ(phi::dtype::ToComplex(phi::DataType::COMPLEX64),
phi::DataType::COMPLEX64);
EXPECT_EQ(dtype::ToComplex(DataType::FLOAT32), DataType::COMPLEX64);
EXPECT_EQ(dtype::ToComplex(DataType::FLOAT64), DataType::COMPLEX128);
EXPECT_EQ(dtype::ToComplex(DataType::COMPLEX64), DataType::COMPLEX64);
}

} // namespace tests
Expand Down
30 changes: 14 additions & 16 deletions test/cpp/phi/common/test_int_array.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ namespace tests {

TEST(IntArray, ConstructFromCPUDenseTensor) {
auto& pool = paddle::experimental::DeviceContextPool::Instance();
const auto* dev_ctx =
static_cast<const phi::CPUContext*>(pool.Get(CPUPlace()));
phi::DenseTensor shape = Full<int>(*dev_ctx, {2}, 3);
phi::DenseTensor out = Full<int>(*dev_ctx, shape, 1);
const auto* dev_ctx = static_cast<const CPUContext*>(pool.Get(CPUPlace()));
DenseTensor shape = Full<int>(*dev_ctx, {2}, 3);
DenseTensor out = Full<int>(*dev_ctx, shape, 1);
ASSERT_EQ(out.dims().size(), 2);
ASSERT_EQ(out.dims()[0], 3);
ASSERT_EQ(out.dims()[1], 3);
Expand All @@ -43,12 +42,11 @@ TEST(IntArray, ConstructFromCPUDenseTensor) {

TEST(IntArray, ConstructFromCPUDenseTensorVector) {
auto& pool = paddle::experimental::DeviceContextPool::Instance();
const auto* dev_ctx =
static_cast<const phi::CPUContext*>(pool.Get(CPUPlace()));
phi::DenseTensor shape0 = Full<int>(*dev_ctx, {1}, 3);
phi::DenseTensor shape1 = Full<int64_t>(*dev_ctx, {1}, 3);
std::vector<phi::DenseTensor> shape{shape0, shape1};
phi::DenseTensor out = Full<int>(*dev_ctx, shape, 1);
const auto* dev_ctx = static_cast<const CPUContext*>(pool.Get(CPUPlace()));
DenseTensor shape0 = Full<int>(*dev_ctx, {1}, 3);
DenseTensor shape1 = Full<int64_t>(*dev_ctx, {1}, 3);
std::vector<DenseTensor> shape{shape0, shape1};
DenseTensor out = Full<int>(*dev_ctx, shape, 1);
ASSERT_EQ(out.dims().size(), 2);
ASSERT_EQ(out.dims()[0], 3);
ASSERT_EQ(out.dims()[1], 3);
Expand Down Expand Up @@ -99,8 +97,8 @@ TEST(IntArray, ConstructFromGPUDenseTensor) {
auto& pool = paddle::experimental::DeviceContextPool::Instance();
const auto* dev_ctx =
static_cast<const phi::GPUContext*>(pool.Get(GPUPlace()));
phi::DenseTensor shape = Full<int>(*dev_ctx, {2}, 3);
phi::DenseTensor out = Full<int>(*dev_ctx, shape, 1);
DenseTensor shape = Full<int>(*dev_ctx, {2}, 3);
DenseTensor out = Full<int>(*dev_ctx, shape, 1);
ASSERT_EQ(out.dims().size(), 2);
ASSERT_EQ(out.dims()[0], 3);
ASSERT_EQ(out.dims()[1], 3);
Expand All @@ -111,10 +109,10 @@ TEST(IntArray, ConstructFromGPUDenseTensorVector) {
auto& pool = paddle::experimental::DeviceContextPool::Instance();
const auto* dev_ctx =
static_cast<const phi::GPUContext*>(pool.Get(GPUPlace()));
phi::DenseTensor shape0 = Full<int>(*dev_ctx, {1}, 3);
phi::DenseTensor shape1 = Full<int64_t>(*dev_ctx, {1}, 3);
std::vector<phi::DenseTensor> shape{shape0, shape1};
phi::DenseTensor out = Full<int>(*dev_ctx, shape, 1);
DenseTensor shape0 = Full<int>(*dev_ctx, {1}, 3);
DenseTensor shape1 = Full<int64_t>(*dev_ctx, {1}, 3);
std::vector<DenseTensor> shape{shape0, shape1};
DenseTensor out = Full<int>(*dev_ctx, shape, 1);
ASSERT_EQ(out.dims().size(), 2);
ASSERT_EQ(out.dims()[0], 3);
ASSERT_EQ(out.dims()[1], 3);
Expand Down
50 changes: 25 additions & 25 deletions test/cpp/phi/common/test_place.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,58 +21,58 @@ namespace phi {
namespace tests {

TEST(PhiPlace, place) {
phi::Place place;
EXPECT_EQ(place.GetType(), phi::AllocationType::UNDEFINED);
Place place;
EXPECT_EQ(place.GetType(), AllocationType::UNDEFINED);

place.Reset(phi::AllocationType::GPU, 1);
EXPECT_EQ(place.GetType(), phi::AllocationType::GPU);
place.Reset(AllocationType::GPU, 1);
EXPECT_EQ(place.GetType(), AllocationType::GPU);
EXPECT_EQ(place.GetDeviceId(), 1);
}

TEST(Place, cpu_place) {
phi::CPUPlace place;
EXPECT_EQ(place.GetType(), phi::AllocationType::CPU);
CPUPlace place;
EXPECT_EQ(place.GetType(), AllocationType::CPU);
std::cout << "cpu place repr: " << place << std::endl;
}

TEST(Place, gpu_place) {
phi::GPUPlace place;
EXPECT_EQ(place.GetType(), phi::AllocationType::GPU);
GPUPlace place;
EXPECT_EQ(place.GetType(), AllocationType::GPU);
EXPECT_EQ(place.GetDeviceId(), 0);

phi::GPUPlace place1(2);
EXPECT_EQ(place1.GetType(), phi::AllocationType::GPU);
GPUPlace place1(2);
EXPECT_EQ(place1.GetType(), AllocationType::GPU);
EXPECT_EQ(place1.GetDeviceId(), 2);
std::cout << "gpu place repr: " << place1 << std::endl;

phi::GPUPinnedPlace place2;
EXPECT_EQ(place2.GetType(), phi::AllocationType::GPUPINNED);
GPUPinnedPlace place2;
EXPECT_EQ(place2.GetType(), AllocationType::GPUPINNED);
std::cout << "gpu pinned place repr: " << place2 << std::endl;

EXPECT_NE(place2, phi::CPUPlace());
EXPECT_NE(place2, CPUPlace());
}

TEST(Place, convert_place) {
phi::Place base_place(phi::AllocationType::CPU);
phi::CPUPlace cpu_place = base_place;
Place base_place(AllocationType::CPU);
CPUPlace cpu_place = base_place;
EXPECT_EQ(cpu_place.GetType(), base_place.GetType());
base_place.Reset(phi::AllocationType::GPU, 2);
phi::GPUPlace gpu_place = base_place;
base_place.Reset(AllocationType::GPU, 2);
GPUPlace gpu_place = base_place;
EXPECT_EQ(gpu_place.GetType(), base_place.GetType());
EXPECT_EQ(gpu_place.GetDeviceId(), base_place.GetDeviceId());
phi::Place place = gpu_place;
Place place = gpu_place;
EXPECT_EQ(gpu_place.GetType(), place.GetType());
EXPECT_EQ(gpu_place.GetDeviceId(), place.GetDeviceId());
place = cpu_place;
EXPECT_EQ(cpu_place.GetType(), place.GetType());

std::map<phi::Place, int> maps;
maps[phi::CPUPlace()] = 1;
maps[phi::GPUPlace(0)] = 2;
maps[phi::GPUPlace(1)] = 3;
maps[phi::GPUPlace(2)] = 4;
maps[phi::GPUPlace(3)] = 5;
maps[phi::GPUPinnedPlace()] = 6;
std::map<Place, int> maps;
maps[CPUPlace()] = 1;
maps[GPUPlace(0)] = 2;
maps[GPUPlace(1)] = 3;
maps[GPUPlace(2)] = 4;
maps[GPUPlace(3)] = 5;
maps[GPUPinnedPlace()] = 6;
for (auto& map_item : maps) {
std::cout << map_item.first << ":" << map_item.second << std::endl;
}
Expand Down
2 changes: 1 addition & 1 deletion test/cpp/phi/common/test_scalar.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ TEST(Scalar, Equality) {
TEST(Scalar, WrapAsScalars) {
std::vector<int32_t> v{1, 2, 3};
auto out = paddle::experimental::WrapAsScalars(v);
ASSERT_EQ(out[0].dtype(), phi::DataType::INT32);
ASSERT_EQ(out[0].dtype(), DataType::INT32);
ASSERT_EQ(out[0].to<int32_t>(), 1);
ASSERT_EQ(out[1].to<int32_t>(), 2);
ASSERT_EQ(out[2].to<int32_t>(), 3);
Expand Down
5 changes: 0 additions & 5 deletions test/cpp/phi/common/test_scalar.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ limitations under the License. */
namespace phi {
namespace tests {

using DDim = phi::DDim;
using float16 = phi::dtype::float16;
using complex64 = ::phi::dtype::complex<float>;
using complex128 = ::phi::dtype::complex<double>;

__global__ void FillTensor(float* data) { data[0] = 1; }

TEST(Scalar, ConstructFromDenseTensor1) {
Expand Down
Loading
Loading