From owner-svn-ports-all@freebsd.org Sun Jan 10 12:03:37 2021
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1D8CB4CA212;
Sun, 10 Jan 2021 12:03:37 +0000 (UTC)
(envelope-from danilo@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4DDFqF0PMPz4Xxx;
Sun, 10 Jan 2021 12:03:37 +0000 (UTC)
(envelope-from danilo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EB37427D4A;
Sun, 10 Jan 2021 12:03:36 +0000 (UTC)
(envelope-from danilo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10AC3apX060444;
Sun, 10 Jan 2021 12:03:36 GMT (envelope-from danilo@FreeBSD.org)
Received: (from danilo@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10AC3aRm060442;
Sun, 10 Jan 2021 12:03:36 GMT (envelope-from danilo@FreeBSD.org)
Message-Id: <202101101203.10AC3aRm060442@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danilo set sender to
danilo@FreeBSD.org using -f
From: Danilo Egea Gondolfo <danilo@FreeBSD.org>
Date: Sun, 10 Jan 2021 12:03:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r561056 - head/net/openmpi
X-SVN-Group: ports-head
X-SVN-Commit-Author: danilo
X-SVN-Commit-Paths: head/net/openmpi
X-SVN-Commit-Revision: 561056
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Jan 2021 12:03:37 -0000
Author: danilo
Date: Sun Jan 10 12:03:36 2021
New Revision: 561056
URL: https://svnweb.freebsd.org/changeset/ports/561056
Log:
net/openmpi: Add an option to enable AVX support
OpenMPI 4.1 fails to detect if the host supports AVX instructions and will fail to build if it doesn't [1].
Also, include the ABI version to the hwloc2 library dependency. If the user has devel/hwloc (and not devel/hwloc2) installed it will satify the dependency check anyway and link against the wrong lib.
[1] - https://github.com/open-mpi/ompi/issues/8306
PR: 252506
Modified:
head/net/openmpi/Makefile
head/net/openmpi/pkg-plist
Modified: head/net/openmpi/Makefile
==============================================================================
--- head/net/openmpi/Makefile Sun Jan 10 11:36:40 2021 (r561055)
+++ head/net/openmpi/Makefile Sun Jan 10 12:03:36 2021 (r561056)
@@ -2,6 +2,7 @@
PORTNAME= openmpi
PORTVERSION= 4.1.0
+PORTREVISION= 1
CATEGORIES= net parallel
MASTER_SITES= http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
@@ -15,7 +16,7 @@ BROKEN_armv6= fails to package: pkg-static: mca_patch
BROKEN_armv7= fails to package: pkg-static: mca_patcher_overwrite.la: No such file or directory
BROKEN_sparc64= fails to compile on sparc64
-LIB_DEPENDS= libhwloc.so:devel/hwloc2 \
+LIB_DEPENDS= libhwloc.so.15:devel/hwloc2 \
libltdl.so:devel/libltdl \
libevent.so:devel/libevent \
libmunge.so:security/munge
@@ -57,12 +58,15 @@ MANPREFIX= ${PREFIX}/${MPIDIR}
SHEBANG_FILES= ompi/mca/common/monitoring/profile2mat.pl \
ompi/mca/common/monitoring/aggregate_profile.pl
-OPTIONS_DEFINE= DEBUG IPV6 SLURM TORQUE
+OPTIONS_DEFINE= AVX DEBUG IPV6 SLURM TORQUE
+AVX_DESC= Enable AVX instructions
TORQUE_DESC= Enable Torque support
SLURM_DESC= Enable SLURM support
OPTIONS_DEFAULT= SLURM
OPTIONS_EXCLUDE_i386= SLURM
OPTIONS_SUB= yes
+
+AVX_CONFIGURE_OFF= --enable-mca-no-build=op-avx
DEBUG_CONFIGURE_ENABLE= debug
DEBUG_INSTALL_TARGET_OFF= install-strip
Modified: head/net/openmpi/pkg-plist
==============================================================================
--- head/net/openmpi/pkg-plist Sun Jan 10 11:36:40 2021 (r561055)
+++ head/net/openmpi/pkg-plist Sun Jan 10 12:03:36 2021 (r561056)
@@ -225,8 +225,8 @@ libdata/pkgconfig/pmix.pc
%%MPIDIR%%/lib/openmpi/mca_odls_pspawn.so
%%MPIDIR%%/lib/openmpi/mca_oob_tcp.la
%%MPIDIR%%/lib/openmpi/mca_oob_tcp.so
-%%MPIDIR%%/lib/openmpi/mca_op_avx.la
-%%MPIDIR%%/lib/openmpi/mca_op_avx.so
+%%AVX%%%%MPIDIR%%/lib/openmpi/mca_op_avx.la
+%%AVX%%%%MPIDIR%%/lib/openmpi/mca_op_avx.so
%%MPIDIR%%/lib/openmpi/mca_osc_monitoring.la
%%MPIDIR%%/lib/openmpi/mca_osc_monitoring.so
%%MPIDIR%%/lib/openmpi/mca_osc_pt2pt.la