Skip to content

Add type safety to BoomerAMG's internal functions #1016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add type safety to BoomerAMG's internal functions #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2079eb3
Substitute void* occurences with hypre_ParAMGData
victorapm Nov 29, 2023
a373280
Merge branch 'master' into remove-void-1
victorapm Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
382 changes: 191 additions & 191 deletions src/parcsr_ls/HYPRE_parcsr_amg.c
View file
Open in desktop

Large diffs are not rendered by default.

488 changes: 250 additions & 238 deletions src/parcsr_ls/_hypre_parcsr_ls.h
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/parcsr_ls/ams.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ HYPRE_Int hypre_BoomerAMGBlockSolve(void *B,

if (dim == 1)
{
hypre_BoomerAMGSolve(B, A, b, x);
hypre_BoomerAMGSolve((hypre_ParAMGData*) B, A, b, x);
return hypre_error_flag;
}

Expand All @@ -291,7 +291,7 @@ HYPRE_Int hypre_BoomerAMGBlockSolve(void *B,

for (d = 0; d < dim; d++)
{
hypre_BoomerAMGSolve(B, A, b_[d], x_[d]);
hypre_BoomerAMGSolve((hypre_ParAMGData*) B, A, b_[d], x_[d]);
}

hypre_ParVectorBlockGather(x, x_, dim);
Expand Down Expand Up @@ -4210,7 +4210,7 @@ HYPRE_Int hypre_AMSProjectOutGradients(void *solver,
{
hypre_ParCSRMatrixMatvecT(1.0, ams_data -> G0, x, 0.0, ams_data -> r1);
hypre_ParVectorSetConstantValues(ams_data -> g1, 0.0);
hypre_BoomerAMGSolve(ams_data -> B_G0, ams_data -> A_G0, ams_data -> r1, ams_data -> g1);
HYPRE_BoomerAMGSolve(ams_data -> B_G0, ams_data -> A_G0, ams_data -> r1, ams_data -> g1);
hypre_ParCSRMatrixMatvec(1.0, ams_data -> G0, ams_data -> g1, 0.0, ams_data -> g0);
hypre_ParVectorAxpy(-1.0, ams_data -> g0, x);
}
Expand Down
4 changes: 2 additions & 2 deletions src/parcsr_ls/block_tridiag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ hypre_BlockTridiagSetup(void *data,
HYPRE_BoomerAMGSetNumFunctions(precon1, 1);
HYPRE_BoomerAMGSetNumSweeps(precon1, nsweeps);
HYPRE_BoomerAMGSetRelaxType(precon1, relax_type);
hypre_BoomerAMGSetup(precon1, submatrices[0], b_data->U1, b_data->F1);
HYPRE_BoomerAMGSetup(precon1, submatrices[0], b_data->U1, b_data->F1);

HYPRE_BoomerAMGCreate(&precon2);
HYPRE_BoomerAMGSetMaxIter(precon2, 1);
Expand All @@ -218,7 +218,7 @@ hypre_BlockTridiagSetup(void *data,
HYPRE_BoomerAMGSetNumFunctions(precon2, 1);
HYPRE_BoomerAMGSetNumSweeps(precon2, nsweeps);
HYPRE_BoomerAMGSetRelaxType(precon2, relax_type);
hypre_BoomerAMGSetup(precon2, submatrices[3], NULL, NULL);
HYPRE_BoomerAMGSetup(precon2, submatrices[3], NULL, NULL);

b_data->precon1 = precon1;
b_data->precon2 = precon2;
Expand Down
25 changes: 12 additions & 13 deletions src/parcsr_ls/gen_redcs_mat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,17 @@ hypre_seqAMGSetup( hypre_ParAMGData *amg_data,
HYPRE_UNUSED_VAR(coarse_threshold);

/* Par Data Structure variables */
hypre_ParCSRMatrix **Par_A_array = hypre_ParAMGDataAArray(amg_data);
hypre_ParCSRMatrix **Par_A_array = hypre_ParAMGDataAArray(amg_data);
MPI_Comm comm = hypre_ParCSRMatrixComm(Par_A_array[0]);
MPI_Comm new_comm, seq_comm;

MPI_Comm comm = hypre_ParCSRMatrixComm(Par_A_array[0]);
MPI_Comm new_comm, seq_comm;
hypre_ParCSRMatrix *A_seq = NULL;
hypre_CSRMatrix *A_seq_diag;
hypre_CSRMatrix *A_seq_offd;
hypre_ParVector *F_seq = NULL;
hypre_ParVector *U_seq = NULL;

hypre_ParCSRMatrix *A_seq = NULL;
hypre_CSRMatrix *A_seq_diag;
hypre_CSRMatrix *A_seq_offd;
hypre_ParVector *F_seq = NULL;
hypre_ParVector *U_seq = NULL;

hypre_ParCSRMatrix *A;
hypre_ParCSRMatrix *A;

hypre_IntArray **dof_func_array;
HYPRE_Int num_procs, my_id;
Expand All @@ -42,7 +41,7 @@ hypre_seqAMGSetup( hypre_ParAMGData *amg_data,
HYPRE_Int redundant;
HYPRE_Int num_functions;

HYPRE_Solver coarse_solver;
HYPRE_Solver coarse_solver;

/* misc */
dof_func_array = hypre_ParAMGDataDofFuncArray(amg_data);
Expand Down Expand Up @@ -318,7 +317,7 @@ hypre_seqAMGSetup( hypre_ParAMGData *amg_data,
hypre_ParVectorInitialize(F_seq);
hypre_ParVectorInitialize(U_seq);

hypre_BoomerAMGSetup(coarse_solver, A_seq, F_seq, U_seq);
hypre_BoomerAMGSetup((hypre_ParAMGData *) coarse_solver, A_seq, F_seq, U_seq);

hypre_ParAMGDataCoarseSolver(amg_data) = coarse_solver;
hypre_ParAMGDataACoarse(amg_data) = A_seq;
Expand Down Expand Up @@ -455,7 +454,7 @@ hypre_seqAMGCycle( hypre_ParAMGData *amg_data,
/* clean up */
if (redundant || my_id == 0)
{
hypre_BoomerAMGSolve(coarse_solver, A_coarse, F_coarse, U_coarse);
hypre_BoomerAMGSolve((hypre_ParAMGData *) coarse_solver, A_coarse, F_coarse, U_coarse);
}

/*copy my part of U to parallel vector */
Expand Down
21 changes: 8 additions & 13 deletions src/parcsr_ls/par_add_cycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,9 @@
*--------------------------------------------------------------------------*/

HYPRE_Int
hypre_BoomerAMGAdditiveCycle( void *amg_vdata)
hypre_BoomerAMGAdditiveCycle( hypre_ParAMGData *amg_data)
{
hypre_ParAMGData *amg_data = (hypre_ParAMGData*) amg_vdata;

/* Data Structure variables */

hypre_ParCSRMatrix **A_array;
hypre_ParCSRMatrix **P_array;
hypre_ParCSRMatrix **R_array;
Expand Down Expand Up @@ -315,6 +312,7 @@ hypre_BoomerAMGAdditiveCycle( void *amg_vdata)
}
}
else
{
for (j = 0; j < num_grid_sweeps[2]; j++)
{
hypre_ParCSRRelax(A_array[fine_grid], F_array[fine_grid],
Expand All @@ -323,6 +321,7 @@ hypre_BoomerAMGAdditiveCycle( void *amg_vdata)
1.0, 1.0, 0.0, 0.0, 0, 0.0,
U_array[fine_grid], Vtemp, Ztemp);
}
}
}
else /* additive version */
{
Expand All @@ -341,13 +340,11 @@ hypre_BoomerAMGAdditiveCycle( void *amg_vdata)
return (Solve_err_flag);
}


HYPRE_Int hypre_CreateLambda(void *amg_vdata)
HYPRE_Int
hypre_CreateLambda(hypre_ParAMGData *amg_data)
{
hypre_ParAMGData *amg_data = (hypre_ParAMGData*) amg_vdata;

/* Data Structure variables */
MPI_Comm comm;
MPI_Comm comm;
hypre_ParCSRMatrix **A_array;
hypre_ParVector **F_array;
hypre_ParVector **U_array;
Expand Down Expand Up @@ -1017,10 +1014,9 @@ HYPRE_Int hypre_CreateLambda(void *amg_vdata)
return Solve_err_flag;
}

HYPRE_Int hypre_CreateDinv(void *amg_vdata)
HYPRE_Int
hypre_CreateDinv(hypre_ParAMGData *amg_data)
{
hypre_ParAMGData *amg_data = (hypre_ParAMGData*) amg_vdata;

/* Data Structure variables */
hypre_ParCSRMatrix **A_array;
hypre_ParVector **F_array;
Expand Down Expand Up @@ -1056,7 +1052,6 @@ HYPRE_Int hypre_CreateDinv(void *amg_vdata)
HYPRE_Int l1_start;

/* Acquire data and allocate storage */

A_array = hypre_ParAMGDataAArray(amg_data);
F_array = hypre_ParAMGDataFArray(amg_data);
U_array = hypre_ParAMGDataUArray(amg_data);
Expand Down
Loading