diff -Nru hypre-2.28.0/debian/changelog hypre-2.28.0/debian/changelog --- hypre-2.28.0/debian/changelog 2023-08-08 09:33:24.000000000 +0000 +++ hypre-2.28.0/debian/changelog 2023-08-29 08:26:33.000000000 +0000 @@ -1,3 +1,14 @@ +hypre (2.28.0-7) unstable; urgency=medium + + * Team upload. + * run build-time tests (make check) on ppc64el, only skip checkpar. + Likewise with hurd-i386. + * relax checkpar tolerance on riscv64. Closes: #1050225 + * report number of available processors (nproc) when running tests + (hanging tests is more likely when oversubscribing) + + -- Drew Parsons Tue, 29 Aug 2023 10:26:33 +0200 + hypre (2.28.0-6) unstable; urgency=medium * Team upload. diff -Nru hypre-2.28.0/debian/rules hypre-2.28.0/debian/rules --- hypre-2.28.0/debian/rules 2023-08-08 09:33:24.000000000 +0000 +++ hypre-2.28.0/debian/rules 2023-08-29 08:26:33.000000000 +0000 @@ -176,17 +176,25 @@ empty := space := $(empty)$(empty) -# disable build tests on arches which consistently time out # ia64 does not fail to run tests, it fails to build them -ARCH_NO_TEST_LIST = ppc64el ia64 +ARCH_NO_TEST_LIST = ia64 ifneq (,$(findstring $(space)$(DEB_HOST_ARCH)$(space), $(space)$(ARCH_NO_TEST_LIST)$(space))) RUNTEST=no endif +# some arches consistently hang in checkpar tests +# possibly due to pmix, see hypre upstream issue #955 +ARCH_NO_CHECKPAR_LIST = ppc64el hurd-i386 + +ifneq (,$(findstring $(space)$(DEB_HOST_ARCH)$(space), $(space)$(ARCH_NO_CHECKPAR_LIST)$(space))) + RUN_CHECKPAR=no +endif + + # Standard tolerance 1e-6 is too tight on many arches # so relax them to 1e-3 -ARCH_RELAX_TOL_LIST = arm64 i386 ppc64el s390x hppa powerpc ppc64 +ARCH_RELAX_TOL_LIST = arm64 i386 ppc64el riscv64 s390x hppa powerpc ppc64 ifneq (,$(findstring $(space)$(DEB_HOST_ARCH)$(space), $(space)$(ARCH_RELAX_TOL_LIST)$(space))) RELAX_TOL = HYPRE_CHECKPAR_TOL=1e-3 @@ -200,6 +208,7 @@ override_dh_auto_test: set -e; \ + echo "max available processors nproc=`nproc`"; \ if [ "$(RUNTEST)" = "no" ]; then \ echo Tests have been disabled on $(DEB_HOST_ARCH); \ else echo "=== Building tests ==="; \ @@ -211,8 +220,12 @@ LD_LIBRARY_PATH=$${TEST_LD_LIBRARY_PATH} make check; \ echo "== running make check (MPI -P 3 1 1) =="; \ LD_LIBRARY_PATH=$${TEST_LD_LIBRARY_PATH} CHECKRUN="mpirun -n 3" PARMS='-P 3 1 1' make check; \ - echo "== running make checkpar =="; \ - LD_LIBRARY_PATH=$${TEST_LD_LIBRARY_PATH} make checkpar $(RELAX_TOL); \ + if [ "x$(RUN_CHECKPAR)" = "xno" ]; then \ + echo "== skipping make checkpar on $(DEB_HOST_ARCH) =="; \ + else \ + echo "== running make checkpar =="; \ + LD_LIBRARY_PATH=$${TEST_LD_LIBRARY_PATH} make checkpar $(RELAX_TOL); \ + fi; \ cd ..; \ done; \ fi diff -Nru hypre-2.28.0/debian/tests/test-hypre-common hypre-2.28.0/debian/tests/test-hypre-common --- hypre-2.28.0/debian/tests/test-hypre-common 2023-08-08 09:33:24.000000000 +0000 +++ hypre-2.28.0/debian/tests/test-hypre-common 2023-08-29 08:26:33.000000000 +0000 @@ -4,6 +4,8 @@ export OMPI_MCA_plm_rsh_agent=/bin/false export OMPI_MCA_rmaps_base_oversubscribe=1 +echo "max available processors nproc=`nproc`" + # don't have Makefile.config in runtime CI tests cd src${HYPRE_LIBNAME_EXT} cp Makefile Makefile.orig