From db550bd8044ec497845addb6d18a482d1f5aab91 Mon Sep 17 00:00:00 2001
From: vinjn <vinjn.z@gmail.com>
Date: Wed, 27 Jun 2018 03:56:21 +0000
Subject: [PATCH] Expose optimize_picture() in DLL
---
darknet.py | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/darknet.py b/darknet.py
index 4e56d98..dff0a31 100644
--- a/darknet.py
+++ b/darknet.py
@@ -78,8 +78,10 @@
#lib = CDLL("darknet.so", RTLD_GLOBAL)
hasGPU = True
if os.name == "nt":
- winGPUdll = "yolo_cpp_dll.dll"
- winNoGPUdll = "yolo_cpp_dll_nogpu.dll"
+ cwd = os.path.dirname(__file__)
+ os.environ['PATH'] = cwd + ';' + os.environ['PATH']
+ winGPUdll = os.path.join(cwd, "yolo_cpp_dll.dll")
+ winNoGPUdll = os.path.join(cwd, "yolo_cpp_dll_nogpu.dll")
envKeys = list()
for k, v in os.environ.items():
envKeys.append(k)
@@ -233,7 +235,7 @@
if debug: print("Assigned pnum")
predict_image(net, im)
if debug: print("did prediction")
- dets = get_network_boxes(net, im.w, im.h, thresh, hier_thresh, None, 0, pnum, 1)
+ dets = get_network_boxes(net, im.w, im.h, thresh, hier_thresh, None, 0, pnum, 0)
if debug: print("Got dets")
num = pnum[0]
if debug: print("got zeroth index of pnum")
--
Gitblit v1.10.0