From 0f954eb6c8bf2f6c8600c56f21fec6aa9ebf082e Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 23 Jun 2020 17:28:38 +0100 Subject: COMPMID-3324: Remove pretranspose_B support from NEGEMM Signed-off-by: Georgios Pinitas Change-Id: Idc60402bebdeeba7a998f69b63f302d75500763e Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3449 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- src/runtime/NEON/functions/NEGEMM.cpp | 11 +---------- src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp | 4 +++- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/runtime/NEON/functions/NEGEMM.cpp b/src/runtime/NEON/functions/NEGEMM.cpp index 2bd459a389..89dd4a15d0 100644 --- a/src/runtime/NEON/functions/NEGEMM.cpp +++ b/src/runtime/NEON/functions/NEGEMM.cpp @@ -68,16 +68,7 @@ void NEGEMM::configure(const ITensor *a, const ITensor *b, const ITensor *c, ITe if(run_optimised) { const ITensor *c_to_use = is_c_bias ? c : nullptr; - if(MEMInfo::get_policy() == MemoryPolicy::MINIMIZE) - { - GEMMInfo gemm_info_ntb = gemm_info; - gemm_info_ntb.set_pretranpose_B(false); - _asm_glue.configure(a, b, c_to_use, d, gemm_info_ntb); - } - else - { - _asm_glue.configure(a, b, c_to_use, d, gemm_info); - } + _asm_glue.configure(a, b, c_to_use, d, gemm_info); ARM_COMPUTE_ERROR_ON(!_asm_glue.is_configured()); // Scale product by alpha diff --git a/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp b/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp index 7a1f0850b2..1fcac58e10 100644 --- a/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp +++ b/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp @@ -516,10 +516,12 @@ NEGEMMAssemblyDispatch::NEGEMMAssemblyDispatch(std::shared_ptr m Status NEGEMMAssemblyDispatch::validate(const ITensorInfo *a, const ITensorInfo *b, const ITensorInfo *c, const ITensorInfo *d, const GEMMInfo &gemm_info) { - ARM_COMPUTE_UNUSED(gemm_info, c); + ARM_COMPUTE_UNUSED(c); ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(a, b, d); ARM_COMPUTE_RETURN_ERROR_ON_CPU_F16_UNSUPPORTED(a); ARM_COMPUTE_RETURN_ERROR_ON_CPU_BF16_UNSUPPORTED(a); + + ARM_COMPUTE_RETURN_ERROR_ON(!gemm_info.pretranpose_B()); #ifndef __aarch64__ ARM_COMPUTE_RETURN_ERROR_ON_MSG(a->element_size() == 1, "8bit integer types only supported for aarch64"); #endif /* __aarch64__ */ -- cgit v1.2.1