From 6e3afec85a49c14a67e340f74965d523f0a8311b Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Tue, 17 Apr 2018 14:21:23 +0300
Subject: [PATCH] Fixed Python detection

---
 src/cuda.c     |  5 ++++-
 src/cuda.h     | 12 +++++++-----
 src/detector.c |  4 ++--
 src/image.h    |  4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/cuda.c b/src/cuda.c
index d8db8514..f19c92dc 100644
--- a/src/cuda.c
+++ b/src/cuda.c
@@ -177,4 +177,7 @@ void cuda_pull_array(float *x_gpu, float *x, size_t n)
 	cudaStreamSynchronize(get_cuda_stream());
 }
 
-#endif
+#else // GPU
+#include "cuda.h"
+void cuda_set_device(int n) {}
+#endif // GPU
diff --git a/src/cuda.h b/src/cuda.h
index 9308031a..e167d367 100644
--- a/src/cuda.h
+++ b/src/cuda.h
@@ -31,11 +31,11 @@ extern int gpu_index;
 
 #ifdef CUDNN
 #include "cudnn.h"
-#endif
+#endif // CUDNN
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif // __cplusplus
 	void check_error(cudaError_t status);
 	cublasHandle_t blas_handle();
 	float *cuda_make_array(float *x, size_t n);
@@ -51,12 +51,14 @@ extern "C" {
 	cudaStream_t get_cuda_stream();
 #ifdef __cplusplus
 }
-#endif
+#endif // __cplusplus
 
 #ifdef CUDNN
 cudnnHandle_t cudnn_handle();
 enum {cudnn_fastest, cudnn_smallest};
 #endif
 
-#endif
-#endif
+#else // GPU
+YOLODLL_API void cuda_set_device(int n);
+#endif // GPU
+#endif // CUDA_H
diff --git a/src/detector.c b/src/detector.c
index c5afae51..13fb5b48 100644
--- a/src/detector.c
+++ b/src/detector.c
@@ -1056,8 +1056,8 @@ void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filenam
 
         float *X = sized.data;
         time= what_time_is_it_now();
-        network_predict(net, X);
-		//network_predict_image(&net, im);
+        //network_predict(net, X);
+		network_predict_image(&net, im); letterbox = 1;
         printf("%s: Predicted in %f seconds.\n", input, (what_time_is_it_now()-time));
         //get_region_boxes(l, 1, 1, thresh, probs, boxes, 0, 0);
 		// if (nms) do_nms_sort_v2(boxes, probs, l.w*l.h*l.n, l.classes, nms);
diff --git a/src/image.h b/src/image.h
index 7145997a..24b86849 100644
--- a/src/image.h
+++ b/src/image.h
@@ -9,8 +9,8 @@
 #include "box.h"
 
 typedef struct {
-    int h;
-    int w;
+	int w;
+	int h;
     int c;
     float *data;
 } image;