add runner to MPI tests, cpu_count handles Apple Silicon performance cores

scivision · scivision · commit b9e117fb6b47 · 2022-07-18T15:30:06.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,6 +24,10 @@ if(NOT DEFINED ${PROJECT_NAME}_BUILD_TESTING)
   set(${PROJECT_NAME}_BUILD_TESTING ${BUILD_TESTING})
 endif()
 
+if(${PROJECT_NAME}_BUILD_TESTING)
+  enable_language(CXX)
+endif()
+
 include(cmake/options.cmake)
 include(cmake/compilers.cmake)
 
@@ -46,10 +50,6 @@ if(HDF5_VERSION VERSION_LESS 1.10.2)
   message(WARNING "HDF5 >= 1.10.2 is needed for HDF5-MPI")
 endif()
 
-if(ENABLE_BENCHMARKS)
-  add_subdirectory(benchmark)
-endif()
-
 # --- HDF5-MPI object oriented API
 
 add_subdirectory(src)
@@ -58,6 +58,11 @@ if(${PROJECT_NAME}_BUILD_TESTING)
   add_subdirectory(test)
 endif()
 
+if(ENABLE_BENCHMARKS)
+  add_subdirectory(benchmark)
+endif()
+
+
 # additional Find*.cmake necessary
 install(FILES
 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindHDF5.cmake
diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -31,9 +31,6 @@ add_library(cli OBJECT cli.f90)
 
 add_executable(runner frontend.f90 cpu.cpp)
 target_link_libraries(runner PRIVATE partition cli)
-# set_target_properties(runner PROPERTIES
-# RUNTIME_OUTPUT_DIRECTORY $<TARGET_FILE_DIR:slab_mpi_write>
-# )
 if(CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
   set_target_properties(runner PROPERTIES LINKER_LANGUAGE Fortran)
 else()
diff --git a/benchmark/Readme.md b/benchmark/Readme.md
diff --git a/benchmark/bench_plot.py b/benchmark/bench_plot.py
diff --git a/benchmark/bench_slab.py b/benchmark/bench_slab.py
diff --git a/benchmark/test/CMakeLists.txt b/benchmark/test/CMakeLists.txt
@@ -173,14 +173,14 @@ if(NOT DEFINED PySkip)
 endif()
 
 
-set(pyargs ${PROJECT_SOURCE_DIR}/scripts/bench_slab.py --datadir ${CMAKE_CURRENT_BINARY_DIR} -B $<TARGET_FILE_DIR:slab_mpi_write> -Nrun ${Nrun} -lx ${lx3} --debug)
+set(pyargs ${PROJECT_SOURCE_DIR}/bench_slab.py --datadir ${CMAKE_CURRENT_BINARY_DIR} -B ${PROJECT_BINARY_DIR} -Nrun ${Nrun} -lx ${lx3} --debug)
 add_test(NAME PythonRunner COMMAND Python::Interpreter ${pyargs})
 set_tests_properties(PythonRunner PROPERTIES
 FIXTURES_SETUP PyRun_fxt
 RUN_SERIAL true
 )
 
-add_test(NAME Plotter COMMAND Python::Interpreter ${PROJECT_SOURCE_DIR}/scripts/bench_plot.py --datadir ${CMAKE_CURRENT_BINARY_DIR} -lx ${lx3})
+add_test(NAME Plotter COMMAND Python::Interpreter ${PROJECT_SOURCE_DIR}/bench_plot.py --datadir ${CMAKE_CURRENT_BINARY_DIR} -lx ${lx3})
 set_tests_properties(Plotter PROPERTIES
 FIXTURES_REQUIRED PyRun_fxt
 )
diff --git a/benchmark/utils.py b/benchmark/utils.py
diff --git a/cmake/Modules/MPI/FindMPI.cmake b/cmake/Modules/MPI/FindMPI.cmake
@@ -529,7 +529,7 @@ if(WIN32 AND NOT CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
     PATH_SUFFIXES x64
   )
 
-  if(MPI_Fortran_INCLUDE_EXTRA AND NOT MPI_Fortran_INCLUDE_EXTRA STREQUAL ${MPI_Fortran_INCLUDE_DIR})
+  if(MPI_Fortran_INCLUDE_EXTRA AND NOT MPI_Fortran_INCLUDE_EXTRA STREQUAL "${MPI_Fortran_INCLUDE_DIR}")
     list(APPEND MPI_Fortran_INCLUDE_DIR ${MPI_Fortran_INCLUDE_EXTRA})
   endif()
 endif()
@@ -590,7 +590,7 @@ if(NOT MPI_ROOT AND DEFINED ENV{MPI_ROOT})
 endif()
 
 # Intel MPI, which works with non-Intel compilers on Linux
-if((CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_C_COMPILER_ID MATCHES "^Intel") AND
+if((CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_C_COMPILER_ID MATCHES "^Intel") AND
       DEFINED ENV{I_MPI_ROOT})
   set(_hints $ENV{I_MPI_ROOT})
 endif()
diff --git a/cmake/hdf5_compression.cmake b/cmake/hdf5_compression.cmake
@@ -73,7 +73,7 @@ call h5open_f(ierr)
 if (ierr/=0) error stop "h5open"
 
 call h5pcreate_f(H5P_FILE_ACCESS_F, fapl, ierr)
-if (ierr/=0) error stop "h5pcreate_f"
+if (ierr/=0) error stop "h5pcreate"
 call h5pset_fapl_mpio_f(fapl, MPI_COMM_WORLD, MPI_INFO_NULL, ierr)
 if (ierr/=0) error stop "h5pset_fapl_mpio"
 
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -19,7 +19,7 @@ if(NOT MPI_ROOT AND DEFINED ENV{MPI_ROOT})
   set(MPI_ROOT $ENV{MPI_ROOT})
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL Linux AND MPI_ROOT)
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND MPI_ROOT)
   set(ld_path $ENV{LD_LIBRARY_PATH})
   cmake_path(CONVERT "${ld_path}" TO_CMAKE_PATH_LIST ld_path NORMALIZE)
   cmake_path(CONVERT "${MPI_ROOT}" TO_CMAKE_PATH_LIST MPI_ROOT NORMALIZE)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,10 +1,5 @@
 set_directory_properties(PROPERTIES LABELS unit)
 
-set(MPI_MAX 1000)  # tests a priori have maximum dimension length 1000, which is more than most contemporary computers
-max_gcd(${MPI_MAX} ${MPIEXEC_MAX_NUMPROCS} Nmpi)
-
-message(STATUS "Unit tests using ${Nmpi} processes")
-
 # --- coverage
 
 if(ENABLE_COVERAGE)
@@ -16,34 +11,58 @@ endif()
 
 # --- unit tests
 
-set(test_names attributes cast deflate_write deflate_props deflate_read destructor exist groups layout shape string)
+add_executable(test_runner runner.f90
+${PROJECT_SOURCE_DIR}/benchmark/cpu.cpp
+${PROJECT_SOURCE_DIR}/benchmark/partition.f90
+${PROJECT_SOURCE_DIR}/benchmark/cli.f90
+)
+# not linked as libraries in case benchmarks aren't built
+if(CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
+  set_target_properties(test_runner PROPERTIES LINKER_LANGUAGE Fortran)
+else()
+  set_target_properties(test_runner PROPERTIES LINKER_LANGUAGE CXX)
+endif()
 
-foreach(t IN LISTS test_names)
+foreach(t attributes cast destructor exist groups layout shape string)
 
   add_executable(test_${t} test_${t}.f90)
   target_link_libraries(test_${t} PRIVATE h5mpi HDF5::HDF5 MPI::MPI_Fortran)
 
   add_test(NAME ${t}
-  COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${Nmpi} $<TARGET_FILE:test_${t}>
+  COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} $<TARGET_FILE:test_${t}>
   )
+  # these tests could also be -n 2 instead of max_numprocs.
+  # Just trying to keep aware of possible problems vs. MPI worker count.
 
 endforeach()
 
+
+foreach(t deflate_write deflate_props deflate_read)
+
+  add_executable(test_${t} test_${t}.f90)
+  target_link_libraries(test_${t} PRIVATE h5mpi HDF5::HDF5 MPI::MPI_Fortran)
+
+  add_test(NAME ${t}
+  COMMAND test_runner -exe $<TARGET_FILE:test_${t}> -mpiexec ${MPIEXEC_EXECUTABLE} -lx 1000
+  )
+
+endforeach()
+
+
 # --- write test data
 add_executable(test_write test_write.f90)
 target_link_libraries(test_write PRIVATE h5mpi HDF5::HDF5 MPI::MPI_Fortran)
 
 add_test(NAME write COMMAND test_write)
-set_tests_properties(write PROPERTIES
-FIXTURES_SETUP test_files
-TIMEOUT 10
-)
 
 # --- test dependencies
 
-set_tests_properties(${test_names} PROPERTIES
+set_tests_properties(${test_names} write PROPERTIES
 TIMEOUT 10
-PROCESSORS ${Nmpi}
+)
+
+set_tests_properties(write PROPERTIES
+FIXTURES_SETUP test_files
 )
 
 set_tests_properties(layout shape PROPERTIES
diff --git a/test/runner.f90 b/test/runner.f90
@@ -0,0 +1,86 @@
+program test_runner
+
+use, intrinsic :: iso_fortran_env, only: compiler_version
+use, intrinsic :: iso_c_binding, only : C_INT
+use partition, only : max_gcd
+use cli, only : get_cli
+
+implicit none (type, external)
+
+interface
+integer(c_int) function cpu_count() bind(c, name="cpu_count")
+import c_int
+end function cpu_count
+end interface
+
+
+integer :: lid, lx2, Ncpu, ierr, i, comp_lvl
+character(2000) :: buf, exe, mpiexec
+character(:), allocatable :: cmd, args
+logical :: exists, debug
+
+!> defaults
+debug = .false.
+comp_lvl = 0
+Ncpu = -1
+lx2 = -1
+lid = -1
+mpiexec = "mpiexec"
+exe = ""
+
+do i = 1, command_argument_count()
+  call get_command_argument(i, buf, status=ierr)
+  if(ierr/=0) exit
+
+  select case(buf)
+  case("-lx")
+    call get_cli(i, buf, lx2)
+  case("-np")
+    call get_cli(i, buf, Ncpu)
+  case("-exe")
+    call get_cli(i, buf, exe)
+  case ("-comp")
+    call get_cli(i, buf, comp_lvl)
+  case("-d", "-debug")
+    debug = .true.
+  case ("-compiler")
+    print '(A)', compiler_version()
+    stop
+  case("-mpiexec")
+    call get_cli(i, buf, mpiexec)
+    inquire(file=mpiexec, exist=exists)
+    if(.not. exists) error stop trim(mpiexec) // " is not a file."
+  end select
+end do
+
+if (lx2 < 1) error stop "use '-lx lx2' to set the simulation size"
+
+if(len_trim(exe)==0) error stop "please specify MPI program to run with option:  -exe myprog.exe"
+inquire(file=exe, exist=exists)
+if(.not. exists) error stop trim(exe) // " is not a file."
+
+if(Ncpu < 1) Ncpu = cpu_count()
+lid = max_gcd(lx2, Ncpu)
+
+print '(A,I0)', 'MPI images: ', lid
+
+!> run MPI-based executable
+!> need to quote executables in case they have spaces in the path.
+!> don't quote "exe" as this makes the CLI invalid syntax--don't have spaces in the exe path.
+write(buf, '(A1,A,A1,1X,A2,1X,I0,1X,A,1X,A3,1X,I0,1X,A5,1X,I0)') &
+  char(34), trim(mpiexec), char(34), '-n', lid, &
+  trim(exe), &
+  "-lx", lx2, &
+  "-comp", comp_lvl
+
+args = ""
+if (debug) args = args // " -debug"
+
+!! quotes are for mpiexec path with spaces
+cmd = trim(buf) // args
+print *, cmd
+call execute_command_line(cmd, exitstat=ierr)
+
+if (ierr/=0) error stop trim(exe) // ' run failure'
+
+end program

Original file line number	Diff line number	Diff line change
`@@ -173,14 +173,14 @@ if(NOT DEFINED PySkip)`
`173`	`173`	`endif()`
`174`	`174`
`175`	`175`
`176`		`-set(pyargs ${PROJECT_SOURCE_DIR}/scripts/bench_slab.py --datadir ${CMAKE_CURRENT_BINARY_DIR} -B $<TARGET_FILE_DIR:slab_mpi_write> -Nrun ${Nrun} -lx ${lx3} --debug)`
	`176`	`+set(pyargs ${PROJECT_SOURCE_DIR}/bench_slab.py --datadir ${CMAKE_CURRENT_BINARY_DIR} -B ${PROJECT_BINARY_DIR} -Nrun ${Nrun} -lx ${lx3} --debug)`
`177`	`177`	`add_test(NAME PythonRunner COMMAND Python::Interpreter ${pyargs})`
`178`	`178`	`set_tests_properties(PythonRunner PROPERTIES`
`179`	`179`	`FIXTURES_SETUP PyRun_fxt`
`180`	`180`	`RUN_SERIAL true`
`181`	`181`	`)`
`182`	`182`
`183`		`-add_test(NAME Plotter COMMAND Python::Interpreter ${PROJECT_SOURCE_DIR}/scripts/bench_plot.py --datadir ${CMAKE_CURRENT_BINARY_DIR} -lx ${lx3})`
	`183`	`+add_test(NAME Plotter COMMAND Python::Interpreter ${PROJECT_SOURCE_DIR}/bench_plot.py --datadir ${CMAKE_CURRENT_BINARY_DIR} -lx ${lx3})`
`184`	`184`	`set_tests_properties(Plotter PROPERTIES`
`185`	`185`	`FIXTURES_REQUIRED PyRun_fxt`
`186`	`186`	`)`