mirror of
https://github.com/NVIDIA/cuda-samples.git
synced 2026-10-25 22:28:17 +08:00
Bug 5196362, 5184356, 5212196, 5214258 and 5214259: Update sameples for CUDA13.0 API changes
This commit is contained in:
@@ -190,8 +190,9 @@ done:
|
||||
|
||||
CUresult cudaDeviceCreateConsumer(test_cuda_consumer_s *cudaConsumer)
|
||||
{
|
||||
CUdevice device;
|
||||
CUresult status = CUDA_SUCCESS;
|
||||
CUdevice device;
|
||||
CUresult status = CUDA_SUCCESS;
|
||||
CUctxCreateParams ctxCreateParams = {};
|
||||
|
||||
if (CUDA_SUCCESS != (status = cuInit(0))) {
|
||||
printf("Failed to initialize CUDA\n");
|
||||
@@ -203,7 +204,7 @@ CUresult cudaDeviceCreateConsumer(test_cuda_consumer_s *cudaConsumer)
|
||||
return status;
|
||||
}
|
||||
|
||||
if (CUDA_SUCCESS != (status = cuCtxCreate(&cudaConsumer->context, 0, device))) {
|
||||
if (CUDA_SUCCESS != (status = cuCtxCreate(&cudaConsumer->context, &ctxCreateParams, 0, device))) {
|
||||
printf("failed to create CUDA context\n");
|
||||
return status;
|
||||
}
|
||||
|
||||
@@ -182,8 +182,9 @@ done:
|
||||
|
||||
CUresult cudaDeviceCreateProducer(test_cuda_producer_s *cudaProducer)
|
||||
{
|
||||
CUdevice device;
|
||||
CUresult status = CUDA_SUCCESS;
|
||||
CUdevice device;
|
||||
CUresult status = CUDA_SUCCESS;
|
||||
CUctxCreateParams ctxCreateParams = {};
|
||||
|
||||
if (CUDA_SUCCESS != (status = cuInit(0))) {
|
||||
printf("Failed to initialize CUDA\n");
|
||||
@@ -195,7 +196,7 @@ CUresult cudaDeviceCreateProducer(test_cuda_producer_s *cudaProducer)
|
||||
return status;
|
||||
}
|
||||
|
||||
if (CUDA_SUCCESS != (status = cuCtxCreate(&cudaProducer->context, 0, device))) {
|
||||
if (CUDA_SUCCESS != (status = cuCtxCreate(&cudaProducer->context, &ctxCreateParams, 0, device))) {
|
||||
printf("failed to create CUDA context\n");
|
||||
return status;
|
||||
}
|
||||
|
||||
@@ -302,7 +302,8 @@ CUresult cudaDeviceCreateConsumer(test_cuda_consumer_s *cudaConsumer, CUdevice d
|
||||
major,
|
||||
minor);
|
||||
|
||||
if (CUDA_SUCCESS != (status = cuCtxCreate(&cudaConsumer->context, 0, device))) {
|
||||
CUctxCreateParams ctxCreateParams = {};
|
||||
if (CUDA_SUCCESS != (status = cuCtxCreate(&cudaConsumer->context, &ctxCreateParams, 0, device))) {
|
||||
printf("failed to create CUDA context\n");
|
||||
return status;
|
||||
}
|
||||
|
||||
@@ -316,7 +316,8 @@ CUresult cudaDeviceCreateProducer(test_cuda_producer_s *cudaProducer, CUdevice d
|
||||
exit(2); // EXIT_WAIVED
|
||||
}
|
||||
|
||||
if (CUDA_SUCCESS != (status = cuCtxCreate(&cudaProducer->context, 0, device))) {
|
||||
CUctxCreateParams ctxCreateParams = {};
|
||||
if (CUDA_SUCCESS != (status = cuCtxCreate(&cudaProducer->context, &ctxCreateParams, 0, device))) {
|
||||
printf("failed to create CUDA context\n");
|
||||
return status;
|
||||
}
|
||||
|
||||
@@ -69,6 +69,9 @@
|
||||
#include <thrust/sort.h>
|
||||
#include <thrust/unique.h>
|
||||
|
||||
// for cuda::std::identity
|
||||
#include <cuda/std/functional>
|
||||
|
||||
// Sample framework includes.
|
||||
#include <helper_cuda.h>
|
||||
#include <helper_functions.h>
|
||||
@@ -680,7 +683,7 @@ private:
|
||||
thrust::make_counting_iterator(validEdgesCount),
|
||||
dEdgesFlags,
|
||||
dVertices_,
|
||||
thrust::identity<uint>())
|
||||
cuda::std::identity())
|
||||
.get();
|
||||
|
||||
pools.uintEdges.put(dEdgesFlags);
|
||||
|
||||
@@ -118,13 +118,14 @@ bool runTest(int argc, char **argv);
|
||||
// to be setup and the CUDA module (CUBIN) is built by NVCC
|
||||
static CUresult InitCUDAContext(CUDAContext *pContext, CUdevice hcuDevice, int deviceID, char **argv)
|
||||
{
|
||||
CUcontext hcuContext = 0;
|
||||
CUmodule hcuModule = 0;
|
||||
CUfunction hcuFunction = 0;
|
||||
CUdeviceptr dptr = 0;
|
||||
CUcontext hcuContext = 0;
|
||||
CUmodule hcuModule = 0;
|
||||
CUfunction hcuFunction = 0;
|
||||
CUdeviceptr dptr = 0;
|
||||
CUctxCreateParams ctxCreateParams = {};
|
||||
|
||||
// cuCtxCreate: Function works on floating contexts and current context
|
||||
CUresult status = cuCtxCreate(&hcuContext, 0, hcuDevice);
|
||||
CUresult status = cuCtxCreate(&hcuContext, &ctxCreateParams, 0, hcuDevice);
|
||||
|
||||
if (CUDA_SUCCESS != status) {
|
||||
fprintf(stderr, "cuCtxCreate for <deviceID=%d> failed %d\n", deviceID, status);
|
||||
|
||||
Reference in New Issue
Block a user