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

Compile all GPU code in toolboxes into a single library #8

Merged
merged 6 commits into from
Dec 21, 2021
Merged

Compile all GPU code in toolboxes into a single library #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41e9121
Building
johnstairs Dec 21, 2021
a46386c
Remove duplicate link libraries
johnstairs Dec 21, 2021
a0c2ae9
Add WIN32 defines
johnstairs Dec 21, 2021
9bc49f3
Revert "Added (temporary) workaround for thrust problem. Should be re…
johnstairs Dec 21, 2021
e42100f
Add comment
johnstairs Dec 21, 2021
68ec6a7
Revert user permissions workaround
johnstairs Dec 21, 2021
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
6 changes: 3 additions & 3 deletions apps/standalone/gpu/deblurring/2d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ add_executable(blur_2d blur_2d.cpp)
add_executable(deblur_2d_cg deblur_2d_cg.cpp)
add_executable(deblur_2d_sb deblur_2d_sb.cpp)

target_link_libraries(deblur_2d_cg gadgetron_toolbox_gpucore gadgetron_toolbox_hostutils gadgetron_toolbox_gpuoperators gadgetron_toolbox_gpusolvers ${CUDA_LIBRARIES})
target_link_libraries(deblur_2d_sb gadgetron_toolbox_gpucore gadgetron_toolbox_hostutils gadgetron_toolbox_gpuoperators gadgetron_toolbox_gpusolvers ${CUDA_LIBRARIES})
target_link_libraries(blur_2d gadgetron_toolbox_gpucore gadgetron_toolbox_hostutils gadgetron_toolbox_gpuoperators gadgetron_toolbox_gpusolvers ${CUDA_LIBRARIES})
target_link_libraries(deblur_2d_cg gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(deblur_2d_sb gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(blur_2d gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})

install(TARGETS blur_2d deblur_2d_cg deblur_2d_sb DESTINATION bin COMPONENT main)

6 changes: 3 additions & 3 deletions apps/standalone/gpu/deblurring/3d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ add_executable(blur_3d blur_3d.cpp)
add_executable(deblur_3d_cg deblur_3d_cg.cpp)
add_executable(deblur_3d_sb deblur_3d_sb.cpp)

target_link_libraries(deblur_3d_cg gadgetron_toolbox_gpucore gadgetron_toolbox_hostutils gadgetron_toolbox_gpuoperators gadgetron_toolbox_gpusolvers gadgetron_toolbox_gpunfft ${CUDA_LIBRARIES})
target_link_libraries(deblur_3d_sb gadgetron_toolbox_gpucore gadgetron_toolbox_hostutils gadgetron_toolbox_gpuoperators gadgetron_toolbox_gpusolvers gadgetron_toolbox_gpunfft ${CUDA_LIBRARIES})
target_link_libraries(blur_3d gadgetron_toolbox_gpucore gadgetron_toolbox_hostutils gadgetron_toolbox_gpuoperators gadgetron_toolbox_gpusolvers gadgetron_toolbox_gpunfft ${CUDA_LIBRARIES})
target_link_libraries(deblur_3d_cg gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(deblur_3d_sb gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(blur_3d gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})

install(TARGETS blur_3d deblur_3d_cg deblur_3d_sb DESTINATION bin COMPONENT main)
5 changes: 1 addition & 4 deletions apps/standalone/gpu/denoising/2d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ include_directories(${CMAKE_SOURCE_DIR}/toolboxes/dwt/gpu)
add_executable(denoise_TV denoise_TV.cpp)

target_link_libraries(denoise_TV
gadgetron_toolbox_gpudwt
gadgetron_toolbox_gpucore
gadgetron_toolbox_gpu
gadgetron_toolbox_hostutils
gadgetron_toolbox_gpusolvers
gadgetron_toolbox_gpuoperators
${CUDA_LIBRARIES})

install(TARGETS denoise_TV DESTINATION bin COMPONENT main)
8 changes: 4 additions & 4 deletions apps/standalone/gpu/mri/nfft/2d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ add_executable(nffth_2d_radial main_nffth.cpp)
add_executable(nffth_cg_2d_radial main_cg.cpp)
add_executable(nffth_sb_2d_radial main_sb.cpp)

target_link_libraries(nfft_2d_radial gadgetron_toolbox_gpucore gadgetron_toolbox_gpuoperators gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(nffth_2d_radial gadgetron_toolbox_gpucore gadgetron_toolbox_gpuoperators gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(nfft_2d_radial gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(nffth_2d_radial gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
#target_link_libraries(moco gpusolvers gpureg gpucore gpuparallelmri gpuoperators gpunfft hostutils ${CUDA_LIBRARIES})
target_link_libraries(nffth_cg_2d_radial gadgetron_toolbox_gpusolvers gadgetron_toolbox_gpuoperators gadgetron_toolbox_gpucore gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(nffth_sb_2d_radial gadgetron_toolbox_gpusolvers gadgetron_toolbox_gpuoperators gadgetron_toolbox_gpucore gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(nffth_cg_2d_radial gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(nffth_sb_2d_radial gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})

install(TARGETS nfft_2d_radial nffth_2d_radial nffth_cg_2d_radial nffth_sb_2d_radial DESTINATION bin COMPONENT main)
6 changes: 3 additions & 3 deletions apps/standalone/gpu/mri/nfft/ms2d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ add_executable(nfft_2d_ms_radial nfft_main.cpp)
add_executable(nffth_2d_ms_radial nffth_main.cpp)
add_executable(nffth_2d_ms_generic nffth_generic.cpp)

target_link_libraries(nfft_2d_ms_radial gadgetron_toolbox_gpucore gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(nffth_2d_ms_radial gadgetron_toolbox_gpucore gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(nffth_2d_ms_generic gadgetron_toolbox_gpucore gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(nfft_2d_ms_radial gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(nffth_2d_ms_radial gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(nffth_2d_ms_generic gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})

install(TARGETS nfft_2d_ms_radial nffth_2d_ms_radial nffth_2d_ms_generic DESTINATION bin COMPONENT main)
2 changes: 1 addition & 1 deletion apps/standalone/gpu/mri/sense/noncartesian/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include_directories(

add_executable(sense_cg_generic_2d generic_cg.cpp)

target_link_libraries(sense_cg_generic_2d gadgetron_toolbox_gpuoperators gadgetron_toolbox_cpucore gadgetron_toolbox_gpucore gadgetron_toolbox_gpuparallelmri gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils gadgetron_toolbox_gpusolvers ${CUDA_LIBRARIES})
target_link_libraries(sense_cg_generic_2d gadgetron_toolbox_gpu gadgetron_toolbox_cpucore gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})

install(TARGETS sense_cg_generic_2d DESTINATION bin COMPONENT main)

Expand Down
8 changes: 4 additions & 4 deletions apps/standalone/gpu/mri/sense/noncartesian/radial/2d_golden_ratio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ add_executable(sense_sbc_radial_2d main_sbc.cpp)
add_executable(sense_gpbb_radial_2d main_gpbb.cpp)
add_executable(sense_nlcg_radial_2d main_nlcg.cpp)

target_link_libraries(sense_cg_radial_2d gadgetron_toolbox_gpuoperators gadgetron_toolbox_cpucore gadgetron_toolbox_gpucore gadgetron_toolbox_gpuparallelmri gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils gadgetron_toolbox_gpusolvers ${CUDA_LIBRARIES})
target_link_libraries(sense_sbc_radial_2d gadgetron_toolbox_gpuoperators gadgetron_toolbox_cpucore gadgetron_toolbox_gpucore gadgetron_toolbox_gpuparallelmri gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils gadgetron_toolbox_gpusolvers ${CUDA_LIBRARIES})
target_link_libraries(sense_gpbb_radial_2d gadgetron_toolbox_gpuoperators gadgetron_toolbox_cpucore gadgetron_toolbox_gpucore gadgetron_toolbox_gpuparallelmri gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils gadgetron_toolbox_gpusolvers ${CUDA_LIBRARIES})
target_link_libraries(sense_nlcg_radial_2d gadgetron_toolbox_gpuoperators gadgetron_toolbox_cpucore gadgetron_toolbox_gpucore gadgetron_toolbox_gpuparallelmri gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils gadgetron_toolbox_gpusolvers ${CUDA_LIBRARIES})
target_link_libraries(sense_cg_radial_2d gadgetron_toolbox_gpu gadgetron_toolbox_cpucore gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(sense_sbc_radial_2d gadgetron_toolbox_gpu gadgetron_toolbox_cpucore gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(sense_gpbb_radial_2d gadgetron_toolbox_gpu gadgetron_toolbox_cpucore gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})
target_link_libraries(sense_nlcg_radial_2d gadgetron_toolbox_gpu gadgetron_toolbox_cpucore gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})

install(TARGETS sense_cg_radial_2d sense_sbc_radial_2d sense_gpbb_radial_2d sense_nlcg_radial_2d DESTINATION bin COMPONENT main)
4 changes: 2 additions & 2 deletions apps/standalone/gpu/mri/sense/noncartesian/radial/2d_golden_ratio_gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ qt4_wrap_cpp (UI_MOC_OUTFILES ${UI_MOC_HEADERS})
add_executable(sense_2d_golden_radial_gui main.cpp ${UI_MOC_OUTFILES}
radialSenseAppMainWidget.cpp reconWidget.cpp GLReconWidget.cpp ${UI_HEADERS} )

target_link_libraries(sense_2d_golden_radial_gui gadgetron_toolbox_gpucore gadgetron_toolbox_gpuparallelmri
gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils gadgetron_toolbox_gpusolvers gpuoperators ${CUDA_LIBRARIES} ${QT_QTGUI_LIBRARY} ${GLEW_LIBRARY}
target_link_libraries(sense_2d_golden_radial_gui gadgetron_toolbox_gpu
gadgetron_toolbox_hostutils gpuoperators ${CUDA_LIBRARIES} ${QT_QTGUI_LIBRARY} ${GLEW_LIBRARY}
${QT_QTCORE_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} )

if (WIN32)
Expand Down
2 changes: 1 addition & 1 deletion apps/standalone/gpu/mri/sense/noncartesian/radial/2d_golden_ratio_kt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
add_executable(ktsense_radial_2d main.cpp)

target_link_libraries(ktsense_radial_2d gadgetron_toolbox_gpucore gadgetron_toolbox_gpuparallelmri gadgetron_toolbox_gpuoperators gadgetron_toolbox_gpunfft gadgetron_toolbox_hostutils gadgetron_toolbox_gpusolvers ${CUDA_LIBRARIES})
target_link_libraries(ktsense_radial_2d gadgetron_toolbox_gpu gadgetron_toolbox_hostutils ${CUDA_LIBRARIES})

install(TARGETS ktsense_radial_2d DESTINATION bin COMPONENT main)
15 changes: 3 additions & 12 deletions apps/standalone/gpu/registration/2d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,13 @@ include_directories(

target_link_libraries(register_HS_2d_gpu
gadgetron_toolbox_hostutils
gadgetron_toolbox_gpureg
gadgetron_toolbox_gpucore
gadgetron_toolbox_gpuoperators
gadgetron_toolbox_gpusolvers
gadgetron_toolbox_gpu
${CUDA_LIBRARIES}
)

target_link_libraries(register_CK_2d_gpu
gadgetron_toolbox_hostutils
gadgetron_toolbox_gpureg
gadgetron_toolbox_gpucore
gadgetron_toolbox_gpuoperators
gadgetron_toolbox_gpusolvers
gadgetron_toolbox_gpu
${CUDA_LIBRARIES}
)

Expand All @@ -38,10 +32,7 @@ target_link_libraries(register_CK_2d_gpu

target_link_libraries(register_CGHS_2d_gpu
gadgetron_toolbox_hostutils
gadgetron_toolbox_gpureg
gadgetron_toolbox_gpucore
gadgetron_toolbox_gpuoperators
gadgetron_toolbox_gpusolvers
gadgetron_toolbox_gpu
${CUDA_LIBRARIES}
)

Expand Down
5 changes: 1 addition & 4 deletions apps/standalone/gpu/registration/3d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ add_executable(register_CK_3d_gpu register_CK_3d.cpp)

target_link_libraries(register_CK_3d_gpu
gadgetron_toolbox_hostutils
gadgetron_toolbox_gpureg
gadgetron_toolbox_gpucore
gadgetron_toolbox_gpuoperators
gadgetron_toolbox_gpusolvers
gadgetron_toolbox_gpu
${CUDA_LIBRARIES}
)

Expand Down
2 changes: 1 addition & 1 deletion gadgets/gpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set_target_properties(gadgetron_gpugadget PROPERTIES VERSION ${GADGETRON_VERSION

target_link_libraries(gadgetron_gpugadget
gadgetron_core
gadgetron_toolbox_gpunfft)
gadgetron_toolbox_gpu)

install(FILES
cuFFTGadget.h
Expand Down
5 changes: 2 additions & 3 deletions gadgets/grappa/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ target_link_libraries(gadgetron_grappa

if (CUDA_FOUND)
target_link_libraries(gadgetron_grappa
gadgetron_toolbox_gpunfft
gadgetron_toolbox_gpucore
gadgetron_toolbox_gpuparallelmri)
gadgetron_toolbox_gpu
)
endif()

install(TARGETS gadgetron_grappa
Expand Down
10 changes: 2 additions & 8 deletions gadgets/hyper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,10 @@ target_link_libraries(gadgetron_hyper
gadgetron_core
gadgetron_mricore
gadgetron_gpuparallelmri
gadgetron_toolbox_gpunfft
gadgetron_toolbox_gpucore
gadgetron_toolbox_gpu
gadgetron_toolbox_cpucore
gadgetron_toolbox_cpufft
gadgetron_toolbox_gpudwt
gadgetron_toolbox_cpucore_math
gadgetron_toolbox_gpusolvers
gadgetron_toolbox_gpuoperators
gadgetron_toolbox_gpuparallelmri
gadgetron_toolbox_hyper)
gadgetron_toolbox_cpucore_math)


install(FILES
Expand Down
5 changes: 2 additions & 3 deletions gadgets/moco/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (CUDA_FOUND)


list(APPEND GPU_GADGETS gpuRegistrationAveragingGadget.cpp gpuRegistrationScatteringGadget.cpp)
list(APPEND GPU_LIBS gadgetron_toolbox_gpucore gadgetron_toolbox_gpureg ${CUDA_LIBRARIES})
list(APPEND GPU_LIBS gadgetron_toolbox_gpu ${CUDA_LIBRARIES})


add_library(gadgetron_moco SHARED
Expand All @@ -27,8 +27,7 @@ if (CUDA_FOUND)
target_link_libraries(gadgetron_moco
gadgetron_core
gadgetron_toolbox_cpucore gadgetron_mricore
gadgetron_toolbox_gpucore
gadgetron_toolbox_gpureg
gadgetron_toolbox_gpu
)

install(TARGETS gadgetron_moco
Expand Down
5 changes: 1 addition & 4 deletions gadgets/mri_noncartesian/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@ target_link_libraries(gadgetron_mri_noncartesian
)
if(CUDA_FOUND)
target_link_libraries(gadgetron_mri_noncartesian
gadgetron_toolbox_gpucore
gadgetron_toolbox_gpusolvers
gadgetron_toolbox_gpuoperators
gadgetron_toolbox_gpuparallelmri
gadgetron_toolbox_gpu
)
endif()

Expand Down
7 changes: 2 additions & 5 deletions gadgets/pmri/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,9 @@ target_link_libraries(gadgetron_gpuparallelmri
gadgetron_mricore
gadgetron_toolbox_log
gadgetron_toolbox_cpucore
gadgetron_toolbox_gpudwt
gadgetron_toolbox_gpucore
gadgetron_toolbox_gpusolvers
gadgetron_toolbox_gpuoperators)
gadgetron_toolbox_gpu)

target_link_libraries(gadgetron_gpuparallelmri gadgetron_toolbox_gpuparallelmri)
target_link_libraries(gadgetron_gpuparallelmri gadgetron_toolbox_gpu)

target_include_directories(gadgetron_gpuparallelmri
PUBLIC
Expand Down
5 changes: 1 addition & 4 deletions gadgets/radial/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,9 @@ target_link_libraries(gadgetron_gpuradial
gadgetron_mricore
gadgetron_toolbox_log
gadgetron_gpuparallelmri
gadgetron_toolbox_gpunfft
gadgetron_toolbox_gpusolvers
gadgetron_toolbox_gpuoperators
gadgetron_toolbox_cpucore
gadgetron_toolbox_cpucore_math
gadgetron_toolbox_gpucore)
gadgetron_toolbox_gpu)

install (FILES gadgetron_radial_export.h
gpuRadialPrepGadget.h
Expand Down
6 changes: 1 addition & 5 deletions gadgets/spiral/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,8 @@ target_link_libraries(gadgetron_spiral
if (CUDA_FOUND)
target_link_libraries(gadgetron_spiral
gadgetron_gpuparallelmri
gadgetron_toolbox_gpucore
gadgetron_toolbox_gpu
gadgetron_core
gadgetron_toolbox_gpunfft
gadgetron_toolbox_gpusolvers
gadgetron_toolbox_gpuoperators
gadgetron_toolbox_gpuparallelmri
gadgetron_toolbox_deblur )
endif()

Expand Down
4 changes: 1 addition & 3 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ include(GoogleTest)

if (CUDA_FOUND)
target_link_libraries(test_all
gadgetron_toolbox_gpucore
gadgetron_toolbox_gpufft
gadgetron_toolbox_gpusdc
gadgetron_toolbox_gpu
)
endif ()
target_link_libraries(test_all
Expand Down
Loading