From 0fd261e605ab37e4911d51623a4cb473ffac5728 Mon Sep 17 00:00:00 2001 From: Dimitrii Lopanov Date: Wed, 8 Apr 2020 09:41:32 +0300 Subject: [PATCH 1/5] upd --- example/main.go | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/example/main.go b/example/main.go index 3b6a7ad..69b2a4e 100644 --- a/example/main.go +++ b/example/main.go @@ -7,9 +7,11 @@ import ( "image" "image/jpeg" "log" + "math" "os" darknet "github.com/LdDl/go-darknet" + "github.com/disintegration/imaging" ) var configFile = flag.String("configFile", "", @@ -78,6 +80,16 @@ func main() { bBox.StartPoint.X, bBox.StartPoint.Y, bBox.EndPoint.X, bBox.EndPoint.Y, ) + + // Uncomment code below if you want save cropped objects to files + // minX, minY := float64(bBox.StartPoint.X), float64(bBox.StartPoint.Y) + // maxX, maxY := float64(bBox.EndPoint.X), float64(bBox.EndPoint.Y) + // rect := image.Rect(round(minX), round(minY), round(maxX), round(maxY)) + // err := saveToFile(src, rect, fmt.Sprintf("crop_%d.jpeg", i)) + // if err != nil { + // fmt.Println(err) + // return + // } } } } @@ -87,3 +99,24 @@ func imageToBytes(img image.Image) ([]byte, error) { err := jpeg.Encode(buf, img, nil) return buf.Bytes(), err } + +func round(v float64) int { + if v >= 0 { + return int(math.Floor(v + 0.5)) + } + return int(math.Ceil(v - 0.5)) +} + +func saveToFile(imgSrc image.Image, bbox image.Rectangle, fname string) error { + rectcropimg := imaging.Crop(imgSrc, bbox) + f, err := os.Create(fname) + if err != nil { + return err + } + defer f.Close() + err = jpeg.Encode(f, rectcropimg, nil) + if err != nil { + return err + } + return nil +} From 3166cdca78a069dbf7a977f90180458a968b90e1 Mon Sep 17 00:00:00 2001 From: lucmichalski Date: Wed, 8 Apr 2020 07:52:55 +0000 Subject: [PATCH 2/5] add docker container for cpu/gpu --- docker/.env | 1 + docker/Dockerfile | 40 ++++++++ docker/Dockerfile.gpu | 38 ++++++++ docker/Makefile.cpu | 185 +++++++++++++++++++++++++++++++++++++ docker/Makefile.gpu | 186 ++++++++++++++++++++++++++++++++++++++ docker/docker-compose.yml | 32 +++++++ docker/download_data.sh | 10 ++ docker/models/.gitignore | 2 + 8 files changed, 494 insertions(+) create mode 100644 docker/.env create mode 100644 docker/Dockerfile create mode 100644 docker/Dockerfile.gpu create mode 100644 docker/Makefile.cpu create mode 100644 docker/Makefile.gpu create mode 100644 docker/docker-compose.yml create mode 100755 docker/download_data.sh create mode 100644 docker/models/.gitignore diff --git a/docker/.env b/docker/.env new file mode 100644 index 0000000..3fde6cd --- /dev/null +++ b/docker/.env @@ -0,0 +1 @@ +NAMESPACE=darknet diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..c518061 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,40 @@ +# Build phase +FROM ubuntu:18.04 as builder + +ENV darknet_commit=a234a5022333c930de08f2470184ef4e0c68356e + +WORKDIR /root/build +COPY Makefile.cpu . +RUN apt-get -y update && \ + apt-get -y install --no-install-recommends git build-essential ca-certificates && \ + git clone https://github.com/AlexeyAB/darknet && \ + cd darknet && \ + git checkout $darknet_commit && \ + cp -f /root/build/Makefile.cpu Makefile && \ + make + +# Final Image +FROM golang:1.14 + +RUN apt-get -y update && \ + apt-get -y install --no-install-recommends nano bash jq + +WORKDIR /root +COPY --from=builder /root/build/darknet/darknet \ + /root/build/darknet/libdarknet.so \ + /root/build/darknet/include/darknet.h \ + ./staging/ + +RUN mv staging/darknet /usr/local/bin && \ + mv staging/darknet.h /usr/include && \ + mv staging/libdarknet.so /usr/lib && \ + rm -rf staging + +RUN go get -u github.com/LdDl/go-darknet \ + && go get -u github.com/disintegration/imaging + +WORKDIR /darknet + +COPY download_data.sh . + +CMD ["/bin/bash"] diff --git a/docker/Dockerfile.gpu b/docker/Dockerfile.gpu new file mode 100644 index 0000000..5a87b1a --- /dev/null +++ b/docker/Dockerfile.gpu @@ -0,0 +1,38 @@ +# Build phase +FROM nvidia/cuda:9.0-cudnn7-devel-ubuntu16.04 as builder + +ENV darknet_commit=680d3bd + +WORKDIR /root/build +COPY darknet.patch . +RUN apt-get -y update && \ + apt-get -y install git build-essential && \ + git clone https://github.com/pjreddie/darknet.git && \ + cd darknet && \ + git checkout $darknet_commit && \ + git apply ../darknet.patch && \ + make + +# Final Image +FROM nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04 + +WORKDIR /root +COPY --from=builder /root/build/darknet/darknet \ + /root/build/darknet/libdarknet.so \ + /root/build/darknet/libdarknet.a \ + /root/build/darknet/include/darknet.h \ + ./staging/ + +RUN mv staging/darknet /usr/local/bin && \ + mv staging/darknet.h /usr/local/include && \ + mv staging/libdarknet.so staging/libdarknet.a /usr/local/lib && \ + rm -rf staging + +RUN go get -u github.com/LdDl/go-darknet \ + && go get -u github.com/disintegration/imaging + +WORKDIR /darknet + +COPY download_data.sh . + +CMD ["/bin/bash"] diff --git a/docker/Makefile.cpu b/docker/Makefile.cpu new file mode 100644 index 0000000..c7bab06 --- /dev/null +++ b/docker/Makefile.cpu @@ -0,0 +1,185 @@ +GPU=0 +CUDNN=0 +CUDNN_HALF=0 +OPENCV=0 +AVX=1 +OPENMP=1 +LIBSO=1 +ZED_CAMERA=0 # ZED SDK 3.0 and above +ZED_CAMERA_v2_8=0 # ZED SDK 2.X + +# set GPU=1 and CUDNN=1 to speedup on GPU +# set CUDNN_HALF=1 to further speedup 3 x times (Mixed-precision on Tensor Cores) GPU: Volta, Xavier, Turing and higher +# set AVX=1 and OPENMP=1 to speedup on CPU (if error occurs then set AVX=0) + +USE_CPP=0 +DEBUG=0 + +ARCH= -gencode arch=compute_30,code=sm_30 \ + -gencode arch=compute_35,code=sm_35 \ + -gencode arch=compute_50,code=[sm_50,compute_50] \ + -gencode arch=compute_52,code=[sm_52,compute_52] \ + -gencode arch=compute_61,code=[sm_61,compute_61] + +OS := $(shell uname) + +# Tesla V100 +# ARCH= -gencode arch=compute_70,code=[sm_70,compute_70] + +# GeForce RTX 2080 Ti, RTX 2080, RTX 2070, Quadro RTX 8000, Quadro RTX 6000, Quadro RTX 5000, Tesla T4, XNOR Tensor Cores +# ARCH= -gencode arch=compute_75,code=[sm_75,compute_75] + +# Jetson XAVIER +# ARCH= -gencode arch=compute_72,code=[sm_72,compute_72] + +# GTX 1080, GTX 1070, GTX 1060, GTX 1050, GTX 1030, Titan Xp, Tesla P40, Tesla P4 +# ARCH= -gencode arch=compute_61,code=sm_61 -gencode arch=compute_61,code=compute_61 + +# GP100/Tesla P100 - DGX-1 +# ARCH= -gencode arch=compute_60,code=sm_60 + +# For Jetson TX1, Tegra X1, DRIVE CX, DRIVE PX - uncomment: +# ARCH= -gencode arch=compute_53,code=[sm_53,compute_53] + +# For Jetson Tx2 or Drive-PX2 uncomment: +# ARCH= -gencode arch=compute_62,code=[sm_62,compute_62] + + +# VPATH=./src/ +VPATH=./src/:./examples +SLIB=libdarknet.so + +EXEC=darknet +OBJDIR=./obj/ + +ifeq ($(LIBSO), 1) +LIBNAMESO=libdarknet.so +APPNAMESO=uselib +endif + +ifeq ($(USE_CPP), 1) +CC=g++ +else +CC=gcc +endif + +CPP=g++ -std=c++11 +NVCC=nvcc +OPTS=-Ofast +LDFLAGS= -lm -pthread +COMMON= -Iinclude/ -I3rdparty/stb/include +CFLAGS=-Wall -Wfatal-errors -Wno-unused-result -Wno-unknown-pragmas -fPIC + +ifeq ($(DEBUG), 1) +#OPTS= -O0 -g +#OPTS= -Og -g +COMMON+= -DDEBUG +CFLAGS+= -DDEBUG +else +ifeq ($(AVX), 1) +CFLAGS+= -ffp-contract=fast -mavx -mavx2 -msse3 -msse4.1 -msse4.2 -msse4a +endif +endif + +CFLAGS+=$(OPTS) + +ifneq (,$(findstring MSYS_NT,$(OS))) +LDFLAGS+=-lws2_32 +endif + +ifeq ($(OPENCV), 1) +COMMON+= -DOPENCV +CFLAGS+= -DOPENCV +LDFLAGS+= `pkg-config --libs opencv4 2> /dev/null || pkg-config --libs opencv` +COMMON+= `pkg-config --cflags opencv4 2> /dev/null || 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 +ifeq ($(OS),Darwin) #MAC +LDFLAGS+= -L/usr/local/cuda/lib -lcuda -lcudart -lcublas -lcurand +else +LDFLAGS+= -L/usr/local/cuda/lib64 -lcuda -lcudart -lcublas -lcurand +endif +endif + +ifeq ($(CUDNN), 1) +COMMON+= -DCUDNN +ifeq ($(OS),Darwin) #MAC +CFLAGS+= -DCUDNN -I/usr/local/cuda/include +LDFLAGS+= -L/usr/local/cuda/lib -lcudnn +else +CFLAGS+= -DCUDNN -I/usr/local/cudnn/include +LDFLAGS+= -L/usr/local/cudnn/lib64 -lcudnn +endif +endif + +ifeq ($(CUDNN_HALF), 1) +COMMON+= -DCUDNN_HALF +CFLAGS+= -DCUDNN_HALF +ARCH+= -gencode arch=compute_70,code=[sm_70,compute_70] +endif + +ifeq ($(ZED_CAMERA), 1) +CFLAGS+= -DZED_STEREO -I/usr/local/zed/include +ifeq ($(ZED_CAMERA_v2_8), 1) +LDFLAGS+= -L/usr/local/zed/lib -lsl_core -lsl_input -lsl_zed +#-lstdc++ -D_GLIBCXX_USE_CXX11_ABI=0 +else +LDFLAGS+= -L/usr/local/zed/lib -lsl_zed +#-lstdc++ -D_GLIBCXX_USE_CXX11_ABI=0 +endif +endif + +OBJ=image_opencv.o http_stream.o gemm.o utils.o dark_cuda.o convolutional_layer.o list.o image.o activations.o im2col.o col2im.o blas.o crop_layer.o dropout_layer.o maxpool_layer.o softmax_layer.o data.o matrix.o network.o connected_layer.o cost_layer.o parser.o option_list.o darknet.o detection_layer.o captcha.o route_layer.o writing.o box.o nightmare.o normalization_layer.o avgpool_layer.o coco.o dice.o yolo.o detector.o layer.o compare.o classifier.o local_layer.o swag.o shortcut_layer.o activation_layer.o rnn_layer.o gru_layer.o rnn.o rnn_vid.o crnn_layer.o demo.o tag.o cifar.o go.o batchnorm_layer.o art.o region_layer.o reorg_layer.o reorg_old_layer.o super.o voxel.o tree.o yolo_layer.o gaussian_yolo_layer.o upsample_layer.o lstm_layer.o conv_lstm_layer.o scale_channels_layer.o sam_layer.o +ifeq ($(GPU), 1) +LDFLAGS+= -lstdc++ +OBJ+=convolutional_kernels.o activation_kernels.o im2col_kernels.o col2im_kernels.o blas_kernels.o crop_layer_kernels.o dropout_layer_kernels.o maxpool_layer_kernels.o network_kernels.o avgpool_layer_kernels.o +endif + +OBJS = $(addprefix $(OBJDIR), $(OBJ)) +DEPS = $(wildcard src/*.h) Makefile include/darknet.h + +all: $(OBJDIR) backup results setchmod $(EXEC) $(LIBNAMESO) $(APPNAMESO) + +ifeq ($(LIBSO), 1) +CFLAGS+= -fPIC + +$(LIBNAMESO): $(OBJDIR) $(OBJS) include/yolo_v2_class.hpp src/yolo_v2_class.cpp + $(CPP) -shared -std=c++11 -fvisibility=hidden -DLIB_EXPORTS $(COMMON) $(CFLAGS) $(OBJS) src/yolo_v2_class.cpp -o $@ $(LDFLAGS) + +$(APPNAMESO): $(LIBNAMESO) include/yolo_v2_class.hpp src/yolo_console_dll.cpp + $(CPP) -std=c++11 $(COMMON) $(CFLAGS) -o $@ src/yolo_console_dll.cpp $(LDFLAGS) -L ./ -l:$(LIBNAMESO) +endif + +$(EXEC): $(OBJS) + $(CPP) -std=c++11 $(COMMON) $(CFLAGS) $^ -o $@ $(LDFLAGS) + +$(OBJDIR)%.o: %.c $(DEPS) + $(CC) $(COMMON) $(CFLAGS) -c $< -o $@ + +$(OBJDIR)%.o: %.cpp $(DEPS) + $(CPP) -std=c++11 $(COMMON) $(CFLAGS) -c $< -o $@ + +$(OBJDIR)%.o: %.cu $(DEPS) + $(NVCC) $(ARCH) $(COMMON) --compiler-options "$(CFLAGS)" -c $< -o $@ + +$(OBJDIR): + mkdir -p $(OBJDIR) +backup: + mkdir -p backup +results: + mkdir -p results +setchmod: + chmod +x *.sh + +.PHONY: clean + +clean: + rm -rf $(OBJS) $(EXEC) $(LIBNAMESO) $(APPNAMESO) diff --git a/docker/Makefile.gpu b/docker/Makefile.gpu new file mode 100644 index 0000000..725eb34 --- /dev/null +++ b/docker/Makefile.gpu @@ -0,0 +1,186 @@ + +GPU=1 +CUDNN=1 +CUDNN_HALF=0 +OPENCV=0 +AVX=0 +OPENMP=0 +LIBSO=1 +ZED_CAMERA=0 # ZED SDK 3.0 and above +ZED_CAMERA_v2_8=0 # ZED SDK 2.X + +# set GPU=1 and CUDNN=1 to speedup on GPU +# set CUDNN_HALF=1 to further speedup 3 x times (Mixed-precision on Tensor Cores) GPU: Volta, Xavier, Turing and higher +# set AVX=1 and OPENMP=1 to speedup on CPU (if error occurs then set AVX=0) + +USE_CPP=0 +DEBUG=0 + +ARCH= -gencode arch=compute_30,code=sm_30 \ + -gencode arch=compute_35,code=sm_35 \ + -gencode arch=compute_50,code=[sm_50,compute_50] \ + -gencode arch=compute_52,code=[sm_52,compute_52] \ + -gencode arch=compute_61,code=[sm_61,compute_61] + +OS := $(shell uname) + +# Tesla V100 +# ARCH= -gencode arch=compute_70,code=[sm_70,compute_70] + +# GeForce RTX 2080 Ti, RTX 2080, RTX 2070, Quadro RTX 8000, Quadro RTX 6000, Quadro RTX 5000, Tesla T4, XNOR Tensor Cores +# ARCH= -gencode arch=compute_75,code=[sm_75,compute_75] + +# Jetson XAVIER +# ARCH= -gencode arch=compute_72,code=[sm_72,compute_72] + +# GTX 1080, GTX 1070, GTX 1060, GTX 1050, GTX 1030, Titan Xp, Tesla P40, Tesla P4 +# ARCH= -gencode arch=compute_61,code=sm_61 -gencode arch=compute_61,code=compute_61 + +# GP100/Tesla P100 - DGX-1 +# ARCH= -gencode arch=compute_60,code=sm_60 + +# For Jetson TX1, Tegra X1, DRIVE CX, DRIVE PX - uncomment: +# ARCH= -gencode arch=compute_53,code=[sm_53,compute_53] + +# For Jetson Tx2 or Drive-PX2 uncomment: +# ARCH= -gencode arch=compute_62,code=[sm_62,compute_62] + + +# VPATH=./src/ +VPATH=./src/:./examples +SLIB=libdarknet.so + +EXEC=darknet +OBJDIR=./obj/ + +ifeq ($(LIBSO), 1) +LIBNAMESO=libdarknet.so +APPNAMESO=uselib +endif + +ifeq ($(USE_CPP), 1) +CC=g++ +else +CC=gcc +endif + +CPP=g++ -std=c++11 +NVCC=nvcc +OPTS=-Ofast +LDFLAGS= -lm -pthread +COMMON= -Iinclude/ -I3rdparty/stb/include +CFLAGS=-Wall -Wfatal-errors -Wno-unused-result -Wno-unknown-pragmas -fPIC + +ifeq ($(DEBUG), 1) +#OPTS= -O0 -g +#OPTS= -Og -g +COMMON+= -DDEBUG +CFLAGS+= -DDEBUG +else +ifeq ($(AVX), 1) +CFLAGS+= -ffp-contract=fast -mavx -mavx2 -msse3 -msse4.1 -msse4.2 -msse4a +endif +endif + +CFLAGS+=$(OPTS) + +ifneq (,$(findstring MSYS_NT,$(OS))) +LDFLAGS+=-lws2_32 +endif + +ifeq ($(OPENCV), 1) +COMMON+= -DOPENCV +CFLAGS+= -DOPENCV +LDFLAGS+= `pkg-config --libs opencv4 2> /dev/null || pkg-config --libs opencv` +COMMON+= `pkg-config --cflags opencv4 2> /dev/null || 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 +ifeq ($(OS),Darwin) #MAC +LDFLAGS+= -L/usr/local/cuda/lib -lcuda -lcudart -lcublas -lcurand +else +LDFLAGS+= -L/usr/local/cuda/lib64 -lcuda -lcudart -lcublas -lcurand +endif +endif + +ifeq ($(CUDNN), 1) +COMMON+= -DCUDNN +ifeq ($(OS),Darwin) #MAC +CFLAGS+= -DCUDNN -I/usr/local/cuda/include +LDFLAGS+= -L/usr/local/cuda/lib -lcudnn +else +CFLAGS+= -DCUDNN -I/usr/local/cudnn/include +LDFLAGS+= -L/usr/local/cudnn/lib64 -lcudnn +endif +endif + +ifeq ($(CUDNN_HALF), 1) +COMMON+= -DCUDNN_HALF +CFLAGS+= -DCUDNN_HALF +ARCH+= -gencode arch=compute_70,code=[sm_70,compute_70] +endif + +ifeq ($(ZED_CAMERA), 1) +CFLAGS+= -DZED_STEREO -I/usr/local/zed/include +ifeq ($(ZED_CAMERA_v2_8), 1) +LDFLAGS+= -L/usr/local/zed/lib -lsl_core -lsl_input -lsl_zed +#-lstdc++ -D_GLIBCXX_USE_CXX11_ABI=0 +else +LDFLAGS+= -L/usr/local/zed/lib -lsl_zed +#-lstdc++ -D_GLIBCXX_USE_CXX11_ABI=0 +endif +endif + +OBJ=image_opencv.o http_stream.o gemm.o utils.o dark_cuda.o convolutional_layer.o list.o image.o activations.o im2col.o col2im.o blas.o crop_layer.o dropout_layer.o maxpool_layer.o softmax_layer.o data.o matrix.o network.o connected_layer.o cost_layer.o parser.o option_list.o darknet.o detection_layer.o captcha.o route_layer.o writing.o box.o nightmare.o normalization_layer.o avgpool_layer.o coco.o dice.o yolo.o detector.o layer.o compare.o classifier.o local_layer.o swag.o shortcut_layer.o activation_layer.o rnn_layer.o gru_layer.o rnn.o rnn_vid.o crnn_layer.o demo.o tag.o cifar.o go.o batchnorm_layer.o art.o region_layer.o reorg_layer.o reorg_old_layer.o super.o voxel.o tree.o yolo_layer.o gaussian_yolo_layer.o upsample_layer.o lstm_layer.o conv_lstm_layer.o scale_channels_layer.o sam_layer.o +ifeq ($(GPU), 1) +LDFLAGS+= -lstdc++ +OBJ+=convolutional_kernels.o activation_kernels.o im2col_kernels.o col2im_kernels.o blas_kernels.o crop_layer_kernels.o dropout_layer_kernels.o maxpool_layer_kernels.o network_kernels.o avgpool_layer_kernels.o +endif + +OBJS = $(addprefix $(OBJDIR), $(OBJ)) +DEPS = $(wildcard src/*.h) Makefile include/darknet.h + +all: $(OBJDIR) backup results setchmod $(EXEC) $(LIBNAMESO) $(APPNAMESO) + +ifeq ($(LIBSO), 1) +CFLAGS+= -fPIC + +$(LIBNAMESO): $(OBJDIR) $(OBJS) include/yolo_v2_class.hpp src/yolo_v2_class.cpp + $(CPP) -shared -std=c++11 -fvisibility=hidden -DLIB_EXPORTS $(COMMON) $(CFLAGS) $(OBJS) src/yolo_v2_class.cpp -o $@ $(LDFLAGS) + +$(APPNAMESO): $(LIBNAMESO) include/yolo_v2_class.hpp src/yolo_console_dll.cpp + $(CPP) -std=c++11 $(COMMON) $(CFLAGS) -o $@ src/yolo_console_dll.cpp $(LDFLAGS) -L ./ -l:$(LIBNAMESO) +endif + +$(EXEC): $(OBJS) + $(CPP) -std=c++11 $(COMMON) $(CFLAGS) $^ -o $@ $(LDFLAGS) + +$(OBJDIR)%.o: %.c $(DEPS) + $(CC) $(COMMON) $(CFLAGS) -c $< -o $@ + +$(OBJDIR)%.o: %.cpp $(DEPS) + $(CPP) -std=c++11 $(COMMON) $(CFLAGS) -c $< -o $@ + +$(OBJDIR)%.o: %.cu $(DEPS) + $(NVCC) $(ARCH) $(COMMON) --compiler-options "$(CFLAGS)" -c $< -o $@ + +$(OBJDIR): + mkdir -p $(OBJDIR) +backup: + mkdir -p backup +results: + mkdir -p results +setchmod: + chmod +x *.sh + +.PHONY: clean + +clean: + rm -rf $(OBJS) $(EXEC) $(LIBNAMESO) $(APPNAMESO) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 0000000..0696a48 --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,32 @@ +--- +version: '3.7' +services: + + sidekiq: &darknet_base + container_name: ${NAMESPACE}-sidekiq + build: + context: . + dockerfile: Dockerfile + image: go-darknet:latest + working_dir: /darknet + volumes: + - darknet-data:/darknet/models + command: /darknet/download_data.sh + + darknet: + <<: *darknet_base + container_name: ${NAMESPACE}-api + ports: + - "9003:9003" + restart: unless-stopped + depends_on: + - sidekiq + command: ["/bin/bash"] + # command: ["darknet-server"] + +volumes: + darknet-data: + driver_opts: + type: none + o: bind + device: ${PWD}/models diff --git a/docker/download_data.sh b/docker/download_data.sh new file mode 100755 index 0000000..38c2078 --- /dev/null +++ b/docker/download_data.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# set -x +# set -e + +wget -nc --output-document=sample.jpg https://cdn-images-1.medium.com/max/800/1*EYFejGUjvjPcc4PZTwoufw.jpeg +wget -nc --output-document=./models/coco.names https://raw.githubusercontent.com/AlexeyAB/darknet/master/data/coco.names +wget -nc --output-document=./models/yolov3.cfg https://raw.githubusercontent.com/AlexeyAB/darknet/master/cfg/yolov3.cfg +sed -i -e "\$anames = coco.names" ./models/yolov3.cfg +wget -nc --output-document=./models/yolov3.weights https://pjreddie.com/media/files/yolov3.weights diff --git a/docker/models/.gitignore b/docker/models/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/docker/models/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore From 766ff56e2ec0e3d317b4036dc2d561d19212c2a5 Mon Sep 17 00:00:00 2001 From: lucmichalski Date: Wed, 8 Apr 2020 08:02:03 +0000 Subject: [PATCH 3/5] fix dockerfile.gpu --- docker/Dockerfile.gpu | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.gpu b/docker/Dockerfile.gpu index 5a87b1a..a90fc54 100644 --- a/docker/Dockerfile.gpu +++ b/docker/Dockerfile.gpu @@ -1,16 +1,16 @@ # Build phase -FROM nvidia/cuda:9.0-cudnn7-devel-ubuntu16.04 as builder +FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu18.04 as builder ENV darknet_commit=680d3bd WORKDIR /root/build -COPY darknet.patch . +COPY Makefile.gpu . RUN apt-get -y update && \ apt-get -y install git build-essential && \ git clone https://github.com/pjreddie/darknet.git && \ cd darknet && \ git checkout $darknet_commit && \ - git apply ../darknet.patch && \ + cp -f /root/build/Makefile.gpu Makefile && \ make # Final Image From 4b3808891631d2e62d8f7801ff265dbef12a31d0 Mon Sep 17 00:00:00 2001 From: lucmichalski Date: Wed, 8 Apr 2020 08:16:20 +0000 Subject: [PATCH 4/5] fix commit, add golang to dockerfile.gpu --- docker/Dockerfile.gpu | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile.gpu b/docker/Dockerfile.gpu index a90fc54..0533965 100644 --- a/docker/Dockerfile.gpu +++ b/docker/Dockerfile.gpu @@ -1,33 +1,44 @@ # Build phase FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu18.04 as builder -ENV darknet_commit=680d3bd +ENV darknet_commit=a234a5022333c930de08f2470184ef4e0c68356e WORKDIR /root/build COPY Makefile.gpu . RUN apt-get -y update && \ apt-get -y install git build-essential && \ - git clone https://github.com/pjreddie/darknet.git && \ + git clone https://github.com/AlexeyAB/darknet.git && \ cd darknet && \ git checkout $darknet_commit && \ cp -f /root/build/Makefile.gpu Makefile && \ make # Final Image -FROM nvidia/cuda:9.0-cudnn7-runtime-ubuntu16.04 +FROM nvidia/cuda:10.0-cudnn7-runtime-ubuntu18.04 WORKDIR /root COPY --from=builder /root/build/darknet/darknet \ /root/build/darknet/libdarknet.so \ - /root/build/darknet/libdarknet.a \ /root/build/darknet/include/darknet.h \ ./staging/ RUN mv staging/darknet /usr/local/bin && \ - mv staging/darknet.h /usr/local/include && \ - mv staging/libdarknet.so staging/libdarknet.a /usr/local/lib && \ + mv staging/darknet.h /usr/include && \ + mv staging/libdarknet.so /usr/lib && \ rm -rf staging +WORKDIR /tmp +RUN cd /tmp \ + && apt-get -y update \ + && apt-get install -y wget git gcc \ + && wget https://dl.google.com/go/go1.14.linux-amd64.tar.gz \ + && tar -xvf go1.14.linux-amd64.tar.gz \ + && mv go /usr/local + +ENV GOROOT=/usr/local/go +ENV GOPATH=/go +ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH + RUN go get -u github.com/LdDl/go-darknet \ && go get -u github.com/disintegration/imaging From d9682ca0f6af377da7cbe7f0451774c9a951f2b7 Mon Sep 17 00:00:00 2001 From: lucmichalski Date: Fri, 10 Apr 2020 04:58:21 +0000 Subject: [PATCH 5/5] fix libcuda.so.1 missing --- docker/Dockerfile.gpu | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile.gpu b/docker/Dockerfile.gpu index 0533965..d71cb2b 100644 --- a/docker/Dockerfile.gpu +++ b/docker/Dockerfile.gpu @@ -35,9 +35,12 @@ RUN cd /tmp \ && tar -xvf go1.14.linux-amd64.tar.gz \ && mv go /usr/local +RUN cp /usr/local/cuda-10.0/compat/* /usr/local/cuda-10.0/targets/x86_64-linux/lib/ + ENV GOROOT=/usr/local/go ENV GOPATH=/go ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH +ENV LIBRARY_PATH=$LIBRARY_PATH:/usr/local/cuda-10.0/compat/ RUN go get -u github.com/LdDl/go-darknet \ && go get -u github.com/disintegration/imaging