Upgrade dependencies
This commit is contained in:
		
							
								
								
									
										31
									
								
								vendor/gocv.io/x/gocv/Makefile
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										31
									
								
								vendor/gocv.io/x/gocv/Makefile
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -2,10 +2,10 @@
 | 
			
		||||
.PHONY: test deps download build clean astyle cmds docker
 | 
			
		||||
 | 
			
		||||
# OpenCV version to use.
 | 
			
		||||
OPENCV_VERSION?=4.4.0
 | 
			
		||||
OPENCV_VERSION?=4.5.1
 | 
			
		||||
 | 
			
		||||
# Go version to use when building Docker image
 | 
			
		||||
GOVERSION?=1.14.4
 | 
			
		||||
GOVERSION?=1.15.3
 | 
			
		||||
 | 
			
		||||
# Temporary directory to put files into.
 | 
			
		||||
TMP_DIR?=/tmp/
 | 
			
		||||
@@ -14,7 +14,7 @@ TMP_DIR?=/tmp/
 | 
			
		||||
BUILD_SHARED_LIBS?=ON
 | 
			
		||||
 | 
			
		||||
# Package list for each well-known Linux distribution
 | 
			
		||||
RPMS=cmake curl wget git gtk2-devel libpng-devel libjpeg-devel libtiff-devel tbb tbb-devel libdc1394-devel unzip
 | 
			
		||||
RPMS=cmake curl wget git gtk2-devel libpng-devel libjpeg-devel libtiff-devel tbb tbb-devel libdc1394-devel unzip gcc-c++
 | 
			
		||||
DEBS=unzip wget build-essential cmake curl git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev
 | 
			
		||||
 | 
			
		||||
explain:
 | 
			
		||||
@@ -60,14 +60,15 @@ download:
 | 
			
		||||
	rm opencv.zip opencv_contrib.zip
 | 
			
		||||
	cd -
 | 
			
		||||
 | 
			
		||||
# Download dldt source tarballs.
 | 
			
		||||
download_dldt:
 | 
			
		||||
# Download openvino source tarballs.
 | 
			
		||||
download_openvino:
 | 
			
		||||
	sudo rm -rf /usr/local/dldt/
 | 
			
		||||
	sudo git clone https://github.com/opencv/dldt -b 2019 /usr/local/dldt/
 | 
			
		||||
	sudo rm -rf /usr/local/openvino/
 | 
			
		||||
	sudo git clone https://github.com/openvinotoolkit/openvino -b 2019_R3.1 /usr/local/openvino/
 | 
			
		||||
 | 
			
		||||
# Build dldt.
 | 
			
		||||
build_dldt:
 | 
			
		||||
	cd /usr/local/dldt/inference-engine
 | 
			
		||||
# Build openvino.
 | 
			
		||||
build_openvino_package:
 | 
			
		||||
	cd /usr/local/openvino/inference-engine
 | 
			
		||||
	sudo git submodule init
 | 
			
		||||
	sudo git submodule update --recursive
 | 
			
		||||
	sudo ./install_dependencies.sh
 | 
			
		||||
@@ -184,10 +185,10 @@ install_raspi_zero: deps download build_raspi_zero sudo_install clean verify
 | 
			
		||||
install_cuda: deps download sudo_pre_install_clean build_cuda sudo_install clean verify verify_cuda
 | 
			
		||||
 | 
			
		||||
# Do everything with openvino.
 | 
			
		||||
install_openvino: deps download download_dldt sudo_pre_install_clean build_dldt sudo_install_dldt build_openvino sudo_install clean verify_openvino
 | 
			
		||||
install_openvino: deps download download_openvino sudo_pre_install_clean build_openvino_package sudo_install_openvino build_openvino sudo_install clean verify_openvino
 | 
			
		||||
 | 
			
		||||
# Do everything with openvino and cuda.
 | 
			
		||||
install_all: deps download download_dldt sudo_pre_install_clean build_dldt sudo_install_dldt build_all sudo_install clean verify_openvino verify_cuda
 | 
			
		||||
install_all: deps download download_openvino sudo_pre_install_clean build_openvino_package sudo_install_openvino build_all sudo_install clean verify_openvino verify_cuda
 | 
			
		||||
 | 
			
		||||
# Install system wide.
 | 
			
		||||
sudo_install:
 | 
			
		||||
@@ -197,8 +198,8 @@ sudo_install:
 | 
			
		||||
	cd -
 | 
			
		||||
 | 
			
		||||
# Install system wide.
 | 
			
		||||
sudo_install_dldt:
 | 
			
		||||
	cd /usr/local/dldt/inference-engine/build
 | 
			
		||||
sudo_install_openvino:
 | 
			
		||||
	cd /usr/local/openvino/inference-engine/build
 | 
			
		||||
	sudo $(MAKE) install
 | 
			
		||||
	sudo ldconfig
 | 
			
		||||
	cd -
 | 
			
		||||
@@ -219,7 +220,7 @@ verify_openvino:
 | 
			
		||||
# This assumes env.sh was already sourced.
 | 
			
		||||
# pvt is not tested here since it requires additional depenedences.
 | 
			
		||||
test:
 | 
			
		||||
	go test . ./contrib
 | 
			
		||||
	go test -tags matprofile . ./contrib
 | 
			
		||||
 | 
			
		||||
docker:
 | 
			
		||||
	docker build --build-arg OPENCV_VERSION=$(OPENCV_VERSION) --build-arg GOVERSION=$(GOVERSION) .
 | 
			
		||||
@@ -227,7 +228,7 @@ docker:
 | 
			
		||||
astyle:
 | 
			
		||||
	astyle --project=.astylerc --recursive *.cpp,*.h
 | 
			
		||||
 | 
			
		||||
CMDS=basic-drawing caffe-classifier captest capwindow counter faceblur facedetect find-circles hand-gestures img-similarity mjpeg-streamer motion-detect pose saveimage savevideo showimage ssd-facedetect tf-classifier tracking version
 | 
			
		||||
CMDS=basic-drawing caffe-classifier captest capwindow counter faceblur facedetect find-circles hand-gestures hello-sift img-similarity mjpeg-streamer motion-detect pose saveimage savevideo showimage ssd-facedetect tf-classifier tracking version
 | 
			
		||||
cmds:
 | 
			
		||||
	for cmd in $(CMDS) ; do \
 | 
			
		||||
		go build -o build/$$cmd cmd/$$cmd/main.go ;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user