diff options
| author | Scott Lobdell <slobdell@google.com> | 2022-01-30 02:48:00 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2022-01-30 03:00:47 +0000 |
| commit | a028272dee9220e6810cbdcfb2328c34f8afe4c2 (patch) | |
| tree | 67574a4494f5fccdb37925294b32d5b62642fa4d /neuralnetworks | |
| parent | c8ad7b85d490d5c925d708f36f4dd74a64e591be (diff) | |
| parent | 8338316c8344ab2707b6572e34e42e5fca9f9ee9 (diff) | |
Merge TP1A.220107.002
Change-Id: I655d5412ccd734059dfb19075bb9abc810396975
Diffstat (limited to 'neuralnetworks')
| -rw-r--r-- | neuralnetworks/1.3/vts/functional/MemoryDomainTests.cpp | 9 | ||||
| -rw-r--r-- | neuralnetworks/OWNERS | 10 |
2 files changed, 7 insertions, 12 deletions
diff --git a/neuralnetworks/1.3/vts/functional/MemoryDomainTests.cpp b/neuralnetworks/1.3/vts/functional/MemoryDomainTests.cpp index e2fa6e4d42..af3641a2fe 100644 --- a/neuralnetworks/1.3/vts/functional/MemoryDomainTests.cpp +++ b/neuralnetworks/1.3/vts/functional/MemoryDomainTests.cpp @@ -1158,12 +1158,15 @@ TEST_P(MemoryDomainExecutionTest, InvalidDimensions) { auto [buffer, token] = allocateBuffer(preparedModel, {0}, {0}, kTestOperand.dimensions); if (buffer == nullptr) return; - Request::MemoryPool sharedMemory = createSharedMemoryPool(kTestOperandDataSize); - Request::MemoryPool deviceMemory = createDeviceMemoryPool(token); + // Use an incompatible dimension and make sure the length matches with the bad dimension. auto badDimensions = kTestOperand.dimensions; badDimensions[0] = 2; + const uint32_t badTestOperandDataSize = kTestOperandDataSize * 2; + + Request::MemoryPool sharedMemory = createSharedMemoryPool(badTestOperandDataSize); + Request::MemoryPool deviceMemory = createDeviceMemoryPool(token); RequestArgument sharedMemoryArg = { - .location = {.poolIndex = 0, .offset = 0, .length = kTestOperandDataSize}, + .location = {.poolIndex = 0, .offset = 0, .length = badTestOperandDataSize}, .dimensions = badDimensions}; RequestArgument deviceMemoryArg = {.location = {.poolIndex = 1}}; RequestArgument deviceMemoryArgWithBadDimensions = {.location = {.poolIndex = 1}, diff --git a/neuralnetworks/OWNERS b/neuralnetworks/OWNERS index def3ea93c3..04c5d72502 100644 --- a/neuralnetworks/OWNERS +++ b/neuralnetworks/OWNERS @@ -1,10 +1,2 @@ # Bug component: 195575 -# Neuralnetworks team -butlermichael@google.com -dgross@google.com -galarragas@google.com -ianhua@google.com -jeanluc@google.com -miaowang@google.com -pszczepaniak@google.com -xusongw@google.com +include platform/packages/modules/NeuralNetworks:/NNAPI_OWNERS # Neuralnetworks team |