Another big update

gpu/CMakeLists.txt

@@ -0,0 +1,67 @@
+cmake_minimum_required(VERSION 2.6)
+project(randomselection)
+set(PROJECT_NAME randomselection)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+set(CMAKE_CXX_COMPILER ${CUDA_NVCC_EXECUTABLE})
+#set(CMAKE_CXX_LINK_FLAGS "")
+#set(CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG "")
+set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
+set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "")
+set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "")
+
+#find_package(OpenCV REQUIRED)
+find_package(OpenCVlibstdcxx REQUIRED)
+find_package(CUDA REQUIRED)
+find_package(Thrust REQUIRED)
+
+find_package(PythonLibs REQUIRED)
+find_package(NumPy REQUIRED)
+
+# Boost
+set(Boost_USE_STATIC_LIBS   ON)
+set(Boost_USE_MULTITHREADED ON)
+find_package(Boost COMPONENTS python REQUIRED)
+
+set(CUDA_LIBRARIES "")
+
+list(APPEND CUDA_NVCC_FLAGS -ccbin clang)
+list(APPEND CUDA_NVCC_FLAGS -Xcompiler -arch)
+list(APPEND CUDA_NVCC_FLAGS -Xcompiler x86_64)
+list(APPEND CUDA_NVCC_FLAGS -Xcompiler -fPIC)
+list(APPEND CUDA_NVCC_FLAGS -Xcompiler -dynamiclib)
+list(APPEND CUDA_NVCC_FLAGS -Xcompiler -install_name)
+list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_20,code=sm_20)
+list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_30,code=sm_30)
+list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_35,code=sm_35)
+list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_37,code=sm_37)
+list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_50,code=sm_50)
+list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_50,code=compute_50)
+
+#set(CMAKE_CXX_FLAGS "-std=c++11 -O3")
+#set(CMAKE_CXX_FLAGS "-ferror-limit=20")
+
+include_directories(
+	include
+	${PYTHON_INCLUDE_DIRS}
+	${NUMPY_INCLUDE_DIRS}
+	${CUDA_INCLUDE_DIRS}
+	${THRUST_INCLUDE_DIRS}
+)
+
+cuda_compile(SEGMENTATION_O segmentationTree.cu)
+cuda_add_library(segmentation ${SEGMENTATION_O})
+target_link_libraries(segmentation ${OPENCV_LIBSTDCXX_LIBRARIES})
+
+#cuda_add_executable(segment_test ${SEGMENTATION_O})
+#target_link_libraries(segment_test ${OPENCV_LIBSTDCXX_LIBRARIES})
+
+cuda_add_library(gpu_segmentation SHARED main.cpp conversion.cpp)
+set_target_properties(gpu_segmentation PROPERTIES PREFIX "")
+target_link_libraries(gpu_segmentation
+	segmentation
+	${Boost_LIBRARIES}
+	${OpenCV_LIBRARIES}
+	${PYTHON_LIBRARIES}
+)

gpu/Makefile

@@ -0,0 +1,212 @@
+################################################################################
+#
+# Copyright 1993-2013 NVIDIA Corporation.  All rights reserved.
+#
+# NOTICE TO USER:
+#
+# This source code is subject to NVIDIA ownership rights under U.S. and
+# international Copyright laws.
+#
+# NVIDIA MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE
+# CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR
+# IMPLIED WARRANTY OF ANY KIND.  NVIDIA DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.
+# IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL,
+# OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+# OR PERFORMANCE OF THIS SOURCE CODE.
+#
+# U.S. Government End Users.  This source code is a "commercial item" as
+# that term is defined at 48 C.F.R. 2.101 (OCT 1995), consisting  of
+# "commercial computer software" and "commercial computer software
+# documentation" as such terms are used in 48 C.F.R. 12.212 (SEPT 1995)
+# and is provided to the U.S. Government only as a commercial end item.
+# Consistent with 48 C.F.R.12.212 and 48 C.F.R. 227.7202-1 through
+# 227.7202-4 (JUNE 1995), all U.S. Government End Users acquire the
+# source code with only those rights set forth herein.
+#
+################################################################################
+#
+# Makefile project only supported on Mac OS X and Linux Platforms)
+#
+################################################################################
+
+# Location of the CUDA Toolkit
+CUDA_PATH       ?= /Developer/NVIDIA/CUDA-6.5
+
+OSUPPER = $(shell uname -s 2>/dev/null | tr "[:lower:]" "[:upper:]")
+OSLOWER = $(shell uname -s 2>/dev/null | tr "[:upper:]" "[:lower:]")
+
+OS_SIZE    = $(shell uname -m | sed -e "s/x86_64/64/" -e "s/armv7l/32/" -e "s/aarch64/64/")
+OS_ARCH    = $(shell uname -m)
+ARCH_FLAGS =
+
+DARWIN = $(strip $(findstring DARWIN, $(OSUPPER)))
+ifneq ($(DARWIN),)
+	XCODE_GE_5 = $(shell expr `xcodebuild -version | grep -i xcode | awk '{print $$2}' | cut -d'.' -f1` \>= 5)
+endif
+
+# Take command line flags that override any of these settings
+ifeq ($(x86_64),1)
+	OS_SIZE = 64
+	OS_ARCH = x86_64
+endif
+ifeq ($(ARMv7),1)
+	OS_SIZE    = 32
+	OS_ARCH    = armv7l
+	ARCH_FLAGS = -target-cpu-arch ARM
+endif
+ifeq ($(aarch64),1)
+	OS_SIZE    = 64
+	OS_ARCH    = aarch64
+	ARCH_FLAGS = -target-cpu-arch ARM
+endif
+
+# Common binaries
+ifneq ($(DARWIN),)
+ifeq ($(XCODE_GE_5),1)
+  GCC ?= clang
+else
+  GCC ?= g++
+endif
+else
+ifeq ($(ARMv7),1)
+  GCC ?= arm-linux-gnueabihf-g++
+else
+  GCC ?= g++
+endif
+endif
+NVCC := $(CUDA_PATH)/bin/nvcc -ccbin $(GCC)
+
+# internal flags
+NVCCFLAGS   := -m${OS_SIZE} ${ARCH_FLAGS}
+CCFLAGS     :=
+LDFLAGS     := 
+
+# Extra user flags
+EXTRA_NVCCFLAGS   ?=
+EXTRA_LDFLAGS     ?=
+EXTRA_CCFLAGS     ?=
+
+# OS-specific build flags
+ifneq ($(DARWIN),)
+  LDFLAGS += -rpath $(CUDA_PATH)/lib
+  CCFLAGS += -arch $(OS_ARCH)
+else
+  ifeq ($(OS_ARCH),armv7l)
+    ifeq ($(abi),androideabi)
+      NVCCFLAGS += -target-os-variant Android
+    else
+      ifeq ($(abi),gnueabi)
+        CCFLAGS += -mfloat-abi=softfp
+      else
+        # default to gnueabihf
+        override abi := gnueabihf
+        LDFLAGS += --dynamic-linker=/lib/ld-linux-armhf.so.3
+        CCFLAGS += -mfloat-abi=hard
+      endif
+    endif
+  endif
+endif
+
+ifeq ($(ARMv7),1)
+ifneq ($(TARGET_FS),)
+GCCVERSIONLTEQ46 := $(shell expr `$(GCC) -dumpversion` \<= 4.6)
+ifeq ($(GCCVERSIONLTEQ46),1)
+CCFLAGS += --sysroot=$(TARGET_FS)
+endif
+LDFLAGS += --sysroot=$(TARGET_FS)
+LDFLAGS += -rpath-link=$(TARGET_FS)/lib
+LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib
+LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib/arm-linux-$(abi)
+endif
+endif
+
+# Debug build flags
+ifeq ($(dbg),1)
+      NVCCFLAGS += -g -G
+      TARGET := debug
+else
+      TARGET := release
+endif
+
+ALL_CCFLAGS := 
+ALL_CCFLAGS += $(NVCCFLAGS)
+ALL_CCFLAGS += $(EXTRA_NVCCFLAGS)
+ALL_CCFLAGS += $(addprefix -Xcompiler ,$(CCFLAGS))
+ALL_CCFLAGS += $(addprefix -Xcompiler ,$(EXTRA_CCFLAGS))
+ALL_CCFLAGS += 
+
+ALL_LDFLAGS :=
+ALL_LDFLAGS += $(ALL_CCFLAGS)
+ALL_LDFLAGS += $(addprefix -Xlinker ,$(LDFLAGS))
+ALL_LDFLAGS += $(addprefix -Xlinker ,$(EXTRA_LDFLAGS))
+ALL_LDFLAGS += `pkg-config --libs opencv-libstdcxx`
+
+# Common includes and paths for CUDA
+INCLUDES  := -I../../common/inc
+LIBRARIES := 
+
+################################################################################
+
+SAMPLE_ENABLED := 1
+
+# Gencode arguments
+ifeq ($(OS_ARCH),armv7l)
+SMS ?= 20 30 32 35 37 50
+else
+SMS ?= 13 20 30 35 37 50
+endif
+
+ifeq ($(SMS),)
+$(info >>> WARNING - no SM architectures have been specified - waiving sample <<<)
+SAMPLE_ENABLED := 0
+endif
+
+ifeq ($(GENCODE_FLAGS),)
+# Generate SASS code for each SM architecture listed in $(SMS)
+$(foreach sm,$(SMS),$(eval GENCODE_FLAGS += -gencode arch=compute_$(sm),code=sm_$(sm)))
+
+# Generate PTX code from the highest SM architecture in $(SMS) to guarantee forward-compatibility
+HIGHEST_SM := $(lastword $(sort $(SMS)))
+ifneq ($(HIGHEST_SM),)
+GENCODE_FLAGS += -gencode arch=compute_$(HIGHEST_SM),code=compute_$(HIGHEST_SM)
+endif
+endif
+
+ifeq ($(SAMPLE_ENABLED),0)
+EXEC ?= @echo "[@]"
+endif
+
+################################################################################
+
+# Target rules
+all: build
+
+build: segmentationTreeThrust
+
+check.deps:
+ifeq ($(SAMPLE_ENABLED),0)
+	@echo "Sample will be waived due to the above missing dependencies"
+else
+	@echo "Sample is ready - all dependencies have been met"
+endif
+
+segmentationTree.o:segmentationTree.cu
+	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
+
+segmentationTreeThrust: segmentationTree.o
+	$(EXEC) $(NVCC) $(ALL_LDFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBRARIES)
+	$(EXEC) mkdir -p ../../bin/$(OS_ARCH)/$(OSLOWER)/$(TARGET)$(if $(abi),/$(abi))
+	$(EXEC) cp $@ ../../bin/$(OS_ARCH)/$(OSLOWER)/$(TARGET)$(if $(abi),/$(abi))
+
+run: build
+	$(EXEC) ./segmentationTreeThrust
+
+clean:
+	rm -f segmentationTreeThrust segmentationTree.o
+	rm -rf ../../bin/$(OS_ARCH)/$(OSLOWER)/$(TARGET)$(if $(abi),/$(abi))/segmentationTreeThrust
+
+clobber: clean