From efdeb01a3a7994fc2bfbbcd98682f4c356dc229e Mon Sep 17 00:00:00 2001
From: Vinjn Zhang <vinjn@users.noreply.github.com>
Date: Sun, 20 May 2018 05:57:21 +0000
Subject: [PATCH] darknet.py - remove unnecessary check of CUDA_HOME
---
darknet.py | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/darknet.py b/darknet.py
index 2deff4f..4e56d98 100644
--- a/darknet.py
+++ b/darknet.py
@@ -84,7 +84,6 @@
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 +117,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 +221,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