Skip to content

Fix Cmake for tools. #2

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
addman2 wants to merge 1 commit into
base: devel-#58
Choose a base branch
from
Open

Fix Cmake for tools. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
99 changes: 52 additions & 47 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,65 +491,70 @@ endif()

if(EXT_TOOLS)

# These tools have to be threaded in special way:

# serial tools
add_target_exe_serial_wrapper( makefort10 )
add_target_exe_serial_wrapper( readforward-serial )
add_target_exe_serial_wrapper( convertfort10-serial )
add_target_exe_serial_wrapper( convertfort10mol-serial )

# parallel tools
add_target_exe_parallel_wrapper( readforward-mpi )
add_target_exe_parallel_wrapper( convertfort10-mpi )
add_target_exe_parallel_wrapper( convertfort10mol-mpi )

# simple serial tools
list(APPEND TOOLS_LIST_SIMPLE corrvar )
list(APPEND TOOLS_LIST_SIMPLE corrforza )
list(APPEND TOOLS_LIST_SIMPLE corrforzap )
list(APPEND TOOLS_LIST_SIMPLE corrforzap_complex )
list(APPEND TOOLS_LIST_SIMPLE readf )
list(APPEND TOOLS_LIST_SIMPLE readffn )
list(APPEND TOOLS_LIST_SIMPLE readalles )
list(APPEND TOOLS_LIST_SIMPLE funvsa )
list(APPEND TOOLS_LIST_SIMPLE copyjas )
list(APPEND TOOLS_LIST_SIMPLE copydet )
list(APPEND TOOLS_LIST_SIMPLE pseudo )
list(APPEND TOOLS_LIST_SIMPLE plot_orbitals )
list(APPEND TOOLS_LIST_SIMPLE assembling_pseudo)
list(APPEND TOOLS_LIST_SIMPLE orthomol )

add_target_lib_serial_wrapper(pfapack)

if(EXT_GPU)
#serial
add_target_lib_serial_wrapper(common-nogpu-serial)
add_target_lib_serial_wrapper(complex-nogpu-serial)
add_target_lib_serial_wrapper(qlapack-nogpu-serial)
add_target_lib_serial_wrapper(adjoint-forward-nogpu-serial)
add_target_lib_serial_wrapper(adjoint-backward-nogpu-serial)
#parallel
add_target_lib_parallel_wrapper(common-mpi)
add_target_lib_parallel_wrapper(complex-mpi)
add_target_lib_parallel_wrapper(qlapack-mpi)
add_target_lib_parallel_wrapper(adjoint-forward-mpi)
add_target_lib_parallel_wrapper(adjoint-backward-mpi)
else()
#serial
if(EXT_SERIAL)
# serial tools
add_target_exe_serial_wrapper( makefort10 )
add_target_exe_serial_wrapper( readforward-serial )
add_target_exe_serial_wrapper( convertfort10-serial )
add_target_exe_serial_wrapper( convertfort10mol-serial )

# simple serial tools
list(APPEND TOOLS_LIST_SIMPLE corrvar )
list(APPEND TOOLS_LIST_SIMPLE corrforza )
list(APPEND TOOLS_LIST_SIMPLE corrforzap )
list(APPEND TOOLS_LIST_SIMPLE corrforzap_complex )
list(APPEND TOOLS_LIST_SIMPLE readf )
list(APPEND TOOLS_LIST_SIMPLE readffn )
list(APPEND TOOLS_LIST_SIMPLE readalles )
list(APPEND TOOLS_LIST_SIMPLE funvsa )
list(APPEND TOOLS_LIST_SIMPLE copyjas )
list(APPEND TOOLS_LIST_SIMPLE copydet )
list(APPEND TOOLS_LIST_SIMPLE pseudo )
list(APPEND TOOLS_LIST_SIMPLE plot_orbitals )
list(APPEND TOOLS_LIST_SIMPLE assembling_pseudo)
list(APPEND TOOLS_LIST_SIMPLE orthomol )

add_target_lib_serial_wrapper(pfapack)
add_target_lib_serial_wrapper(common-serial)
add_target_lib_serial_wrapper(complex-serial)
add_target_lib_serial_wrapper(qlapack-serial)
add_target_lib_serial_wrapper(adjoint-forward-serial)
add_target_lib_serial_wrapper(adjoint-backward-serial)
#parallel

if(EXT_GPU)
add_target_lib_serial_wrapper(common-nogpu-serial)
add_target_lib_serial_wrapper(complex-nogpu-serial)
add_target_lib_serial_wrapper(qlapack-nogpu-serial)
add_target_lib_serial_wrapper(adjoint-forward-nogpu-serial)
add_target_lib_serial_wrapper(adjoint-backward-nogpu-serial)
endif()
endif()

if(EXT_PARALLEL)
# parallel tools
add_target_exe_parallel_wrapper( readforward-mpi )
add_target_exe_parallel_wrapper( convertfort10-mpi )
add_target_exe_parallel_wrapper( convertfort10mol-mpi )

add_target_lib_serial_wrapper(pfapack)
add_target_lib_parallel_wrapper(common-mpi)
add_target_lib_parallel_wrapper(complex-mpi)
add_target_lib_parallel_wrapper(qlapack-mpi)
add_target_lib_parallel_wrapper(adjoint-forward-mpi)
add_target_lib_parallel_wrapper(adjoint-backward-mpi)
endif()

if(EXT_GPU)
add_target_lib_serial_wrapper(common-nogpu-serial)
add_target_lib_serial_wrapper(complex-nogpu-serial)
add_target_lib_serial_wrapper(qlapack-nogpu-serial)
add_target_lib_serial_wrapper(adjoint-forward-nogpu-serial)
add_target_lib_serial_wrapper(adjoint-backward-nogpu-serial)
else()
#serial
#parallel
endif()

foreach(TOOL_NAME ${TOOLS_LIST_SIMPLE})
add_target_exe_serial_wrapper(${TOOL_NAME})
endforeach()
Expand Down
2 changes: 1 addition & 1 deletion src/a_tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
)
endif()

if(EXT_GPU)
if( ${EXT_GPU} AND ${TOOL_NAME} MATCHES testad )
target_link_libraries( ${TOOL_NAME}
PRIVATE
complex-nogpu-serial
Expand Down