Skip to content

Commit bd449a4

Browse files
committed
use proper error type
1 parent 867454d commit bd449a4

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

GPU_SVD_computeControlMatrix.c

+10-5
Original file line numberDiff line numberDiff line change
@@ -386,9 +386,9 @@ errno_t GPU_SVD_computeControlMatrix(
386386

387387
save_fits(ID_VTmatrix_name, "!matVT.fits");
388388

389-
cudaStat = cublasSgemm(cublasH, CUBLAS_OP_T, CUBLAS_OP_T, n, m, n, &alpha, d_VT,
389+
cublasStatus_t cublasStat = cublasSgemm(cublasH, CUBLAS_OP_T, CUBLAS_OP_T, n, m, n, &alpha, d_VT,
390390
n, d_U, m, &beta, d_M, n);
391-
if(cudaStat != cudaSuccess)
391+
if(cublasStat != CUBLAS_STATUS_SUCCESS)
392392
{
393393
printf("cublasSgemm returned error code %d, line(%d)\n", cudaStat, __LINE__);
394394
exit(EXIT_FAILURE);
@@ -411,11 +411,16 @@ errno_t GPU_SVD_computeControlMatrix(
411411
}
412412

413413

414-
ID_Cmatrix = create_image_ID(ID_Cmatrix_name,
415-
data.image[ID_Rmatrix].md[0].naxis, arraysizetmp, _DATATYPE_FLOAT, 0, 0);
414+
ID_Cmatrix = create_image_ID(
415+
ID_Cmatrix_name,
416+
data.image[ID_Rmatrix].md[0].naxis,
417+
arraysizetmp,
418+
_DATATYPE_FLOAT,
419+
0,
420+
0);
416421

417422

418-
// cudaStat = cudaMemcpy(data.image[ID_Cmatrix].array.F, d_M, sizeof(float)*m*n, cudaMemcpyDeviceToHost);
423+
// cudaStat = cudaMemcpy(data.image[ID_Cmatrix].array.F, d_M, sizeof(float)*m*n, cudaMemcpyDeviceToHost);
419424

420425
h_M = (float *) malloc(sizeof(float) * m * n);
421426
cudaStat = cudaMemcpy(h_M, d_M, sizeof(float) * m * n, cudaMemcpyDeviceToHost);

GPUloadCmat.c

+11-12
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,18 @@ errno_t GPUloadCmat(
5353
for(int device = 0; device < gpumatmultconf[index].NBstreams; device++)
5454
{
5555
cudaSetDevice(gpumatmultconf[index].GPUdevice[device]);
56-
57-
cudaError_t error = cublasSetMatrix(
58-
gpumatmultconf[index].M,
59-
gpumatmultconf[index].Nsize[device],
60-
sizeof(float),
61-
gpumatmultconf[index].cMat_part[device],
62-
gpumatmultconf[index].M,
63-
gpumatmultconf[index].d_cMat[device],
64-
gpumatmultconf[index].M);
65-
66-
if(error != cudaSuccess)
56+
cublasStatus_t error = cublasSetMatrix(
57+
gpumatmultconf[index].M,
58+
gpumatmultconf[index].Nsize[device],
59+
sizeof(float),
60+
gpumatmultconf[index].cMat_part[device],
61+
gpumatmultconf[index].M,
62+
gpumatmultconf[index].d_cMat[device],
63+
gpumatmultconf[index].M);
64+
65+
if(error != CUBLAS_STATUS_SUCCESS)
6766
{
68-
printf("cudblasSetMatrix returned error code %d, line(%d)\n", error, __LINE__);
67+
printf("cudblasSetMatrix returned error code %d, line(%d)\n", (int) error, __LINE__);
6968
exit(EXIT_FAILURE);
7069
}
7170
}

0 commit comments

Comments
 (0)