CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typo on hypre_GpuMatDataMatDescr variable (#864)

Browse Source 
* The Accessor macro is being changed from Decsr to Descr
* Run astyle

---------

Co-authored-by: Paul Mullowney <Paul.Mullowney@nrel.gov>
This commit is contained in:
Victor A. P. Magri 2023-03-22 22:52:47 -04:00 committed by GitHub
parent 2391e4703f
commit f69f8ef469
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/seq_mv/csr_matop_device.c
View File

@ -69,7 +69,7 @@ hypre_GpuMatDataCreate()
HYPRE_CUSPARSE_CALL( cusparseCreateMatDescr(&mat_descr) ); HYPRE_CUSPARSE_CALL( cusparseCreateMatDescr(&mat_descr) );
HYPRE_CUSPARSE_CALL( cusparseSetMatType(mat_descr, CUSPARSE_MATRIX_TYPE_GENERAL) ); HYPRE_CUSPARSE_CALL( cusparseSetMatType(mat_descr, CUSPARSE_MATRIX_TYPE_GENERAL) );
HYPRE_CUSPARSE_CALL( cusparseSetMatIndexBase(mat_descr, CUSPARSE_INDEX_BASE_ZERO) ); HYPRE_CUSPARSE_CALL( cusparseSetMatIndexBase(mat_descr, CUSPARSE_INDEX_BASE_ZERO) );
hypre_GpuMatDataMatDecsr(data) = mat_descr; hypre_GpuMatDataMatDescr(data) = mat_descr;
#endif #endif
#if defined(HYPRE_USING_ROCSPARSE) #if defined(HYPRE_USING_ROCSPARSE)
@ -78,7 +78,7 @@ hypre_GpuMatDataCreate()
HYPRE_ROCSPARSE_CALL( rocsparse_create_mat_descr(&mat_descr) ); HYPRE_ROCSPARSE_CALL( rocsparse_create_mat_descr(&mat_descr) );
HYPRE_ROCSPARSE_CALL( rocsparse_set_mat_type(mat_descr, rocsparse_matrix_type_general) ); HYPRE_ROCSPARSE_CALL( rocsparse_set_mat_type(mat_descr, rocsparse_matrix_type_general) );
HYPRE_ROCSPARSE_CALL( rocsparse_set_mat_index_base(mat_descr, rocsparse_index_base_zero) ); HYPRE_ROCSPARSE_CALL( rocsparse_set_mat_index_base(mat_descr, rocsparse_index_base_zero) );
hypre_GpuMatDataMatDecsr(data) = mat_descr; hypre_GpuMatDataMatDescr(data) = mat_descr;
HYPRE_ROCSPARSE_CALL( rocsparse_create_mat_info(&info) ); HYPRE_ROCSPARSE_CALL( rocsparse_create_mat_info(&info) );
hypre_GpuMatDataMatInfo(data) = info; hypre_GpuMatDataMatInfo(data) = info;
#endif #endif
@ -117,12 +117,12 @@ hypre_GpuMatDataDestroy(hypre_GpuMatData *data)
} }
#if defined(HYPRE_USING_CUSPARSE) #if defined(HYPRE_USING_CUSPARSE)
HYPRE_CUSPARSE_CALL( cusparseDestroyMatDescr(hypre_GpuMatDataMatDecsr(data)) ); HYPRE_CUSPARSE_CALL( cusparseDestroyMatDescr(hypre_GpuMatDataMatDescr(data)) );
hypre_TFree(hypre_GpuMatDataSpMVBuffer(data), HYPRE_MEMORY_DEVICE); hypre_TFree(hypre_GpuMatDataSpMVBuffer(data), HYPRE_MEMORY_DEVICE);
#endif #endif
#if defined(HYPRE_USING_ROCSPARSE) #if defined(HYPRE_USING_ROCSPARSE)
HYPRE_ROCSPARSE_CALL( rocsparse_destroy_mat_descr(hypre_GpuMatDataMatDecsr(data)) ); HYPRE_ROCSPARSE_CALL( rocsparse_destroy_mat_descr(hypre_GpuMatDataMatDescr(data)) );
HYPRE_ROCSPARSE_CALL( rocsparse_destroy_mat_info(hypre_GpuMatDataMatInfo(data)) ); HYPRE_ROCSPARSE_CALL( rocsparse_destroy_mat_info(hypre_GpuMatDataMatInfo(data)) );
#endif #endif

2
src/seq_mv/protos.h
View File

@ -352,7 +352,7 @@ hypre_GpuMatData* hypre_GpuMatDataCreate();
void hypre_GPUMatDataSetCSRData(hypre_CSRMatrix *matrix); void hypre_GPUMatDataSetCSRData(hypre_CSRMatrix *matrix);
void hypre_GpuMatDataDestroy(hypre_GpuMatData *data); void hypre_GpuMatDataDestroy(hypre_GpuMatData *data);
hypre_GpuMatData* hypre_CSRMatrixGetGPUMatData(hypre_CSRMatrix *matrix); hypre_GpuMatData* hypre_CSRMatrixGetGPUMatData(hypre_CSRMatrix *matrix);
#define hypre_CSRMatrixGPUMatDescr(matrix) ( hypre_GpuMatDataMatDecsr(hypre_CSRMatrixGetGPUMatData(matrix)) ) #define hypre_CSRMatrixGPUMatDescr(matrix) ( hypre_GpuMatDataMatDescr(hypre_CSRMatrixGetGPUMatData(matrix)) )
#define hypre_CSRMatrixGPUMatInfo(matrix) ( hypre_GpuMatDataMatInfo (hypre_CSRMatrixGetGPUMatData(matrix)) ) #define hypre_CSRMatrixGPUMatInfo(matrix) ( hypre_GpuMatDataMatInfo (hypre_CSRMatrixGetGPUMatData(matrix)) )
#define hypre_CSRMatrixGPUMatHandle(matrix) ( hypre_GpuMatDataMatHandle (hypre_CSRMatrixGetGPUMatData(matrix)) ) #define hypre_CSRMatrixGPUMatHandle(matrix) ( hypre_GpuMatDataMatHandle (hypre_CSRMatrixGetGPUMatData(matrix)) )
#define hypre_CSRMatrixGPUMatSpMVBuffer(matrix) ( hypre_GpuMatDataSpMVBuffer (hypre_CSRMatrixGetGPUMatData(matrix)) ) #define hypre_CSRMatrixGPUMatSpMVBuffer(matrix) ( hypre_GpuMatDataSpMVBuffer (hypre_CSRMatrixGetGPUMatData(matrix)) )

2
src/seq_mv/seq_mv.h
View File

@ -624,7 +624,7 @@ hypre_GpuMatData* hypre_GpuMatDataCreate();
void hypre_GPUMatDataSetCSRData(hypre_CSRMatrix *matrix); void hypre_GPUMatDataSetCSRData(hypre_CSRMatrix *matrix);
void hypre_GpuMatDataDestroy(hypre_GpuMatData *data); void hypre_GpuMatDataDestroy(hypre_GpuMatData *data);
hypre_GpuMatData* hypre_CSRMatrixGetGPUMatData(hypre_CSRMatrix *matrix); hypre_GpuMatData* hypre_CSRMatrixGetGPUMatData(hypre_CSRMatrix *matrix);
#define hypre_CSRMatrixGPUMatDescr(matrix) ( hypre_GpuMatDataMatDecsr(hypre_CSRMatrixGetGPUMatData(matrix)) ) #define hypre_CSRMatrixGPUMatDescr(matrix) ( hypre_GpuMatDataMatDescr(hypre_CSRMatrixGetGPUMatData(matrix)) )
#define hypre_CSRMatrixGPUMatInfo(matrix) ( hypre_GpuMatDataMatInfo (hypre_CSRMatrixGetGPUMatData(matrix)) ) #define hypre_CSRMatrixGPUMatInfo(matrix) ( hypre_GpuMatDataMatInfo (hypre_CSRMatrixGetGPUMatData(matrix)) )
#define hypre_CSRMatrixGPUMatHandle(matrix) ( hypre_GpuMatDataMatHandle (hypre_CSRMatrixGetGPUMatData(matrix)) ) #define hypre_CSRMatrixGPUMatHandle(matrix) ( hypre_GpuMatDataMatHandle (hypre_CSRMatrixGetGPUMatData(matrix)) )
#define hypre_CSRMatrixGPUMatSpMVBuffer(matrix) ( hypre_GpuMatDataSpMVBuffer (hypre_CSRMatrixGetGPUMatData(matrix)) ) #define hypre_CSRMatrixGPUMatSpMVBuffer(matrix) ( hypre_GpuMatDataSpMVBuffer (hypre_CSRMatrixGetGPUMatData(matrix)) )

2
src/utilities/_hypre_utilities.hpp
View File

@ -757,7 +757,7 @@ struct hypre_GpuMatData
#endif #endif
}; };
#define hypre_GpuMatDataMatDecsr(data) ((data) -> mat_descr) #define hypre_GpuMatDataMatDescr(data) ((data) -> mat_descr)
#define hypre_GpuMatDataMatInfo(data) ((data) -> mat_info) #define hypre_GpuMatDataMatInfo(data) ((data) -> mat_info)
#define hypre_GpuMatDataMatHandle(data) ((data) -> mat_handle) #define hypre_GpuMatDataMatHandle(data) ((data) -> mat_handle)
#define hypre_GpuMatDataSpMVBuffer(data) ((data) -> spmv_buffer) #define hypre_GpuMatDataSpMVBuffer(data) ((data) -> spmv_buffer)

2
src/utilities/device_utils.h
View File

@ -705,7 +705,7 @@ struct hypre_GpuMatData
#endif #endif
}; };
#define hypre_GpuMatDataMatDecsr(data) ((data) -> mat_descr) #define hypre_GpuMatDataMatDescr(data) ((data) -> mat_descr)
#define hypre_GpuMatDataMatInfo(data) ((data) -> mat_info) #define hypre_GpuMatDataMatInfo(data) ((data) -> mat_info)
#define hypre_GpuMatDataMatHandle(data) ((data) -> mat_handle) #define hypre_GpuMatDataMatHandle(data) ((data) -> mat_handle)
#define hypre_GpuMatDataSpMVBuffer(data) ((data) -> spmv_buffer) #define hypre_GpuMatDataSpMVBuffer(data) ((data) -> spmv_buffer)

3
src/utilities/general.c
View File

@ -19,7 +19,8 @@ hypre_handle(void)
{ {
if (!_hypre_handle) if (!_hypre_handle)
{ {
hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR - _hypre_handle is not initialized. Calling HYPRE_Init(). All HYPRE_* or hypre_* function calls should occur between HYPRE_Init() and HYPRE_Finalize().\n"); hypre_error_w_msg(HYPRE_ERROR_GENERIC,
"ERROR - _hypre_handle is not initialized. Calling HYPRE_Init(). All HYPRE_* or hypre_* function calls should occur between HYPRE_Init() and HYPRE_Finalize().\n");
HYPRE_Init(); HYPRE_Init();
} }

6
src/utilities/memory_tracker.c
View File

@ -23,7 +23,7 @@ hypre_MemoryTracker*
hypre_memory_tracker(void) hypre_memory_tracker(void)
{ {
#ifdef HYPRE_USING_OPENMP #ifdef HYPRE_USING_OPENMP
#pragma omp critical #pragma omp critical
#endif #endif
{ {
if (!_hypre_memory_tracker) if (!_hypre_memory_tracker)
@ -272,7 +272,7 @@ hypre_MemoryTrackerInsert2(const char *action,
hypre_MemoryTrackerQueue *queue = &tracker->queue[q]; hypre_MemoryTrackerQueue *queue = &tracker->queue[q];
#ifdef HYPRE_USING_OPENMP #ifdef HYPRE_USING_OPENMP
#pragma omp critical #pragma omp critical
#endif #endif
{ {
/* resize if not enough space */ /* resize if not enough space */
@ -281,7 +281,7 @@ hypre_MemoryTrackerInsert2(const char *action,
{ {
queue->alloced_size = 2 * queue->alloced_size + 1; queue->alloced_size = 2 * queue->alloced_size + 1;
queue->data = (hypre_MemoryTrackerEntry *) realloc(queue->data, queue->data = (hypre_MemoryTrackerEntry *) realloc(queue->data,
queue->alloced_size * sizeof(hypre_MemoryTrackerEntry)); queue->alloced_size * sizeof(hypre_MemoryTrackerEntry));
} }
hypre_assert(queue->actual_size < queue->alloced_size); hypre_assert(queue->actual_size < queue->alloced_size);