github
/
darknet
mirror of https://github.com/AlexeyAB/darknet.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #856 from vinjn/patch-1

Browse Source 
darknet.py - improve dll loading under Windows
pull/901/head^2
Alexey 7 years ago committed by GitHub
parent 7b7c669f49 c6ca54b411
commit 175c68b9b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      build/darknet/x64/darknet.py
  2. 7
      darknet.py

7
build/darknet/x64/darknet.py
Unescape View File

@ -78,13 +78,14 @@ class METADATA(Structure):
#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"]:

7
darknet.py
Unescape View File

@ -78,13 +78,14 @@ class METADATA(Structure):
#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"]:

Write Preview
Loading…
Cancel
Save