From patchwork Mon Nov 12 16:00:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Garlick X-Patchwork-Id: 181 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 9B23B167F7; Mon, 12 Nov 2018 16:03:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 50851167F5 for ; Mon, 12 Nov 2018 16:03:33 +0000 (GMT) Received: from localhost ([::1]:49359 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMEgW-00038F-0P for patchwork@mira.cbaines.net; Mon, 12 Nov 2018 11:03:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMEgJ-0002wy-9r for guix-patches@gnu.org; Mon, 12 Nov 2018 11:03:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMEg5-00047D-7p for guix-patches@gnu.org; Mon, 12 Nov 2018 11:03:12 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:43974) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gMEg2-000461-Hr for guix-patches@gnu.org; Mon, 12 Nov 2018 11:03:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gMEg2-0000vm-BP for guix-patches@gnu.org; Mon, 12 Nov 2018 11:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33059] [PATCH v2 0/9] Add the FEniCS Project, v2 patches Resent-From: Paul Garlick Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Nov 2018 16:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33059 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 33059@debbugs.gnu.org, Efraim Flashner , Eric Bavier , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 33059-submit@debbugs.gnu.org id=B33059.15420385503533 (code B ref 33059); Mon, 12 Nov 2018 16:03:02 +0000 Received: (at 33059) by debbugs.gnu.org; 12 Nov 2018 16:02:30 +0000 Received: from localhost ([127.0.0.1]:48231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gMEfV-0000uv-Sc for submit@debbugs.gnu.org; Mon, 12 Nov 2018 11:02:30 -0500 Received: from smtp.hosts.co.uk ([85.233.160.19]:62502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gMEfT-0000uf-Cy for 33059@debbugs.gnu.org; Mon, 12 Nov 2018 11:02:27 -0500 Received: from [79.123.23.187] (helo=parkin.tourbillion-technology.com.com) by smtp.hosts.co.uk with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim) (envelope-from ) id 1gMEfM-000500-9S; Mon, 12 Nov 2018 16:02:21 +0000 From: Paul Garlick Date: Mon, 12 Nov 2018 16:00:32 +0000 Message-Id: <1542038441-5738-1-git-send-email-pgarlick@tourbillion-technology.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <87k1m7vvjp.fsf@gnu.org> References: <87k1m7vvjp.fsf@gnu.org> 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: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Garlick Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Efraim, Hi Eric, Hi Ludo, Thank you for your comments on the patch series for the FEniCS Project packages. I have been able to make changes to address all of the suggestions with one exception, noted below. The main differences between the original and v2 patches are: i) python-mpi4py is now part of (gnu packages mpi) ii) python-petsc4py is now part of (gnu packages maths) iii) python-slepc4py is now part of (gnu packages maths) iv) temporary directory changes use 'with-directory-excursion' v) 'substitute*' is used in preference to 'with-atomic-file-replacement' vi) the Guix 'catch' package is used in preference to the bundled version vii) the 'python-fenics-dolfin' package has been renamed 'fenics' viii) the 'fenics' package has an updated home-page and synopsis The remaining suggestion was in the 'fenics-dolfin' package: > + (string-append > + "set(CTEST_CUSTOM_TESTS_IGNORE " > + "demo_bcs_serial " > + "demo_bcs_mpi " > + "demo_eigenvalue_serial " > + "demo_eigenvalue_mpi " > + "demo_navier-stokes_serial " > Could we avoid listing all the files here? I tried a few ideas to avoid listing the demos to ignore. These are the ones with the 'git-lfs' links. However, this proved to be awkward. The source code lists the demos that cmake expects to be present. So, one may either make a list of demos to ignore (as in the original patch) or delete the same members from a list to include (plus delete the subdirectories themselves). Simply deleting the subdirectories from the build directory does not work. Since they exist as Makefile targets they are re-created by the 'make demos' step. I think the original method is preferable. An advantage is that users may readily access the demos if they are using Guix on a host system that has a git-lfs package available. Best regards, Paul. Paul Garlick (9): gnu: Add python-mpi4py. gnu: Add python-petsc4py. gnu: Add python-slepc4py. gnu: Add python-fenics-dijitso. gnu: Add python-fenics-ufl. gnu: Add python-fenics-fiat. gnu: Add python-fenics-ffc. gnu: Add fenics-dolfin. gnu: Add fenics. gnu/packages/maths.scm | 72 +++++++ gnu/packages/mpi.scm | 42 ++++ gnu/packages/simulation.scm | 490 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 603 insertions(+), 1 deletion(-)