Update samples for CUDA 11.8 with correct props

Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/Makefile

@@ -301,9 +301,9 @@ endif
 
 # Gencode arguments
 ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),armv7l aarch64 sbsa))
-SMS ?= 53 61 70 72 75 80 86 87
+SMS ?= 53 61 70 72 75 80 86 87 90
 else
-SMS ?= 35 37 50 52 60 61 70 75 80 86
+SMS ?= 35 37 50 52 60 61 70 75 80 86 90
 endif
 
 ifeq ($(SMS),)

Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/NsightEclipse.xml

@@ -3,42 +3,42 @@
 <entry>
   <name>EGLStream_CUDA_CrossGPU</name>
   <cuda_api_list>
-    <driver>cuEGLStreamConsumerConnect</driver>
-    <driver>cuMemFree</driver>
-    <driver>cuInit</driver>
-    <driver>cuStreamCreate</driver>
-    <driver>cuCtxCreate</driver>
-    <driver>cuGraphicsResourceGetMappedEglFrame</driver>
     <driver>cuDeviceGetName</driver>
-    <driver>cuCtxSynchronize</driver>
-    <driver>cuEGLStreamConsumerAcquireFrame</driver>
-    <driver>cuDeviceGet</driver>
-    <driver>cuDeviceGetAttribute</driver>
-    <driver>cuMemAlloc</driver>
     <driver>cuEGLStreamConsumerReleaseFrame</driver>
+    <driver>cuEGLStreamConsumerConnect</driver>
+    <driver>cuEGLStreamConsumerDisconnect</driver>
+    <driver>cuCtxPushCurrent</driver>
+    <driver>cuEGLStreamProducerReturnFrame</driver>
+    <driver>cuStreamCreate</driver>
+    <driver>cuEGLStreamProducerPresentFrame</driver>
+    <driver>cuMemFree</driver>
+    <driver>cuGraphicsResourceGetMappedEglFrame</driver>
+    <driver>cuInit</driver>
+    <driver>cuMemcpyHtoD</driver>
+    <driver>cuDeviceGet</driver>
+    <driver>cuEGLStreamConsumerAcquireFrame</driver>
     <driver>cuEGLStreamProducerDisconnect</driver>
     <driver>cuEGLStreamProducerConnect</driver>
-    <driver>cuEGLStreamConsumerDisconnect</driver>
-    <driver>cuMemcpyHtoD</driver>
-    <driver>cuEGLStreamProducerReturnFrame</driver>
-    <driver>cuCtxPushCurrent</driver>
+    <driver>cuDeviceGetAttribute</driver>
+    <driver>cuCtxSynchronize</driver>
+    <driver>cuMemAlloc</driver>
     <driver>cuCtxPopCurrent</driver>
-    <driver>cuEGLStreamProducerPresentFrame</driver>
-    <toolkit>cudaDeviceCreateConsumer</toolkit>
-    <toolkit>cudaFree</toolkit>
-    <toolkit>cudaConsumerReleaseFrame</toolkit>
-    <toolkit>cudaDeviceSynchronize</toolkit>
-    <toolkit>cudaGetValueMismatch</toolkit>
-    <toolkit>cudaProducerDeinit</toolkit>
-    <toolkit>cudaProducerPresentFrame</toolkit>
-    <toolkit>cudaMalloc</toolkit>
-    <toolkit>cudaProducerInit</toolkit>
-    <toolkit>cudaProducerReturnFrame</toolkit>
-    <toolkit>cudaProducerPrepareFrame</toolkit>
-    <toolkit>cudaConsumerAcquireFrame</toolkit>
+    <driver>cuCtxCreate</driver>
     <toolkit>cudaMemcpy</toolkit>
+    <toolkit>cudaMalloc</toolkit>
+    <toolkit>cudaProducerPresentFrame</toolkit>
+    <toolkit>cudaFree</toolkit>
     <toolkit>cudaGetErrorString</toolkit>
+    <toolkit>cudaConsumerReleaseFrame</toolkit>
+    <toolkit>cudaProducerReturnFrame</toolkit>
+    <toolkit>cudaDeviceSynchronize</toolkit>
     <toolkit>cudaDeviceCreateProducer</toolkit>
+    <toolkit>cudaProducerDeinit</toolkit>
+    <toolkit>cudaProducerPrepareFrame</toolkit>
+    <toolkit>cudaGetValueMismatch</toolkit>
+    <toolkit>cudaConsumerAcquireFrame</toolkit>
+    <toolkit>cudaProducerInit</toolkit>
+    <toolkit>cudaDeviceCreateConsumer</toolkit>
   </cuda_api_list>
   <description><![CDATA[Demonstrates CUDA and EGL Streams interop, where consumer's EGL Stream is on one GPU and producer's on other and both consumer-producer are different processes.]]></description>
   <devicecompilation>whole</devicecompilation>
@@ -81,6 +81,7 @@
   <sm-arch>sm80</sm-arch>
   <sm-arch>sm86</sm-arch>
   <sm-arch>sm87</sm-arch>
+  <sm-arch>sm90</sm-arch>
   <supported_envs>
     <env>
       <arch>x86_64</arch>

Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/README.md

@@ -10,7 +10,7 @@ EGLStreams Interop
 
 ## Supported SM Architectures
 
-[SM 3.5 ](https://developer.nvidia.com/cuda-gpus)  [SM 3.7 ](https://developer.nvidia.com/cuda-gpus)  [SM 5.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 5.2 ](https://developer.nvidia.com/cuda-gpus)  [SM 5.3 ](https://developer.nvidia.com/cuda-gpus)  [SM 6.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 6.1 ](https://developer.nvidia.com/cuda-gpus)  [SM 7.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 7.2 ](https://developer.nvidia.com/cuda-gpus)  [SM 7.5 ](https://developer.nvidia.com/cuda-gpus)  [SM 8.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 8.6 ](https://developer.nvidia.com/cuda-gpus)  [SM 8.7 ](https://developer.nvidia.com/cuda-gpus)
+[SM 3.5 ](https://developer.nvidia.com/cuda-gpus)  [SM 3.7 ](https://developer.nvidia.com/cuda-gpus)  [SM 5.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 5.2 ](https://developer.nvidia.com/cuda-gpus)  [SM 5.3 ](https://developer.nvidia.com/cuda-gpus)  [SM 6.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 6.1 ](https://developer.nvidia.com/cuda-gpus)  [SM 7.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 7.2 ](https://developer.nvidia.com/cuda-gpus)  [SM 7.5 ](https://developer.nvidia.com/cuda-gpus)  [SM 8.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 8.6 ](https://developer.nvidia.com/cuda-gpus)  [SM 8.7 ](https://developer.nvidia.com/cuda-gpus)  [SM 9.0 ](https://developer.nvidia.com/cuda-gpus)
 
 ## Supported OSes
 
@@ -23,17 +23,17 @@ x86_64, armv7l
 ## CUDA APIs involved
 
 ### [CUDA Driver API](http://docs.nvidia.com/cuda/cuda-driver-api/index.html)
-cuEGLStreamConsumerConnect, cuMemFree, cuInit, cuStreamCreate, cuCtxCreate, cuGraphicsResourceGetMappedEglFrame, cuDeviceGetName, cuCtxSynchronize, cuEGLStreamConsumerAcquireFrame, cuDeviceGet, cuDeviceGetAttribute, cuMemAlloc, cuEGLStreamConsumerReleaseFrame, cuEGLStreamProducerDisconnect, cuEGLStreamProducerConnect, cuEGLStreamConsumerDisconnect, cuMemcpyHtoD, cuEGLStreamProducerReturnFrame, cuCtxPushCurrent, cuCtxPopCurrent, cuEGLStreamProducerPresentFrame
+cuDeviceGetName, cuEGLStreamConsumerReleaseFrame, cuEGLStreamConsumerConnect, cuEGLStreamConsumerDisconnect, cuCtxPushCurrent, cuEGLStreamProducerReturnFrame, cuStreamCreate, cuEGLStreamProducerPresentFrame, cuMemFree, cuGraphicsResourceGetMappedEglFrame, cuInit, cuMemcpyHtoD, cuDeviceGet, cuEGLStreamConsumerAcquireFrame, cuEGLStreamProducerDisconnect, cuEGLStreamProducerConnect, cuDeviceGetAttribute, cuCtxSynchronize, cuMemAlloc, cuCtxPopCurrent, cuCtxCreate
 
 ### [CUDA Runtime API](http://docs.nvidia.com/cuda/cuda-runtime-api/index.html)
-cudaDeviceCreateConsumer, cudaFree, cudaConsumerReleaseFrame, cudaDeviceSynchronize, cudaGetValueMismatch, cudaProducerDeinit, cudaProducerPresentFrame, cudaMalloc, cudaProducerInit, cudaProducerReturnFrame, cudaProducerPrepareFrame, cudaConsumerAcquireFrame, cudaMemcpy, cudaGetErrorString, cudaDeviceCreateProducer
+cudaMemcpy, cudaMalloc, cudaProducerPresentFrame, cudaFree, cudaGetErrorString, cudaConsumerReleaseFrame, cudaProducerReturnFrame, cudaDeviceSynchronize, cudaDeviceCreateProducer, cudaProducerDeinit, cudaProducerPrepareFrame, cudaGetValueMismatch, cudaConsumerAcquireFrame, cudaProducerInit, cudaDeviceCreateConsumer
 
 ## Dependencies needed to build/run
 [EGL](../../../README.md#egl)
 
 ## Prerequisites
 
-Download and install the [CUDA Toolkit 11.6](https://developer.nvidia.com/cuda-downloads) for your corresponding platform.
+Download and install the [CUDA Toolkit 11.8](https://developer.nvidia.com/cuda-downloads) for your corresponding platform.
 Make sure the dependencies mentioned in [Dependencies]() section above are installed.
 
 ## Build and Run

Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/findegl.mk

@@ -58,6 +58,7 @@ ifeq ("$(TARGET_OS)","linux")
     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
@@ -84,22 +85,12 @@ ifeq ("$(TARGET_OS)","linux")
         DFLT_PATH ?= /usr/lib
       endif
     endif
-    ifeq ("$(SUSE)","0")
+	
+	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")
+    else 
       GLPATH    ?= /usr/lib64/nvidia
       GLLINK    ?= -L/usr/lib64/nvidia
       DFLT_PATH ?= /usr/lib64