From patchwork Sun Mar 1 20:23:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 20485 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8AF9427BBE4; Sun, 1 Mar 2020 20:25:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E236027BBEA for ; Sun, 1 Mar 2020 20:25:13 +0000 (GMT) Received: from localhost ([::1]:51596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8V9F-0002Q3-F2 for patchwork@mira.cbaines.net; Sun, 01 Mar 2020 15:25:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49370) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8V97-0002Pr-3R for guix-patches@gnu.org; Sun, 01 Mar 2020 15:25:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8V95-0007Nu-NP for guix-patches@gnu.org; Sun, 01 Mar 2020 15:25:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59248) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8V95-0007Nc-6z for guix-patches@gnu.org; Sun, 01 Mar 2020 15:25:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j8V94-0006Gt-2M for guix-patches@gnu.org; Sun, 01 Mar 2020 15:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39862] [PATCH 1/4] gnu: dune-*: set up MPI for tests Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Mar 2020 20:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39862 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39862@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 39862-submit@debbugs.gnu.org id=B39862.158309426924049 (code B ref 39862); Sun, 01 Mar 2020 20:25:02 +0000 Received: (at 39862) by debbugs.gnu.org; 1 Mar 2020 20:24:29 +0000 Received: from localhost ([127.0.0.1]:36988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8V8W-0006Fp-HJ for submit@debbugs.gnu.org; Sun, 01 Mar 2020 15:24:28 -0500 Received: from mout02.posteo.de ([185.67.36.66]:40525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8V8U-0006FZ-4U for 39862@debbugs.gnu.org; Sun, 01 Mar 2020 15:24:27 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2BF712400FB for <39862@debbugs.gnu.org>; Sun, 1 Mar 2020 21:24:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1583094260; bh=+HK+gAoAGo3lV+N+hjBMvQSYHb66zikufq1YeNk+wzc=; h=From:To:Cc:Subject:Date:From; b=g3rRJOppMPt9MIXBIpaE4G2dC2iKY+JEIcI8S4UdcRdX8fG7JNf+puZtq+7jQzUD9 PUT2dbjjpjm4ZXMqKb0yixVGFMbm9B/QvRfnXdVa3T5S7iKAzNh0m5gnN1xYofwZId 5O+k34tDMugz3yG0n1RTolwi5BlpHiBUFMn65wDNJU+QI/cI+x/EmWG1g6hVXzUEgg Cxg8fUZGeWywtpCJKhMr5jkqu0XPfc6driT+L3JnaEWK2VbJgkHKqgYV2BGVUMVyYF Fv8twFAC4h9vtjf36bUZe0CedC4ZlvI1QJrXC6G3S4BsZhSgmx9+Eop7+J1fOpQDsm uSKVMOhx6XxQQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48VvrM2TZmz9rxG; Sun, 1 Mar 2020 21:24:19 +0100 (CET) From: Felix Gruber Date: Sun, 1 Mar 2020 21:23:59 +0100 Message-Id: <20200301202402.899669-1-felgru@posteo.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200301194914.899011-1-felgru@posteo.net> References: <20200301194914.899011-1-felgru@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (dune-common, dune-grid, dune-istl, dune-alugrid): [arguments]: correctly set up MPI instead of disabling tests that require MPI. --- gnu/packages/maths.scm | 110 ++++------------------------------------- 1 file changed, 10 insertions(+), 100 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cee626f179..effba8956f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4583,36 +4583,8 @@ linear algebra primitives specifically targeting graph analytics.") (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags))) - ;; These tests fail because they require a fully functional MPI - ;; environment. - (add-after 'unpack 'disable-failing-tests - (lambda _ - (setenv "ARGS" - (string-append "--exclude-regex '(" - (string-join - (list - "remoteindicestest" - "remoteindicestest-mpi-2" - "syncertest" - "syncertest-mpi-2" - "variablesizecommunicatortest" - "variablesizecommunicatortest-mpi-2" - "arithmetictestsuitetest" - "assertandreturntest" - "assertandreturntest_ndebug" - "concept" - "debugaligntest" - "mpicollectivecommunication" - "mpicollectivecommunication-mpi-2" - "mpiguardtest" - "mpiguardtest-mpi-2" - "mpihelpertest" - "mpihelpertest-mpi-2" - "mpihelpertest2" - "mpihelpertest2-mpi-2") - "|") - ")'")) - #t))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (inputs `(("gmp" ,gmp) ("metis" ,metis) @@ -4693,54 +4665,8 @@ This package contains the basic DUNE geometry classes.") (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags))) - ;; These tests fail because they require a fully functional MPI - ;; environment. - (add-after 'unpack 'disable-failing-tests - (lambda _ - (setenv "ARGS" - (string-append "--exclude-regex '(" - (string-join - (list - "scsgmappertest" - "conformvolumevtktest" - "gnuplottest" - "nonconformboundaryvtktest" - "subsamplingvtktest" - "vtktest" - "vtktest-mpi-2" - "vtksequencetest" - "gmshtest-onedgrid" - "test-dgf-yasp" - "test-dgf-yasp-offset" - "test-dgf-oned" - "test-geogrid-yaspgrid" - "test-gridinfo" - "test-identitygrid" - "testiteratorranges" - "test-hierarchicsearch" - "test-parallel-ug-mpi-2" - "test-yaspgrid-backuprestore-equidistant" - "test-yaspgrid-backuprestore-equidistant-mpi-2" - "test-yaspgrid-backuprestore-equidistantoffset" - "test-yaspgrid-backuprestore-equidistantoffset-mpi-2" - "test-yaspgrid-backuprestore-tensor" - "test-yaspgrid-backuprestore-tensor-mpi-2" - "test-yaspgrid-tensorgridfactory" - "test-yaspgrid-tensorgridfactory-mpi-2" - "test-yaspgrid-yaspfactory-1d" - "test-yaspgrid-yaspfactory-1d-mpi-2" - "test-yaspgrid-yaspfactory-2d" - "test-yaspgrid-yaspfactory-2d-mpi-2" - "test-yaspgrid-yaspfactory-3d" - "test-yaspgrid-yaspfactory-3d-mpi-2" - "globalindexsettest" - "persistentcontainertest" - "structuredgridfactorytest" - "tensorgridfactorytest" - "vertexordertest") - "|") - ")'")) - #t))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry) @@ -4783,24 +4709,8 @@ This package contains the basic DUNE grid classes.") (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags))) - ;; These tests fail because they require a fully functional MPI - ;; environment. - (add-after 'unpack 'disable-failing-tests - (lambda _ - (setenv "ARGS" - (string-append "--exclude-regex '(" - (string-join - (list - "galerkintest" - "hierarchytest" - "pamgtest" - "pamg_comm_repart_test" - "matrixredisttest" - "vectorcommtest" - "matrixmarkettest") - "|") - ")'")) - #t))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (inputs `(("dune-common" ,dune-common) ("openmpi" ,openmpi) @@ -4886,9 +4796,7 @@ assemble global function spaces on finite-element grids.") "1l9adgyjpra8mvwm445s0lpjshnb63jag85fb2hisbjn6bm320yj")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; 7 of 8 tests fail because they need a full MPI - ; environment - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-include (lambda _ @@ -4900,7 +4808,9 @@ assemble global function spaces on finite-element grids.") (lambda* (#:key inputs make-flags #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "dune-grid") "/share")) - (apply invoke "make" "build_tests" make-flags)))))) + (apply invoke "make" "build_tests" make-flags))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry)