From: ericbavier@openmailbox.org
To: guix-devel@gnu.org
Cc: Eric Bavier <bavier@member.fsf.org>
Subject: [PATCH 11/14] gnu: petsc: Upgrade to 3.6.0.
Date: Sat, 27 Jun 2015 22:45:48 -0500 [thread overview]
Message-ID: <1435463151-32099-12-git-send-email-ericbavier@openmailbox.org> (raw)
In-Reply-To: <1435463151-32099-1-git-send-email-ericbavier@openmailbox.org>
From: Eric Bavier <bavier@member.fsf.org>
* gnu/packages/maths.scm (petsc): Upgrade to 3.6.0.
* gnu/packages/patches/petsc-fix-threadcomm.patch: Delete patch.
* gnu-system.am (dist_patch_DATA): Remove it.
---
gnu-system.am | 1 -
gnu/packages/maths.scm | 26 ++++++++++---------------
gnu/packages/patches/petsc-fix-threadcomm.patch | 15 --------------
3 files changed, 10 insertions(+), 32 deletions(-)
delete mode 100644 gnu/packages/patches/petsc-fix-threadcomm.patch
diff --git a/gnu-system.am b/gnu-system.am
index af2c0eb..16b71e9 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -544,7 +544,6 @@ dist_patch_DATA = \
gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch \
gnu/packages/patches/perl-no-sys-dirs.patch \
gnu/packages/patches/perl-tk-x11-discover.patch \
- gnu/packages/patches/petsc-fix-threadcomm.patch \
gnu/packages/patches/pingus-sdl-libs-config.patch \
gnu/packages/patches/plotutils-libpng-jmpbuf.patch \
gnu/packages/patches/polkit-drop-test.patch \
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 369457d..a6c4bba 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -501,7 +501,7 @@ ASCII text files using Gmsh's own scripting language.")
(define-public petsc
(package
(name "petsc")
- (version "3.4.4")
+ (version "3.6.0")
(source
(origin
(method url-fetch)
@@ -509,9 +509,7 @@ ASCII text files using Gmsh's own scripting language.")
(uri (string-append "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/"
"petsc-lite-" version ".tar.gz"))
(sha256
- (base32 "0v5dg6dhdjpi5ianvd4mm6hsvxzv1bsxwnh9f9myag0a0d9xk9iv"))
- (patches
- (list (search-patch "petsc-fix-threadcomm.patch")))))
+ (base32 "0lzhk1flgszks1wlhz2b92rnlx5np7bgad8vqy9fcqziz5b4pr26"))))
(build-system gnu-build-system)
(native-inputs
`(("python" ,python-2)
@@ -525,7 +523,7 @@ ASCII text files using Gmsh's own scripting language.")
))
(arguments
`(#:test-target "test"
- #:parallel-build? #f
+ #:parallel-build? #f ;build is parallel by default
#:configure-flags
`("--with-mpi=0"
"--with-openmp=1"
@@ -561,26 +559,22 @@ ASCII text files using Gmsh's own scripting language.")
(let ((out (assoc-ref outputs "out"))
(fortran (assoc-ref inputs "gfortran")))
(substitute* (map (lambda (file)
- (string-append out "/" file))
- '("conf/petscvariables"
- "conf/PETScConfig.cmake"))
+ (string-append out "/lib/petsc/conf/" file))
+ '("petscvariables" "PETScConfig.cmake"))
(((getcwd)) out))
;; Make compiler references point to the store
- (substitute* (string-append out "/conf/petscvariables")
+ (substitute* (string-append out "/lib/petsc/conf/petscvariables")
(("= g(cc|\\+\\+|fortran)" _ suffix)
(string-append "= " fortran "/bin/g" suffix)))
;; PETSc installs some build logs, which aren't necessary.
(for-each (lambda (file)
- (let ((f (string-append out "/" file)))
+ (let ((f (string-append out "/lib/petsc/conf/" file)))
(when (file-exists? f)
(delete-file f))))
- '("conf/configure.log"
- "conf/make.log"
- "conf/test.log"
- "conf/error.log"
- "conf/RDict.db"
+ '("configure.log" "make.log" "gmake.log"
+ "test.log" "error.log" "RDict.db"
;; Once installed, should uninstall with Guix
- "conf/uninstall.py"))))
+ "uninstall.py"))))
%standard-phases)))))
(home-page "http://www.mcs.anl.gov/petsc")
(synopsis "Library to solve PDEs")
diff --git a/gnu/packages/patches/petsc-fix-threadcomm.patch b/gnu/packages/patches/petsc-fix-threadcomm.patch
deleted file mode 100644
index 3ef4f2d..0000000
--- a/gnu/packages/patches/petsc-fix-threadcomm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix "error: unknown type name 'cpu_set_t'". Patch submitted upstream
-http://lists.mcs.anl.gov/pipermail/petsc-dev/2014-May/015345.html
-
---- a/src/sys/threadcomm/impls/openmp/tcopenmp.c 2014-03-13 21:47:22.000000000 -0500
-+++ b/src/sys/threadcomm/impls/openmp/tcopenmp.c 2014-04-02 14:44:57.185170151 -0500
-@@ -1,6 +1,9 @@
- #define PETSC_DESIRE_FEATURE_TEST_MACROS
- #include <../src/sys/threadcomm/impls/openmp/tcopenmpimpl.h>
- #include <omp.h>
-+#if defined(PETSC_HAVE_SCHED_CPU_SET_T)
-+#include <sched.h>
-+#endif
-
- PetscErrorCode PetscThreadCommGetRank_OpenMP(PetscInt *trank)
- {
--
2.2.1
next prev parent reply other threads:[~2015-06-28 3:45 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-28 3:45 [PATCH 00/14] Add deal.II and some dependencies ericbavier
2015-06-28 3:45 ` [PATCH 01/14] gnu: hwloc: Upgrade to 1.10.1 ericbavier
2015-06-28 9:08 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 02/14] gnu: hwloc: Move numactl to inputs ericbavier
2015-06-28 9:09 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 03/14] gnu: openmpi: Upgrade to 1.8.5 ericbavier
2015-06-28 9:10 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 04/14] gnu: Update scotch to 6.0.4 ericbavier
2015-06-28 9:12 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 05/14] gnu: scotch, pt-scotch: Use modify-phases ericbavier
2015-06-28 9:15 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 06/14] gnu: scotch, pt-scotch: Build esmumps libraries ericbavier
2015-06-28 9:14 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 07/14] gnu: Add ScaLAPACK ericbavier
2015-06-28 9:12 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 08/14] gnu: Add p4est ericbavier
2015-06-28 20:03 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 09/14] gnu: Add METIS ericbavier
2015-06-28 20:03 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 10/14] gnu: Add MUMPS ericbavier
2015-06-28 20:12 ` Ludovic Courtès
2015-06-28 15:59 ` Eric Bavier
2015-06-28 3:45 ` ericbavier [this message]
2015-06-28 20:13 ` [PATCH 11/14] gnu: petsc: Upgrade to 3.6.0 Ludovic Courtès
2015-06-28 3:45 ` [PATCH 12/14] gnu: Add arpack-ng-openmpi ericbavier
2015-06-28 20:13 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 13/14] gnu: Add SLEPc ericbavier
2015-06-28 20:18 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 14/14] gnu: Add deal.II ericbavier
2015-06-28 20:22 ` Ludovic Courtès
2015-06-28 16:05 ` Eric Bavier
2015-06-28 21:09 ` Andreas Enge
2015-06-29 8:39 ` Ludovic Courtès
2015-06-30 19:55 ` Eric Bavier
2015-07-04 7:40 ` Mark H Weaver
2015-07-05 10:20 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435463151-32099-12-git-send-email-ericbavier@openmailbox.org \
--to=ericbavier@openmailbox.org \
--cc=bavier@member.fsf.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).