Merge pull request #856 from vinjn/patch-1

Alexey

2018-05-20 175c68b9b37e079813994dbf5a63937af4b71d8b

Merge pull request #856 from vinjn/patch-1

darknet.py - improve dll loading under Windows

 build/darknet/x64/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"]:

 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"]: