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 296111388C0 for ; Mon, 22 Feb 2016 08:38:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5252021C018; Mon, 22 Feb 2016 08:38:16 +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 A6C5C21C00B for ; Mon, 22 Feb 2016 08:38:14 +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 E4526340B9F for ; Mon, 22 Feb 2016 08:38:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B75DD2098 for ; Mon, 22 Feb 2016 08:38:08 +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.7a9027cbd4c3510b8e5010422505a70e1420b7a4.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-parallelmetis4-fix.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: 7a9027cbd4c3510b8e5010422505a70e1420b7a4 X-VCS-Branch: master Date: Mon, 22 Feb 2016 08:38:08 +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: 2edf93c6-f246-44fe-b7c0-090c3a99d759 X-Archives-Hash: b1e3f469ea03755357b8881f4d92335f commit: 7a9027cbd4c3510b8e5010422505a70e1420b7a4 Author: Grégory Salvan gmail com> AuthorDate: Sun Feb 21 23:58:20 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=7a9027cb fix parallelmetis for metis version 4 .../files/netgen-5.x-parallelmetis4-fix.patch | 36 ++++++++++++++++++++++ sci-mathematics/netgen/netgen-5.3.1.ebuild | 1 + 2 files changed, 37 insertions(+) diff --git a/sci-mathematics/netgen/files/netgen-5.x-parallelmetis4-fix.patch b/sci-mathematics/netgen/files/netgen-5.x-parallelmetis4-fix.patch new file mode 100644 index 0000000..0170fb8 --- /dev/null +++ b/sci-mathematics/netgen/files/netgen-5.x-parallelmetis4-fix.patch @@ -0,0 +1,36 @@ +diff -uwrN -x.git netgen-5.3.1/libsrc/meshing/parallelmesh.cpp netgen/libsrc/meshing/parallelmesh.cpp +--- netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-22 00:22:28.885598956 +0100 ++++ netgen/libsrc/meshing/parallelmesh.cpp 2016-02-22 00:46:17.030638283 +0100 +@@ -962,10 +962,15 @@ + } + + +-#ifdef METIS5 ++#ifdef METIS + void Mesh :: ParallelMetis (Array & volume_weights , Array & surface_weights, Array & segment_weights) + { ++ ++ #ifdef METIS5 + PrintMessage (3, "call metis 5 with weights ..."); ++ #else ++ PrintMessage (3, "call metis 4 with weights ..."); ++ #endif + + // cout << "segment_weights " << segment_weights << endl; + // cout << "surface_weights " << surface_weights << endl; +@@ -1034,9 +1039,15 @@ + + + metis::idx_t ncommon = 3; ++ #ifdef METIS5 + METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], &nwgt[0], NULL, &ncommon, &nparts, + NULL, NULL, + &edgecut, &epart[0], &npart[0]); ++ #else ++ int numflag = 0; ++ METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], &numflag, &nparts, ++ &edgecut, &epart[0], &npart[0]); ++ #endif + /* + METIS_PartMeshNodal (&ne, &nn, &eptr[0], &eind[0], NULL, NULL, &nparts, + NULL, NULL, diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild index d39d45c..9aac92d 100644 --- a/sci-mathematics/netgen/netgen-5.3.1.ebuild +++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild @@ -44,6 +44,7 @@ src_prepare() { # Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch epatch "${FILESDIR}/${PN}-5.x-fedora-fixes.patch" epatch "${FILESDIR}/${PN}-5.x-includes-fixes.patch" + epatch "${FILESDIR}/${PN}-5.x-parallelmetis4-fix.patch" if use mpi; then export CC=mpicc export CXX=mpic++