Create the CombBLAS::SpParMat with the MPI_Comm from the input 'gridinfo_t'. This prevents a warning/error from CombBLAS about using MPI_COMM_WORLD. --- a/SRC/AWPM_CombBLAS.hpp +++ b/SRC/AWPM_CombBLAS.hpp @@ -52,7 +52,7 @@ { printf("AWPM only supports square process grid. Retuning without a permutation.\n"); } - combblas::SpParMat < int_t, double, combblas::SpDCCols > Adcsc; + combblas::SpParMat < int_t, double, combblas::SpDCCols > Adcsc(grid->comm); std::vector< std::vector < std::tuple > > data(procs); /* ------------------------------------------------------------ @@ -100,11 +100,10 @@ combblas::AWPM(Adcsc, mateRow2Col, mateCol2Row,true); // now gather the matching vector - MPI_Comm World = mateRow2Col.getcommgrid()->GetWorld(); int * rdispls = new int[procs]; int sendcnt = mateRow2Col.LocArrSize(); int * recvcnt = new int[procs]; - MPI_Allgather(&sendcnt, 1, MPI_INT, recvcnt, 1, MPI_INT, World); + MPI_Allgather(&sendcnt, 1, MPI_INT, recvcnt, 1, MPI_INT, grid->comm); rdispls[0] = 0; for(int i=0; i(), ScalePermstruct->perm_r, recvcnt, rdispls, combblas::MPIType(), World); + MPI_Allgatherv(senddata, sendcnt, combblas::MPIType(), ScalePermstruct->perm_r, recvcnt, rdispls, combblas::MPIType(), grid->comm); delete[] rdispls; delete[] recvcnt; 7e04536c618f'/>
AgeCommit message (Expand)Author
2019-10-23cve: Rewrite to read the JSON feed instead of the XML feed....The XML feed was discontinued on Oct. 16th, 2019: <https://nvd.nist.gov/General/News/XML-Vulnerability-Feed-Retirement-Phase-3> * guix/cve.scm (string->date*): New procedure. (<cve-item>, <cve>, <cve-reference>): New record types. (cpe-match->cve-configuration, configuration-data->cve-configurations) (json->cve-items, version-matches?): New procedures. (yearly-feed-uri): Change URL to refer to JSON feed. (cpe->product-alist, %parse-vulnerability-feed) (xml->vulnerabilities): Remove. (cve-configuration->package-list, merge-package-lists) (cve-item->vulnerability, json->vulnerabilities): New procedures. (write-cache): Use 'json->vulnerabilities' instead of 'xml->vulnerabilities', and remove 'parameterize'. (vulnerabilities->lookup-proc): Use 'version-matches?' when VERSION is true. * tests/cve.scm (%sample): Use 'tests/cve-sample.json'. (%expected-vulnerabilities): Rewrite accordingly. ("json->cve-items", "cve-item-published-date") ("json->vulnerabilities"): New tests. ("xml->vulnerabilities"): Remove. ("vulnerabilities->lookup-proc"): Adjust to new vulnerabilities. * tests/cve-sample.json: New file. * tests/cve-sample.xml: Remove. * Makefile.am (EXTRA_DIST): Adjust accordingly. * doc/guix.texi (Invoking guix lint): Update nist.gov URLs. Ludovic Courtès
2019-10-20tests: Avoid now-deprecated 'make-struct'....* tests/cve.scm (vulnerability): Use 'make-struct/no-tail' instead of 'make-struct', which is deprecated. * tests/lint.scm ("cve: one vulnerability") ("cve: one patched vulnerability") ("cve: known safe from vulnerability") ("cve: vulnerability fixed in replacement version") ("cve: patched vulnerability in replacement"): Likewise. Ludovic Courtès