diff --git a/math/combblas/Makefile b/math/combblas/Makefile index e9e54af3b90f..8e5b71aea567 100644 --- a/math/combblas/Makefile +++ b/math/combblas/Makefile @@ -1,30 +1,29 @@ 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 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le 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 .include 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 @@ -1,130 +1,135 @@ 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 include/CombBLAS/DenseParMat.h include/CombBLAS/DistEdgeList.cpp include/CombBLAS/DistEdgeList.h include/CombBLAS/Exception.h 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 include/CombBLAS/HeapEntry.h include/CombBLAS/Isect.h include/CombBLAS/LocArr.h include/CombBLAS/MMmul.h include/CombBLAS/MPIOp.h include/CombBLAS/MPIType.h include/CombBLAS/MemoryPool.h include/CombBLAS/MultiwayMerge.h include/CombBLAS/Operations.h include/CombBLAS/OptBuf.h include/CombBLAS/PBBS/radixSort.h include/CombBLAS/PBBS/utils.h include/CombBLAS/PBBS/utils.h.orig include/CombBLAS/ParFriends.h include/CombBLAS/ParFriendsExt.h include/CombBLAS/PreAllocatedSPA.h include/CombBLAS/RefGen21.h include/CombBLAS/SemanticGraph.h include/CombBLAS/Semirings.h include/CombBLAS/SequenceHeaps/heap-CLR.h include/CombBLAS/SequenceHeaps/heap2.h include/CombBLAS/SequenceHeaps/heap4.h include/CombBLAS/SequenceHeaps/hold.C include/CombBLAS/SequenceHeaps/knheap.C include/CombBLAS/SequenceHeaps/knheap.h include/CombBLAS/SequenceHeaps/knupdown3.C include/CombBLAS/SequenceHeaps/knwiggle.C include/CombBLAS/SequenceHeaps/multiMergeUnrolled.C include/CombBLAS/SequenceHeaps/util.h include/CombBLAS/SpCCols.cpp include/CombBLAS/SpCCols.h include/CombBLAS/SpDCCols.cpp include/CombBLAS/SpDCCols.h include/CombBLAS/SpDefs.h include/CombBLAS/SpHelper.h include/CombBLAS/SpImpl.cpp include/CombBLAS/SpImpl.h include/CombBLAS/SpMat.cpp include/CombBLAS/SpMat.h 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 include/CombBLAS/ThreadedFriends.h include/CombBLAS/VecIterator.cpp include/CombBLAS/VecIterator.h include/CombBLAS/csc.cpp include/CombBLAS/csc.h include/CombBLAS/dcsc.cpp include/CombBLAS/dcsc.h include/CombBLAS/hash.hpp include/CombBLAS/mmio.h include/CombBLAS/mmio.h.orig include/CombBLAS/mtSpGEMM.h include/CombBLAS/myenableif.h include/CombBLAS/papi_combblas_globals.h include/CombBLAS/promote.h include/Tommy/tommychain.h include/Tommy/tommyhash.c include/Tommy/tommyhash.h include/Tommy/tommyhashdyn.c include/Tommy/tommyhashdyn.h include/Tommy/tommylist.c include/Tommy/tommylist.h include/Tommy/tommytypes.h include/graph500/generator/apply_permutation_mpi.h include/graph500/generator/btrd_binomial_distribution.h include/graph500/generator/graph_generator.h include/graph500/generator/make_graph.h include/graph500/generator/mod_arith.h include/graph500/generator/mod_arith_32bit.h include/graph500/generator/mod_arith_64bit.h include/graph500/generator/mod_arith_xmt.h include/graph500/generator/permutation_gen.h include/graph500/generator/scramble_edges.h include/graph500/generator/splittable_mrg.h include/graph500/generator/utils.h include/psort/MersenneTwister.h include/psort/funnel.h include/psort/funnel.timpl.h include/psort/psort.h include/psort/psort_alltoall.h include/psort/psort_merge.h include/psort/psort_samplesort.h include/psort/psort_seqsort.h include/psort/psort_splitters.h include/psort/psort_util.h include/psort/sort.h include/psort/sort.timpl.h include/usort/binUtils.h include/usort/dtypes.h include/usort/indexHolder.h include/usort/ompUtils.h include/usort/ompUtils.tcc include/usort/parUtils.h include/usort/parUtils.tcc include/usort/seqUtils.h include/usort/seqUtils.tcc include/usort/sort_profiler.h lib/cmake/CombBLAS/CombBLASConfig.cmake lib/cmake/CombBLAS/CombBLASConfigVersion.cmake lib/cmake/CombBLAS/CombBLASTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/CombBLAS/CombBLASTargets.cmake lib/libCombBLAS.so lib/libCombBLAS.so.1.16.0 lib/libGraphGenlib.so lib/libUsortlib.so