Fixed Python detection

This commit is contained in:
AlexeyAB
2018-04-17 14:21:23 +03:00
parent 140333977c
commit 6e3afec85a
4 changed files with 15 additions and 10 deletions

View File

@ -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

View File

@ -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

View File

@ -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);

View File

@ -9,8 +9,8 @@
#include "box.h"
typedef struct {
int h;
int w;
int w;
int h;
int c;
float *data;
} image;