From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E90F61388C0 for ; Mon, 22 Feb 2016 08:38:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7689C21C016; Mon, 22 Feb 2016 08:38:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3134721C00B for ; Mon, 22 Feb 2016 08:38:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E4F0340B35 for ; Mon, 22 Feb 2016 08:38:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9C1A1B8A for ; Mon, 22 Feb 2016 08:38:07 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1456130191.ff32a770a509011f0f527f2972e7f4825d3f6281.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch sci-mathematics/netgen/netgen-5.3.1.ebuild X-VCS-Directories: sci-mathematics/netgen/ sci-mathematics/netgen/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: ff32a770a509011f0f527f2972e7f4825d3f6281 X-VCS-Branch: master Date: Mon, 22 Feb 2016 08:38:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 31b1e2a1-3983-428a-ab44-928a9f3d67e1 X-Archives-Hash: 3b7b0ad4f41af391ce75b27b9cbfb299 commit: ff32a770a509011f0f527f2972e7f4825d3f6281 Author: Grégory Salvan gmail com> AuthorDate: Sat Feb 20 21:18:33 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Feb 22 08:36:31 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ff32a770 added fedora metis patch .../netgen/files/netgen-5.x-fedora-metis.patch | 93 ++++++++++++++++++++++ sci-mathematics/netgen/netgen-5.3.1.ebuild | 2 + 2 files changed, 95 insertions(+) diff --git a/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch b/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch new file mode 100644 index 0000000..68b3396 --- /dev/null +++ b/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch @@ -0,0 +1,93 @@ +--- ./netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-20 21:55:59.227450843 +0100 ++++ ./netgen/libsrc/meshing/parallelmesh.cpp 2016-02-20 21:46:32.331435233 +0100 +@@ -14,7 +14,7 @@ + + #if METIS_VER_MAJOR >= 5 + #define METIS5 +- typedef idx_t idxtype; ++ typedef metis::idx_t idxtype; + #else + #define METIS4 + typedef idxtype idx_t; +@@ -794,10 +794,10 @@ + eptr.Append (eind.Size()); + Array epart(ne), npart(nn); + +- int nparts = ntasks-1; +- int edgecut; ++ metis::idx_t nparts = ntasks-1; ++ metis::idx_t edgecut; + +- int ncommon = 3; ++ metis::idx_t ncommon = 3; + METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], NULL, NULL, &ncommon, &nparts, + NULL, NULL, + &edgecut, &epart[0], &npart[0]); +@@ -1029,11 +1029,11 @@ + eptr.Append (eind.Size()); + Array epart(ne), npart(nn); + +- int nparts = ntasks-1; +- int edgecut; ++ metis::idx_t nparts = ntasks-1; ++ metis::idx_t edgecut; + + +- int ncommon = 3; ++ metis::idx_t ncommon = 3; + METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], &nwgt[0], NULL, &ncommon, &nparts, + NULL, NULL, + &edgecut, &epart[0], &npart[0]); +@@ -1266,7 +1266,7 @@ + + for ( int vert = 0; vert < nn; vert++ ) + { +- FlatArray array ( cnt[vert], &adjacency[ xadj[vert] ] ); ++ FlatArray array ( cnt[vert], &adjacency[ xadj[vert] ] ); + BubbleSort(array); + } + +@@ -1377,7 +1377,7 @@ + + for ( int el = 0; el < ne; el++ ) + { +- FlatArray array ( cnt[el], &adjacency[ xadj[el] ] ); ++ FlatArray array ( cnt[el], &adjacency[ xadj[el] ] ); + BubbleSort(array); + } + +@@ -1428,8 +1428,8 @@ + void Mesh :: PartDualHybridMesh2D ( ) + { + #ifdef METIS +- int ne = GetNSE(); +- int nv = GetNV(); ++ metis::idx_t ne = GetNSE(); ++ metis::idx_t nv = GetNV(); + + Array xadj(ne+1); + Array adjacency(ne*4); +@@ -1484,18 +1484,18 @@ + + idxtype *v_weights = NULL, *e_weights = NULL; + +- int weightflag = 0; +- int numflag = 0; +- int nparts = ntasks - 1; ++ metis::idx_t weightflag = 0; ++ metis::idx_t numflag = 0; ++ metis::idx_t nparts = ntasks - 1; + +- int edgecut; ++ metis::idx_t edgecut; + Array part(ne); + + for ( int el = 0; el < ne; el++ ) + BubbleSort (adjacency.Range (xadj[el], xadj[el+1])); + + #ifdef METIS4 +- int options[5]; ++ metis::idx_t options[5]; + options[0] = 0; + METIS_PartGraphKway ( &ne, &xadj[0], &adjacency[0], v_weights, e_weights, &weightflag, + &numflag, &nparts, options, &edgecut, &part[0] ); diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild index 9a1f35c..cf09c82 100644 --- a/sci-mathematics/netgen/netgen-5.3.1.ebuild +++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild @@ -36,6 +36,8 @@ src_prepare() { # Adapted from http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824 epatch "${FILESDIR}/${PN}-5.x-missing-define.patch" epatch "${FILESDIR}/${PN}-5.x-metis-numflag.patch" + # Taken from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch + epatch "${FILESDIR}/${PN}-5.x-fedora-metis.patch" epatch "${FILESDIR}/${PN}-5.x-occ-stl-api-change.patch" if use mpi; then export CC=mpicc