From ae9fb2abbd8e2b7e079b56bf1cf39754d7c091ac Mon Sep 17 00:00:00 2001
From: Nadeen Udantha <udanthan@gmail.com>
Date: Fri, 18 May 2018 08:49:19 +0000
Subject: [PATCH] ojbects -> objects
---
darknet.py | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/darknet.py b/darknet.py
index 873dab7..b290a35 100644
--- a/darknet.py
+++ b/darknet.py
@@ -118,7 +118,7 @@
lib = CDLL(winGPUdll, RTLD_GLOBAL)
print("Environment variables indicated a CPU run, but we didn't find `"+winNoGPUdll+"`. Trying a GPU run anyway.")
else:
- lib = CDLL("./libdarknet.so", RTLD_GLOBAL)
+ lib = CDLL("./darknet.so", RTLD_GLOBAL)
lib.network_width.argtypes = [c_void_p]
lib.network_width.restype = c_int
lib.network_height.argtypes = [c_void_p]
@@ -160,6 +160,10 @@
load_net.argtypes = [c_char_p, c_char_p, c_int]
load_net.restype = c_void_p
+load_net_custom = lib.load_network_custom
+load_net_custom.argtypes = [c_char_p, c_char_p, c_int, c_int]
+load_net_custom.restype = c_void_p
+
do_nms_obj = lib.do_nms_obj
do_nms_obj.argtypes = [POINTER(DETECTION), c_int, c_int, c_float]
@@ -188,6 +192,18 @@
predict_image.argtypes = [c_void_p, IMAGE]
predict_image.restype = POINTER(c_float)
+def array_to_image(arr):
+ import numpy as np
+ # need to return old values to avoid python freeing memory
+ arr = arr.transpose(2,0,1)
+ c = arr.shape[0]
+ h = arr.shape[1]
+ w = arr.shape[2]
+ arr = np.ascontiguousarray(arr.flat, dtype=np.float32) / 255.0
+ data = arr.ctypes.data_as(POINTER(c_float))
+ im = IMAGE(w,h,c,data)
+ return im, arr
+
def classify(net, meta, im):
out = predict_image(net, im)
res = []
@@ -206,6 +222,11 @@
"""
#pylint: disable= C0321
im = load_image(image, 0, 0)
+ #import cv2
+ #custom_image = cv2.imread(image) # use: detect(,,imagePath,)
+ #import scipy.misc
+ #custom_image = scipy.misc.imread(image)
+ #im, arr = array_to_image(custom_image) # you should comment line below: free_image(im)
if debug: print("Loaded image")
num = c_int(0)
if debug: print("Assigned num")
@@ -310,7 +331,7 @@
if not os.path.exists(metaPath):
raise ValueError("Invalid data file path `"+os.path.abspath(metaPath)+"`")
if netMain is None:
- netMain = load_net(configPath.encode("ascii"), weightPath.encode("ascii"), 0)
+ netMain = load_net_custom(configPath.encode("ascii"), weightPath.encode("ascii"), 0, 1) # batch size = 1
if metaMain is None:
metaMain = load_meta(metaPath.encode("ascii"))
if altNames is None:
--
Gitblit v1.10.0