From nobody Wed Jun 29 06:11:20 2022 X-Original-To: dev-commits-ports-all@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 C2F75870403; Wed, 29 Jun 2022 06:11: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 4LXrgr52Cjz3qYv; Wed, 29 Jun 2022 06:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656483080; 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=lJHQ2K5SnFm+dJkjWfpUngmO6VaJB3a5kiCVHkV3Gq8=; b=PzTk44TEilIBeHxEGO1iAkYCltL+D5nC8hejz9FvlxdiSLJAf6pM3Xks1zHGGlQXT291b3 Lv6cthxFrx0A59xkLOcLv8x1vV1IadVtsRxywacIAWiBHyoUftjHpXQENjr/uKx8xOFXX5 bPQV6IYxyZRxH+mpNr9NCwaq+pSBkyL1DUhMQ7EubptqQOfJCkOqfwSl/1ffT2pU3/dNsp ZyK8VnzZ15uCcCApB/Wr7n4Q4fG22YKvHPluKXGaEDjj4ZkPdmjH1w11wlkcohIk2UiCC0 UlFjQ9t95UJsOGg0yO0l1tgFl6IpoHr/ckqFWDrWvmjTnhkgn0ztF/MYIrV3QA== 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 8D49A4491; Wed, 29 Jun 2022 06:11:20 +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 25T6BKDd038543; Wed, 29 Jun 2022 06:11:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25T6BKFX038542; Wed, 29 Jun 2022 06:11:20 GMT (envelope-from git) Date: Wed, 29 Jun 2022 06:11:20 GMT Message-Id: <202206290611.25T6BKFX038542@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 7f9cd79566fd - main - math/sundials: Multiple changes List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 7f9cd79566fd1f8d159b25ee9bf4678af1fadc39 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656483080; 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=lJHQ2K5SnFm+dJkjWfpUngmO6VaJB3a5kiCVHkV3Gq8=; b=Vng/J4TMdG82I3ep2OqIKktZ+GrIJ33bOVFE/DusuoKizbUmDsmU+xx0DDc7dUli0MK/Rr KlerAlr/kWcD409CR1NliA24IE58BtWm365WyvhQYO3MKfM1KywaLQQ0cEsqI+cnv6I1yc Yo0HjoTlj2kSB0sbghJenybYbqoajaXpOmp3A7tMnFN1PzlebiLN+sKKKJTlVWYw9uE4qK TNAFTAyhkaj5el9gPbNO+Fy+Y8Kg4EQEaT8uJkiTQ+fSTGonFpONes49kMKBjEVFi8Bkmw fQ8GnfjeewCNYqURJ9hAANJRIlTaTwbjgk5y/H0greBMeOfgsH4ALDbN1dMyHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656483080; a=rsa-sha256; cv=none; b=fkMEOVPZsOW/W9CNFNU68QIDScHbeOqoM8jJW2w0jaLHLHtPgiL+BHY1YltkEEdv1yahXZ ogmaJzzYjhiHfQAS2YslRvQ5Uv7mLi/QPlZ56kkr0eW1qc0YVQWS7Lotlo2nSEiw/AbuS0 VFutvtT9nn2JkI2ERubeZ9fbkMchIR4smwL3UHAi1F3zT5N31GcWJh7YmbGG6DTuBdfJgC ooG4zkJ8Ffa8XwxUbHN69MoWK6v4h5hffQWT/JAZPERY9DFPDKovHMD2+vkAE9EztwIhTc WpgCCG2Epprc3kGLwwvaDz0YJoI0gte1JTw7r+MDbaz7pOLoVkg+JQDZqRpYCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f9cd79566fd1f8d159b25ee9bf4678af1fadc39 commit 7f9cd79566fd1f8d159b25ee9bf4678af1fadc39 Author: Yuri Victorovich AuthorDate: 2022-06-29 06:05:06 +0000 Commit: Yuri Victorovich CommitDate: 2022-06-29 06:11:17 +0000 math/sundials: Multiple changes - add -DCMAKE_C_STANDARD=99 to CMAKE_ARGS; this fixes the LAPACK option - remove -DSUNDIALS_INDEX_TYPE:STRING=int64_t, since this is automatically determined based on SUNDIALS_INDEX_SIZE which defaults to 64 bits. SUNDIALS_INDEX_TYPE has been deprecated with release 3.2.0 - make LAPACK default - remove LAPACK_BROKEN - remove {BLAS,LAPACK}_CMAKE_ON, since CMake warns during configuring that FREEBSD_GCC_DIR is not used - reenable OPENMP option - replace BLAS_ENABLE with ENABLE_BLAS; this silences a warning - switch the MPI option to CMAKE_BOOL - add HYPRE_BROKEN, since configure errors out when trying to build with hypre support PR: 260771 Original patch submitted by: Philipp Ost --- math/sundials/Makefile | 19 ++++++++++--------- math/sundials/pkg-plist | 10 ++++++---- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/math/sundials/Makefile b/math/sundials/Makefile index 2649cccb2c2d..44916c08392b 100644 --- a/math/sundials/Makefile +++ b/math/sundials/Makefile @@ -1,5 +1,6 @@ PORTNAME= sundials DISTVERSION= 6.2.0 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://github.com/LLNL/sundials/releases/download/v${DISTVERSION}/ @@ -13,24 +14,24 @@ USES= cmake:testing fortran localbase:ldflags python:build USE_LDCONFIG= yes CMAKE_ARGS= -DENABLE_PTHREAD:BOOL=ON \ - -DBUILD_STATIC_LIBS:BOOL=OFF + -DBUILD_STATIC_LIBS:BOOL=OFF \ + -DCMAKE_C_STANDARD=99 CMAKE_OFF= EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90 CMAKE_TESTING_ON= SUNDIALS_TEST_UNITTESTS \ EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90 FCFLAGS:= ${FFLAGS} # project checks that these flags are equal -OPTIONS_DEFINE= BLAS LAPACK MPI # OPENMP detection is broken in cmake: https://gitlab.kitware.com/cmake/cmake/issues/17474; EXAMPLES are broken on some systems due to CLOCK_MONOTONIC -#OPTIONS_DEFAULT= LAPACK # LAPACK is broken +OPTIONS_DEFINE= BLAS EXAMPLES LAPACK MPI OPENMP +OPTIONS_DEFAULT= LAPACK OPTIONS_GROUP= VECTORS OPTIONS_GROUP_VECTORS= HYPRE PETSC VECTORS_DESC= Alternative vector libraries OPTIONS_SUB= yes BLAS_DESC= Enable BLAS support -BLAS_CMAKE_BOOL= BLAS_ENABLE +BLAS_CMAKE_BOOL= ENABLE_BLAS BLAS_USES= blaslapack:openblas -BLAS_CMAKE_ON= -DFREEBSD_GCC_DIR:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT:S/.//} # assumes that fortran:gcc is used #EXAMPLES_CMAKE_BOOL= EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90 #EXAMPLES_CMAKE_ON= -DEXAMPLES_INSTALL_PATH=${EXAMPLESDIR} @@ -43,17 +44,17 @@ HYPRE_CMAKE_ON= -DHYPRE_INCLUDE_DIR=${LOCALBASE}/include \ HYPRE_LIB_DEPENDS= libHYPRE.so:science/hypre # maybe is broken due to https://github.com/hypre-space/hypre/issues/464 HYPRE_IMPLIES= MPI HYPRE_PREVENTS= LAPACK # error: Incompatible sunindextype for LAPACK; disable LAPACK and rebuild +HYPRE_BROKEN= ERROR: SUNDIALS interface to HYPRE is not functional. LAPACK_DESC= Use Lapack linear algebra (sets SUNDIALS_INDEX_TYPE=int32) LAPACK_USES= blaslapack:openblas LAPACK_CMAKE_BOOL= ENABLE_LAPACK -LAPACK_CMAKE_ON= -DSUNDIALS_INDEX_TYPE:STRING=int64_t \ - -DFREEBSD_GCC_DIR:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT:S/.//} # assumes that fortran:gcc is used -LAPACK_BROKEN= Ignores LDFLAGS and fails to find lapack: https://github.com/LLNL/sundials/issues/74 -MPI_CMAKE_ON= -DMPI_ENABLE:BOOL=ON +MPI_CMAKE_BOOL= ENABLE_MPI MPI_LIB_DEPENDS= libmpich.so:net/mpich +OPENMP_CMAKE_BOOL= ENABLE_OPENMP + PETSC_DESC= PETSc vectors support (also enables MPI) PETSC_CMAKE_BOOL= ENABLE_PETSC PETSC_CMAKE_ON= -DPETSC_DIR=${LOCALBASE} \ diff --git a/math/sundials/pkg-plist b/math/sundials/pkg-plist index 87960a1f948c..0d167a1df2d1 100644 --- a/math/sundials/pkg-plist +++ b/math/sundials/pkg-plist @@ -42,6 +42,7 @@ include/kinsol/kinsol_spils.h include/nvector/nvector_manyvector.h %%MPI%%include/nvector/nvector_mpimanyvector.h %%MPI%%include/nvector/nvector_mpiplusx.h +%%OPENMP%%include/nvector/nvector_openmp.h %%MPI%%include/nvector/nvector_parallel.h %%HYPRE%%include/nvector/nvector_parhyp.h %%PETSC%%include/nvector/nvector_petsc.h @@ -116,6 +117,9 @@ lib/libsundials_nvecmanyvector.so.6.2.0 %%MPI%%lib/libsundials_nvecmpiplusx.so %%MPI%%lib/libsundials_nvecmpiplusx.so.6 %%MPI%%lib/libsundials_nvecmpiplusx.so.6.2.0 +%%OPENMP%%lib/libsundials_nvecopenmp.so +%%OPENMP%%lib/libsundials_nvecopenmp.so.6 +%%OPENMP%%lib/libsundials_nvecopenmp.so.6.2.0 %%MPI%%lib/libsundials_nvecparallel.so %%MPI%%lib/libsundials_nvecparallel.so.6 %%MPI%%lib/libsundials_nvecparallel.so.6.2.0 @@ -136,11 +140,9 @@ lib/libsundials_sunlinsolband.so.4.2.0 lib/libsundials_sunlinsoldense.so lib/libsundials_sunlinsoldense.so.4.2.0 %%LAPACK%%lib/libsundials_sunlinsollapackband.so -%%LAPACK%%lib/libsundials_sunlinsollapackband.so.%%SHLX1%% -%%LAPACK%%lib/libsundials_sunlinsollapackband.so.%%SHLX3%% +%%LAPACK%%lib/libsundials_sunlinsollapackband.so.4.2.0 %%LAPACK%%lib/libsundials_sunlinsollapackdense.so -%%LAPACK%%lib/libsundials_sunlinsollapackdense.so.%%SHLX1%% -%%LAPACK%%lib/libsundials_sunlinsollapackdense.so.%%SHLX3%% +%%LAPACK%%lib/libsundials_sunlinsollapackdense.so.4.2.0 lib/libsundials_sunlinsolpcg.so lib/libsundials_sunlinsolpcg.so.4.2.0 lib/libsundials_sunlinsolspbcgs.so