From c1b03b9f818c6a63ef09e7c115e6593356ebfeaa Mon Sep 17 00:00:00 2001 From: shawnz Date: Fri, 16 May 2025 11:21:07 +0800 Subject: [PATCH] Bug 5277193: Remove the CUFFT_LICENSE_ERROR checking as it is deprecated since CUDA13.0 --- CHANGELOG.md | 17 +++++++++++++++++ Common/helper_cuda.h | 3 +++ .../simpleCUFFT_callback.cu | 8 -------- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef4d5ccf..19cc5391 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -60,6 +60,23 @@ * Replaced "thrust::identity()" with "cuda::std::identity()" as it is deprecated in CUDA 13.0. * `2_Concepts_and_Techniques` * `segmentationTreeThrust` +* Updated the the headers file and samples for CUFFT error codes update. + * Deprecated CUFFT errors: + * `CUFFT_INCOMPLETE_PARAMETER_LIST` + * `CUFFT_PARSE_ERROR` + * `CUFFT_LICENSE_ERROR` + * New added CUFFT errors: + * `CUFFT_MISSING_DEPENDENCY` + * `CUFFT_NVRTC_FAILURE` + * `CUFFT_NVJITLINK_FAILURE` + * `CUFFT_NVSHMEM_FAILURE` + * Header files and samples that are related with this change: + * `Common/helper_cuda.h` + * `4_CUDA_Libraries` + * `simpleCUFFT` + * `simpleCUFFT_2d_MGPU` + * `simpleCUFFT_MGPU` + * `simpleCUFFT_callback` ### CUDA 12.9 * Updated toolchain for cross-compilation for Tegra Linux platforms. diff --git a/Common/helper_cuda.h b/Common/helper_cuda.h index 401c41b2..3c70fdc2 100644 --- a/Common/helper_cuda.h +++ b/Common/helper_cuda.h @@ -147,6 +147,9 @@ static const char *_cudaGetErrorEnum(cufftResult error) { case CUFFT_NOT_IMPLEMENTED: return "CUFFT_NOT_IMPLEMENTED"; + case CUFFT_NOT_SUPPORTED: + return "CUFFT_NOT_SUPPORTED"; + case CUFFT_MISSING_DEPENDENCY: return "CUFFT_MISSING_DEPENDENCY"; diff --git a/Samples/4_CUDA_Libraries/simpleCUFFT_callback/simpleCUFFT_callback.cu b/Samples/4_CUDA_Libraries/simpleCUFFT_callback/simpleCUFFT_callback.cu index 64017353..5f636e1d 100644 --- a/Samples/4_CUDA_Libraries/simpleCUFFT_callback/simpleCUFFT_callback.cu +++ b/Samples/4_CUDA_Libraries/simpleCUFFT_callback/simpleCUFFT_callback.cu @@ -182,14 +182,6 @@ int runTest(int argc, char **argv) checkCudaErrors(cudaMemcpyFromSymbol(&hostCopyOfCallbackPtr, myOwnCallbackPtr, sizeof(hostCopyOfCallbackPtr))); // Now associate the load callback with the plan. - cufftResult status = - cufftXtSetCallback(cb_plan, (void **)&hostCopyOfCallbackPtr, CUFFT_CB_LD_COMPLEX, (void **)&d_params); - if (status == CUFFT_LICENSE_ERROR) { - printf("This sample requires a valid license file.\n"); - printf("The file was either not found, out of date, or otherwise invalid.\n"); - return EXIT_WAIVED; - } - checkCudaErrors( cufftXtSetCallback(cb_plan, (void **)&hostCopyOfCallbackPtr, CUFFT_CB_LD_COMPLEX, (void **)&d_params));