OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving some files for CMake

Browse Source
This commit is contained in:
Mark Berrill 2014-01-28 14:57:05 -05:00
parent d6caa81ceb
commit 00f8e32c2f
7 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -108,11 +108,6 @@ IF ( NOT ONLY_BUILD_DOCS )
ENDIF() ENDIF()
INSTALL_LBPM_TARGET( lbpm-wia ) INSTALL_LBPM_TARGET( lbpm-wia )
ADD_SUBDIRECTORY( tests ) ADD_SUBDIRECTORY( tests )
#IF ( USE_CUDA )
# ADD_SUBDIRECTORY( gpu/exe )
#ELSE()
# ADD_SUBDIRECTORY( cpu/exe )
#ENDIF()
INSTALL( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/example DESTINATION ${LBPM_INSTALL_DIR} ) INSTALL( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/example DESTINATION ${LBPM_INSTALL_DIR} )
ENDIF() ENDIF()

0
cpu/lb2_Color_wia_mpi_bubble.cpp → cpu/exe/lb2_Color_wia_mpi_bubble.cpp
View File

24
tests/CMakeLists.txt
View File

@ -5,12 +5,20 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/cylindertest ${CMAKE_CURRENT_BINARY_
# Add the tests # Add the tests
ADD_LBPM_TEST( pmmc_cylinder ) ADD_LBPM_TEST( pmmc_cylinder )
ADD_LBPM_TEST( TestCylinderAreas ) ADD_LBPM_TEST( TestCylinderAreas )
ADD_LBPM_TEST( TestSphereCurvature ) ADD_LBPM_TEST( TestSphereCurvature )
# Sample test that will run with 1, 2, and 4 processors, failing with 4 or more procs # Sample test that will run with 1, 2, and 4 processors, failing with 4 or more procs
ADD_LBPM_TEST_1_2_4( hello_world ) ADD_LBPM_TEST_1_2_4( hello_world )
SET_TESTS_PROPERTIES( hello_world PROPERTIES ENVIRONMENT "MPICH_RDMA_ENABLED_CUDA=0") SET_TESTS_PROPERTIES( hello_world PROPERTIES ENVIRONMENT "MPICH_RDMA_ENABLED_CUDA=0")
SET_TESTS_PROPERTIES( hello_world_2procs PROPERTIES ENVIRONMENT "MPICH_RDMA_ENABLED_CUDA=0") SET_TESTS_PROPERTIES( hello_world_2procs PROPERTIES ENVIRONMENT "MPICH_RDMA_ENABLED_CUDA=0")
SET_TESTS_PROPERTIES( hello_world_4procs PROPERTIES ENVIRONMENT "MPICH_RDMA_ENABLED_CUDA=0") SET_TESTS_PROPERTIES( hello_world_4procs PROPERTIES ENVIRONMENT "MPICH_RDMA_ENABLED_CUDA=0")
# Add CPU/GPU specific test
IF ( USE_CUDA )
ADD_SUBDIRECTORY( gpu )
ELSE()
ADD_SUBDIRECTORY( cpu )
ENDIF()

10
tests/cpu/CMakeLists.txt Executable file
View File

@ -0,0 +1,10 @@
# Add tests/executables that need to be compiled but not run
INSTALL_LBPM_EXE( lb2_Color_wia_mpi )
# Run the serial ConstrainedBubble inputs as a weekly test
CONFIGURE_FILE( ${LBPM_SOURCE_DIR}/example/ConstrainedBubble/Color.in ${CMAKE_CURRENT_BINARY_DIR}/Color.in COPYONLY )
CONFIGURE_FILE( ${LBPM_SOURCE_DIR}/example/ConstrainedBubble/Domain.in ${CMAKE_CURRENT_BINARY_DIR}/Domain.in COPYONLY )
ADD_LBPM_WEEKLY_TEST( lb2_Color_wia_mpi 1 )

0
cpu/lb2_Color_wia_mpi.cpp → tests/cpu/lb2_Color_wia_mpi.cpp
View File

8
tests/gpu/CMakeLists.txt Executable file
View File

@ -0,0 +1,8 @@
# Add tests/executables that need to be compiled but not run
INSTALL_LBPM_EXE( lb2_Color_wia_mpi )
# Run the serial ConstrainedBubble inputs as a weekly test
CONFIGURE_FILE( ${LBPM_SOURCE_DIR}/example/ConstrainedBubble/Color.in ${CMAKE_CURRENT_BINARY_DIR}/Color.in COPYONLY )
CONFIGURE_FILE( ${LBPM_SOURCE_DIR}/example/ConstrainedBubble/Domain.in ${CMAKE_CURRENT_BINARY_DIR}/Domain.in COPYONLY )
ADD_LBPM_WEEKLY_TEST( lb2_Color_wia_mpi 1 )

0
gpu/exe/lb2_Color_wia_mpi.cpp → tests/gpu/lb2_Color_wia_mpi.cpp
View File