cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Internal change.

Browse Source 
PiperOrigin-RevId: 499490514
This commit is contained in:
Nikolay Chirkov 2023-01-04 08:21:55 -08:00 committed by Copybara-Service
parent add5600d0d
commit a4ea606eac
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mediapipe/framework/formats/tensor_ahwb_gpu_test.cc
View File

@ -83,8 +83,8 @@ void FillGpuBuffer(GLuint name, std::size_t size,
TFLITE_GPU_CALL_GL(glBindBufferBase, GL_SHADER_STORAGE_BUFFER, 0, name)); TFLITE_GPU_CALL_GL(glBindBufferBase, GL_SHADER_STORAGE_BUFFER, 0, name));
MP_ASSERT_OK(TFLITE_GPU_CALL_GL(glUseProgram, to_buffer_program)); MP_ASSERT_OK(TFLITE_GPU_CALL_GL(glUseProgram, to_buffer_program));
MP_ASSERT_OK(TFLITE_GPU_CALL_GL(glDispatchCompute, size / 2, 1, 1)); MP_ASSERT_OK(TFLITE_GPU_CALL_GL(glDispatchCompute, size / 2, 1, 1));
MP_ASSERT_OK(TFLITE_GPU_CALL_GL(glBindBuffer, GL_SHADER_STORAGE_BUFFER, 0)); MP_EXPECT_OK(TFLITE_GPU_CALL_GL(glBindBuffer, GL_SHADER_STORAGE_BUFFER, 0));
MP_ASSERT_OK(TFLITE_GPU_CALL_GL(glDeleteProgram, to_buffer_program)); MP_EXPECT_OK(TFLITE_GPU_CALL_GL(glDeleteProgram, to_buffer_program));
} }
class TensorAhwbGpuTest : public mediapipe::GpuTestBase { class TensorAhwbGpuTest : public mediapipe::GpuTestBase {
@ -97,18 +97,18 @@ TEST_F(TensorAhwbGpuTest, TestGpuToCpuFloat32) {
{ {
// Request Ahwb first to get Ahwb storage allocated internally. // Request Ahwb first to get Ahwb storage allocated internally.
auto view = tensor.GetAHardwareBufferWriteView(); auto view = tensor.GetAHardwareBufferWriteView();
EXPECT_NE(view.handle(), nullptr); ASSERT_NE(view.handle(), nullptr);
view.SetWritingFinishedFD(-1, [](bool) { return true; }); view.SetWritingFinishedFD(-1, [](bool) { return true; });
} }
RunInGlContext([&tensor] { RunInGlContext([&tensor] {
auto ssbo_view = tensor.GetOpenGlBufferWriteView(); auto ssbo_view = tensor.GetOpenGlBufferWriteView();
auto ssbo_name = ssbo_view.name(); auto ssbo_name = ssbo_view.name();
EXPECT_GT(ssbo_name, 0); ASSERT_GT(ssbo_name, 0);
FillGpuBuffer(ssbo_name, tensor.shape().num_elements(), FillGpuBuffer(ssbo_name, tensor.shape().num_elements(),
tensor.element_type()); tensor.element_type());
}); });
auto ptr = tensor.GetCpuReadView().buffer<float>(); auto ptr = tensor.GetCpuReadView().buffer<float>();
EXPECT_NE(ptr, nullptr); ASSERT_NE(ptr, nullptr);
std::vector<float> reference; std::vector<float> reference;
reference.resize(num_elements); reference.resize(num_elements);
for (int i = 0; i < num_elements; i++) { for (int i = 0; i < num_elements; i++) {
@ -124,18 +124,18 @@ TEST_F(TensorAhwbGpuTest, TestGpuToCpuFloat16) {
{ {
// Request Ahwb first to get Ahwb storage allocated internally. // Request Ahwb first to get Ahwb storage allocated internally.
auto view = tensor.GetAHardwareBufferWriteView(); auto view = tensor.GetAHardwareBufferWriteView();
EXPECT_NE(view.handle(), nullptr); ASSERT_NE(view.handle(), nullptr);
view.SetReadingFinishedFunc([](bool) { return true; }); view.SetReadingFinishedFunc([](bool) { return true; });
} }
RunInGlContext([&tensor] { RunInGlContext([&tensor] {
auto ssbo_view = tensor.GetOpenGlBufferWriteView(); auto ssbo_view = tensor.GetOpenGlBufferWriteView();
auto ssbo_name = ssbo_view.name(); auto ssbo_name = ssbo_view.name();
EXPECT_GT(ssbo_name, 0); ASSERT_GT(ssbo_name, 0);
FillGpuBuffer(ssbo_name, tensor.shape().num_elements(), FillGpuBuffer(ssbo_name, tensor.shape().num_elements(),
tensor.element_type()); tensor.element_type());
}); });
auto ptr = tensor.GetCpuReadView().buffer<Float16>(); auto ptr = tensor.GetCpuReadView().buffer<Float16>();
EXPECT_NE(ptr, nullptr); ASSERT_NE(ptr, nullptr);
std::vector<Float16> reference; std::vector<Float16> reference;
reference.resize(num_elements); reference.resize(num_elements);
for (int i = 0; i < num_elements; i++) { for (int i = 0; i < num_elements; i++) {
@ -153,18 +153,18 @@ TEST_F(TensorAhwbGpuTest, TestReplacingCpuByAhwb) {
Tensor tensor{Tensor::ElementType::kFloat32, Tensor::Shape({num_elements})}; Tensor tensor{Tensor::ElementType::kFloat32, Tensor::Shape({num_elements})};
{ {
auto ptr = tensor.GetCpuWriteView().buffer<float>(); auto ptr = tensor.GetCpuWriteView().buffer<float>();
EXPECT_NE(ptr, nullptr); ASSERT_NE(ptr, nullptr);
for (int i = 0; i < num_elements; i++) { for (int i = 0; i < num_elements; i++) {
ptr[i] = static_cast<float>(i) / 10.0f; ptr[i] = static_cast<float>(i) / 10.0f;
} }
} }
{ {
auto view = tensor.GetAHardwareBufferReadView(); auto view = tensor.GetAHardwareBufferReadView();
EXPECT_NE(view.handle(), nullptr); ASSERT_NE(view.handle(), nullptr);
view.SetReadingFinishedFunc([](bool) { return true; }); view.SetReadingFinishedFunc([](bool) { return true; });
} }
auto ptr = tensor.GetCpuReadView().buffer<float>(); auto ptr = tensor.GetCpuReadView().buffer<float>();
EXPECT_NE(ptr, nullptr); ASSERT_NE(ptr, nullptr);
std::vector<float> reference; std::vector<float> reference;
reference.resize(num_elements); reference.resize(num_elements);
for (int i = 0; i < num_elements; i++) { for (int i = 0; i < num_elements; i++) {
@ -182,17 +182,17 @@ TEST_F(TensorAhwbGpuTest, TestReplacingGpuByAhwb) {
RunInGlContext([&tensor] { RunInGlContext([&tensor] {
auto ssbo_view = tensor.GetOpenGlBufferWriteView(); auto ssbo_view = tensor.GetOpenGlBufferWriteView();
auto ssbo_name = ssbo_view.name(); auto ssbo_name = ssbo_view.name();
EXPECT_GT(ssbo_name, 0); ASSERT_GT(ssbo_name, 0);
FillGpuBuffer(ssbo_name, tensor.shape().num_elements(), FillGpuBuffer(ssbo_name, tensor.shape().num_elements(),
tensor.element_type()); tensor.element_type());
}); });
{ {
auto view = tensor.GetAHardwareBufferReadView(); auto view = tensor.GetAHardwareBufferReadView();
EXPECT_NE(view.handle(), nullptr); ASSERT_NE(view.handle(), nullptr);
view.SetReadingFinishedFunc([](bool) { return true; }); view.SetReadingFinishedFunc([](bool) { return true; });
} }
auto ptr = tensor.GetCpuReadView().buffer<float>(); auto ptr = tensor.GetCpuReadView().buffer<float>();
EXPECT_NE(ptr, nullptr); ASSERT_NE(ptr, nullptr);
std::vector<float> reference; std::vector<float> reference;
reference.resize(num_elements); reference.resize(num_elements);
for (int i = 0; i < num_elements; i++) { for (int i = 0; i < num_elements; i++) {

2
mediapipe/framework/formats/tensor_ahwb_test.cc
View File

@ -34,7 +34,7 @@ TEST(TensorAhwbTest, TestAhwbAlignment) {
Tensor tensor(Tensor::ElementType::kFloat32, Tensor::Shape{5}); Tensor tensor(Tensor::ElementType::kFloat32, Tensor::Shape{5});
{ {
auto view = tensor.GetAHardwareBufferWriteView(16); auto view = tensor.GetAHardwareBufferWriteView(16);
EXPECT_NE(view.handle(), nullptr); ASSERT_NE(view.handle(), nullptr);
if (__builtin_available(android 26, *)) { if (__builtin_available(android 26, *)) {
AHardwareBuffer_Desc desc; AHardwareBuffer_Desc desc;
AHardwareBuffer_describe(view.handle(), &desc); AHardwareBuffer_describe(view.handle(), &desc);