From nobody Tue Jul 19 08:11:41 2022 X-Original-To: dev-commits-ports-branches@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 4LnBPT39Vpz4Wh1g; Tue, 19 Jul 2022 08:11:41 +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 4LnBPT2cQ0z3vs8; Tue, 19 Jul 2022 08:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658218301; 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=0i423XCUOiD1Uk2zEt274Ec+qj+4j0McRj+6dUMf6Q8=; b=hQIFgEo2EQggdNe9qguEzLCdX6GruSOkVChpUPOxhnUFXpObe+8vUw3eG8fya77DvexYf3 UK+ZK17quxJSN7eEyTZrKJMm6v+HLwIK7JrHe3K7Aq/PH3JW3XZQv0iZ0j48g2qS8UyCpC 8M7ksejwabSwborhLDi04oi1EyGmEx5cTp+3N2DLx5RkYOotZy9JJIMKvcvq3cczcZ2QAQ mAOW9bjpZDZXne9P04dtUIR0KtKu1upb1ZkoPoeQMXwUeVJn6Lo6nIHT/ZIcYO2QK7uQPB BmHGTcuw84Qbr91zLJLAyAJfJKGK1htF63SVMOwmdietAJ8Lr3+dQwHCeqSg0g== 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 4LnBPT1fYpz1B12; Tue, 19 Jul 2022 08:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26J8BfvB075473; Tue, 19 Jul 2022 08:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26J8Bf3h075472; Tue, 19 Jul 2022 08:11:41 GMT (envelope-from git) Date: Tue, 19 Jul 2022 08:11:41 GMT Message-Id: <202207190811.26J8Bf3h075472@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 16da44f3c3b5 - 2022Q3 - math/elpa: Update 2019.05.002 -> 2021.11.001 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 16da44f3c3b5cffa23f9e0be99ce4ecf851afccc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658218301; 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=0i423XCUOiD1Uk2zEt274Ec+qj+4j0McRj+6dUMf6Q8=; b=sxjhdwPxEAimYkdJWGXJPccwqyfkZqfd7N7KQG+ytvGHe/qMiO0XCSe4Wx9me8nTYiYGs+ c36TILngiu56Fq95rMQEpLwCkpTnuklIp6XWbwSqc42iZXwPbfwBubFceJvXaldIPiJRr3 hZG1EyJbYssMfZHC4cp8TStdE0VA9caErTasTIR0VFK7FxKZ2U78DPnstN3MdkFLdwM2CX JXa9hi8R1vPhWMUSkUDdknfKxvU16lPmJFP3fjA+irMm9aVUzGfBqh2mOlbxnJDnDegX4l Df/41B2zIVTJbL9NOPU/GIwjNPGMqwV6Q/sHiP/DYrQc+rvTdJL/l2Xi3woi9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658218301; a=rsa-sha256; cv=none; b=wP1mVzO5CtLfAXMRbPrjLOMvK934GrgXdlO/0F+YJOuYJJNdfF54nsyxoPyTTzhaJb6FmV 0qcMe7GAFuKOBajvRVhVK8abDk8iF8kO5HflQfPszSFGMFO6PBTJrY6yOYK9qr6PMPd8P4 shgLakUELZ05OYuzBoOr2pgNPYow65s9xfCnbZT+3TEYnvd9TZ/fMFYMKbFn2Rp5yNsHj9 yYF2/vHjVpdRQD+YGOBGpZC6s20wMNLf906DoIEtJoUDiBh1QRYxQWpeqRznY8zD2cUI0n aEPrpj0Jm1Ss8UelL/xEt2xIqP6DqeusCJILlevnAZlkSvxS0dVp9muuITC6Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=16da44f3c3b5cffa23f9e0be99ce4ecf851afccc commit 16da44f3c3b5cffa23f9e0be99ce4ecf851afccc Author: Yuri Victorovich AuthorDate: 2022-07-17 00:27:37 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-19 08:11:31 +0000 math/elpa: Update 2019.05.002 -> 2021.11.001 A special hack is used to build this port because GNU Makefiles don't build components in proper order by default, and .mod files are built only after they are used. It was broken for a long while for this reason. (cherry picked from commit 935ebd18187e109c940bd6a3e2a7eea2ee7b56cf) --- math/elpa/Makefile | 26 ++++++++---- math/elpa/distinfo | 6 +-- .../patch-src_helpers_check__thread__affinity.c | 32 ++++++++++++++ math/elpa/pkg-plist | 49 +++++++++++++--------- 4 files changed, 83 insertions(+), 30 deletions(-) diff --git a/math/elpa/Makefile b/math/elpa/Makefile index e0363f416c7c..bce7ed9c98b6 100644 --- a/math/elpa/Makefile +++ b/math/elpa/Makefile @@ -1,8 +1,7 @@ PORTNAME= elpa -DISTVERSION= 2019.05.002 -PORTREVISION= 2 +DISTVERSION= 2021.11.001 CATEGORIES= math -MASTER_SITES= http://elpa.mpcdf.mpg.de/html/Releases/${DISTVERSION}/ +MASTER_SITES= https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${DISTVERSION}/ MAINTAINER= yuri@FreeBSD.org COMMENT= Eigenvalue soLver for Petaflop Applications @@ -12,8 +11,6 @@ LICENSE_COMB= dual LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING/gpl.txt LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING/lgpl.txt -BROKEN_aarch64= fails to build: Fatal Error: config-f90.h: No such file or directory - LIB_DEPENDS= libopenblas.so:math/openblas USES= compiler:c11 fortran gmake libtool localbase perl5 shebangfix @@ -22,14 +19,26 @@ USE_LDCONFIG= yes SHEBANG_GLOB= *.pl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-avx --disable-avx2 --disable-static \ +CONFIGURE_ARGS= --disable-avx --disable-avx2 --disable-avx512 --disable-static \ --disable-c-tests +CFLAGS+= -I${WRKSRC} -I${WRKSRC}/private_modules +FCFLAGS+= -I${WRKSRC} -I${WRKSRC}/private_modules +LDFLAGS+= -lutil + +# ugly workaround for missing .mod files: some targets are added before 'all' that force rebuild of missing .mod files +ALL_TARGET= src/general/libelpa_private_la-elpa_utilities.lo \ + src/libelpa_private_la-elpa_generated_fortran_interfaces.lo \ + src/elpa1/libelpa_private_la-elpa1_compute_private.lo \ + src/elpa2/libelpa_private_la-elpa2_compute.lo \ + all INSTALL_TARGET= install-strip BINARY_ALIAS= make=gmake gcc=gcc${GCC_DEFAULT} g++=g++${GCC_DEFAULT} # build fails with clang: recursively calls cc FCFLAGS+= -std=legacy -I${LOCALBASE}/include +MAKE_JOBS_UNSAFE= yes # part of the workaround for .mod files + OPTIONS_DEFINE= OPENMP MPI DOCS OPTIONS_DEFINE_amd64= SSE OPTIONS_DEFAULT_amd64= SSE @@ -42,8 +51,11 @@ MPI_LIB_DEPENDS= libmpich.so:net/mpich \ PORTDOCS= * -post-patch: # workaround for: https://github.com/marekandreas/elpa/issues/6 +post-patch: + # workaround for: https://github.com/marekandreas/elpa/issues/6 @${FIND} ${WRKSRC} -name "*.mk" | ${XARGS} ${REINPLACE_CMD} -e 's|-Werror| |' + # patch in the full path name of config-f90.h + @${FIND} ${WRKSRC} -name *.F90 -o -name *.c | ${XARGS} ${REINPLACE_CMD} -e 's|#include "config-f90.h"|#include "${WRKSRC}/config-f90.h"|' .include diff --git a/math/elpa/distinfo b/math/elpa/distinfo index e55b2cbd10a3..2ab100f5d7b4 100644 --- a/math/elpa/distinfo +++ b/math/elpa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1570675365 -SHA256 (elpa-2019.05.002.tar.gz) = d2eab5e5d74f53601220b00d18185670da8c00c13e1c1559ecfb0cd7cb2c4e8d -SIZE (elpa-2019.05.002.tar.gz) = 1239916 +TIMESTAMP = 1642194690 +SHA256 (elpa-2021.11.001.tar.gz) = fb361da6c59946661b73e51538d419028f763d7cb9dacf9d8cd5c9cd3fb7802f +SIZE (elpa-2021.11.001.tar.gz) = 1388817 diff --git a/math/elpa/files/patch-src_helpers_check__thread__affinity.c b/math/elpa/files/patch-src_helpers_check__thread__affinity.c new file mode 100644 index 000000000000..40db36a7cd7d --- /dev/null +++ b/math/elpa/files/patch-src_helpers_check__thread__affinity.c @@ -0,0 +1,32 @@ +--- src/helpers/check_thread_affinity.c.orig 2021-11-16 11:26:03 UTC ++++ src/helpers/check_thread_affinity.c +@@ -47,11 +47,14 @@ + // + // Author: Andreas Marek, MPCDF + +-#define _GNU_SOURCE ++//#define _GNU_SOURCE ++#define __BSD_VISIBLE + #include + #include + #include + #include ++#include ++#include + #include + + +@@ -60,11 +63,11 @@ void get_thread_affinity(int *cpu_id) { + } + + void get_process_affinity(int cpu_id) { +- cpu_set_t set; ++ cpuset_t set; + int ret, i; + int cpu; + cpu_id = 9999999 ; +- ret = sched_getaffinity(0, sizeof(cpu_set_t), &set); ++ ret = sched_getaffinity(0, sizeof(cpuset_t), &set); + for (i=0; i < CPU_SETSIZE; i++) + { + cpu = CPU_ISSET(i, &set); diff --git a/math/elpa/pkg-plist b/math/elpa/pkg-plist index 4d8e1bbdda50..c4569a7c4294 100644 --- a/math/elpa/pkg-plist +++ b/math/elpa/pkg-plist @@ -1,34 +1,41 @@ bin/elpa2_print_kernels -include/elpa-2019.05.002/elpa/elpa.h -include/elpa-2019.05.002/elpa/elpa_constants.h -include/elpa-2019.05.002/elpa/elpa_generated.h -include/elpa-2019.05.002/elpa/elpa_generated_c_api.h -include/elpa-2019.05.002/elpa/elpa_generated_legacy.h -include/elpa-2019.05.002/elpa/elpa_generic.h -include/elpa-2019.05.002/elpa/elpa_legacy.h -include/elpa-2019.05.002/elpa/elpa_version.h -include/elpa-2019.05.002/modules/elpa.mod -include/elpa-2019.05.002/modules/elpa_api.mod -include/elpa-2019.05.002/modules/elpa_constants.mod -include/elpa-2019.05.002/modules/elpa1.mod -include/elpa-2019.05.002/modules/elpa1_auxiliary.mod -include/elpa-2019.05.002/modules/elpa2.mod -include/elpa-2019.05.002/modules/elpa2_utilities.mod -include/elpa-2019.05.002/modules/elpa_driver.mod -include/elpa-2019.05.002/modules/elpa_utilities.mod +include/elpa-2021.11.001/elpa/elpa.h +include/elpa-2021.11.001/elpa/elpa_constants.h +include/elpa-2021.11.001/elpa/elpa_generated.h +include/elpa-2021.11.001/elpa/elpa_generated_c_api.h +include/elpa-2021.11.001/elpa/elpa_generic.h +include/elpa-2021.11.001/elpa/elpa_simd_constants.h +include/elpa-2021.11.001/elpa/elpa_version.h +include/elpa-2021.11.001/modules/elpa.mod +include/elpa-2021.11.001/modules/elpa_api.mod +include/elpa-2021.11.001/modules/elpa_constants.mod +include/elpa-2021.11.001/src/helpers/lapack_interfaces.h +include/elpa-2021.11.001/src/helpers/scalapack_interfaces.h lib/libelpa.so -lib/libelpa.so.14 -lib/libelpa.so.14.0.0 -libdata/pkgconfig/elpa-2019.05.002.pc +lib/libelpa.so.17 +lib/libelpa.so.17.0.0 +libdata/pkgconfig/elpa.pc man/man1/elpa2_print_kernels.1.gz man/man3/elpa_allocate.3.gz +man/man3/elpa_autotune_deallocate.3.gz man/man3/elpa_autotune_load_state.3.gz man/man3/elpa_autotune_print_state.3.gz man/man3/elpa_autotune_save_state.3.gz +man/man3/elpa_autotune_set_best.3.gz +man/man3/elpa_autotune_setup.3.gz +man/man3/elpa_autotune_step.3.gz man/man3/elpa_cholesky.3.gz man/man3/elpa_deallocate.3.gz man/man3/elpa_eigenvalues.3.gz +man/man3/elpa_eigenvalues_double.3.gz +man/man3/elpa_eigenvalues_double_complex.3.gz +man/man3/elpa_eigenvalues_float.3.gz +man/man3/elpa_eigenvalues_float_complex.3.gz man/man3/elpa_eigenvectors.3.gz +man/man3/elpa_eigenvectors_double.3.gz +man/man3/elpa_eigenvectors_double_complex.3.gz +man/man3/elpa_eigenvectors_float.3.gz +man/man3/elpa_eigenvectors_float_complex.3.gz man/man3/elpa_generalized_eigenvalues.3.gz man/man3/elpa_generalized_eigenvectors.3.gz man/man3/elpa_hermitian_multiply.3.gz @@ -38,6 +45,8 @@ man/man3/elpa_load_settings.3.gz man/man3/elpa_print_settings.3.gz man/man3/elpa_set.3.gz man/man3/elpa_setup.3.gz +man/man3/elpa_skew_eigenvalues.3.gz +man/man3/elpa_skew_eigenvectors.3.gz man/man3/elpa_solve_tridiagonal.3.gz man/man3/elpa_store_settings.3.gz man/man3/elpa_uninit.3.gz