Skip to content

Test: simplify compiling ucell info in UNIT tests #2747

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

Merged
hongriTianqi merged 5 commits into from
Jul 23, 2023
Merged

Test: simplify compiling ucell info in UNIT tests #2747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f794ea
Test: simplify compiling ucell info in UNIT tests
Jul 23, 2023
647a441
remove __EXX definition in surchem tests
Jul 23, 2023
41a9d27
fix error
Jul 23, 2023
13a127a
fix compilation error
Jul 23, 2023
aa92a4e
change cell_simple to cell_info
Jul 23, 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
1 change: 0 additions & 1 deletion source/module_cell/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@ if(BUILD_TESTING)
add_subdirectory(test)
add_subdirectory(test_pw)
endif()

21 changes: 6 additions & 15 deletions source/module_cell/module_neighbor/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,22 @@ AddTest(

AddTest(
TARGET cell_neighbor_sltk_atom_input
LIBS ${math_libs} base device
LIBS ${math_libs} base device cell_info
SOURCES sltk_atom_input_test.cpp ../sltk_atom_input.cpp ../sltk_atom.cpp ../sltk_adjacent_set.cpp
../../unitcell.cpp ../../read_atoms.cpp ../../read_cell_pseudopots.cpp
../../atom_spec.cpp ../../atom_pseudo.cpp ../../pseudo_nc.cpp
../../read_pp.cpp ../../read_pp_upf201.cpp ../../read_pp_upf100.cpp
../../read_pp_vwr.cpp ../../read_pp_blps.cpp ../../../module_io/output.cpp
../../../module_io/output.cpp
)

AddTest(
TARGET cell_neighbor_sltk_grid
LIBS ${math_libs} base device
LIBS ${math_libs} base device cell_info
SOURCES sltk_grid_test.cpp ../sltk_grid.cpp ../sltk_atom_input.cpp ../sltk_atom.cpp ../sltk_adjacent_set.cpp
../../unitcell.cpp ../../read_atoms.cpp ../../read_cell_pseudopots.cpp
../../atom_spec.cpp ../../atom_pseudo.cpp ../../pseudo_nc.cpp
../../read_pp.cpp ../../read_pp_upf201.cpp ../../read_pp_upf100.cpp
../../read_pp_vwr.cpp ../../read_pp_blps.cpp ../../../module_io/output.cpp
../../../module_io/output.cpp
)

AddTest(
TARGET cell_neighbor_sltk_atom_arrange
LIBS ${math_libs} base device
LIBS ${math_libs} base device cell_info
SOURCES sltk_atom_arrange_test.cpp ../sltk_atom_arrange.cpp ../sltk_grid_driver.cpp ../sltk_grid.cpp
../sltk_atom_input.cpp ../sltk_atom.cpp ../sltk_adjacent_set.cpp
../../unitcell.cpp ../../read_atoms.cpp ../../read_cell_pseudopots.cpp
../../atom_spec.cpp ../../atom_pseudo.cpp ../../pseudo_nc.cpp
../../read_pp.cpp ../../read_pp_upf201.cpp ../../read_pp_upf100.cpp
../../read_pp_vwr.cpp ../../read_pp_blps.cpp ../../../module_io/output.cpp
../../../module_io/output.cpp
)
40 changes: 24 additions & 16 deletions source/module_cell/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,22 @@ install(FILES parallel_kpoints_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
install(FILES klist_test_para.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
install(FILES unitcell_test_parallel.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

list(APPEND cell_simple_srcs
../unitcell.cpp
../read_atoms.cpp
../read_cell_pseudopots.cpp
../atom_spec.cpp
../atom_pseudo.cpp
../pseudo_nc.cpp
../read_pp.cpp
../read_pp_upf201.cpp
../read_pp_upf100.cpp
../read_pp_vwr.cpp
../read_pp_blps.cpp
)

add_library(cell_info OBJECT ${cell_simple_srcs})

AddTest(
TARGET cell_read_pp
LIBS ${math_libs} base device
Expand Down Expand Up @@ -82,34 +98,26 @@ add_test(NAME cell_parallel_kpoints_test

AddTest(
TARGET cell_unitcell_test
LIBS ${math_libs} base device
SOURCES unitcell_test.cpp ../unitcell.cpp ../read_atoms.cpp ../read_cell_pseudopots.cpp ../atom_spec.cpp
../atom_pseudo.cpp ../pseudo_nc.cpp ../read_pp.cpp ../read_pp_upf201.cpp ../read_pp_upf100.cpp
../read_pp_vwr.cpp ../read_pp_blps.cpp ../../module_io/output.cpp
LIBS ${math_libs} base device cell_info
SOURCES unitcell_test.cpp ../../module_io/output.cpp
)

AddTest(
TARGET cell_unitcell_test_readpp
LIBS ${math_libs} base device
SOURCES unitcell_test_readpp.cpp ../unitcell.cpp ../read_atoms.cpp ../read_cell_pseudopots.cpp ../atom_spec.cpp
../atom_pseudo.cpp ../pseudo_nc.cpp ../read_pp.cpp ../read_pp_upf201.cpp ../read_pp_upf100.cpp
../read_pp_vwr.cpp ../read_pp_blps.cpp ../../module_io/output.cpp
LIBS ${math_libs} base device cell_info
SOURCES unitcell_test_readpp.cpp ../../module_io/output.cpp
)

AddTest(
TARGET cell_unitcell_test_para
LIBS ${math_libs} base device
SOURCES unitcell_test_para.cpp ../unitcell.cpp ../read_atoms.cpp ../read_cell_pseudopots.cpp ../atom_spec.cpp
../atom_pseudo.cpp ../pseudo_nc.cpp ../read_pp.cpp ../read_pp_upf201.cpp ../read_pp_upf100.cpp
../read_pp_vwr.cpp ../read_pp_blps.cpp ../../module_io/output.cpp
LIBS ${math_libs} base device cell_info
SOURCES unitcell_test_para.cpp ../../module_io/output.cpp
)

AddTest(
TARGET cell_unitcell_test_setupcell
LIBS ${math_libs} base device
SOURCES unitcell_test_setupcell.cpp ../unitcell.cpp ../read_atoms.cpp ../read_cell_pseudopots.cpp ../atom_spec.cpp
../atom_pseudo.cpp ../pseudo_nc.cpp ../read_pp.cpp ../read_pp_upf201.cpp ../read_pp_upf100.cpp
../read_pp_vwr.cpp ../read_pp_blps.cpp ../../module_io/output.cpp
LIBS ${math_libs} base device cell_info
SOURCES unitcell_test_setupcell.cpp ../../module_io/output.cpp
)

add_test(NAME cell_unitcell_test_parallel
Expand Down
44 changes: 4 additions & 40 deletions source/module_elecstate/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,60 +75,24 @@ AddTest(

AddTest(
TARGET charge_test
LIBS ${math_libs} planewave_serial base device
LIBS ${math_libs} planewave_serial base device cell_info
SOURCES charge_test.cpp ../module_charge/charge.cpp
# UnitCell dependencies
../../module_cell/unitcell.cpp
../../module_cell/read_atoms.cpp
../../module_cell/read_cell_pseudopots.cpp
../../module_cell/atom_spec.cpp
../../module_cell/atom_pseudo.cpp
../../module_cell/pseudo_nc.cpp
../../module_cell/read_pp.cpp
../../module_cell/read_pp_upf201.cpp
../../module_cell/read_pp_upf100.cpp
../../module_cell/read_pp_vwr.cpp
../../module_cell/read_pp_blps.cpp
../../module_io/output.cpp
)

AddTest(
TARGET charge_mixing
LIBS base ${math_libs} psi device planewave_serial
LIBS base ${math_libs} psi device planewave_serial cell_info
SOURCES charge_mixing_test.cpp
../module_charge/charge_mixing.cpp
../module_charge/charge_broyden.cpp
../module_charge/charge_pulay.cpp
# UnitCell dependencies
../../module_cell/unitcell.cpp
../../module_cell/read_atoms.cpp
../../module_cell/read_cell_pseudopots.cpp
../../module_cell/atom_spec.cpp
../../module_cell/atom_pseudo.cpp
../../module_cell/pseudo_nc.cpp
../../module_cell/read_pp.cpp
../../module_cell/read_pp_upf201.cpp
../../module_cell/read_pp_upf100.cpp
../../module_cell/read_pp_vwr.cpp
../../module_cell/read_pp_blps.cpp
../../module_io/output.cpp
../../module_io/output.cpp
)

AddTest(
TARGET charge_extra
LIBS ${math_libs} base device
LIBS ${math_libs} base device cell_info
SOURCES charge_extra_test.cpp ../module_charge/charge_extra.cpp ../../module_io/read_cube.cpp ../../module_io/write_cube.cpp
# UnitCell dependencies
../../module_cell/unitcell.cpp
../../module_cell/read_atoms.cpp
../../module_cell/read_cell_pseudopots.cpp
../../module_cell/atom_spec.cpp
../../module_cell/atom_pseudo.cpp
../../module_cell/pseudo_nc.cpp
../../module_cell/read_pp.cpp
../../module_cell/read_pp_upf201.cpp
../../module_cell/read_pp_upf100.cpp
../../module_cell/read_pp_vwr.cpp
../../module_cell/read_pp_blps.cpp
../../module_io/output.cpp
)
16 changes: 4 additions & 12 deletions source/module_io/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,8 @@ AddTest(

AddTest(
TARGET io_print_info
LIBS ${math_libs} base device symmetry
SOURCES print_info_test.cpp ../print_info.cpp ../input.cpp ../output.cpp ../../module_cell/unitcell.cpp
../../module_cell/read_atoms.cpp ../../module_cell/read_cell_pseudopots.cpp ../../module_cell/atom_spec.cpp
../../module_cell/atom_pseudo.cpp ../../module_cell/pseudo_nc.cpp ../../module_cell/read_pp.cpp
../../module_cell/read_pp_upf201.cpp ../../module_cell/read_pp_upf100.cpp ../../module_cell/read_pp_vwr.cpp
../../module_cell/read_pp_blps.cpp ../../module_cell/klist.cpp ../../module_cell/parallel_kpoints.cpp
LIBS ${math_libs} base device symmetry cell_info
SOURCES print_info_test.cpp ../print_info.cpp ../input.cpp ../output.cpp ../../module_cell/klist.cpp ../../module_cell/parallel_kpoints.cpp
)

AddTest(
Expand All @@ -99,12 +95,8 @@ AddTest(

AddTest(
TARGET io_write_orb_info
LIBS ${math_libs} base device
SOURCES write_orb_info_test.cpp ../write_orb_info.cpp ../output.cpp ../../module_cell/unitcell.cpp
../../module_cell/read_atoms.cpp ../../module_cell/read_cell_pseudopots.cpp ../../module_cell/atom_spec.cpp
../../module_cell/atom_pseudo.cpp ../../module_cell/pseudo_nc.cpp ../../module_cell/read_pp.cpp
../../module_cell/read_pp_upf201.cpp ../../module_cell/read_pp_upf100.cpp ../../module_cell/read_pp_vwr.cpp
../../module_cell/read_pp_blps.cpp
LIBS ${math_libs} base device cell_info
SOURCES write_orb_info_test.cpp ../write_orb_info.cpp ../output.cpp
)

AddTest(
Expand Down
16 changes: 4 additions & 12 deletions source/module_io/test_serial/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,14 @@ install(DIRECTORY support DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

AddTest(
TARGET io_rho_io
LIBS ${math_libs} base device
SOURCES rho_io_test.cpp ../read_cube.cpp ../write_cube.cpp ../read_rho.cpp ../write_rho.cpp ../output.cpp ../../module_cell/unitcell.cpp
../../module_cell/read_atoms.cpp ../../module_cell/read_cell_pseudopots.cpp ../../module_cell/atom_spec.cpp
../../module_cell/atom_pseudo.cpp ../../module_cell/pseudo_nc.cpp ../../module_cell/read_pp.cpp
../../module_cell/read_pp_upf201.cpp ../../module_cell/read_pp_upf100.cpp ../../module_cell/read_pp_vwr.cpp
../../module_cell/read_pp_blps.cpp
LIBS ${math_libs} base device cell_info
SOURCES rho_io_test.cpp ../read_cube.cpp ../write_cube.cpp ../read_rho.cpp ../write_rho.cpp ../output.cpp
)

AddTest(
TARGET io_dm_io
LIBS ${math_libs} base device
SOURCES dm_io_test.cpp ../read_dm.cpp ../write_dm.cpp ../output.cpp ../../module_cell/unitcell.cpp
../../module_cell/read_atoms.cpp ../../module_cell/read_cell_pseudopots.cpp ../../module_cell/atom_spec.cpp
../../module_cell/atom_pseudo.cpp ../../module_cell/pseudo_nc.cpp ../../module_cell/read_pp.cpp
../../module_cell/read_pp_upf201.cpp ../../module_cell/read_pp_upf100.cpp ../../module_cell/read_pp_vwr.cpp
../../module_cell/read_pp_blps.cpp
LIBS ${math_libs} base device cell_info
SOURCES dm_io_test.cpp ../read_dm.cpp ../write_dm.cpp ../output.cpp
)

AddTest(
Expand Down