From f6d2f7ffb77024d8e3b804db11627b5b789990e1 Mon Sep 17 00:00:00 2001
From: sjsujinkim <sjsujin.kim@samsung.com>
Date: Mon, 26 Mar 2018 19:23:53 +0900
Subject: [PATCH] Implement Memory_createFromFd and free

This commit implements Memory_createFromFd and free.

Signed-off-by: sjsujinkim <sjsujin.kim@samsung.com>
---
 src/runtime/ref/nn/runtime/NeuralNetworks.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/runtime/ref/nn/runtime/NeuralNetworks.cpp b/src/runtime/ref/nn/runtime/NeuralNetworks.cpp
index f2c2a5d..67e483a 100644
--- a/src/runtime/ref/nn/runtime/NeuralNetworks.cpp
+++ b/src/runtime/ref/nn/runtime/NeuralNetworks.cpp
@@ -22,8 +22,10 @@
 
 #include "CompilationBuilder.h"
 #include "ModelBuilder.h"
+#include "Memory.h"
 
 #include <iostream>
+#include <memory>
 
 #include "CompilationBuilder.h"
 
@@ -32,11 +34,9 @@
 #include "Callbacks.h"
 #include "ExecutionBuilder.h"
 #include "Manager.h"
-#include "Memory.h"
 #include "NeuralNetworksOEM.h"
 #include "ModelBuilder.h"
 
-#include <memory>
 #include <vector>
 #endif
 
@@ -228,11 +228,6 @@ using namespace android::nn;
 
 int ANeuralNetworksMemory_createFromFd(size_t size, int prot, int fd, size_t offset,
                                        ANeuralNetworksMemory** memory) {
-    // Dummy Implementation
-    return ANEURALNETWORKS_NO_ERROR;
-
-    // Original code for reference
-#if 0
     *memory = nullptr;
     std::unique_ptr<MemoryFd> m = std::make_unique<MemoryFd>();
     if (m == nullptr) {
@@ -244,16 +239,12 @@ int ANeuralNetworksMemory_createFromFd(size_t size, int prot, int fd, size_t off
     }
     *memory = reinterpret_cast<ANeuralNetworksMemory*>(m.release());
     return ANEURALNETWORKS_NO_ERROR;
-#endif
 }
 
 void ANeuralNetworksMemory_free(ANeuralNetworksMemory* memory) {
-    // Original code for reference
-#if 0
     // No validation.  Free of nullptr is valid.
     Memory* m = reinterpret_cast<Memory*>(memory);
     delete m;
-#endif
 }
 
 int ANeuralNetworksModel_create(ANeuralNetworksModel** model) {
-- 
2.7.4