From 7b0068a433a78f98041354ca9feae2aa0b19ff3a Mon Sep 17 00:00:00 2001 From: Rob Armstrong Date: Mon, 16 Dec 2024 15:11:32 -0800 Subject: [PATCH] Update simpleVulkanMMAP, smokeParticles --- Samples/5_Domain_Specific/CMakeLists.txt | 4 +- .../simpleVulkanMMAP/CMakeLists.txt | 46 ++ .../simpleVulkanMMAP/Makefile | 488 ------------------ .../simpleVulkanMMAP/NsightEclipse.xml | 117 ----- .../simpleVulkanMMAP/findvulkan.mk | 152 ------ .../smokeParticles/CMakeLists.txt | 47 ++ .../5_Domain_Specific/smokeParticles/Makefile | 427 --------------- .../smokeParticles/NsightEclipse.xml | 107 ---- .../smokeParticles/ParticleSystem_cuda.cu | 182 +++---- .../smokeParticles/findgllib.mk | 136 ----- .../particles_kernel_device.cuh | 38 +- 11 files changed, 213 insertions(+), 1531 deletions(-) create mode 100644 Samples/5_Domain_Specific/simpleVulkanMMAP/CMakeLists.txt delete mode 100644 Samples/5_Domain_Specific/simpleVulkanMMAP/Makefile delete mode 100644 Samples/5_Domain_Specific/simpleVulkanMMAP/NsightEclipse.xml delete mode 100644 Samples/5_Domain_Specific/simpleVulkanMMAP/findvulkan.mk create mode 100644 Samples/5_Domain_Specific/smokeParticles/CMakeLists.txt delete mode 100644 Samples/5_Domain_Specific/smokeParticles/Makefile delete mode 100644 Samples/5_Domain_Specific/smokeParticles/NsightEclipse.xml delete mode 100644 Samples/5_Domain_Specific/smokeParticles/findgllib.mk diff --git a/Samples/5_Domain_Specific/CMakeLists.txt b/Samples/5_Domain_Specific/CMakeLists.txt index ed6b9063..c15717f4 100644 --- a/Samples/5_Domain_Specific/CMakeLists.txt +++ b/Samples/5_Domain_Specific/CMakeLists.txt @@ -36,8 +36,8 @@ add_subdirectory(simpleGL) #add_subdirectory(simpleGLES_EGLOutput) #add_subdirectory(simpleGLES_screen) add_subdirectory(simpleVulkan) -#add_subdirectory(simpleVulkanMMAP) -#add_subdirectory(smokeParticles) +add_subdirectory(simpleVulkanMMAP) +add_subdirectory(smokeParticles) #add_subdirectory(stereoDisparity) #add_subdirectory(volumeFiltering) #add_subdirectory(volumeRender) diff --git a/Samples/5_Domain_Specific/simpleVulkanMMAP/CMakeLists.txt b/Samples/5_Domain_Specific/simpleVulkanMMAP/CMakeLists.txt new file mode 100644 index 00000000..231b319d --- /dev/null +++ b/Samples/5_Domain_Specific/simpleVulkanMMAP/CMakeLists.txt @@ -0,0 +1,46 @@ +# Include directories and libraries +include_directories(../../../Common) + +find_package(Vulkan) +find_package(OpenGL) + +# Source file +set(SRC_FILES + ../../../Common/helper_multiprocess.cpp + MonteCarloPi.cu + VulkanBaseApp.cpp + main.cpp +) + +if(${Vulkan_FOUND}) + if(${OPENGL_FOUND}) + # Add target for simpleVulkanMMAP + add_executable(simpleVulkanMMAP ${SRC_FILES}) + set_target_properties(simpleVulkanMMAP PROPERTIES CUDA_SEPARABLE_COMPILATION ON) + + target_include_directories(simpleVulkanMMAP PUBLIC + ${Vulkan_INCLUDE_DIRS} + ${CUDAToolkit_INCLUDE_DIRS} + ) + + target_link_libraries(simpleVulkanMMAP + ${Vulkan_LIBRARIES} + OpenGL::GL + CUDA::cuda_driver + glfw + ) + + add_custom_command(TARGET simpleVulkanMMAP POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${CMAKE_CURRENT_SOURCE_DIR}/montecarlo.frag + ${CMAKE_CURRENT_SOURCE_DIR}/montecarlo.vert + ${CMAKE_CURRENT_SOURCE_DIR}/vert.spv + ${CMAKE_CURRENT_SOURCE_DIR}/frag.spv + ${CMAKE_CURRENT_BINARY_DIR} + ) + else() + message(STATUS "GLFW not found - will not build sample 'simpleVulkanMMAP'") + endif() +else() + message(STATUS "Vulkan not found - will not build sample 'simpleVulkanMMAP'") +endif() diff --git a/Samples/5_Domain_Specific/simpleVulkanMMAP/Makefile b/Samples/5_Domain_Specific/simpleVulkanMMAP/Makefile deleted file mode 100644 index 420d0307..00000000 --- a/Samples/5_Domain_Specific/simpleVulkanMMAP/Makefile +++ /dev/null @@ -1,488 +0,0 @@ -################################################################################ -# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of NVIDIA CORPORATION nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -################################################################################ -# -# Makefile project only supported on Mac OS X and Linux Platforms) -# -################################################################################ - -# Location of the CUDA Toolkit -CUDA_PATH ?= /usr/local/cuda - -############################## -# start deprecated interface # -############################## -ifeq ($(x86_64),1) - $(info WARNING - x86_64 variable has been deprecated) - $(info WARNING - please use TARGET_ARCH=x86_64 instead) - TARGET_ARCH ?= x86_64 -endif -ifeq ($(ARMv7),1) - $(info WARNING - ARMv7 variable has been deprecated) - $(info WARNING - please use TARGET_ARCH=armv7l instead) - TARGET_ARCH ?= armv7l -endif -ifeq ($(aarch64),1) - $(info WARNING - aarch64 variable has been deprecated) - $(info WARNING - please use TARGET_ARCH=aarch64 instead) - TARGET_ARCH ?= aarch64 -endif -ifeq ($(ppc64le),1) - $(info WARNING - ppc64le variable has been deprecated) - $(info WARNING - please use TARGET_ARCH=ppc64le instead) - TARGET_ARCH ?= ppc64le -endif -ifneq ($(GCC),) - $(info WARNING - GCC variable has been deprecated) - $(info WARNING - please use HOST_COMPILER=$(GCC) instead) - HOST_COMPILER ?= $(GCC) -endif -ifneq ($(abi),) - $(error ERROR - abi variable has been removed) -endif -############################ -# end deprecated interface # -############################ - -# architecture -HOST_ARCH := $(shell uname -m) -TARGET_ARCH ?= $(HOST_ARCH) -ifneq (,$(filter $(TARGET_ARCH),x86_64 aarch64 sbsa ppc64le armv7l)) - ifneq ($(TARGET_ARCH),$(HOST_ARCH)) - ifneq (,$(filter $(TARGET_ARCH),x86_64 aarch64 sbsa ppc64le)) - TARGET_SIZE := 64 - else ifneq (,$(filter $(TARGET_ARCH),armv7l)) - TARGET_SIZE := 32 - endif - else - TARGET_SIZE := $(shell getconf LONG_BIT) - endif -else - $(error ERROR - unsupported value $(TARGET_ARCH) for TARGET_ARCH!) -endif - -# sbsa and aarch64 systems look similar. Need to differentiate them at host level for now. -ifeq ($(HOST_ARCH),aarch64) - ifeq ($(CUDA_PATH)/targets/sbsa-linux,$(shell ls -1d $(CUDA_PATH)/targets/sbsa-linux 2>/dev/null)) - HOST_ARCH := sbsa - TARGET_ARCH := sbsa - endif -endif - -ifneq ($(TARGET_ARCH),$(HOST_ARCH)) - ifeq (,$(filter $(HOST_ARCH)-$(TARGET_ARCH),aarch64-armv7l x86_64-armv7l x86_64-aarch64 x86_64-sbsa x86_64-ppc64le)) - $(error ERROR - cross compiling from $(HOST_ARCH) to $(TARGET_ARCH) is not supported!) - endif -endif - -# When on native aarch64 system with userspace of 32-bit, change TARGET_ARCH to armv7l -ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_SIZE),aarch64-aarch64-32) - TARGET_ARCH = armv7l -endif - -# operating system -HOST_OS := $(shell uname -s 2>/dev/null | tr "[:upper:]" "[:lower:]") -TARGET_OS ?= $(HOST_OS) -ifeq (,$(filter $(TARGET_OS),linux darwin qnx android)) - $(error ERROR - unsupported value $(TARGET_OS) for TARGET_OS!) -endif - -# host compiler -ifdef HOST_COMPILER - CUSTOM_HOST_COMPILER = 1 -endif - -ifeq ($(TARGET_OS),darwin) - ifeq ($(shell expr `xcodebuild -version | grep -i xcode | awk '{print $$2}' | cut -d'.' -f1` \>= 5),1) - HOST_COMPILER ?= clang++ - endif -else ifneq ($(TARGET_ARCH),$(HOST_ARCH)) - ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l) - ifeq ($(TARGET_OS),linux) - HOST_COMPILER ?= arm-linux-gnueabihf-g++ - else ifeq ($(TARGET_OS),qnx) - ifeq ($(QNX_HOST),) - $(error ERROR - QNX_HOST must be passed to the QNX host toolchain) - endif - ifeq ($(QNX_TARGET),) - $(error ERROR - QNX_TARGET must be passed to the QNX target toolchain) - endif - export QNX_HOST - export QNX_TARGET - HOST_COMPILER ?= $(QNX_HOST)/usr/bin/arm-unknown-nto-qnx6.6.0eabi-g++ - else ifeq ($(TARGET_OS),android) - HOST_COMPILER ?= arm-linux-androideabi-g++ - endif - else ifeq ($(TARGET_ARCH),aarch64) - ifeq ($(TARGET_OS), linux) - HOST_COMPILER ?= aarch64-linux-gnu-g++ - else ifeq ($(TARGET_OS),qnx) - ifeq ($(QNX_HOST),) - $(error ERROR - QNX_HOST must be passed to the QNX host toolchain) - endif - ifeq ($(QNX_TARGET),) - $(error ERROR - QNX_TARGET must be passed to the QNX target toolchain) - endif - export QNX_HOST - export QNX_TARGET - HOST_COMPILER ?= $(QNX_HOST)/usr/bin/q++ - else ifeq ($(TARGET_OS), android) - HOST_COMPILER ?= aarch64-linux-android-clang++ - endif - else ifeq ($(TARGET_ARCH),sbsa) - HOST_COMPILER ?= aarch64-linux-gnu-g++ - else ifeq ($(TARGET_ARCH),ppc64le) - HOST_COMPILER ?= powerpc64le-linux-gnu-g++ - endif -endif -HOST_COMPILER ?= g++ -NVCC := $(CUDA_PATH)/bin/nvcc -ccbin $(HOST_COMPILER) - -# internal flags -NVCCFLAGS := -m${TARGET_SIZE} -CCFLAGS := -LDFLAGS := - -# build flags - -# Link flag for customized HOST_COMPILER with gcc realpath -GCC_PATH := $(shell which gcc) -ifeq ($(CUSTOM_HOST_COMPILER),1) - ifneq ($(filter /%,$(HOST_COMPILER)),) - ifneq ($(findstring gcc,$(HOST_COMPILER)),) - ifneq ($(GCC_PATH),$(HOST_COMPILER)) - LDFLAGS += -lstdc++ - endif - endif - endif -endif - -ifeq ($(TARGET_OS),darwin) - LDFLAGS += -rpath $(CUDA_PATH)/lib - CCFLAGS += -arch $(HOST_ARCH) -else ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-armv7l-linux) - LDFLAGS += --dynamic-linker=/lib/ld-linux-armhf.so.3 - CCFLAGS += -mfloat-abi=hard -else ifeq ($(TARGET_OS),android) - LDFLAGS += -pie - CCFLAGS += -fpie -fpic -fexceptions -endif - -ifneq ($(TARGET_ARCH),$(HOST_ARCH)) - ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-linux) - ifneq ($(TARGET_FS),) - GCCVERSIONLTEQ46 := $(shell expr `$(HOST_COMPILER) -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-gnueabihf - endif - endif - ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-linux) - ifneq ($(TARGET_FS),) - GCCVERSIONLTEQ46 := $(shell expr `$(HOST_COMPILER) -dumpversion` \<= 4.6) - ifeq ($(GCCVERSIONLTEQ46),1) - CCFLAGS += --sysroot=$(TARGET_FS) - endif - LDFLAGS += --sysroot=$(TARGET_FS) - LDFLAGS += -rpath-link=$(TARGET_FS)/lib -L$(TARGET_FS)/lib - LDFLAGS += -rpath-link=$(TARGET_FS)/lib/aarch64-linux-gnu -L$(TARGET_FS)/lib/aarch64-linux-gnu - LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib -L$(TARGET_FS)/usr/lib - LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib/aarch64-linux-gnu -L$(TARGET_FS)/usr/lib/aarch64-linux-gnu - LDFLAGS += --unresolved-symbols=ignore-in-shared-libs - CCFLAGS += -isystem=$(TARGET_FS)/usr/include -I$(TARGET_FS)/usr/include -I$(TARGET_FS)/usr/include/libdrm - CCFLAGS += -isystem=$(TARGET_FS)/usr/include/aarch64-linux-gnu -I$(TARGET_FS)/usr/include/aarch64-linux-gnu - endif - endif - ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-qnx) - NVCCFLAGS += -D_QNX_SOURCE - NVCCFLAGS += --qpp-config 8.3.0,gcc_ntoaarch64le - CCFLAGS += -DWIN_INTERFACE_CUSTOM -I/usr/include/aarch64-qnx-gnu - LDFLAGS += -lsocket - LDFLAGS += -L/usr/lib/aarch64-qnx-gnu - CCFLAGS += "-Wl\,-rpath-link\,/usr/lib/aarch64-qnx-gnu" - ifdef TARGET_OVERRIDE - LDFLAGS += -lslog2 - endif - - ifneq ($(TARGET_FS),) - LDFLAGS += -L$(TARGET_FS)/usr/lib - CCFLAGS += "-Wl\,-rpath-link\,$(TARGET_FS)/usr/lib" - LDFLAGS += -L$(TARGET_FS)/usr/libnvidia - CCFLAGS += "-Wl\,-rpath-link\,$(TARGET_FS)/usr/libnvidia" - CCFLAGS += -I$(TARGET_FS)/../include - endif - endif -endif - -ifdef TARGET_OVERRIDE # cuda toolkit targets override - NVCCFLAGS += -target-dir $(TARGET_OVERRIDE) -endif - -# Install directory of different arch -CUDA_INSTALL_TARGET_DIR := -ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-linux) - CUDA_INSTALL_TARGET_DIR = targets/armv7-linux-gnueabihf/ -else ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-linux) - CUDA_INSTALL_TARGET_DIR = targets/aarch64-linux/ -else ifeq ($(TARGET_ARCH)-$(TARGET_OS),sbsa-linux) - CUDA_INSTALL_TARGET_DIR = targets/sbsa-linux/ -else ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-android) - CUDA_INSTALL_TARGET_DIR = targets/armv7-linux-androideabi/ -else ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-android) - CUDA_INSTALL_TARGET_DIR = targets/aarch64-linux-androideabi/ -else ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-qnx) - CUDA_INSTALL_TARGET_DIR = targets/ARMv7-linux-QNX/ -else ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-qnx) - CUDA_INSTALL_TARGET_DIR = targets/aarch64-qnx/ -else ifeq ($(TARGET_ARCH),ppc64le) - CUDA_INSTALL_TARGET_DIR = targets/ppc64le-linux/ -endif - -# Debug build flags -ifeq ($(dbg),1) - NVCCFLAGS += -g -G - BUILD_TYPE := debug -else - BUILD_TYPE := release -endif - -ALL_CCFLAGS := -ALL_CCFLAGS += $(NVCCFLAGS) -ALL_CCFLAGS += $(EXTRA_NVCCFLAGS) -ALL_CCFLAGS += $(addprefix -Xcompiler ,$(CCFLAGS)) -ALL_CCFLAGS += $(addprefix -Xcompiler ,$(EXTRA_CCFLAGS)) - -UBUNTU = $(shell lsb_release -i -s 2>/dev/null | grep -i ubuntu) - -SAMPLE_ENABLED := 1 - -# This sample is not supported on Mac OSX -ifeq ($(TARGET_OS),darwin) - $(info >>> WARNING - simpleVulkanMMAP is not supported on Mac OSX - waiving sample <<<) - SAMPLE_ENABLED := 0 -endif - -# This sample is not supported on ARMv7 -ifeq ($(TARGET_ARCH),armv7l) - $(info >>> WARNING - simpleVulkanMMAP is not supported on ARMv7 - waiving sample <<<) - SAMPLE_ENABLED := 0 -endif - -# This sample is not supported on QNX -ifeq ($(TARGET_OS),qnx) - $(info >>> WARNING - simpleVulkanMMAP is not supported on QNX - waiving sample <<<) - SAMPLE_ENABLED := 0 -endif - -ALL_LDFLAGS := -ALL_LDFLAGS += $(ALL_CCFLAGS) -ALL_LDFLAGS += $(addprefix -Xlinker ,$(LDFLAGS)) -ALL_LDFLAGS += $(addprefix -Xlinker ,$(EXTRA_LDFLAGS)) - -# Common includes and paths for CUDA -INCLUDES := -I../../../Common -LIBRARIES := - -################################################################################ - -# Makefile include to help find Vulkan SDK and dependencies -include ./findvulkan.mk - -# Vulkan specific libraries -ifeq ($(TARGET_OS),linux) - ifneq ($(TARGET_ARCH),$(HOST_ARCH)) - LIBRARIES += -L$(VULKAN_SDK_LIB) -lvulkan - LIBRARIES += -lglfw - INCLUDES += -I$(VULKAN_HEADER) - else - LIBRARIES += -L$(VULKAN_SDK_LIB) - LIBRARIES += `pkg-config --static --libs glfw3` -lvulkan - INCLUDES += `pkg-config --static --cflags glfw3` -I$(VULKAN_HEADER) - endif -endif - -#Detect if installed version of GCC supports required C++11 -ifeq ($(TARGET_OS),linux) - empty := - space := $(empty) $(empty) - GCCVERSIONSTRING := $(shell expr `$(HOST_COMPILER) -dumpversion`) -#Create version number without "." - GCCVERSION := $(shell expr `echo $(GCCVERSIONSTRING)` | cut -f1 -d.) - GCCVERSION += $(shell expr `echo $(GCCVERSIONSTRING)` | cut -f2 -d.) - GCCVERSION += $(shell expr `echo $(GCCVERSIONSTRING)` | cut -f3 -d.) -# Make sure the version number has at least 3 decimals - GCCVERSION += 00 -# Remove spaces from the version number - GCCVERSION := $(subst $(space),$(empty),$(GCCVERSION)) -#$(warning $(GCCVERSION)) - - IS_MIN_VERSION := $(shell expr `echo $(GCCVERSION)` \>= 47000) - ifneq ($(CUSTOM_HOST_COMPILER), 1) - ifeq ($(IS_MIN_VERSION), 1) - $(info >>> GCC Version is greater or equal to 4.7.0 <<<) - else - $(info >>> Waiving build. Minimum GCC version required is 4.7.0<<<) - SAMPLE_ENABLED := 0 - endif - else - $(warning >>> Custom HOST_COMPILER set; skipping GCC version check. This may lead to unintended behavior. Please note the minimum equivalent GCC version is 4.7.0 <<<) - endif -endif - -# Gencode arguments -ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),armv7l aarch64 sbsa)) -SMS ?= 53 61 70 72 75 80 86 87 90 -else -SMS ?= 50 52 60 61 70 75 80 86 89 90 -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 ($(TARGET_OS),darwin) - ALL_LDFLAGS += -Xcompiler -F/Library/Frameworks -Xlinker -framework -Xlinker CUDA -else - ifeq ($(TARGET_ARCH),x86_64) - CUDA_SEARCH_PATH ?= $(CUDA_PATH)/lib64/stubs - CUDA_SEARCH_PATH += $(CUDA_PATH)/lib/stubs - CUDA_SEARCH_PATH += $(CUDA_PATH)/targets/x86_64-linux/lib/stubs - endif - - ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-linux) - CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/armv7-linux-gnueabihf/lib/stubs - endif - - ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-linux) - CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/aarch64-linux/lib/stubs - endif - - ifeq ($(TARGET_ARCH)-$(TARGET_OS),sbsa-linux) - CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/sbsa-linux/lib/stubs - endif - - ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-android) - CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/armv7-linux-androideabi/lib/stubs - endif - - ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-android) - CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/aarch64-linux-androideabi/lib/stubs - endif - - ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-qnx) - CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/ARMv7-linux-QNX/lib/stubs - endif - - ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-qnx) - CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/aarch64-qnx/lib/stubs - ifdef TARGET_OVERRIDE - CUDA_SEARCH_PATH := $(CUDA_PATH)/targets/$(TARGET_OVERRIDE)/lib/stubs - endif - endif - - ifeq ($(TARGET_ARCH),ppc64le) - CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/ppc64le-linux/lib/stubs - endif - - ifeq ($(HOST_ARCH),ppc64le) - CUDA_SEARCH_PATH += $(CUDA_PATH)/lib64/stubs - endif - - CUDALIB ?= $(shell find -L $(CUDA_SEARCH_PATH) -maxdepth 1 -name libcuda.so 2> /dev/null) - ifeq ("$(CUDALIB)","") - $(info >>> WARNING - libcuda.so not found, CUDA Driver is not installed. Please re-install the driver. <<<) - SAMPLE_ENABLED := 0 - else - CUDALIB := $(shell echo $(CUDALIB) | sed "s/ .*//" | sed "s/\/libcuda.so//" ) - LIBRARIES += -L$(CUDALIB) -lcuda - endif -endif - -ALL_CCFLAGS += --std=c++11 --threads 0 - -ifeq ($(SAMPLE_ENABLED),0) -EXEC ?= @echo "[@]" -endif - -################################################################################ - -# Target rules -all: build - -build: simpleVulkanMMAP - -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 - -helper_multiprocess.o:../../../Common/helper_multiprocess.cpp - $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $< - -MonteCarloPi.o:MonteCarloPi.cu - $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $< - -VulkanBaseApp.o:VulkanBaseApp.cpp - $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $< - -main.o:main.cpp - $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $< - -simpleVulkanMMAP: helper_multiprocess.o MonteCarloPi.o VulkanBaseApp.o main.o - $(EXEC) $(NVCC) $(ALL_LDFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBRARIES) - $(EXEC) mkdir -p ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE) - $(EXEC) cp $@ ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE) - -run: build - $(EXEC) ./simpleVulkanMMAP - -testrun: build - -clean: - rm -f simpleVulkanMMAP helper_multiprocess.o MonteCarloPi.o VulkanBaseApp.o main.o - rm -rf ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE)/simpleVulkanMMAP - -clobber: clean diff --git a/Samples/5_Domain_Specific/simpleVulkanMMAP/NsightEclipse.xml b/Samples/5_Domain_Specific/simpleVulkanMMAP/NsightEclipse.xml deleted file mode 100644 index 877c2a2e..00000000 --- a/Samples/5_Domain_Specific/simpleVulkanMMAP/NsightEclipse.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - simpleVulkanMMAP - - --std=c++11 - - - cuMemCreate - cuMemAddressReserve - cuMemGetAllocationGranularity - cuMemAddressFree - cuMemUnmap - cuMemMap - cuMemRelease - cuMemExportToShareableHandle - cuMemSetAccess - cudaWaitExternalSemaphoresAsync - cudaImportExternalSemaphore - cudaDeviceGetAttribute - cudaSetDevice - cudaLaunchHostFunc - cudaMallocHost - cudaSignalExternalSemaphoresAsync - cudaFreeHost - cudaMemsetAsync - cudaMemcpyAsync - cudaGetDeviceCount - cudaStreamCreateWithFlags - cudaStreamDestroy - cudaDestroyExternalSemaphore - cudaSignalSemaphore - cudaWaitSemaphore - cudaFree - cudaStreamSynchronize - cudaMalloc - cudaOccupancyMaxActiveBlocksPerMultiprocessor - cudaGetDeviceProperties - - - whole - - montecarlo.vert - montecarlo.frag - - - ./ - ../ - ../../../Common - - - cuMemMap IPC - MMAP - Graphics Interop - CUDA Vulkan Interop - Data Parallel Algorithms - - - CUDA - CPP11 - monte-carlo - Vulkan - - - cuda - CUDA - - - - true - main.cpp - - X11 - VULKAN - - - 2:Graphics Interop - 1:CUDA Advanced Topics - 1:CUDA Vulkan Interop - - sm50 - sm52 - sm53 - sm60 - sm61 - sm70 - sm72 - sm75 - sm80 - sm86 - sm87 - sm89 - sm90 - - ../../../Common/helper_multiprocess.cpp - ../../../Common/helper_multiprocess.h - - - - x86_64 - linux - - - windows7 - - - aarch64 - - - sbsa - - - - all - - Vulkan CUDA Interop PI Approximation - diff --git a/Samples/5_Domain_Specific/simpleVulkanMMAP/findvulkan.mk b/Samples/5_Domain_Specific/simpleVulkanMMAP/findvulkan.mk deleted file mode 100644 index 004ab22b..00000000 --- a/Samples/5_Domain_Specific/simpleVulkanMMAP/findvulkan.mk +++ /dev/null @@ -1,152 +0,0 @@ -################################################################################ -# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of NVIDIA CORPORATION nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -################################################################################ -# -# findvulkan.mk is used to find the necessary Vulkan Libraries for specific distributions -# this is supported on Linux -# -################################################################################ - -# Determine OS platform and unix distribution -ifeq ("$(TARGET_OS)","linux") - # first search lsb_release - DISTRO = $(shell lsb_release -i -s 2>/dev/null | tr "[:upper:]" "[:lower:]") - ifeq ("$(DISTRO)","") - # second search and parse /etc/issue - DISTRO = $(shell more /etc/issue | awk '{print $$1}' | sed '1!d' | sed -e "/^$$/d" 2>/dev/null | tr "[:upper:]" "[:lower:]") - # ensure data from /etc/issue is valid - ifneq (,$(filter-out $(DISTRO),ubuntu fedora red rhel centos suse)) - DISTRO = - endif - ifeq ("$(DISTRO)","") - # third, we can search in /etc/os-release or /etc/{distro}-release - DISTRO = $(shell awk '/ID/' /etc/*-release | sed 's/ID=//' | grep -v "VERSION" | grep -v "ID" | grep -v "DISTRIB") - endif - endif -endif - -ifeq ("$(TARGET_OS)","linux") - # Each set of Linux Distros have different paths for where to find libraries - UBUNTU = $(shell echo $(DISTRO) | grep -i ubuntu >/dev/null 2>&1; echo $$?) - FEDORA = $(shell echo $(DISTRO) | grep -i fedora >/dev/null 2>&1; echo $$?) - RHEL = $(shell echo $(DISTRO) | grep -i 'red\|rhel' >/dev/null 2>&1; echo $$?) - CENTOS = $(shell echo $(DISTRO) | grep -i centos >/dev/null 2>&1; echo $$?) - SUSE = $(shell echo $(DISTRO) | grep -i 'suse\|sles' >/dev/null 2>&1; echo $$?) - KYLIN = $(shell echo $(DISTRO) | grep -i kylin >/dev/null 2>&1; echo $$?) - ifeq ("$(UBUNTU)","0") - ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l) - GLPATH := /usr/arm-linux-gnueabihf/lib - GLLINK := -L/usr/arm-linux-gnueabihf/lib - ifneq ($(TARGET_FS),) - GLPATH += $(TARGET_FS)/usr/lib/arm-linux-gnueabihf - GLLINK += -L$(TARGET_FS)/usr/lib/arm-linux-gnueabihf - endif - else ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-aarch64) - GLPATH := /usr/aarch64-linux-gnu/lib - GLLINK := -L/usr/aarch64-linux-gnu/lib - ifneq ($(TARGET_FS),) - GLPATH += $(TARGET_FS)/usr/lib - GLPATH += $(TARGET_FS)/usr/lib/aarch64-linux-gnu - GLLINK += -L$(TARGET_FS)/usr/lib/aarch64-linux-gnu - endif - else - UBUNTU_PKG_NAME = $(shell which dpkg >/dev/null 2>&1 && dpkg -l 'nvidia-*' | grep '^ii' | awk '{print $$2}' | head -1) - ifneq ("$(UBUNTU_PKG_NAME)","") - GLPATH ?= /usr/lib/$(UBUNTU_PKG_NAME) - GLLINK ?= -L/usr/lib/$(UBUNTU_PKG_NAME) - endif - - DFLT_PATH ?= /usr/lib - endif - endif - ifeq ("$(SUSE)","0") - GLPATH ?= /usr/X11R6/lib64 - GLLINK ?= -L/usr/X11R6/lib64 - DFLT_PATH ?= /usr/lib64 - endif - ifeq ("$(FEDORA)","0") - GLPATH ?= /usr/lib64/nvidia - GLLINK ?= -L/usr/lib64/nvidia - DFLT_PATH ?= /usr/lib64 - endif - ifeq ("$(RHEL)","0") - GLPATH ?= /usr/lib64/nvidia - GLLINK ?= -L/usr/lib64/nvidia - DFLT_PATH ?= /usr/lib64 - endif - ifeq ("$(CENTOS)","0") - GLPATH ?= /usr/lib64/nvidia - GLLINK ?= -L/usr/lib64/nvidia - DFLT_PATH ?= /usr/lib64 - endif - ifeq ("$(KYLIN)","0") - GLPATH ?= /usr/lib64/nvidia - GLLINK ?= -L/usr/lib64/nvidia - DFLT_PATH ?= /usr/lib64 - endif - - VULKAN_SDK_PATH ?= ${VULKAN_SDK} - - ifeq ("$(VULKAN_SDK_PATH)","") - VULKAN_SDK_PATH := $(DFLT_PATH) - endif - - VULKAN_SDK_LIB := $(shell find -L $(VULKAN_SDK_PATH) -name libvulkan.so -print 2>/dev/null) - X11LIB := $(shell find -L $(GLPATH) $(DFLT_PATH) -name libX11.so -print 2>/dev/null) - - ifeq ("$(VULKAN_SDK_LIB)","") - $(info >>> WARNING - libvulkan.so not found, please install Vulkan SDK and pass VULKAN_SDK_PATH= <<<) - SAMPLE_ENABLED := 0 - else - VULKAN_SDK_LIB := $(shell echo $(VULKAN_SDK_LIB) | sed "s/ .*//" | sed "s/\/libvulkan.so//" ) - endif - - ifeq ("$(X11LIB)","") - $(info >>> WARNING - libX11.so not found, please install libX11.so <<<) - SAMPLE_ENABLED := 0 - endif - - HEADER_SEARCH_PATH ?= $(TARGET_FS)/usr/include - HEADER_SEARCH_PATH += $(TARGET_FS)/usr/local/include - ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-armv7l-linux) - HEADER_SEARCH_PATH += /usr/arm-linux-gnueabihf/include - else ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-aarch64-linux) - HEADER_SEARCH_PATH += /usr/aarch64-linux-gnu/include - endif - - VULKAN_HEADER := $(shell find -L $(VULKAN_SDK_PATH) $(HEADER_SEARCH_PATH) -name vulkan.h -print 2>/dev/null) - - ifeq ("$(VULKAN_HEADER)","") - $(info >>> WARNING - vulkan.h not found, please install vulkan.h <<<) - SAMPLE_ENABLED := 0 - else - VULKAN_HEADER := $(shell echo $(VULKAN_HEADER) | sed "s/ .*//" | sed "s/\/vulkan\/vulkan.h//" ) - endif -else -endif - diff --git a/Samples/5_Domain_Specific/smokeParticles/CMakeLists.txt b/Samples/5_Domain_Specific/smokeParticles/CMakeLists.txt new file mode 100644 index 00000000..d66679cc --- /dev/null +++ b/Samples/5_Domain_Specific/smokeParticles/CMakeLists.txt @@ -0,0 +1,47 @@ +# Include directories and libraries +include_directories(../../../Common) + +find_package(OpenGL) +find_package(GLUT) + +# Source file +set(SRC_FILES + GLSLProgram.cpp + ParticleSystem.cpp + ParticleSystem_cuda.cu + SmokeRenderer.cpp + SmokeShaders.cpp + framebufferObject.cpp + particleDemo.cpp + renderbuffer.cpp +) + +if(${OpenGL_FOUND}) + if (${GLUT_FOUND}) + # Add target for smokeParticles + add_executable(smokeParticles ${SRC_FILES}) + set_target_properties(smokeParticles PROPERTIES CUDA_SEPARABLE_COMPILATION ON) + + target_include_directories(smokeParticles PUBLIC + ${OPENGL_INCLUDE_DIR} + ${CUDAToolkit_INCLUDE_DIRS} + ${GLUT_INCLUDE_DIRS} + ) + + target_link_libraries(smokeParticles + ${OPENGL_LIBRARIES} + ${GLUT_LIBRARIES} + ) + + add_custom_command(TARGET smokeParticles POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different + ${CMAKE_CURRENT_SOURCE_DIR}/data + ${CMAKE_CURRENT_BINARY_DIR}/data + ) + + else() + message(STATUS "GLUT not found - will not build sample 'smokeParticles'") + endif() +else() + message(STATUS "OpenGL not found - will not build sample 'smokeParticles'") +endif() diff --git a/Samples/5_Domain_Specific/smokeParticles/Makefile b/Samples/5_Domain_Specific/smokeParticles/Makefile deleted file mode 100644 index 83977eaa..00000000 --- a/Samples/5_Domain_Specific/smokeParticles/Makefile +++ /dev/null @@ -1,427 +0,0 @@ -################################################################################ -# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of NVIDIA CORPORATION nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -################################################################################ -# -# Makefile project only supported on Mac OS X and Linux Platforms) -# -################################################################################ - -# Location of the CUDA Toolkit -CUDA_PATH ?= /usr/local/cuda - -############################## -# start deprecated interface # -############################## -ifeq ($(x86_64),1) - $(info WARNING - x86_64 variable has been deprecated) - $(info WARNING - please use TARGET_ARCH=x86_64 instead) - TARGET_ARCH ?= x86_64 -endif -ifeq ($(ARMv7),1) - $(info WARNING - ARMv7 variable has been deprecated) - $(info WARNING - please use TARGET_ARCH=armv7l instead) - TARGET_ARCH ?= armv7l -endif -ifeq ($(aarch64),1) - $(info WARNING - aarch64 variable has been deprecated) - $(info WARNING - please use TARGET_ARCH=aarch64 instead) - TARGET_ARCH ?= aarch64 -endif -ifeq ($(ppc64le),1) - $(info WARNING - ppc64le variable has been deprecated) - $(info WARNING - please use TARGET_ARCH=ppc64le instead) - TARGET_ARCH ?= ppc64le -endif -ifneq ($(GCC),) - $(info WARNING - GCC variable has been deprecated) - $(info WARNING - please use HOST_COMPILER=$(GCC) instead) - HOST_COMPILER ?= $(GCC) -endif -ifneq ($(abi),) - $(error ERROR - abi variable has been removed) -endif -############################ -# end deprecated interface # -############################ - -# architecture -HOST_ARCH := $(shell uname -m) -TARGET_ARCH ?= $(HOST_ARCH) -ifneq (,$(filter $(TARGET_ARCH),x86_64 aarch64 sbsa ppc64le armv7l)) - ifneq ($(TARGET_ARCH),$(HOST_ARCH)) - ifneq (,$(filter $(TARGET_ARCH),x86_64 aarch64 sbsa ppc64le)) - TARGET_SIZE := 64 - else ifneq (,$(filter $(TARGET_ARCH),armv7l)) - TARGET_SIZE := 32 - endif - else - TARGET_SIZE := $(shell getconf LONG_BIT) - endif -else - $(error ERROR - unsupported value $(TARGET_ARCH) for TARGET_ARCH!) -endif - -# sbsa and aarch64 systems look similar. Need to differentiate them at host level for now. -ifeq ($(HOST_ARCH),aarch64) - ifeq ($(CUDA_PATH)/targets/sbsa-linux,$(shell ls -1d $(CUDA_PATH)/targets/sbsa-linux 2>/dev/null)) - HOST_ARCH := sbsa - TARGET_ARCH := sbsa - endif -endif - -ifneq ($(TARGET_ARCH),$(HOST_ARCH)) - ifeq (,$(filter $(HOST_ARCH)-$(TARGET_ARCH),aarch64-armv7l x86_64-armv7l x86_64-aarch64 x86_64-sbsa x86_64-ppc64le)) - $(error ERROR - cross compiling from $(HOST_ARCH) to $(TARGET_ARCH) is not supported!) - endif -endif - -# When on native aarch64 system with userspace of 32-bit, change TARGET_ARCH to armv7l -ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_SIZE),aarch64-aarch64-32) - TARGET_ARCH = armv7l -endif - -# operating system -HOST_OS := $(shell uname -s 2>/dev/null | tr "[:upper:]" "[:lower:]") -TARGET_OS ?= $(HOST_OS) -ifeq (,$(filter $(TARGET_OS),linux darwin qnx android)) - $(error ERROR - unsupported value $(TARGET_OS) for TARGET_OS!) -endif - -# host compiler -ifdef HOST_COMPILER - CUSTOM_HOST_COMPILER = 1 -endif - -ifeq ($(TARGET_OS),darwin) - ifeq ($(shell expr `xcodebuild -version | grep -i xcode | awk '{print $$2}' | cut -d'.' -f1` \>= 5),1) - HOST_COMPILER ?= clang++ - endif -else ifneq ($(TARGET_ARCH),$(HOST_ARCH)) - ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l) - ifeq ($(TARGET_OS),linux) - HOST_COMPILER ?= arm-linux-gnueabihf-g++ - else ifeq ($(TARGET_OS),qnx) - ifeq ($(QNX_HOST),) - $(error ERROR - QNX_HOST must be passed to the QNX host toolchain) - endif - ifeq ($(QNX_TARGET),) - $(error ERROR - QNX_TARGET must be passed to the QNX target toolchain) - endif - export QNX_HOST - export QNX_TARGET - HOST_COMPILER ?= $(QNX_HOST)/usr/bin/arm-unknown-nto-qnx6.6.0eabi-g++ - else ifeq ($(TARGET_OS),android) - HOST_COMPILER ?= arm-linux-androideabi-g++ - endif - else ifeq ($(TARGET_ARCH),aarch64) - ifeq ($(TARGET_OS), linux) - HOST_COMPILER ?= aarch64-linux-gnu-g++ - else ifeq ($(TARGET_OS),qnx) - ifeq ($(QNX_HOST),) - $(error ERROR - QNX_HOST must be passed to the QNX host toolchain) - endif - ifeq ($(QNX_TARGET),) - $(error ERROR - QNX_TARGET must be passed to the QNX target toolchain) - endif - export QNX_HOST - export QNX_TARGET - HOST_COMPILER ?= $(QNX_HOST)/usr/bin/q++ - else ifeq ($(TARGET_OS), android) - HOST_COMPILER ?= aarch64-linux-android-clang++ - endif - else ifeq ($(TARGET_ARCH),sbsa) - HOST_COMPILER ?= aarch64-linux-gnu-g++ - else ifeq ($(TARGET_ARCH),ppc64le) - HOST_COMPILER ?= powerpc64le-linux-gnu-g++ - endif -endif -HOST_COMPILER ?= g++ -NVCC := $(CUDA_PATH)/bin/nvcc -ccbin $(HOST_COMPILER) - -# internal flags -NVCCFLAGS := -m${TARGET_SIZE} -CCFLAGS := -LDFLAGS := - -# build flags - -# Link flag for customized HOST_COMPILER with gcc realpath -GCC_PATH := $(shell which gcc) -ifeq ($(CUSTOM_HOST_COMPILER),1) - ifneq ($(filter /%,$(HOST_COMPILER)),) - ifneq ($(findstring gcc,$(HOST_COMPILER)),) - ifneq ($(GCC_PATH),$(HOST_COMPILER)) - LDFLAGS += -lstdc++ - endif - endif - endif -endif - -ifeq ($(TARGET_OS),darwin) - LDFLAGS += -rpath $(CUDA_PATH)/lib - CCFLAGS += -arch $(HOST_ARCH) -else ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-armv7l-linux) - LDFLAGS += --dynamic-linker=/lib/ld-linux-armhf.so.3 - CCFLAGS += -mfloat-abi=hard -else ifeq ($(TARGET_OS),android) - LDFLAGS += -pie - CCFLAGS += -fpie -fpic -fexceptions -endif - -ifneq ($(TARGET_ARCH),$(HOST_ARCH)) - ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-linux) - ifneq ($(TARGET_FS),) - GCCVERSIONLTEQ46 := $(shell expr `$(HOST_COMPILER) -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-gnueabihf - endif - endif - ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-linux) - ifneq ($(TARGET_FS),) - GCCVERSIONLTEQ46 := $(shell expr `$(HOST_COMPILER) -dumpversion` \<= 4.6) - ifeq ($(GCCVERSIONLTEQ46),1) - CCFLAGS += --sysroot=$(TARGET_FS) - endif - LDFLAGS += --sysroot=$(TARGET_FS) - LDFLAGS += -rpath-link=$(TARGET_FS)/lib -L$(TARGET_FS)/lib - LDFLAGS += -rpath-link=$(TARGET_FS)/lib/aarch64-linux-gnu -L$(TARGET_FS)/lib/aarch64-linux-gnu - LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib -L$(TARGET_FS)/usr/lib - LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib/aarch64-linux-gnu -L$(TARGET_FS)/usr/lib/aarch64-linux-gnu - LDFLAGS += --unresolved-symbols=ignore-in-shared-libs - CCFLAGS += -isystem=$(TARGET_FS)/usr/include -I$(TARGET_FS)/usr/include -I$(TARGET_FS)/usr/include/libdrm - CCFLAGS += -isystem=$(TARGET_FS)/usr/include/aarch64-linux-gnu -I$(TARGET_FS)/usr/include/aarch64-linux-gnu - endif - endif - ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-qnx) - NVCCFLAGS += -D_QNX_SOURCE - NVCCFLAGS += --qpp-config 8.3.0,gcc_ntoaarch64le - CCFLAGS += -DWIN_INTERFACE_CUSTOM -I/usr/include/aarch64-qnx-gnu - LDFLAGS += -lsocket - LDFLAGS += -L/usr/lib/aarch64-qnx-gnu - CCFLAGS += "-Wl\,-rpath-link\,/usr/lib/aarch64-qnx-gnu" - ifdef TARGET_OVERRIDE - LDFLAGS += -lslog2 - endif - - ifneq ($(TARGET_FS),) - LDFLAGS += -L$(TARGET_FS)/usr/lib - CCFLAGS += "-Wl\,-rpath-link\,$(TARGET_FS)/usr/lib" - LDFLAGS += -L$(TARGET_FS)/usr/libnvidia - CCFLAGS += "-Wl\,-rpath-link\,$(TARGET_FS)/usr/libnvidia" - CCFLAGS += -I$(TARGET_FS)/../include - endif - endif -endif - -ifdef TARGET_OVERRIDE # cuda toolkit targets override - NVCCFLAGS += -target-dir $(TARGET_OVERRIDE) -endif - -# Install directory of different arch -CUDA_INSTALL_TARGET_DIR := -ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-linux) - CUDA_INSTALL_TARGET_DIR = targets/armv7-linux-gnueabihf/ -else ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-linux) - CUDA_INSTALL_TARGET_DIR = targets/aarch64-linux/ -else ifeq ($(TARGET_ARCH)-$(TARGET_OS),sbsa-linux) - CUDA_INSTALL_TARGET_DIR = targets/sbsa-linux/ -else ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-android) - CUDA_INSTALL_TARGET_DIR = targets/armv7-linux-androideabi/ -else ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-android) - CUDA_INSTALL_TARGET_DIR = targets/aarch64-linux-androideabi/ -else ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-qnx) - CUDA_INSTALL_TARGET_DIR = targets/ARMv7-linux-QNX/ -else ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-qnx) - CUDA_INSTALL_TARGET_DIR = targets/aarch64-qnx/ -else ifeq ($(TARGET_ARCH),ppc64le) - CUDA_INSTALL_TARGET_DIR = targets/ppc64le-linux/ -endif - -# Debug build flags -ifeq ($(dbg),1) - NVCCFLAGS += -g -G - BUILD_TYPE := debug -else - BUILD_TYPE := release -endif - -ALL_CCFLAGS := -ALL_CCFLAGS += $(NVCCFLAGS) -ALL_CCFLAGS += $(EXTRA_NVCCFLAGS) -ALL_CCFLAGS += $(addprefix -Xcompiler ,$(CCFLAGS)) -ALL_CCFLAGS += $(addprefix -Xcompiler ,$(EXTRA_CCFLAGS)) - -SAMPLE_ENABLED := 1 - -# This sample is not supported on QNX -ifeq ($(TARGET_OS),qnx) - $(info >>> WARNING - smokeParticles is not supported on QNX - waiving sample <<<) - SAMPLE_ENABLED := 0 -endif - -ALL_LDFLAGS := -ALL_LDFLAGS += $(ALL_CCFLAGS) -ALL_LDFLAGS += $(addprefix -Xlinker ,$(LDFLAGS)) -ALL_LDFLAGS += $(addprefix -Xlinker ,$(EXTRA_LDFLAGS)) - -# Common includes and paths for CUDA -INCLUDES := -I../../../Common -LIBRARIES := - -################################################################################ - -# Makefile include to help find GL Libraries -include ./findgllib.mk - -# OpenGL specific libraries -ifeq ($(TARGET_OS),darwin) - # Mac OSX specific libraries and paths to include - LIBRARIES += -L/System/Library/Frameworks/OpenGL.framework/Libraries - LIBRARIES += -lGL -lGLU - ALL_LDFLAGS += -Xlinker -framework -Xlinker GLUT -else - LIBRARIES += $(GLLINK) - LIBRARIES += -lGL -lGLU -lglut -endif - -#Detect if installed version of GCC supports required C++14 -ifeq ($(TARGET_OS),linux) - empty := - space := $(empty) $(empty) - GCCVERSIONSTRING := $(shell expr `$(HOST_COMPILER) -dumpversion`) -#Create version number without "." - GCCVERSION := $(shell expr `echo $(GCCVERSIONSTRING)` | cut -f1 -d.) - GCCVERSION += $(shell expr `echo $(GCCVERSIONSTRING)` | cut -f2 -d.) - GCCVERSION += $(shell expr `echo $(GCCVERSIONSTRING)` | cut -f3 -d.) -# Make sure the version number has at least 3 decimals - GCCVERSION += 00 -# Remove spaces from the version number - GCCVERSION := $(subst $(space),$(empty),$(GCCVERSION)) -#$(warning $(GCCVERSION)) - - IS_MIN_VERSION := $(shell expr `echo $(GCCVERSION)` \>= 50000) - ifneq ($(CUSTOM_HOST_COMPILER), 1) - ifeq ($(IS_MIN_VERSION), 1) - $(info >>> GCC Version is greater or equal to 5.0.0 <<<) - else - $(info >>> Waiving build. Minimum GCC version required is 5.0.0<<<) - SAMPLE_ENABLED := 0 - endif - else - $(warning >>> Custom HOST_COMPILER set; skipping GCC version check. This may lead to unintended behavior. Please note the minimum equivalent GCC version is 5.0.0 <<<) - endif -endif - -# Gencode arguments -ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),armv7l aarch64 sbsa)) -SMS ?= 53 61 70 72 75 80 86 87 90 -else -SMS ?= 50 52 60 61 70 75 80 86 89 90 -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 - -ALL_CCFLAGS += --std=c++14 --threads 0 - -ifeq ($(SAMPLE_ENABLED),0) -EXEC ?= @echo "[@]" -endif - -################################################################################ - -# Target rules -all: build - -build: smokeParticles - -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 - -GLSLProgram.o:GLSLProgram.cpp - $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $< - -ParticleSystem.o:ParticleSystem.cpp - $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $< - -ParticleSystem_cuda.o:ParticleSystem_cuda.cu - $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $< - -SmokeRenderer.o:SmokeRenderer.cpp - $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $< - -SmokeShaders.o:SmokeShaders.cpp - $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $< - -framebufferObject.o:framebufferObject.cpp - $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $< - -particleDemo.o:particleDemo.cpp - $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $< - -renderbuffer.o:renderbuffer.cpp - $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $< - -smokeParticles: GLSLProgram.o ParticleSystem.o ParticleSystem_cuda.o SmokeRenderer.o SmokeShaders.o framebufferObject.o particleDemo.o renderbuffer.o - $(EXEC) $(NVCC) $(ALL_LDFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBRARIES) - $(EXEC) mkdir -p ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE) - $(EXEC) cp $@ ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE) - -run: build - $(EXEC) ./smokeParticles - -testrun: build - $(EXEC) ./smokeParticles -qatest - -clean: - rm -f smokeParticles GLSLProgram.o ParticleSystem.o ParticleSystem_cuda.o SmokeRenderer.o SmokeShaders.o framebufferObject.o particleDemo.o renderbuffer.o - rm -rf ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE)/smokeParticles - -clobber: clean diff --git a/Samples/5_Domain_Specific/smokeParticles/NsightEclipse.xml b/Samples/5_Domain_Specific/smokeParticles/NsightEclipse.xml deleted file mode 100644 index e483e626..00000000 --- a/Samples/5_Domain_Specific/smokeParticles/NsightEclipse.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - smokeParticles - - --std=c++14 - - - cudaExtent - cudaPitchedPtr - cudaCreateTextureObject - cudaMemcpyToSymbol - - - whole - - ..\..\doc\Thrust_license.txt - data\floortile.ppm - data\smokeParticles_ref.ppm - data\ref_smokePart_pos.bin - data\ref_smokePart_vel.bin - - - ./ - ../ - ../../../Common - - - Graphics Interop - Data Parallel Algorithms - Physically-Based Simulation - - - CUDA - GPGPU - simulation - particles - OpenGL - openGL - CPP14 - - - GLU - GL - GLUT - GLEW - glut - X11 - - - ../../../common/lib/linux/x86_64 - ../../../common/lib/linux/armv7l - ../../../common/lib/darwin - - true - particleDemo.cpp - - -qatest - - - X11 - GL - - - 2:Graphics Interop - 2:Texture - 3:Physically-Based Simulation - - sm50 - sm52 - sm53 - sm60 - sm61 - sm70 - sm72 - sm75 - sm80 - sm86 - sm87 - sm89 - sm90 - - - x86_64 - linux - - - windows7 - - - x86_64 - macosx - - - arm - - - sbsa - - - - all - - Smoke Particles - exe - doc\smokeParticles.pdf - diff --git a/Samples/5_Domain_Specific/smokeParticles/ParticleSystem_cuda.cu b/Samples/5_Domain_Specific/smokeParticles/ParticleSystem_cuda.cu index 19d29247..fc895653 100644 --- a/Samples/5_Domain_Specific/smokeParticles/ParticleSystem_cuda.cu +++ b/Samples/5_Domain_Specific/smokeParticles/ParticleSystem_cuda.cu @@ -44,108 +44,116 @@ This file contains simple wrapper functions that call the CUDA kernels #include "particles_kernel_device.cuh" #include "ParticleSystem.cuh" -extern "C" { +extern "C" +{ -cudaArray *noiseArray; + cudaArray *noiseArray; -void setParameters(SimParams *hostParams) { - // copy parameters to constant memory - checkCudaErrors(cudaMemcpyToSymbol(params, hostParams, sizeof(SimParams))); -} - -// Round a / b to nearest higher integer value -int iDivUp(int a, int b) { return (a % b != 0) ? (a / b + 1) : (a / b); } - -// compute grid and thread block size for a given number of elements -void computeGridSize(int n, int blockSize, int &numBlocks, int &numThreads) { - numThreads = min(blockSize, n); - numBlocks = iDivUp(n, numThreads); -} - -inline float frand() { return rand() / (float)RAND_MAX; } - -// create 3D texture containing random values -void createNoiseTexture(int w, int h, int d) { - cudaExtent size = make_cudaExtent(w, h, d); - size_t elements = size.width * size.height * size.depth; - - float *volumeData = (float *)malloc(elements * 4 * sizeof(float)); - float *ptr = volumeData; - - for (size_t i = 0; i < elements; i++) { - *ptr++ = frand() * 2.0f - 1.0f; - *ptr++ = frand() * 2.0f - 1.0f; - *ptr++ = frand() * 2.0f - 1.0f; - *ptr++ = frand() * 2.0f - 1.0f; + void setParameters(SimParams *hostParams) + { + // copy parameters to constant memory + checkCudaErrors(cudaMemcpyToSymbol(cudaParams, hostParams, sizeof(SimParams))); } - cudaChannelFormatDesc channelDesc = cudaCreateChannelDesc(); - checkCudaErrors(cudaMalloc3DArray(&noiseArray, &channelDesc, size)); + // Round a / b to nearest higher integer value + int iDivUp(int a, int b) { return (a % b != 0) ? (a / b + 1) : (a / b); } - cudaMemcpy3DParms copyParams = {0}; - copyParams.srcPtr = make_cudaPitchedPtr( - (void *)volumeData, size.width * sizeof(float4), size.width, size.height); - copyParams.dstArray = noiseArray; - copyParams.extent = size; - copyParams.kind = cudaMemcpyHostToDevice; - checkCudaErrors(cudaMemcpy3D(©Params)); + // compute grid and thread block size for a given number of elements + void computeGridSize(int n, int blockSize, int &numBlocks, int &numThreads) + { + numThreads = min(blockSize, n); + numBlocks = iDivUp(n, numThreads); + } - free(volumeData); + inline float frand() { return rand() / (float)RAND_MAX; } - cudaResourceDesc texRes; - memset(&texRes, 0, sizeof(cudaResourceDesc)); + // create 3D texture containing random values + void createNoiseTexture(int w, int h, int d) + { + cudaExtent size = make_cudaExtent(w, h, d); + size_t elements = size.width * size.height * size.depth; - texRes.resType = cudaResourceTypeArray; - texRes.res.array.array = noiseArray; + float *volumeData = (float *)malloc(elements * 4 * sizeof(float)); + float *ptr = volumeData; - cudaTextureDesc texDescr; - memset(&texDescr, 0, sizeof(cudaTextureDesc)); + for (size_t i = 0; i < elements; i++) + { + *ptr++ = frand() * 2.0f - 1.0f; + *ptr++ = frand() * 2.0f - 1.0f; + *ptr++ = frand() * 2.0f - 1.0f; + *ptr++ = frand() * 2.0f - 1.0f; + } - texDescr.normalizedCoords = true; - texDescr.filterMode = cudaFilterModeLinear; - texDescr.addressMode[0] = cudaAddressModeWrap; - texDescr.addressMode[1] = cudaAddressModeWrap; - texDescr.addressMode[2] = cudaAddressModeWrap; - texDescr.readMode = cudaReadModeElementType; + cudaChannelFormatDesc channelDesc = cudaCreateChannelDesc(); + checkCudaErrors(cudaMalloc3DArray(&noiseArray, &channelDesc, size)); - checkCudaErrors(cudaCreateTextureObject(&noiseTex, &texRes, &texDescr, NULL)); -} + cudaMemcpy3DParms copyParams = {0}; + copyParams.srcPtr = make_cudaPitchedPtr( + (void *)volumeData, size.width * sizeof(float4), size.width, size.height); + copyParams.dstArray = noiseArray; + copyParams.extent = size; + copyParams.kind = cudaMemcpyHostToDevice; + checkCudaErrors(cudaMemcpy3D(©Params)); -void integrateSystem(float4 *oldPos, float4 *newPos, float4 *oldVel, - float4 *newVel, float deltaTime, int numParticles) { - thrust::device_ptr d_newPos(newPos); - thrust::device_ptr d_newVel(newVel); - thrust::device_ptr d_oldPos(oldPos); - thrust::device_ptr d_oldVel(oldVel); + free(volumeData); - thrust::for_each(thrust::make_zip_iterator(thrust::make_tuple( - d_newPos, d_newVel, d_oldPos, d_oldVel)), - thrust::make_zip_iterator(thrust::make_tuple( - d_newPos + numParticles, d_newVel + numParticles, - d_oldPos + numParticles, d_oldVel + numParticles)), - integrate_functor(deltaTime, noiseTex)); -} + cudaResourceDesc texRes; + memset(&texRes, 0, sizeof(cudaResourceDesc)); -void calcDepth(float4 *pos, - float *keys, // output - uint *indices, // output - float3 sortVector, int numParticles) { - thrust::device_ptr d_pos(pos); - thrust::device_ptr d_keys(keys); - thrust::device_ptr d_indices(indices); + texRes.resType = cudaResourceTypeArray; + texRes.res.array.array = noiseArray; - thrust::for_each(thrust::make_zip_iterator(thrust::make_tuple(d_pos, d_keys)), - thrust::make_zip_iterator(thrust::make_tuple( - d_pos + numParticles, d_keys + numParticles)), - calcDepth_functor(sortVector)); + cudaTextureDesc texDescr; + memset(&texDescr, 0, sizeof(cudaTextureDesc)); - thrust::sequence(d_indices, d_indices + numParticles); -} + texDescr.normalizedCoords = true; + texDescr.filterMode = cudaFilterModeLinear; + texDescr.addressMode[0] = cudaAddressModeWrap; + texDescr.addressMode[1] = cudaAddressModeWrap; + texDescr.addressMode[2] = cudaAddressModeWrap; + texDescr.readMode = cudaReadModeElementType; -void sortParticles(float *sortKeys, uint *indices, uint numParticles) { - thrust::sort_by_key(thrust::device_ptr(sortKeys), - thrust::device_ptr(sortKeys + numParticles), - thrust::device_ptr(indices)); -} + checkCudaErrors(cudaCreateTextureObject(&noiseTex, &texRes, &texDescr, NULL)); + } -} // extern "C" + void integrateSystem(float4 *oldPos, float4 *newPos, float4 *oldVel, + float4 *newVel, float deltaTime, int numParticles) + { + thrust::device_ptr d_newPos(newPos); + thrust::device_ptr d_newVel(newVel); + thrust::device_ptr d_oldPos(oldPos); + thrust::device_ptr d_oldVel(oldVel); + + thrust::for_each(thrust::make_zip_iterator(thrust::make_tuple( + d_newPos, d_newVel, d_oldPos, d_oldVel)), + thrust::make_zip_iterator(thrust::make_tuple( + d_newPos + numParticles, d_newVel + numParticles, + d_oldPos + numParticles, d_oldVel + numParticles)), + integrate_functor(deltaTime, noiseTex)); + } + + void calcDepth(float4 *pos, + float *keys, // output + uint *indices, // output + float3 sortVector, int numParticles) + { + thrust::device_ptr d_pos(pos); + thrust::device_ptr d_keys(keys); + thrust::device_ptr d_indices(indices); + + thrust::for_each(thrust::make_zip_iterator(thrust::make_tuple(d_pos, d_keys)), + thrust::make_zip_iterator(thrust::make_tuple( + d_pos + numParticles, d_keys + numParticles)), + calcDepth_functor(sortVector)); + + thrust::sequence(d_indices, d_indices + numParticles); + } + + void sortParticles(float *sortKeys, uint *indices, uint numParticles) + { + thrust::sort_by_key(thrust::device_ptr(sortKeys), + thrust::device_ptr(sortKeys + numParticles), + thrust::device_ptr(indices)); + } + +} // extern "C" diff --git a/Samples/5_Domain_Specific/smokeParticles/findgllib.mk b/Samples/5_Domain_Specific/smokeParticles/findgllib.mk deleted file mode 100644 index 998fcf0f..00000000 --- a/Samples/5_Domain_Specific/smokeParticles/findgllib.mk +++ /dev/null @@ -1,136 +0,0 @@ -################################################################################ -# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of NVIDIA CORPORATION nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -################################################################################ -# -# findgllib.mk is used to find the necessary GL Libraries for specific distributions -# this is supported on Mac OSX and Linux Platforms -# -################################################################################ - -# Determine OS platform and unix distribution -ifeq ("$(TARGET_OS)","linux") - # first search lsb_release - DISTRO := $(shell lsb_release -i -s 2>/dev/null | tr "[:upper:]" "[:lower:]") - ifeq ("$(DISTRO)","") - # second search and parse /etc/issue - DISTRO := $(shell awk '{print $$1}' /etc/issue | tr -d "[:space:]" | sed -e "/^$$/d" | tr "[:upper:]" "[:lower:]") - # ensure data from /etc/issue is valid - ifeq (,$(filter $(DISTRO),ubuntu fedora red rhel centos suse)) - DISTRO := - endif - ifeq ("$(DISTRO)","") - # third, we can search in /etc/os-release or /etc/{distro}-release - DISTRO := $(shell awk '/ID/' /etc/*-release | sed 's/ID=//' | grep -v "VERSION" | grep -v "ID" | grep -v "DISTRIB") - endif - endif -endif - -ifeq ("$(TARGET_OS)","linux") - # $(info) >> findgllib.mk -> LINUX path <<<) - # Each set of Linux Distros have different paths for where to find their OpenGL libraries reside - UBUNTU = $(shell echo $(DISTRO) | grep -i ubuntu >/dev/null 2>&1; echo $$?) - FEDORA = $(shell echo $(DISTRO) | grep -i fedora >/dev/null 2>&1; echo $$?) - RHEL = $(shell echo $(DISTRO) | grep -i 'red\|rhel' >/dev/null 2>&1; echo $$?) - CENTOS = $(shell echo $(DISTRO) | grep -i centos >/dev/null 2>&1; echo $$?) - SUSE = $(shell echo $(DISTRO) | grep -i 'suse\|sles' >/dev/null 2>&1; echo $$?) - KYLIN = $(shell echo $(DISTRO) | grep -i kylin >/dev/null 2>&1; echo $$?) - ifeq ("$(UBUNTU)","0") - ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l) - GLPATH := /usr/arm-linux-gnueabihf/lib - GLLINK := -L/usr/arm-linux-gnueabihf/lib - ifneq ($(TARGET_FS),) - GLPATH += $(TARGET_FS)/usr/lib/arm-linux-gnueabihf - GLLINK += -L$(TARGET_FS)/usr/lib/arm-linux-gnueabihf - endif - else ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-aarch64) - GLPATH := /usr/aarch64-linux-gnu/lib - GLLINK := -L/usr/aarch64-linux-gnu/lib - ifneq ($(TARGET_FS),) - GLPATH += $(TARGET_FS)/usr/lib - GLPATH += $(TARGET_FS)/usr/lib/aarch64-linux-gnu - GLLINK += -L$(TARGET_FS)/usr/lib/aarch64-linux-gnu - endif - else ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-ppc64le) - GLPATH := /usr/powerpc64le-linux-gnu/lib - GLLINK := -L/usr/powerpc64le-linux-gnu/lib - else - UBUNTU_PKG_NAME = $(shell which dpkg >/dev/null 2>&1 && dpkg -l 'nvidia-*' | grep '^ii' | awk '{print $$2}' | head -1) - ifneq ("$(UBUNTU_PKG_NAME)","") - GLPATH ?= /usr/lib/$(UBUNTU_PKG_NAME) - GLLINK ?= -L/usr/lib/$(UBUNTU_PKG_NAME) - endif - - DFLT_PATH ?= /usr/lib - endif - endif - - ifeq ("$(SUSE)","0") - GLPATH ?= /usr/X11R6/lib64 - GLLINK ?= -L/usr/X11R6/lib64 - DFLT_PATH ?= /usr/lib64 - else - GLPATH ?= /usr/lib64/nvidia - GLLINK ?= -L/usr/lib64/nvidia - DFLT_PATH ?= /usr/lib64 - endif - - # find libGL, libGLU - GLLIB := $(shell find -L $(GLPATH) $(DFLT_PATH) -name libGL.so -print 2>/dev/null) - GLULIB := $(shell find -L $(GLPATH) $(DFLT_PATH) -name libGLU.so -print 2>/dev/null) - - ifeq ("$(GLLIB)","") - $(info >>> WARNING - libGL.so not found, refer to CUDA Getting Started Guide for how to find and install them. <<<) - SAMPLE_ENABLED := 0 - endif - ifeq ("$(GLULIB)","") - $(info >>> WARNING - libGLU.so not found, refer to CUDA Getting Started Guide for how to find and install them. <<<) - SAMPLE_ENABLED := 0 - endif - - HEADER_SEARCH_PATH ?= $(TARGET_FS)/usr/include - ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-armv7l-linux) - HEADER_SEARCH_PATH += /usr/arm-linux-gnueabihf/include - else ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-aarch64-linux) - HEADER_SEARCH_PATH += /usr/aarch64-linux-gnu/include - endif - - GLHEADER := $(shell find -L $(HEADER_SEARCH_PATH) -name gl.h -print 2>/dev/null) - GLUHEADER := $(shell find -L $(HEADER_SEARCH_PATH) -name glu.h -print 2>/dev/null) - - ifeq ("$(GLHEADER)","") - $(info >>> WARNING - gl.h not found, refer to CUDA Getting Started Guide for how to find and install them. <<<) - SAMPLE_ENABLED := 0 - endif - ifeq ("$(GLUHEADER)","") - $(info >>> WARNING - glu.h not found, refer to CUDA Getting Started Guide for how to find and install them. <<<) - SAMPLE_ENABLED := 0 - endif -else - # This would be the Mac OS X path if we had to do anything special -endif - diff --git a/Samples/5_Domain_Specific/smokeParticles/particles_kernel_device.cuh b/Samples/5_Domain_Specific/smokeParticles/particles_kernel_device.cuh index ffa9d268..0bf37c7d 100644 --- a/Samples/5_Domain_Specific/smokeParticles/particles_kernel_device.cuh +++ b/Samples/5_Domain_Specific/smokeParticles/particles_kernel_device.cuh @@ -26,8 +26,8 @@ */ /* -* CUDA Device code for particle simulation. -*/ + * CUDA Device code for particle simulation. + */ #ifndef _PARTICLES_KERNEL_H_ #define _PARTICLES_KERNEL_H_ @@ -38,16 +38,18 @@ cudaTextureObject_t noiseTex; // simulation parameters -__constant__ SimParams params; +__constant__ SimParams cudaParams; // look up in 3D noise texture -__device__ float3 noise3D(float3 p, cudaTextureObject_t noiseTex) { +__device__ float3 noise3D(float3 p, cudaTextureObject_t noiseTex) +{ float4 n = tex3D(noiseTex, p.x, p.y, p.z); return make_float3(n.x, n.y, n.z); } // integrate particle attributes -struct integrate_functor { +struct integrate_functor +{ float deltaTime; cudaTextureObject_t noiseTex; @@ -56,7 +58,8 @@ struct integrate_functor { : deltaTime(delta_time), noiseTex(noise_Tex) {} template - __device__ void operator()(Tuple t) { + __device__ void operator()(Tuple t) + { volatile float4 posData = thrust::get<2>(t); volatile float4 velData = thrust::get<3>(t); @@ -67,24 +70,27 @@ struct integrate_functor { float age = posData.w; float lifetime = velData.w; - if (age < lifetime) { + if (age < lifetime) + { age += deltaTime; - } else { + } + else + { age = lifetime; } // apply accelerations - vel += params.gravity * deltaTime; + vel += cudaParams.gravity * deltaTime; // apply procedural noise float3 noise = noise3D( - pos * params.noiseFreq + params.time * params.noiseSpeed, noiseTex); - vel += noise * params.noiseAmp; + pos * cudaParams.noiseFreq + cudaParams.time * cudaParams.noiseSpeed, noiseTex); + vel += noise * cudaParams.noiseAmp; // new position = old position + velocity * deltaTime pos += vel * deltaTime; - vel *= params.globalDamping; + vel *= cudaParams.globalDamping; // store new position and velocity thrust::get<0>(t) = make_float4(pos, age); @@ -92,17 +98,19 @@ struct integrate_functor { } }; -struct calcDepth_functor { +struct calcDepth_functor +{ float3 sortVector; __host__ __device__ calcDepth_functor(float3 sort_vector) : sortVector(sort_vector) {} template - __host__ __device__ void operator()(Tuple t) { + __host__ __device__ void operator()(Tuple t) + { volatile float4 p = thrust::get<0>(t); float key = -dot(make_float3(p.x, p.y, p.z), - sortVector); // project onto sort vector + sortVector); // project onto sort vector thrust::get<1>(t) = key; } };