diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-11-27 02:08:03 -0500 |
|---|---|---|
| committer | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-11-30 21:30:53 -0500 |
| commit | c3a0064091d13080c89da8da3e05fa5771717f0c (patch) | |
| tree | 75952333fafd765a8dcabb3380177b25b07d0337 /test cases | |
| parent | e097c22f8246bb44e356d83cd9e04d768df86030 (diff) | |
| download | meson-c3a0064091d13080c89da8da3e05fa5771717f0c.zip meson-c3a0064091d13080c89da8da3e05fa5771717f0c.tar.gz meson-c3a0064091d13080c89da8da3e05fa5771717f0c.tar.bz2 | |
scalapack: run without mpiexec
Normally MPI programs would be run with MPI exec, but Travis-CI
has errors wanting --allow-run-as-root. To simplify, we don't use
mpiexec in this test, since it's a library check, not an MPI stack check.
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/frameworks/30 scalapack/main.f90 | 2 | ||||
| -rw-r--r-- | test cases/frameworks/30 scalapack/meson.build | 21 |
2 files changed, 4 insertions, 19 deletions
diff --git a/test cases/frameworks/30 scalapack/main.f90 b/test cases/frameworks/30 scalapack/main.f90 index 5e3a192..53b5fb9 100644 --- a/test cases/frameworks/30 scalapack/main.f90 +++ b/test cases/frameworks/30 scalapack/main.f90 @@ -22,4 +22,4 @@ if(myrow == mycol) print '(A, F10.6)', "OK: Scalapack Fortran eps=", eps call blacs_gridexit(ictxt) call blacs_exit(0) -end program
\ No newline at end of file +end program diff --git a/test cases/frameworks/30 scalapack/meson.build b/test cases/frameworks/30 scalapack/meson.build index f9c453f..430f54f 100644 --- a/test cases/frameworks/30 scalapack/meson.build +++ b/test cases/frameworks/30 scalapack/meson.build @@ -1,31 +1,19 @@ project('test scalapack', 'c') -cc = meson.get_compiler('c') - -mpiexec = find_program('mpiexec', required: false) -if not mpiexec.found() - error('MESON_SKIP_TEST: mpiexec not found') -endif - mpi_c = dependency('mpi', language: 'c', required: false) if not mpi_c.found() error('MESON_SKIP_TEST: MPI library not available') endif -# examples can run with any number of MPI images. -mpi_args = ['-np', '1'] scalapack = dependency('scalapack', required: false) if not scalapack.found() error('MESON_SKIP_TEST: scalapack library not available') endif -# https://software.intel.com/en-us/mkl-developer-reference-c-scalapack-routines c_exe = executable('scalapack_c', 'main.c', dependencies: [scalapack, mpi_c]) -test('scalapack_c', mpiexec, - args: [mpi_args, c_exe], - timeout: 30) +test('scalapack_c', c_exe, timeout: 30) if add_languages('fortran') mpi_f = dependency('mpi', language: 'fortran', required: false) @@ -33,10 +21,7 @@ if add_languages('fortran') error('MESON_SKIP_TEST: MPI Fortran library not available') endif - # https://software.intel.com/en-us/mkl-developer-reference-fortran-scalapack-routines f_exe = executable('scalapack_fortran', 'main.f90', dependencies: [scalapack, mpi_f]) - test('scalapack_fortran', mpiexec, - args: [mpi_args, f_exe], - timeout: 30) -endif
\ No newline at end of file + test('scalapack_fortran', f_exe, timeout: 30) +endif |