Skip to content

Commit 354a85f

Browse files
committed
# This is a combination of 16 commits.
# This is the 1st commit message: Issue #303: framework for reference_dense added This commit comes from a split of the original commit whose details are as follows: SHA1 ID: a7c1db0 Author: Albert-Jan Yzelman <yzelman@linux.fritz.box> 2022-01-14 15:52:26 Committer: Albert-Jan Yzelman <yzelman@linux.fritz.box> 2022-01-30 13:48:35 The reason for splitting is to separate the changes irrelevant to the branch 303 into a separate branch. The split produced 3 separate commits. This commit is number 1. This commit in particular is relevant to 303 and will remain in it. # This is the commit message #2: Issue #303: unify script argument similar to --no-reference # This is the commit message #3: Issue #303: complete implementation of Vector< reference_dense >, modulo output iteration. # This is the commit message #4: Issue #303: modified vector implementation according to option 3 in handling dense container construction. # This is the commit message #5: Issue #303: vectors now have an iterator for the user to extract data from. # This is the commit message #6: Issue #303, fixed silly oops: the difference between two iterators should be an integer # This is the commit message #7: Issue #303: containers are now uninitialized on construction. Iteration over uninitialized containers returns nothing. # This is the commit message #8: Issue #303: configure and cmake now properly do make install with reference_dense # This is the commit message #9: Issue #303: cmake infra has updated-- make dense_reference additions compatible to it # This is the commit message #10: Drafting structured matrix interface using reference_dense backend # This is the commit message #11: Issue #303: Copy test mxm.cpp to dense_mxm.cpp as a starting point # This is the commit message #12: Issue #303: Add partial first version of Matrix interface for denseref # This is the commit message #13: Issue #303: WIP: dense mxm test # This is the commit message #14: Issue #303: Add dense mxm test to CMakeLists # This is the commit message #15: Issue #303: Separate reference and reference_dense includes # This is the commit message #16: Issue #303: Fix grb include name mismatch
1 parent 98e332a commit 354a85f

File tree

15 files changed

+32
-3
lines changed

15 files changed

+32
-3
lines changed

cmake/AddGRBVars.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ set( REFERENCE_OMP_INCLUDE_DEFS "_GRB_WITH_OMP" )
4444
set( HYPERDAGS_INCLUDE_DEFS "_GRB_WITH_HYPERDAGS" )
4545
set( NONBLOCKING_INCLUDE_DEFS "_GRB_WITH_NONBLOCKING" )
4646
set( LPF_INCLUDE_DEFS "_GRB_WITH_LPF" )
47-
set( DENSE_INCLUDE_DEFS "_GRB_WITH_DENSEREF" )
47+
set( DENSE_INCLUDE_DEFS "_GRB_WITH_DENSE" )
4848

4949
# compiler definitions to select a backend
5050
set( REFERENCE_SELECTION_DEFS "_GRB_BACKEND=reference" )

include/graphblas/benchmark.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
// include specialisations
3030
#ifdef _GRB_WITH_REFERENCE
3131
#include "graphblas/reference/benchmark.hpp"
32+
#endif
33+
#ifdef _GRB_WITH_DENSE
3234
#include "graphblas/denseref/benchmark.hpp"
3335
#endif
3436
#ifdef _GRB_WITH_HYPERDAGS

include/graphblas/blas1.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727

2828
#ifdef _GRB_WITH_REFERENCE
2929
#include <graphblas/reference/blas1.hpp>
30+
#endif
31+
#ifdef _GRB_WITH_DENSE
3032
#include <graphblas/denseref/blas1.hpp>
3133
#endif
3234
#ifdef _GRB_WITH_HYPERDAGS

include/graphblas/blas2.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
// now include all specialisations contained in the backend directories:
3333
#ifdef _GRB_WITH_REFERENCE
3434
#include <graphblas/reference/blas2.hpp>
35+
#endif
36+
#ifdef _GRB_WITH_DENSE
3537
#include <graphblas/denseref/blas2.hpp>
3638
#endif
3739
#ifdef _GRB_WITH_HYPERDAGS

include/graphblas/blas3.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
// now include all specialisations contained in the backend directories:
3030
#ifdef _GRB_WITH_REFERENCE
3131
#include <graphblas/reference/blas3.hpp>
32+
#endif
33+
#ifdef _GRB_WITH_DENSE
3234
#include <graphblas/denseref/blas3.hpp>
3335
#endif
3436
#ifdef _GRB_WITH_HYPERDAGS

include/graphblas/collectives.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
// include template specialisations
3030
#ifdef _GRB_WITH_REFERENCE
3131
#include <graphblas/reference/collectives.hpp>
32+
#endif
33+
#ifdef _GRB_WITH_DENSE
3234
#include <graphblas/denseref/collectives.hpp>
3335
#endif
3436
#ifdef _GRB_WITH_HYPERDAGS

include/graphblas/config.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
// include all active configurations
2929
#ifdef _GRB_WITH_REFERENCE
3030
#include "graphblas/reference/config.hpp"
31+
#endif
32+
#ifdef _GRB_WITH_DENSE
3133
#include "graphblas/denseref/config.hpp"
3234
#endif
3335
#ifdef _GRB_WITH_HYPERDAGS

include/graphblas/exec.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828

2929
// include template specialisations
3030
#ifdef _GRB_WITH_REFERENCE
31-
#include "graphblas/reference/exec.hpp"
31+
#include "graphblas/reference/exec.hpp"
32+
#endif
33+
#ifdef _GRB_WITH_DENSE
3234
#include "graphblas/denseref/exec.hpp"
3335
#endif
3436
#ifdef _GRB_WITH_HYPERDAGS

include/graphblas/init.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
// include all implementations
3030
#ifdef _GRB_WITH_REFERENCE
3131
#include "graphblas/reference/init.hpp"
32+
#endif
33+
#ifdef _GRB_WITH_DENSE
3234
#include "graphblas/denseref/init.hpp"
3335
#endif
3436
#ifdef _GRB_WITH_HYPERDAGS

include/graphblas/io.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
// now include all specialisations contained in the backend directories:
2929
#ifdef _GRB_WITH_REFERENCE
3030
#include <graphblas/reference/io.hpp>
31+
#endif
32+
#ifdef _GRB_WITH_DENSE
3133
#include <graphblas/denseref/io.hpp>
3234
#endif
3335
#ifdef _GRB_WITH_HYPERDAGS

0 commit comments

Comments
 (0)