From 526e58d0d1a2f8e640a4791f8df79b8150f75040 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Sun, 10 Jun 2018 11:48:38 +0000
Subject: [PATCH] Merge pull request #1017 from jing-vision/master
---
darknet.py | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/darknet.py b/darknet.py
index b290a35..dff0a31 100644
--- a/darknet.py
+++ b/darknet.py
@@ -78,13 +78,14 @@
#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)
try:
- tmp = os.environ["CUDA_HOME"]
try:
tmp = os.environ["FORCE_CPU"].lower()
if tmp in ["1", "true", "yes", "on"]:
@@ -234,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