diff options
Diffstat (limited to 'tests/validation')
-rw-r--r-- | tests/validation/NEON/UNIT/MemoryManager.cpp | 12 | ||||
-rw-r--r-- | tests/validation/fixtures/UNIT/MemoryManagerFixture.h | 18 |
2 files changed, 13 insertions, 17 deletions
diff --git a/tests/validation/NEON/UNIT/MemoryManager.cpp b/tests/validation/NEON/UNIT/MemoryManager.cpp index 27b05ed55a..431254cf94 100644 --- a/tests/validation/NEON/UNIT/MemoryManager.cpp +++ b/tests/validation/NEON/UNIT/MemoryManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -74,10 +74,8 @@ TEST_CASE(BlobMemoryManagerSimpleWithinFunctionLevel, framework::DatasetMode::AL ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); // 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->pool_manager()->num_pools() == 1, framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(mm->lifetime_manager()->are_all_finalized(), framework::LogLevel::ERRORS); // Fill tensors @@ -86,6 +84,10 @@ TEST_CASE(BlobMemoryManagerSimpleWithinFunctionLevel, framework::DatasetMode::AL // Compute functions norm_layer_1.run(); norm_layer_2.run(); + + // Clear manager + mm->clear(); + ARM_COMPUTE_EXPECT(mm->pool_manager()->num_pools() == 0, framework::LogLevel::ERRORS); } TEST_SUITE_END() 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); |