From 85e07b6d1be6565d401ee0a1fb81829411b2c1fe Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 28 Aug 2023 13:58:19 +0200 Subject: [PATCH] restore original Makefile --- Makefile | 111 +++++++++++++++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/Makefile b/Makefile index 5a87ad64679..6c93282f274 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,8 @@ USE_CPP=0 DEBUG=0 ARCH= -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] + -gencode arch=compute_52,code=[sm_52,compute_52] \ + -gencode arch=compute_61,code=[sm_61,compute_61] OS := $(shell uname) @@ -79,14 +79,14 @@ EXEC=darknet OBJDIR=./obj/ ifeq ($(LIBSO), 1) - LIBNAMESO=libdarknet.so - APPNAMESO=uselib +LIBNAMESO=libdarknet.so +APPNAMESO=uselib endif ifeq ($(USE_CPP), 1) - CC=g++ +CC=g++ else - CC=gcc +CC=gcc endif CPP=g++ -std=c++11 @@ -97,81 +97,80 @@ COMMON= -Iinclude/ -I3rdparty/stb/include CFLAGS=-Wall -Wfatal-errors -Wno-unused-result -Wno-unknown-pragmas -fPIC -rdynamic ifeq ($(DEBUG), 1) - #OPTS= -O0 -g - #OPTS= -Og -g - COMMON+= -DDEBUG - CFLAGS+= -DDEBUG +#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 +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 +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` +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) - ifeq ($(OS),Darwin) #MAC - CFLAGS+= -Xpreprocessor -fopenmp + ifeq ($(OS),Darwin) #MAC + CFLAGS+= -Xpreprocessor -fopenmp else CFLAGS+= -fopenmp endif - LDFLAGS+= -lgomp +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 +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 +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] +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 +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 representation_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 jWrite.o sam_layer.o - +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 representation_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 jWrite.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 +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)) @@ -180,13 +179,13 @@ DEPS = $(wildcard src/*.h) Makefile include/darknet.h all: $(OBJDIR) backup results setchmod $(EXEC) $(LIBNAMESO) $(APPNAMESO) ifeq ($(LIBSO), 1) - CFLAGS+= -fPIC +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) +$(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) +$(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)