From nobody Mon Dec 04 18:38:19 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkXVN1RMLz52fv3; Mon, 4 Dec 2023 18:38:20 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkXVN0wZgz3SVV; Mon, 4 Dec 2023 18:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701715100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ekPWsdiG86HQxnxuT0Y/RE70JChHF/rUPXgzihaPjMo=; b=AyoXZ7LiU/FxstUTSV9iqyxBjWE8eitqbMNVf5RuhrGeed8m/NbaWxndo1RgDeH9CvShsw 5H1XxdAnJBlE3tGep9JxtHX07pwL9rZhg1nLE/v9V8t3oR/Vb/R6L4ljBvCKhBBXvJgOCo Os7KXpSZjngzT195jo8OPiuK10SMsoHr9lnbpcwqDZ7GJaNK98y9sG45gqJ8DOxR3PRPWk AAsBluCa7N7OOK2FbA8Pk9mwen+blyNn7pZoPFwwibeTur37Y3h7v89wboEknVzX8s/Z04 olMKpsftcpVjAW5CMDXdNuahGUqrfNY3ZQF66PN8MJrVgEoYScqnyHv/fPbgSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701715100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ekPWsdiG86HQxnxuT0Y/RE70JChHF/rUPXgzihaPjMo=; b=tZLeI1dwil/MZ2zoERM0mVtIzHu9duF+pEjo0tFoMbIW0ztbIwHFMLCEBzNA0mWG/FnoeB ViSISAfhyoOCzGWvG604CDGhtT8Kw6RVtCxkELZDVhMcPumQd+T4Lq2NJEezgWR2Va0GIO gxMy50VONWsxxsTgFI6XEB1dy3cJLIww1naUZRFyMcFMxmJEdwMsYpB/XI+W51Hl4JnMyw Ugsbbs+JUShsIN1FLC8FM2mmyvnbRrv1AAc1vghaR/2P2WehD9ztDH3M/BrU3dhb25TwEz 342EAFi2RnlICetsFZgu/ihjP7NxcH9E+7jTb1f2ZoBFFUztJa1To5vHQ+2RTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701715100; a=rsa-sha256; cv=none; b=GDBOb/W51UTONRo2jl+/xHhVeJ/ZdnYj+xWPIzMO4oz//J3p1lw9p4KUQf7Xccup5FmgoK UC4XVcc0Eg2Z4OJp7TNxgpziNcE0rhk0cd3ALFN0YYcQ1Kulea9Vrn+T4ie3k1UlEOZ+Cg aLSIlTHe60Q7icnFykdbOmPeWIQj6q4FHSo+hUC+SEjQwsDlgt6x/03fByVvYuG5+QHeEn 6y9CJ/Pp5DIombcBVgvYg5hGAxP15EnNLQUs0cFZzcTdNBunjihniOpBRru2KM3joGJCHO z9R6E/qR3mq4gaDs7Lt3bJGx2GZAqaRZaVQO46WvZ56LgldWe9X1Jw6sO1OFpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkXVM6zFNzd6g; Mon, 4 Dec 2023 18:38:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4IcJ2j010764; Mon, 4 Dec 2023 18:38:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4IcJSg010761; Mon, 4 Dec 2023 18:38:19 GMT (envelope-from git) Date: Mon, 4 Dec 2023 18:38:19 GMT Message-Id: <202312041838.3B4IcJSg010761@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 4994c452468c - main - science/abinit: temporary switch to OpenMPI List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4994c452468c33a19d0a3cf1c828528796da0ac7 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=4994c452468c33a19d0a3cf1c828528796da0ac7 commit 4994c452468c33a19d0a3cf1c828528796da0ac7 Author: Thierry Thomas AuthorDate: 2023-12-02 17:12:11 +0000 Commit: Thierry Thomas CommitDate: 2023-12-04 18:36:58 +0000 science/abinit: temporary switch to OpenMPI Waiting for the error with MPICH-4 to be fixed. Cf. . PR: 275485 Approved by: yuri (maintainer) --- science/abinit/Makefile | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/science/abinit/Makefile b/science/abinit/Makefile index 3271dd86d91b..809b842f47e6 100644 --- a/science/abinit/Makefile +++ b/science/abinit/Makefile @@ -1,5 +1,6 @@ PORTNAME= abinit DISTVERSION= 9.10.3 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -18,7 +19,6 @@ BUILD_DEPENDS= gm4:devel/m4 \ ${PYTHON_PKGNAMEPREFIX}graphviz>0:graphics/py-graphviz@${PY_FLAVOR} LIB_DEPENDS= libelpa.so:math/elpa \ libsz.so:science/libaec \ - libelpa.so:math/elpa \ libxc.so:science/libxc \ libfftw3.so:math/fftw3 \ libhdf5.so:science/hdf5 \ @@ -38,8 +38,7 @@ USE_GNOME= libxml2 SHEBANG_FILES= config/scripts/* doc/tutorial/paral_bandpw_assets/abinit.sub.* SHEBANG_GLOB= *.py GNU_CONFIGURE= yes -CONFIGURE_ENV= CC_LDFLAGS="${LDFLAGS}" CXX_LDFLAGS="${LDFLAGS}" FC_LDFLAGS="${LDFLAGS}" \ - H5CC="${LOCALBASE}/bin/h5cc" \ +CONFIGURE_ENV= H5CC="${LOCALBASE}/bin/h5cc" \ HDF5_CFLAGS="-I${LOCALBASE}/include" \ HDF5_LDFLAGS="-L${LOCALBASE}/lib -lhdf5" \ LINALG_FCFLAGS="-I${LOCALBASE}/include/elpa-2019.05.002/modules" \ @@ -54,19 +53,29 @@ TEST_TARGET= tests_abirules tests_buildsys # Many tests print RuntimeError, http TEST_WRKSRC= ${WRKSRC}/abichecks PORTDOCS= * -OPTIONS_DEFINE= DOCS OPENMP MPI -OPTIONS_DEFAULT= OPENMP MPI +OPTIONS_DEFINE= DOCS OPENMP OPENMPI +OPTIONS_DEFAULT= OPENMP OPENMPI OPENMP_CONFIGURE_ENABLE= openmp OPENMP_LDFLAGS= -lomp -MPI_CONFIGURE_WITH= mpi=yes +OPENMPI_CONFIGURE_WITH= mpi=yes +# BROKEN with MPICH4: see +# To set back to mpich when this issue will be fixed. +OPENMPI_USES= mpi:openmpi # fftw3 not enabled because libfftw3_mpi is required but not packaged -MPI_VARS= FFLAGS+=-I${LOCALBASE}/include FCFLAGS+=-I${LOCALBASE}/include \ - CONFIGURE_ENV+=MPI_LIBS="`pkg-config --libs mpich` -lmpifort" \ - CONFIGURE_ENV+MPI_LDFLAGS="`pkg-config --libs mpich` -lmpifort" -MPI_BUILD_DEPENDS= mpich>0:net/mpich -MPI_RUN_DEPENDS= mpich>0:net/mpich +OPENMPI_VARS= FCFLAGS+="`pkg-config --cflags ompi-fort`" +OPENMPI_CONFIGURE_ENV= CC_LDFLAGS="${MPI_LIBS} ${LDFLAGS}" \ + CXX_LDFLAGS="${MPI_LIBS} ${LDFLAGS}" \ + FC_LDFLAGS="${MPI_LIBS} ${LDFLAGS}" \ + CFLAGS="${MPI_CFLAGS} ${CFLAGS} ${CFLAGS_F2018}" \ + MPI_CPPFLAGS="${MPI_CFLAGS}" \ + MPI_FCFLAGS="`pkg-config --cflags ompi-fort`" \ + MPI_LIBS="${MPI_LIBS}" \ + MPI_LDFLAGS="${MPI_LIBS}" +# When OpenMPI is enabled, put its related variables 1st to avoid conflicts with MPICH +OPENMPI_CONFIGURE_ENV_OFF= CC_LDFLAGS="${LDFLAGS}" CXX_LDFLAGS="${LDFLAGS}" \ + FC_LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" .if defined(WITH_LEVMAR) # --with-levmar seems deprecated