From nobody Fri Jul 15 17:42:17 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 4LkzFj6Ljnz4TDQW; Fri, 15 Jul 2022 17:42:17 +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 4LkzFj5sffz3Ny7; Fri, 15 Jul 2022 17:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657906937; 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=l3I00iD8GGHe6rT5BUjDgmqbMiCVqb+9YxDz7FfYWnM=; b=hZLJn2cqXc8S11LdgK+kBFvROa5MVHIx4ozDH76uN9t9K5V4DeS8hxhX8Sfsn/vvCrw5xy DlAN3r2YS2ZY9PFgWyfFDy8oV+Oz9QtoPvDEGxW7ZIDhG0v1bhURB+SMtLzKLyvLJwAPwD 6KenXZGoQWPIzc4M67ktiYfU78cxHDSudFvzqSWmHB1ghHdfSudDgWaTkU4RjK0+kI89h7 zK2y5rF2SeOuG1xRGcJgFFYrj0ulEIdVuay7cENPl2baad0xtOw5t4BdCts7Zy0ksdbc5C eLo9YmKc7fN+hkLGMh8VDUHiRD90rRfA7di8xYuP1U8lxFW0pl21zjG0j0AlCg== 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 4LkzFj4vz5zrHK; Fri, 15 Jul 2022 17:42:17 +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 26FHgH6K031481; Fri, 15 Jul 2022 17:42:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26FHgHCX031480; Fri, 15 Jul 2022 17:42:17 GMT (envelope-from git) Date: Fri, 15 Jul 2022 17:42:17 GMT Message-Id: <202207151742.26FHgHCX031480@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: 4f0c26c304e8 - main - math/combblas: Update 1.6.2 -> 2.0.0 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: 4f0c26c304e87ca5271983bc6dd9bab2354a49fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657906937; 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=l3I00iD8GGHe6rT5BUjDgmqbMiCVqb+9YxDz7FfYWnM=; b=Zte5nOqLM00qlnt26fIPkwiOOrEo2PlRq79fHgBQZI/QiXA/D0at9c4CumnOOtWUs+A3F9 OgmU7biVEndbLFTl3bkZ70jhkJv8khyiUMpkMw4q97HRvJRmF/lbtJSfqc8LWyyhCQxu1q plFyWbtNqLMo81qVvSs+0ty2O2cSGFdlsZSOVSK3kWPno2PEi+xqFq+D5q4u45kqWfS31X rsslOlMIjLAutOEOzBEgG6k5MIZ2kdDVvG7Pp1RF3zPUqz1vBLONGSgTPnIfW6jJfLBwlU Pfv7ksgu1xpLTCvxBGl31npkvDpAlQtJJQ0M3ygkkdE70RBNqYlkV632r6m9rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657906937; a=rsa-sha256; cv=none; b=Fg1ZJTr6bPskNtTb5I4dkMn0f3ocHyJRhrH73BHBqtmuRWB9I1dL1ihbokrHPT8p3Mx0zz pifCgemZp+v1DF5r13rbCCR29f9t/LDyFTNOz9Gft8Zaxk+29umGJx6qkZxgctdaHm6oiQ iz9qRgNOTkaBMI+4Neb4Nh4S7c/Ziv+1XVFZm/vcrDGK8adAZbAlGt61Gl5U86Pz/mM0hI BfaCi/kQ56K6175EcqK3hU7DHfLNMwohfnWXxX4SD8gOfYkzzQyrBrxH4300llln6Bn79u PTlNtoGLDlfECnmaMTdL+5amJIrQYoTWCOpDhxR+Q17Qq+kDpGUxkd0muKt8pw== 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=4f0c26c304e87ca5271983bc6dd9bab2354a49fc commit 4f0c26c304e87ca5271983bc6dd9bab2354a49fc Author: Yuri Victorovich AuthorDate: 2022-07-15 17:41:42 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-15 17:42:15 +0000 math/combblas: Update 1.6.2 -> 2.0.0 --- math/combblas/Makefile | 13 ++++++------ math/combblas/distinfo | 6 +++--- math/combblas/files/extra-patch-CMakeLists.txt | 24 ---------------------- ...ipartiteMatchings_ApproxWeightPerfectMatching.h | 22 ++++++++++++++++++++ ...eshCode_graph500__2D__SC11_src_create__graph.cc | 11 ++++++++++ .../patch-include_CombBLAS_FullyDistSpVec.cpp | 13 ++++++++++++ math/combblas/pkg-plist | 5 +++++ 7 files changed, 60 insertions(+), 34 deletions(-) diff --git a/math/combblas/Makefile b/math/combblas/Makefile index e9e54af3b90f..8e5b71aea567 100644 --- a/math/combblas/Makefile +++ b/math/combblas/Makefile @@ -1,9 +1,7 @@ PORTNAME= CombBLAS -DISTVERSION= 1.6.2 -PORTREVISION= 5 +DISTVERSIONPREFIX= v +DISTVERSION= 2.0.0 CATEGORIES= math -MASTER_SITES= https://people.eecs.berkeley.edu/~aydin/${PORTNAME}_FILES/ -DISTNAME= ${PORTNAME}_beta_${DISTVERSION:S/.//:S/./_/} MAINTAINER= yuri@FreeBSD.org COMMENT= Combinatorial BLAS library: an extensible parallel graph library @@ -17,12 +15,13 @@ ONLY_FOR_ARCHS_REASON= fails to build: uses x86 asm LIB_DEPENDS= libmpi.so:net/mpich RUN_DEPENDS= ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so.1:lang/gcc${GCC_DEFAULT} # because of the link flags induced by mpich -USES= cmake compiler:c++14-lang localbase:ldflags tar:tgz +USES= cmake:testing compiler:c++14-lang localbase:ldflags tar:tgz USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= PASSIONLab + CMAKE_ON= BUILD_SHARED_LIBS -EXTRA_PATCHES= ${EXTRA_PATCHES_${CHOSEN_COMPILER_TYPE}} -EXTRA_PATCHES_clang= ${FILESDIR}/extra-patch-CMakeLists.txt post-extract: @cd ${WRKSRC}/include && ${RM} .DS_Store ._.DS_Store CombBLAS/._CombBLAS.h diff --git a/math/combblas/distinfo b/math/combblas/distinfo index f23d63b8ea5a..b4f210f5ee3f 100644 --- a/math/combblas/distinfo +++ b/math/combblas/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544940787 -SHA256 (CombBLAS_beta_16_2.tgz) = 2a35c725606f18d010c110c66814b6558dae26f6807ac01c843c788fdb5b3ca9 -SIZE (CombBLAS_beta_16_2.tgz) = 1555398 +TIMESTAMP = 1657902673 +SHA256 (PASSIONLab-CombBLAS-v2.0.0_GH0.tar.gz) = 632a94201a042a2a9aa86803f50ee38b7bf0aa1cfef6ba0eb34ea4007f79a679 +SIZE (PASSIONLab-CombBLAS-v2.0.0_GH0.tar.gz) = 43776896 diff --git a/math/combblas/files/extra-patch-CMakeLists.txt b/math/combblas/files/extra-patch-CMakeLists.txt deleted file mode 100644 index 052ff9fee6fd..000000000000 --- a/math/combblas/files/extra-patch-CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ ---- CMakeLists.txt.orig 2018-12-16 07:56:08 UTC -+++ CMakeLists.txt -@@ -23,7 +23,11 @@ target_include_directories(CombBLAS PRIV - - # MPI and OpenMP dependencies - find_package(MPI REQUIRED) --find_package(OpenMP REQUIRED) -+#find_package(OpenMP REQUIRED) -+set(OPENMP_FOUND TRUE) -+set(OpenMP_CXX_FOUND TRUE) -+set(OpenMP_CXX_FLAGS "") -+set(OpenMP_LINK_FLAGS "-lomp") - - if(TARGET MPI::MPI_CXX) # Use target if available (cmake >= 3.9) - target_link_libraries(CombBLAS PUBLIC MPI::MPI_CXX) -@@ -40,7 +44,7 @@ if(OPENMP_FOUND OR OpenMP_CXX_FOUND) - target_link_libraries(CombBLAS PUBLIC OpenMP::OpenMP_CXX) - else() - target_compile_options(CombBLAS PUBLIC "${OpenMP_CXX_FLAGS}") -- target_link_libraries(CombBLAS PUBLIC "${OpenMP_CXX_FLAGS}") -+ target_link_libraries(CombBLAS PUBLIC "${OpenMP_LINK_FLAGS}") - endif() - endif() - diff --git a/math/combblas/files/patch-Applications_BipartiteMatchings_ApproxWeightPerfectMatching.h b/math/combblas/files/patch-Applications_BipartiteMatchings_ApproxWeightPerfectMatching.h new file mode 100644 index 000000000000..eafeb4939e62 --- /dev/null +++ b/math/combblas/files/patch-Applications_BipartiteMatchings_ApproxWeightPerfectMatching.h @@ -0,0 +1,22 @@ +--- Applications/BipartiteMatchings/ApproxWeightPerfectMatching.h.orig 2022-07-15 16:38:29 UTC ++++ Applications/BipartiteMatchings/ApproxWeightPerfectMatching.h +@@ -12,8 +12,8 @@ + #include "CombBLAS/CombBLAS.h" + #include "BPMaximalMatching.h" + #include "BPMaximumMatching.h" +-#include +-#include ++#include ++//#include + #include + #include + +@@ -563,7 +563,7 @@ std::vector< std::tuple > Phase2(const AW + double tstart = MPI_Wtime(); + + // Step 1: Sort for effecient searching of indices +- __gnu_parallel::sort(recvTuples.begin(), recvTuples.end()); ++ sort(recvTuples.begin(), recvTuples.end()); + std::vector>> tempTuples1 (param.nprocs); + + std::vector sendcnt(param.nprocs,0); // number items to be sent to each processor diff --git a/math/combblas/files/patch-KameshCode_graph500__2D__SC11_src_create__graph.cc b/math/combblas/files/patch-KameshCode_graph500__2D__SC11_src_create__graph.cc new file mode 100644 index 000000000000..2624fbc5e91e --- /dev/null +++ b/math/combblas/files/patch-KameshCode_graph500__2D__SC11_src_create__graph.cc @@ -0,0 +1,11 @@ +--- KameshCode/graph500_2D_SC11/src/create_graph.cc.orig 2022-07-15 16:38:12 UTC ++++ KameshCode/graph500_2D_SC11/src/create_graph.cc +@@ -16,7 +16,7 @@ extern "C" { + #define USE_GNU_PARALLELMODE 0 + + #if USE_GNU_PARALLELMODE +-#include ++#include + #endif + + #define TIME_GRAPHCREATE_STEPS 0 diff --git a/math/combblas/files/patch-include_CombBLAS_FullyDistSpVec.cpp b/math/combblas/files/patch-include_CombBLAS_FullyDistSpVec.cpp new file mode 100644 index 000000000000..ea23d456a579 --- /dev/null +++ b/math/combblas/files/patch-include_CombBLAS_FullyDistSpVec.cpp @@ -0,0 +1,13 @@ +--- include/CombBLAS/FullyDistSpVec.cpp.orig 2022-07-15 16:37:18 UTC ++++ include/CombBLAS/FullyDistSpVec.cpp +@@ -37,8 +37,8 @@ + #include + + #ifdef GNU_PARALLEL +-#include +-#include ++#include ++//#include + #endif + + #include "usort/parUtils.h" diff --git a/math/combblas/pkg-plist b/math/combblas/pkg-plist index 476c6d096f06..245809aa68f5 100644 --- a/math/combblas/pkg-plist +++ b/math/combblas/pkg-plist @@ -2,8 +2,10 @@ include/CombBLAS/BFSFriends.h include/CombBLAS/BitMap.h include/CombBLAS/BitMapCarousel.h include/CombBLAS/BitMapFringe.h +include/CombBLAS/BlockSpGEMM.h include/CombBLAS/CombBLAS.h include/CombBLAS/CommGrid.h +include/CombBLAS/CommGrid3D.h include/CombBLAS/Compare.h include/CombBLAS/Deleter.h include/CombBLAS/DenseParMat.cpp @@ -15,6 +17,7 @@ include/CombBLAS/FileHeader.h include/CombBLAS/Friends.h include/CombBLAS/FullyDist.h include/CombBLAS/FullyDistSpVec.cpp +include/CombBLAS/FullyDistSpVec.cpp.orig include/CombBLAS/FullyDistSpVec.h include/CombBLAS/FullyDistVec.cpp include/CombBLAS/FullyDistVec.h @@ -61,6 +64,8 @@ include/CombBLAS/SpParHelper.cpp include/CombBLAS/SpParHelper.h include/CombBLAS/SpParMat.cpp include/CombBLAS/SpParMat.h +include/CombBLAS/SpParMat3D.cpp +include/CombBLAS/SpParMat3D.h include/CombBLAS/SpTuples.cpp include/CombBLAS/SpTuples.h include/CombBLAS/StackEntry.h