Merge pull request #209 from wcohen/wcohen/cuda_fixes

Cuda component fixes
icl-utk-edu · Jul 29, 2024 · bd0b206 · bd0b206
2 parents c76c54c + 39ddb0f
commit bd0b206
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/cuda/linux-cuda.c b/src/components/cuda/linux-cuda.c
@@ -155,7 +155,7 @@ static int cuda_init_private(void)
     papi_errno = cuptid_init();
     if (papi_errno != PAPI_OK) {
         cuptid_disabled_reason_get(&disabled_reason);
-        sprintf(_cuda_vector.cmp_info.disabled_reason, disabled_reason);
+        sprintf(_cuda_vector.cmp_info.disabled_reason, "%s", disabled_reason);
         _cuda_vector.cmp_info.disabled = papi_errno;
         goto fn_exit;
     }

diff --git a/src/components/cuda/tests/Makefile b/src/components/cuda/tests/Makefile
@@ -13,7 +13,7 @@ TESTS_NOCTX = concurrent_profiling_noCuCtx pthreads_noCuCtx \
 			  simpleMultiGPU_noCuCtx
 
 NVCC = $(PAPI_CUDA_ROOT)/bin/nvcc
-NVCC_VERSION := $(shell nvcc --version | grep -oP '(?<=release )\d+\.\d+')
+NVCC_VERSION := $(shell $(NVCC) --version | grep -oP '(?<=release )\d+\.\d+')
 ifeq ($(shell echo "$(NVCC_VERSION) >= 11.6" | bc), 1)
     NVCFLAGS := -arch=native
 else