diff --git a/Samples/0_Introduction/CMakeLists.txt b/Samples/0_Introduction/CMakeLists.txt
index 7255a491..a777d925 100644
--- a/Samples/0_Introduction/CMakeLists.txt
+++ b/Samples/0_Introduction/CMakeLists.txt
@@ -15,8 +15,8 @@ add_subdirectory(simpleAssert_nvrtc)
add_subdirectory(simpleAtomicIntrinsics)
add_subdirectory(simpleAtomicIntrinsics_nvrtc)
add_subdirectory(simpleAttributes)
-#add_subdirectory(simpleCUDA2GL)
-#add_subdirectory(simpleCallback)
+add_subdirectory(simpleCUDA2GL)
+add_subdirectory(simpleCallback)
add_subdirectory(simpleCooperativeGroups)
add_subdirectory(simpleCubemapTexture)
#add_subdirectory(simpleDrvRuntime)
diff --git a/Samples/0_Introduction/simpleCUDA2GL/CMakeLists.txt b/Samples/0_Introduction/simpleCUDA2GL/CMakeLists.txt
new file mode 100644
index 00000000..32d64160
--- /dev/null
+++ b/Samples/0_Introduction/simpleCUDA2GL/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Include directories and libraries
+include_directories(../../../Common)
+
+find_package(OpenGL)
+find_package(GLUT)
+
+# Source file
+set(SRC_FILES
+ simpleCUDA2GL.cu
+ main.cpp
+)
+
+
+if(${OpenGL_FOUND})
+ if (${GLUT_FOUND})
+ # Add target for simpleCUDA2GL
+ add_executable(simpleCUDA2GL ${SRC_FILES})
+ set_target_properties(simpleCUDA2GL PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+
+ target_include_directories(simpleCUDA2GL PUBLIC
+ ${OPENGL_INCLUDE_DIR}
+ ${CUDAToolkit_INCLUDE_DIRS}
+ ${GLUT_INCLUDE_DIRS}
+ )
+
+ target_link_libraries(simpleCUDA2GL
+ ${OPENGL_LIBRARIES}
+ ${GLUT_LIBRARIES}
+ )
+ else()
+ message(STATUS "GLUT not found - will not build sample 'simpleCUDA2GL'")
+ endif()
+else()
+ message(STATUS "OpenGL not found - will not build sample 'simpleCUDA2GL'")
+endif()
diff --git a/Samples/0_Introduction/simpleCUDA2GL/Makefile b/Samples/0_Introduction/simpleCUDA2GL/Makefile
deleted file mode 100644
index ef6d0228..00000000
--- a/Samples/0_Introduction/simpleCUDA2GL/Makefile
+++ /dev/null
@@ -1,393 +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 ARMv7
-ifeq ($(TARGET_ARCH),armv7l)
- $(info >>> WARNING - simpleCUDA2GL is not supported on ARMv7 - waiving sample <<<)
- SAMPLE_ENABLED := 0
-endif
-
-# This sample is not supported on aarch64
-ifeq ($(TARGET_ARCH),aarch64)
- $(info >>> WARNING - simpleCUDA2GL is not supported on aarch64 - waiving sample <<<)
- SAMPLE_ENABLED := 0
-endif
-
-# This sample is not supported on sbsa
-ifeq ($(TARGET_ARCH),sbsa)
- $(info >>> WARNING - simpleCUDA2GL is not supported on sbsa - 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
-
-# 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 += --threads 0 --std=c++11
-
-ifeq ($(SAMPLE_ENABLED),0)
-EXEC ?= @echo "[@]"
-endif
-
-################################################################################
-
-# Target rules
-all: build
-
-build: simpleCUDA2GL
-
-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
-
-main.o:main.cpp
- $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
-
-simpleCUDA2GL.o:simpleCUDA2GL.cu
- $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
-
-simpleCUDA2GL: main.o simpleCUDA2GL.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) ./simpleCUDA2GL
-
-testrun: build
- $(EXEC) ./simpleCUDA2GL -file=ref_simpleCUDA2GL.ppm
-
-clean:
- rm -f simpleCUDA2GL main.o simpleCUDA2GL.o
- rm -rf ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE)/simpleCUDA2GL
-
-clobber: clean
diff --git a/Samples/0_Introduction/simpleCUDA2GL/NsightEclipse.xml b/Samples/0_Introduction/simpleCUDA2GL/NsightEclipse.xml
deleted file mode 100644
index 3d62c5e0..00000000
--- a/Samples/0_Introduction/simpleCUDA2GL/NsightEclipse.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
- simpleCUDA2GL
-
- cudaHostAlloc
- cudaGraphicsUnmapResources
- cudaMalloc
- cudaFree
- cudaGraphicsResourceGetMappedPointer
- cudaGraphicsMapResources
- cudaMemcpyToArray
- cudaDeviceSynchronize
- cudaProcess
- cudaGraphicsUnregisterResource
- cudaGraphicsSubResourceGetMappedArray
- cudaGraphicsGLRegisterBuffer
- cudaGraphicsGLRegisterImage
-
-
- whole
-
- data\ref_simpleCUDA2GL.ppm
-
-
- ./
- ../
- ../../../Common
-
-
- Graphics Interop
- Image Processing
- Performance Strategies
-
-
- GPGPU
- CUDA
- Image Processing
- Opengl
- openGL
-
-
- GLU
- GL
- GLUT
- GLEW
- glut
- X11
-
-
- ../../../common/lib/linux/x86_64
- ../../../common/lib/linux/armv7l
- ../../../common/lib/darwin
-
- true
- main.cpp
-
- -file=ref_simpleCUDA2GL.ppm
-
-
- X11
- GL
-
-
- 2:Graphics Interop
- 2:Image Processing
- 2:Performance Strategies
-
- sm50
- sm52
- sm53
- sm60
- sm61
- sm70
- sm72
- sm75
- sm80
- sm86
- sm87
- sm89
- sm90
-
-
- x86_64
- linux
-
-
- windows7
-
-
- x86_64
- macosx
-
-
-
- all
-
- CUDA and OpenGL Interop of Images
- exe
-
diff --git a/Samples/0_Introduction/simpleCallback/CMakeLists.txt b/Samples/0_Introduction/simpleCallback/CMakeLists.txt
new file mode 100644
index 00000000..466c32ca
--- /dev/null
+++ b/Samples/0_Introduction/simpleCallback/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Include directories and libraries
+include_directories(../../../Common)
+
+# Source file
+set(SRC_FILES
+ simpleCallback.cu
+ multithreading.cpp
+)
+
+# Add target for simpleCallback
+add_executable(simpleCallback ${SRC_FILES})
+set_target_properties(simpleCallback PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
diff --git a/Samples/0_Introduction/simpleCallback/Makefile b/Samples/0_Introduction/simpleCallback/Makefile
deleted file mode 100644
index 7e64be2b..00000000
--- a/Samples/0_Introduction/simpleCallback/Makefile
+++ /dev/null
@@ -1,360 +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
-
-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 :=
-
-################################################################################
-
-# 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 += --threads 0 --std=c++11
-
-ifeq ($(SAMPLE_ENABLED),0)
-EXEC ?= @echo "[@]"
-endif
-
-################################################################################
-
-# Target rules
-all: build
-
-build: simpleCallback
-
-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
-
-multithreading.o:multithreading.cpp
- $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
-
-simpleCallback.o:simpleCallback.cu
- $(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
-
-simpleCallback: multithreading.o simpleCallback.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) ./simpleCallback
-
-testrun: build
-
-clean:
- rm -f simpleCallback multithreading.o simpleCallback.o
- rm -rf ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE)/simpleCallback
-
-clobber: clean
diff --git a/Samples/0_Introduction/simpleCallback/NsightEclipse.xml b/Samples/0_Introduction/simpleCallback/NsightEclipse.xml
deleted file mode 100644
index 320410d4..00000000
--- a/Samples/0_Introduction/simpleCallback/NsightEclipse.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
- simpleCallback
-
- cudaHostAlloc
- cudaStreamDestroy
- cudaFree
- cudaSetDevice
- cudaGetDeviceCount
- cudaFreeHost
- cudaStreamAddCallback
- cudaMalloc
- cudaMemcpyAsync
- cudaStreamCreate
- cudaGetDeviceProperties
-
-
- whole
-
- ./
- ../
- ../../../Common
-
-
- CUDA Streams
- Callback Functions
- Multithreading
-
-
- CUDA
-
-
-
-
-
- true
- simpleCallback.cu
-
- 1:CUDA Basic Topics
- 1:Performance Strategies
-
- sm50
- sm52
- sm53
- sm60
- sm61
- sm70
- sm72
- sm75
- sm80
- sm86
- sm87
- sm89
- sm90
-
-
- x86_64
- linux
-
-
- windows7
-
-
- x86_64
- macosx
-
-
- arm
-
-
- sbsa
-
-
- ppc64le
- linux
-
-
-
- all
-
- Simple CUDA Callbacks
- exe
-