Put back the b6_ prefix

This commit is contained in:
Rodrigo Arias 2024-04-15 15:45:22 +02:00
parent fbb8fc3bb3
commit 80a47f1ec9

View File

@ -22,7 +22,7 @@ macro(mk_heat_smp NAME SOURCE)
endmacro() endmacro()
# No requisites # No requisites
mk_heat_smp(heat_seq solver_seq.c) mk_heat_smp(b6_heat_seq solver_seq.c)
if(NANOS6_FOUND) if(NANOS6_FOUND)
macro(mk_heat_nanos6 NAME SOURCE) macro(mk_heat_nanos6 NAME SOURCE)
@ -31,8 +31,8 @@ if(NANOS6_FOUND)
target_link_options(${NAME} PRIVATE "-fompss-2=libnanos6") target_link_options(${NAME} PRIVATE "-fompss-2=libnanos6")
endmacro() endmacro()
mk_heat_nanos6(heat_nanos6 solver_ompss2.c) mk_heat_nanos6(b6_heat_nanos6 solver_ompss2.c)
mk_heat_nanos6(heat_nanos6_residual solver_ompss2_residual.c) mk_heat_nanos6(b6_heat_nanos6_residual solver_ompss2_residual.c)
endif() endif()
message(STATUS "NODES FOUND = ${NODES_FOUND}") message(STATUS "NODES FOUND = ${NODES_FOUND}")
@ -42,8 +42,8 @@ if(NODES_FOUND)
target_link_libraries(${NAME} PRIVATE Nodes::nodes) target_link_libraries(${NAME} PRIVATE Nodes::nodes)
endmacro() endmacro()
mk_heat_nodes(heat_nodes solver_ompss2.c) mk_heat_nodes(b6_heat_nodes solver_ompss2.c)
mk_heat_nodes(heat_nodes_residual solver_ompss2_residual.c) mk_heat_nodes(b6_heat_nodes_residual solver_ompss2_residual.c)
endif() endif()
# --- MPI based --- # --- MPI based ---
@ -57,8 +57,8 @@ if(MPI_FOUND)
target_sources(${NAME} PRIVATE ${SOURCE}) target_sources(${NAME} PRIVATE ${SOURCE})
target_link_libraries(${NAME} PRIVATE heat_mpi_common) target_link_libraries(${NAME} PRIVATE heat_mpi_common)
endmacro() endmacro()
mk_heat_mpi(heat_mpi solver_mpi.c) mk_heat_mpi(b6_heat_mpi solver_mpi.c)
mk_heat_mpi(heat_mpi_nbuffer solver_mpi_nbuffer.c) mk_heat_mpi(b6_heat_mpi_nbuffer solver_mpi_nbuffer.c)
if(NANOS6_FOUND) if(NANOS6_FOUND)
macro(mk_heat_mpi_nanos6 NAME SOURCE) macro(mk_heat_mpi_nanos6 NAME SOURCE)
@ -66,15 +66,15 @@ if(MPI_FOUND)
target_compile_options(${NAME} PRIVATE "-fompss-2=libnanos6") target_compile_options(${NAME} PRIVATE "-fompss-2=libnanos6")
target_link_options(${NAME} PRIVATE "-fompss-2=libnanos6") target_link_options(${NAME} PRIVATE "-fompss-2=libnanos6")
endmacro() endmacro()
mk_heat_mpi_nanos6(heat_mpi_nanos6_forkjoin solver_mpi_ompss2_forkjoin.c) mk_heat_mpi_nanos6(b6_heat_mpi_nanos6_forkjoin solver_mpi_ompss2_forkjoin.c)
mk_heat_mpi_nanos6(heat_mpi_nanos6_tasks solver_mpi_ompss2_tasks.c) mk_heat_mpi_nanos6(b6_heat_mpi_nanos6_tasks solver_mpi_ompss2_tasks.c)
if(TAMPI_FOUND) if(TAMPI_FOUND)
macro(mk_heat_tampi_nanos6 NAME SOURCE) macro(mk_heat_tampi_nanos6 NAME SOURCE)
mk_heat_mpi_nanos6(${NAME} ${SOURCE}) mk_heat_mpi_nanos6(${NAME} ${SOURCE})
target_link_libraries(${NAME} PRIVATE Tampi::tampi-c) target_link_libraries(${NAME} PRIVATE Tampi::tampi-c)
endmacro() endmacro()
mk_heat_tampi_nanos6(heat_itampi_nanos6_tasks solver_itampi_ompss2_tasks.c) mk_heat_tampi_nanos6(b6_heat_itampi_nanos6_tasks solver_itampi_ompss2_tasks.c)
endif() endif()
endif() endif()
@ -83,8 +83,8 @@ if(MPI_FOUND)
mk_heat_mpi(${NAME} ${SOURCE}) mk_heat_mpi(${NAME} ${SOURCE})
target_link_libraries(${NAME} PRIVATE Nodes::nodes) target_link_libraries(${NAME} PRIVATE Nodes::nodes)
endmacro() endmacro()
mk_heat_mpi_nodes(heat_mpi_nodes_forkjoin solver_mpi_ompss2_forkjoin.c) mk_heat_mpi_nodes(b6_heat_mpi_nodes_forkjoin solver_mpi_ompss2_forkjoin.c)
mk_heat_mpi_nodes(heat_mpi_nodes_tasks solver_mpi_ompss2_tasks.c) mk_heat_mpi_nodes(b6_heat_mpi_nodes_tasks solver_mpi_ompss2_tasks.c)
endif() endif()
endif() endif()