Skip to content
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

Jump to bottom

Update Caliper annotations #8

Merged
merged 3 commits into from
Feb 12, 2024
Merged

Update Caliper annotations #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e13b5b
Update Caliper annotations
daboehme Feb 6, 2024
35f1cf3
Add solver name in Adiak
daboehme Feb 12, 2024
a1c2b88
Save procs-per-dimension in Adiak
daboehme Feb 12, 2024
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ configure_file(
)

add_executable(amg amg.c)
target_link_libraries(amg PUBLIC ${AMG_DEPENDENCIES})
target_link_libraries(amg PUBLIC ${AMG_DEPENDENCIES} m)
target_include_directories(amg PUBLIC ${CMAKE_BINARY_DIR})

install(TARGETS amg DESTINATION ${CMAKE_INSTALL_BINDIR})
76 changes: 32 additions & 44 deletions amg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,17 +181,11 @@ main( hypre_int argc,
* Set Caliper and Adiak metadata
*----------------------------------------------------------*/
adiak_init(&comm);
adiak_user();
adiak_uid();
adiak_launchdate();
adiak_executable();
adiak_executablepath();
adiak_libraries();
adiak_cmdline();
adiak_hostname();
adiak_clustername();
adiak_collect_all();

adiak_namevalue("compiler", adiak_general, NULL, "%s", AMG2023_COMPILER_ID);
adiak_namevalue("compiler version", adiak_general, NULL, "%s", AMG2023_COMPILER_VERSION);

CALI_MARK_BEGIN("main");
#endif

Expand Down Expand Up @@ -338,7 +332,9 @@ main( hypre_int argc,
* Must be done before HYPRE_Init() and should not be changed after
*-----------------------------------------------------------------*/
hypre_bind_device(myid, num_procs, comm);

#ifdef USE_CALIPER
CALI_MARK_BEGIN("Hypre init");
#endif
time_index = hypre_InitializeTiming("Hypre init");
hypre_BeginTiming(time_index);

Expand All @@ -351,7 +347,9 @@ main( hypre_int argc,
hypre_GetTiming("Hypre init times", &wall_time, comm);
hypre_FinalizeTiming(time_index);
hypre_ClearTiming();

#ifdef USE_CALIPER
CALI_MARK_END("Hypre init");
#endif
/*-----------------------------------------------------------------
* UMPIRE Pools
*-----------------------------------------------------------------*/
Expand Down Expand Up @@ -507,12 +505,13 @@ main( hypre_int argc,
{
#ifdef USE_CALIPER
adiak_namevalue("Problem", adiak_general, NULL, "%d", 2);
CALI_MARK_BEGIN("problem");
adiak_namevalue("Solver", adiak_general, NULL, "%s", "PCG");
CALI_MARK_BEGIN("Problem");
#endif
time_index = hypre_InitializeTiming("PCG Setup");
hypre_MPI_Barrier(comm);
#ifdef USE_CALIPER
CALI_MARK_BEGIN("PCG-Setup");
CALI_MARK_BEGIN("Setup");
#endif
hypre_BeginTiming(time_index);
HYPRE_ParCSRPCGCreate(comm, &pcg_solver);
Expand Down Expand Up @@ -565,7 +564,7 @@ main( hypre_int argc,
hypre_MPI_Barrier(comm);
hypre_EndTiming(time_index);
#ifdef USE_CALIPER
CALI_MARK_END("PCG-Setup");
CALI_MARK_END("Setup");
#endif
hypre_GetTiming("Problem 2: AMG Setup Time", &wall_time, comm);
hypre_FinalizeTiming(time_index);
Expand All @@ -578,21 +577,18 @@ main( hypre_int argc,
total_time = wall_time;

#ifdef USE_CALIPER
CALI_MARK_BEGIN("setup-FOM");
adiak_namevalue("Setup-FOM", adiak_general, NULL, "%f", FOM1);
liruipeng marked this conversation as resolved.
Show resolved Hide resolved
#endif

if (myid == 0)
{
hypre_printf ("\nFOM_Setup: nnz_AP / Setup Phase Time: %e\n\n", FOM1);
}

#ifdef USE_CALIPER
CALI_MARK_END("setup-FOM");
adiak_namevalue("Setup-FOM", adiak_general, NULL, "%f", FOM1);
#endif
time_index = hypre_InitializeTiming("PCG Solve");
hypre_MPI_Barrier(comm);
#ifdef USE_CALIPER
CALI_MARK_BEGIN("PCG-Solve");
CALI_MARK_BEGIN("Solve");
#endif
hypre_BeginTiming(time_index);

Expand All @@ -602,7 +598,7 @@ main( hypre_int argc,
hypre_MPI_Barrier(comm);
hypre_EndTiming(time_index);
#ifdef USE_CALIPER
CALI_MARK_END("PCG-Solve");
CALI_MARK_END("Solve");
#endif
hypre_GetTiming("Problem 2: AMG-PCG Solve Time", &wall_time, comm);
hypre_FinalizeTiming(time_index);
Expand All @@ -620,9 +616,6 @@ main( hypre_int argc,
FOM2 = cum_nnz_AP / wall_time;
total_time += 3*wall_time;

#ifdef USE_CALIPER
CALI_MARK_BEGIN("calculate-FOM");
#endif
if (myid == 0)
{
hypre_printf("\n");
Expand All @@ -632,15 +625,14 @@ main( hypre_int argc,
hypre_printf ("\nFOM_Solve: nnz_AP * iterations / Solve Phase Time: %e\n\n", FOM2);
FOM1 = cum_nnz_AP/total_time;
#ifdef USE_CALIPER
adiak_namevalue("Solve-FOM", adiak_general, NULL, "%f", FOM2);
adiak_namevalue("Final-FOM", adiak_general, NULL, "%f", FOM1);
adiak_namevalue("Solve-FOM", adiak_general, NULL, "%f", FOM2);
adiak_namevalue("Final-FOM", adiak_general, NULL, "%f", FOM1);
#endif
hypre_printf ("\n\nFigure of Merit (FOM): nnz_AP / (Setup Phase Time + 3 * Solve Phase Time) %e\n\n", FOM1);
}

#ifdef USE_CALIPER
CALI_MARK_END("calculate-FOM");
CALI_MARK_END("problem");
CALI_MARK_END("Problem");
#endif
}

Expand All @@ -652,12 +644,13 @@ main( hypre_int argc,
{
#ifdef USE_CALIPER
adiak_namevalue("Problem", adiak_general, NULL, "%d", 1);
CALI_MARK_BEGIN("problem");
adiak_namevalue("Solver", adiak_general, NULL, "%s", "GMRES");
CALI_MARK_BEGIN("Problem");
liruipeng marked this conversation as resolved.
Show resolved Hide resolved
#endif
time_index = hypre_InitializeTiming("GMRES Setup");
hypre_MPI_Barrier(comm);
#ifdef USE_CALIPER
CALI_MARK_BEGIN("GMRES-Setup");
CALI_MARK_BEGIN("Setup");
#endif
hypre_BeginTiming(time_index);

Expand Down Expand Up @@ -708,7 +701,7 @@ main( hypre_int argc,
hypre_MPI_Barrier(comm);
hypre_EndTiming(time_index);
#ifdef USE_CALIPER
CALI_MARK_END("GMRES-Setup");
CALI_MARK_END("Setup");
#endif
hypre_GetTiming("Problem 1: AMG Setup Time", &wall_time, comm);
hypre_FinalizeTiming(time_index);
Expand All @@ -720,22 +713,18 @@ main( hypre_int argc,
FOM1 = cum_nnz_AP / wall_time;
total_time = wall_time;

#ifdef USE_CALIPER
CALI_MARK_BEGIN("setup-FOM");
#endif
if (myid == 0)
{
hypre_printf ("\nFOM_Setup: nnz_AP / Setup Phase Time: %e\n\n", FOM1);
}

#ifdef USE_CALIPER
CALI_MARK_END("setup-FOM");
adiak_namevalue("Setup-FOM", adiak_general, NULL, "%f", FOM1);
#endif
time_index = hypre_InitializeTiming("GMRES Solve");
hypre_MPI_Barrier(comm);
#ifdef USE_CALIPER
CALI_MARK_BEGIN("GMRES-Solve");
CALI_MARK_BEGIN("Solve");
#endif
hypre_BeginTiming(time_index);

Expand All @@ -744,7 +733,7 @@ main( hypre_int argc,
hypre_MPI_Barrier(comm);
hypre_EndTiming(time_index);
#ifdef USE_CALIPER
CALI_MARK_END("GMRES-Solve");
CALI_MARK_END("Solve");
#endif
hypre_GetTiming("Problem 1: AMG-GMRES Solve Time", &wall_time, comm);
hypre_FinalizeTiming(time_index);
Expand All @@ -760,9 +749,6 @@ main( hypre_int argc,
FOM2 = cum_nnz_AP / wall_time;
total_time += wall_time;

#ifdef USE_CALIPER
CALI_MARK_BEGIN("calculate-FOM");
#endif
if (myid == 0)
{
hypre_printf("\n");
Expand All @@ -772,14 +758,13 @@ main( hypre_int argc,
hypre_printf ("\nFOM_Solve: nnz_AP / Solve Phase Time: %e\n\n", FOM2);
FOM1 = cum_nnz_AP / total_time;
#ifdef USE_CALIPER
adiak_namevalue("Solve-FOM", adiak_general, NULL, "%f", FOM2);
adiak_namevalue("Final-FOM", adiak_general, NULL, "%f", FOM1);
adiak_namevalue("Solve-FOM", adiak_general, NULL, "%f", FOM2);
adiak_namevalue("Final-FOM", adiak_general, NULL, "%f", FOM1);
#endif
hypre_printf ("\n\nFigure of Merit (FOM): nnz_AP / (Setup Phase Time + Solve Phase Time) %e\n\n", FOM1);
}
#ifdef USE_CALIPER
CALI_MARK_END("calculate-FOM");
CALI_MARK_END("problem");
CALI_MARK_END("Problem");
#endif
}

Expand Down Expand Up @@ -913,6 +898,9 @@ BuildIJLaplacian27pt( HYPRE_Int argc,
adiak_namevalue("Size-x", adiak_general, NULL, "%d", nx);
adiak_namevalue("Size-y", adiak_general, NULL, "%d", ny);
adiak_namevalue("Size-z", adiak_general, NULL, "%d", nz);
adiak_namevalue("Px", adiak_general, NULL, "%d", P);
adiak_namevalue("Py", adiak_general, NULL, "%d", Q);
adiak_namevalue("Pz", adiak_general, NULL, "%d", R);
#endif

/*-----------------------------------------------------------
Expand Down