From 9ff0b7efcb9281bd68ffc9b670e4f882a03dc559 Mon Sep 17 00:00:00 2001 From: AlexeyAB Date: Thu, 3 Aug 2017 22:18:00 +0300 Subject: [PATCH] Linux supported --- Makefile | 6 ++++++ image_voc.sh | 6 ++++++ net_cam_voc.sh | 6 ++++++ src/utils.c | 6 +++--- video_voc.sh | 6 ++++++ 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 image_voc.sh create mode 100644 net_cam_voc.sh create mode 100644 video_voc.sh diff --git a/Makefile b/Makefile index 3d3d5e43..a2a90f7b 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ GPU=0 CUDNN=0 OPENCV=0 DEBUG=0 +OPENMP=0 ARCH= -gencode arch=compute_20,code=[sm_20,sm_21] \ -gencode arch=compute_30,code=sm_30 \ @@ -36,6 +37,11 @@ LDFLAGS+= `pkg-config --libs opencv` COMMON+= `pkg-config --cflags opencv` endif +ifeq ($(OPENMP), 1) +CFLAGS+= -fopenmp +LDFLAGS+= -lgomp +endif + ifeq ($(GPU), 1) COMMON+= -DGPU -I/usr/local/cuda/include/ CFLAGS+= -DGPU diff --git a/image_voc.sh b/image_voc.sh new file mode 100644 index 00000000..f8491d4f --- /dev/null +++ b/image_voc.sh @@ -0,0 +1,6 @@ + + +./darknet detector test ./cfg/voc.data ./cfg/yolo-voc.cfg ./yolo-voc.weights dog.jpg -i 0 -thresh 0.2 + + + diff --git a/net_cam_voc.sh b/net_cam_voc.sh new file mode 100644 index 00000000..196b371b --- /dev/null +++ b/net_cam_voc.sh @@ -0,0 +1,6 @@ +#rm test_dnn_out.avi + +./darknet detector demo ./cfg/voc.data ./cfg/yolo-voc.cfg ./yolo-voc.weights rtsp://admin:admin12345@192.168.0.228:554 -i 0 -thresh 0.24 + + + diff --git a/src/utils.c b/src/utils.c index b0ef0fc0..ec4f8ac3 100644 --- a/src/utils.c +++ b/src/utils.c @@ -3,14 +3,14 @@ #include #include #include -#include "unistd.h" #include #include #ifdef WIN32 -#include "utils.h" +#include "unistd.h" #else -#include +#include #endif +#include "utils.h" #pragma warning(disable: 4996) diff --git a/video_voc.sh b/video_voc.sh new file mode 100644 index 00000000..99112ca0 --- /dev/null +++ b/video_voc.sh @@ -0,0 +1,6 @@ + + +./darknet detector demo ./cfg/voc.data ./cfg/yolo-voc.cfg ./yolo-voc.weights test50.mp4 -i 0 -thresh 0.2 + + +