From nobody Sat Jun 15 09:12:26 2024 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 4W1Vlt48qzz5NQYx; Sat, 15 Jun 2024 09:12:26 +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 4W1Vlt3kNFz4mB6; Sat, 15 Jun 2024 09:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718442746; 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=DA8jjnbZGRaM8moZctDRt4nyVfBuYNa+tlEOxhX07SI=; b=rf0hJVLbC/+bWVTlspoZYUip1f5vagJ4eMiAYeJ3klyxX5TVSyVgnVoU5lHWKCXmJ4ye7J 8G4/ftTqzvKn//adHOrk22Sp32sbRwTmUdk7AhUqZyQxvDx/oejS97Iy1q7ybN52k+JTiz kwvdSypiaNydRyN0rS6H9WWnB9pH+13xvLWyTzSput6OAgUNqhk4wU0Aunhpo0N6UePVoD owbeiDgjNX5TvbER/7hFhuOTxSA3siroJ64lE0GwBIDX0BDPT6mboCN0Gg8p7U0d+oebON nzqfF/n1hrx9yg+dW3V2tV91SPw0kUFdcLXLRbuMtcMqq3rXTa9BcJ37VDTfsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718442746; a=rsa-sha256; cv=none; b=JjvEE9k6J3SdrbYhBG9PctTzlW2Vvyyi7VPqmnnTwbO2cXw0rVhltyatlSeznQh0zLlTCo Qr57Rn6xpfc0jJ6ZWx6MpbRpsupi+qTALUfpaF2Ls+sijzkbWxcJo2shaiFPiXVLu+e23P fwcxFQC9B3qgAG96wx7+svkocjEIpgMF3sT/gFLm2UnSFT/AKkg1fNDrNCESyT6LJTJHlR Hd4vF1++M6AbqaIkUlgBYWOn3SNEpLVgZDB5c+uybh0nS/P2MT4Z5DJAYz+D9u7aAG7fCH fpVhnY+3F3kxFhTLn9FR1LbsGqjYno7k711LA/WccV7vJeKi4BMR0I4PM5Eq7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718442746; 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=DA8jjnbZGRaM8moZctDRt4nyVfBuYNa+tlEOxhX07SI=; b=Jx+P2J0DOapFRcYqyjL1cw4CympBL4RQSDhdHdV54s2o2Xed55tACfWIiAannFGtdMHPM9 x1VGhOdBaoC5HO+PMz90eI9PbNYbR5wv4uMX4fIRcFatSHhW1A6HjBFXkPFI4vBnQRemuF cyBEi23UiL3VLz7Jz/9vr6TC55/bjHUSviHUtrYuBi4/6A6zCXVzVKOZdSzjv3PQl67l5Z hB0xNPBmjA/CbM8ebvofqDVkFKuMUCrx3DIiF+t3oFysd9NwvwiJP3p5pI6jz0Jjo9X7o6 +xmrjy/VjoyapNYoiLZmJFqRNEfaSuUaXhAgaT2hHoIP3K1OcucPy/g1ip6vqg== 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 4W1Vlt3L3Wzy6k; Sat, 15 Jun 2024 09:12:26 +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 45F9CQO5090757; Sat, 15 Jun 2024 09:12:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45F9CQqi090754; Sat, 15 Jun 2024 09:12:26 GMT (envelope-from git) Date: Sat, 15 Jun 2024 09:12:26 GMT Message-Id: <202406150912.45F9CQqi090754@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: 68be1b1411ce - main - science/hypre: =?utf-8?Q?don=E2=80=99t?= use internal BLAS but switch to OpenBLAS 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 68be1b1411cee3fcb34658b65914aedcc64dc873 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=68be1b1411cee3fcb34658b65914aedcc64dc873 commit 68be1b1411cee3fcb34658b65914aedcc64dc873 Author: Thierry Thomas AuthorDate: 2024-06-14 17:40:18 +0000 Commit: Thierry Thomas CommitDate: 2024-06-15 09:12:24 +0000 science/hypre: don’t use internal BLAS but switch to OpenBLAS USES is set to blaslapack, but the internal BLAS and LAPACK libraries are used: switch to the external OpenBLAS. Since I’m there, also build with SUPERLU. PR: 279739 Approved by: yuri (maintainer) --- science/hypre/Makefile | 11 +++++++++-- science/hypre/pkg-plist | 4 ---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/science/hypre/Makefile b/science/hypre/Makefile index b74295970e5e..a740fd533fc5 100644 --- a/science/hypre/Makefile +++ b/science/hypre/Makefile @@ -1,6 +1,7 @@ PORTNAME= hypre DISTVERSIONPREFIX= v DISTVERSION= 2.31.0 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -12,7 +13,9 @@ LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/../LICENSE-APACHE LICENSE_FILE_MIT= ${WRKSRC}/../LICENSE-MIT -USES= blaslapack cmake:testing fortran localbase +LIB_DEPENDS= libsuperlu.so:math/superlu + +USES= blaslapack:openblas cmake:testing fortran localbase USE_LDCONFIG= yes USE_GITHUB= yes @@ -20,7 +23,11 @@ GH_ACCOUNT= hypre-space WRKSRC_SUBDIR= src -CMAKE_ON= HYPRE_ENABLE_SHARED HYPRE_WITH_OPENMP +CMAKE_ON= HYPRE_ENABLE_SHARED HYPRE_WITH_OPENMP HYPRE_WITH_SUPERLU +CMAKE_OFF= HYPRE_ENABLE_HYPRE_BLAS HYPRE_ENABLE_HYPRE_LAPACK +CMAKE_ARGS= -DTPL_BLAS_LIBRARIES="${_BLASLIB}" \ + -DTPL_SUPERLU_LIBRARIES="${LOCALBASE}/lib/libsuperlu.so" \ + -DTPL_SUPERLU_INCLUDE_DIRS="${LOCALBASE}/include/superlu" CMAKE_TESTING_ON= HYPRE_BUILD_TESTS # tests are only built and not run, see https://github.com/hypre-space/hypre/issues/502 OPTIONS_DEFINE= DOCS diff --git a/science/hypre/pkg-plist b/science/hypre/pkg-plist index 232b6f092f39..d505f57cbf50 100644 --- a/science/hypre/pkg-plist +++ b/science/hypre/pkg-plist @@ -23,8 +23,6 @@ include/HYPREf.h include/IJ_matrix.h include/IJ_vector.h include/_hypre_IJ_mv.h -include/_hypre_blas.h -include/_hypre_lapack.h include/_hypre_parcsr_ls.h include/_hypre_parcsr_mv.h include/_hypre_seq_block_mv.h @@ -39,10 +37,8 @@ include/aux_parcsr_matrix.h include/csr_block_matrix.h include/csr_matmultivec.h include/distributed_matrix.h -include/f2c.h include/fortran.h include/fortran_matrix.h -include/hypre_blas.h include/interpreter.h include/krylov.h include/lobpcg.h