From 9da19e9da660057785fb736aba5c61b1ae773f2f Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Thu, 11 Oct 2018 15:33:11 +0100 Subject: COMPMID-1605: API alignment for the MemoryManager with ARMNN Change-Id: Iac6a95ba7f388e65b7f1c8865c3e9bf289b233ea Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/155490 Reviewed-by: Anthony Barbier Tested-by: bsgcomp --- tests/validation/fixtures/UNIT/MemoryManagerFixture.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'tests/validation/fixtures/UNIT/MemoryManagerFixture.h') diff --git a/tests/validation/fixtures/UNIT/MemoryManagerFixture.h b/tests/validation/fixtures/UNIT/MemoryManagerFixture.h index d8e2b0b427..01f9092da5 100644 --- a/tests/validation/fixtures/UNIT/MemoryManagerFixture.h +++ b/tests/validation/fixtures/UNIT/MemoryManagerFixture.h @@ -99,11 +99,9 @@ protected: dst.allocator()->allocate(); // Finalize memory manager - mm->set_allocator(&_allocator); - mm->set_num_pools(1); - mm->finalize(); - ARM_COMPUTE_EXPECT(mm->is_finalized(), framework::LogLevel::ERRORS); + mm->populate(_allocator, 1 /* num_pools */); ARM_COMPUTE_EXPECT(mm->lifetime_manager()->are_all_finalized(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(mm->pool_manager()->num_pools() == 1, framework::LogLevel::ERRORS); // Fill tensors fill(AccessorType(src), 0); @@ -207,11 +205,9 @@ protected: dst.allocator()->allocate(); // Finalize memory manager - mm->set_allocator(&allocator); - mm->set_num_pools(1); - mm->finalize(); - ARM_COMPUTE_EXPECT(mm->is_finalized(), framework::LogLevel::ERRORS); + mm->populate(_allocator, 1 /* num_pools */); ARM_COMPUTE_EXPECT(mm->lifetime_manager()->are_all_finalized(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(mm->pool_manager()->num_pools() == 1, framework::LogLevel::ERRORS); // Fill tensors (1st iteration) fill(AccessorType(src), 0); @@ -343,11 +339,9 @@ protected: dst.allocator()->allocate(); // Finalize memory manager - mm->set_allocator(&allocator); - mm->set_num_pools(1); - mm->finalize(); - ARM_COMPUTE_EXPECT(mm->is_finalized(), framework::LogLevel::ERRORS); + mm->populate(_allocator, 1 /* num_pools */); ARM_COMPUTE_EXPECT(mm->lifetime_manager()->are_all_finalized(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(mm->pool_manager()->num_pools() == 1, framework::LogLevel::ERRORS); // Fill tensors (1st iteration) fill(AccessorType(src), 0); -- cgit v1.2.1