From e39d1011095de8e7428fe0e76b73986db3ca6918 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Thu, 17 May 2018 13:36:50 +0000
Subject: [PATCH] Merge pull request #844 from salbatron/patch-1
---
darknet.py | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/darknet.py b/darknet.py
index 700ed0c..9888c22 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]
@@ -325,7 +329,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