From 01bec657080d123a5b44a10ec94ebe132e20b1f3 Mon Sep 17 00:00:00 2001
From: IlyaOvodov <b@ovdv.ru>
Date: Wed, 30 May 2018 16:51:55 +0000
Subject: [PATCH] "channel" parameter of [net] is used in detector when preparing images for net.
---
darknet.py | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/darknet.py b/darknet.py
index 2deff4f..75ef04b 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"]:
@@ -118,7 +119,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]
@@ -222,9 +223,11 @@
"""
#pylint: disable= C0321
im = load_image(image, 0, 0)
+ #import cv2
+ #custom_image = cv2.imread(image) # use: detect(,,imagePath,)
#import scipy.misc
- #sci_image = scipy.misc.imread(image)
- #im, arr = array_to_image(sci_image) # you should comment line below: free_image(im)
+ #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")
--
Gitblit v1.10.0