commit 8ae3cdadbc96910171d35abaab633be03b07d6f4
author Michele Di Giorgio <michele.digiorgio@arm.com> Mon Jun 07 15:30:26 2021 +0100
committer Sheri Zhang <sheri.zhang@arm.com> Mon Jun 07 16:27:33 2021 +0000
tree dd2c1fb9c2c05b88869a341cf2c5e4aca361e0f8
parent 18834933ac69330190a974c42ce0a22264a76431

Revert "Implement memory injection in CpuDirectGemmConv2d"

This reverts commit b3be45759bdd0749ae3a16fe470820f0d9830ea9.

Resolves: COMPMID-4548

Change-Id: I46e0d8c67ddf988af3ce38f83177cda412db916c
Signed-off-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5775
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Sheri Zhang <sheri.zhang@arm.com>

src/runtime/cpu/operators/CpuGemmDirectConv2d.h

diff --git a/src/runtime/cpu/operators/CpuGemmDirectConv2d.h b/src/runtime/cpu/operators/CpuGemmDirectConv2d.h
index 305a076..6aa17c2 100644
--- a/src/runtime/cpu/operators/CpuGemmDirectConv2d.h
+++ b/src/runtime/cpu/operators/CpuGemmDirectConv2d.h
@@ -48,7 +48,7 @@
 {
 public:
     /** Constructor */
-    CpuGemmDirectConv2d();
+    CpuGemmDirectConv2d(const std::shared_ptr<IMemoryManager> &memory_manager = nullptr);
     ARM_COMPUTE_DISALLOW_COPY_ALLOW_MOVE(CpuGemmDirectConv2d);
     /** Destructor */
     ~CpuGemmDirectConv2d();
@@ -80,16 +80,15 @@
     void configure(const ITensorInfo *src, const ITensorInfo *weights, const ITensorInfo *biases, ITensorInfo *dst, const Conv2dInfo &info);
     /** Static function to check if given info will lead to a valid configuration of @ref CpuGemmDirectConv2d
      *
-     * Similar to @ref CpuGemmDirectConv2d::configure()
+     * Similar to CpuGemmDirectConv2d::configure()
      *
      * @return a status
      */
     static Status validate(const ITensorInfo *src, const ITensorInfo *weights, const ITensorInfo *biases, const ITensorInfo *dst, const Conv2dInfo &info);
 
     // Inherited methods overridden:
-    void                             run(ITensorPack &tensors) override;
-    void                             prepare(ITensorPack &constants) override;
-    experimental::MemoryRequirements workspace() const override;
+    void run(ITensorPack &tensors) override;
+    void prepare(ITensorPack &constants) override;
 
 private:
     std::unique_ptr<CpuGemmAssemblyDispatch> _gemm_asm_func;
@@ -101,13 +100,11 @@
     bool                                     _is_prepared{ false };
     bool                                     _run_activation{ false };
 
-    /** Function to import workspace tensors
+    /** Function to allocated a tensor for permuted weights
      *
-     * @param[in] tensors Tensor pack includes workspace tensors
+     * @note This function will be removed when memory injection is properly implemented.
      */
-    void import_workspace_memory(ITensorPack &tensors);
-    /** Function free used workspace tensors */
-    void free_imported_workspace_memory();
+    void allocate_permuted_weights();
 };
 } // namespace cpu
 } // namespace arm_compute