From 8c09b6a4c915e8917d2a72af176a18f6cf633029 Mon Sep 17 00:00:00 2001
From: Brian Kelley <bmkelle@sandia.gov>
Date: Wed, 22 Jan 2020 14:13:36 -0700
Subject: [PATCH 1/3] D1 color: use conflict resolution scheme enum

instead of magic numbers 0,1,2
---
 .../impl/KokkosGraph_Distance1Color_impl.hpp  | 33 ++++++-------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/src/graph/impl/KokkosGraph_Distance1Color_impl.hpp b/src/graph/impl/KokkosGraph_Distance1Color_impl.hpp
index b68ff84755..28c4668929 100644
--- a/src/graph/impl/KokkosGraph_Distance1Color_impl.hpp
+++ b/src/graph/impl/KokkosGraph_Distance1Color_impl.hpp
@@ -789,7 +789,7 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
 
   bool _serialConflictResolution; //if true use serial conflict resolution
   bool _ticToc; //if true print info in each step
-  char _conflictlist; //0 for no conflictlist, 1 for atomic, 2 for pps
+  ConflictList _conflict_scheme; //Enum: COLORING_NOCONFLICT, COLORING_ATOMIC, COLORING_PPS
 
   double _pps_ratio; //the minimum number of reduction on the size of the conflictlist to create a new conflictlist
   nnz_lno_t _min_vertex_cut_off; //minimum number of vertices to reduce the conflictlist further.
@@ -819,7 +819,7 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
     GraphColor<HandleType,lno_row_view_t_,lno_nnz_view_t_>(nv_, ne_, row_map, entries, coloring_handle),
     _serialConflictResolution(coloring_handle->get_serial_conflict_resolution()),
     _ticToc(coloring_handle->get_tictoc()),
-    _conflictlist(),
+    _conflict_scheme(coloring_handle->get_conflict_list_type()),
     _pps_ratio(coloring_handle->get_min_reduction_for_conflictlist()),
     _min_vertex_cut_off(coloring_handle->get_min_elements_for_conflictlist()),
     _edge_filtering(coloring_handle->get_vb_edge_filtering()),
@@ -840,19 +840,6 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
       default: //cannnot get in here.
         this->_use_color_set = 0;
         break;
-
-      }
-
-      switch (coloring_handle->get_conflict_list_type()){
-      case COLORING_NOCONFLICT:
-        this->_conflictlist = 0;
-        break;
-      case COLORING_ATOMIC:
-        this->_conflictlist = 1;
-        break;
-      case COLORING_PPS:
-        this->_conflictlist = 2;
-        break;
       }
     }
 
@@ -872,7 +859,7 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
     if (this->_ticToc) {
       std::cout
           << "\tVB params:" << std::endl
-          << "\tuseConflictList:" << int (this->_conflictlist) << std::endl
+          << "\tuseConflictList:" << int (this->_conflict_scheme) << std::endl
           << "\talgorithm:" << (int)this->_use_color_set << std::endl
           << "\tserialConflictResolution:"  << (int) this->_serialConflictResolution << std::endl
           << "\tticToc:" << (int) this->_ticToc << std::endl
@@ -921,11 +908,11 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
     nnz_lno_temp_work_view_t pps_work_view;
 
     // if a conflictlist is used
-    if (this->_conflictlist > 0){
+    if (this->_conflict_scheme!= COLORING_NOCONFLICT){
       // Vertices to recolor. Will swap with vertexList.
       next_iteration_recolorList = nnz_lno_temp_work_view_t(Kokkos::ViewAllocateWithoutInitializing("recolorList"), this->nv);
       next_iteration_recolorListLength = single_dim_index_view_type("recolorListLength");
-      if (this->_conflictlist == 2) {
+      if (this->_conflict_scheme == COLORING_PPS) {
         pps_work_view = nnz_lno_temp_work_view_t("pps_view", this->nv);
       }
     }
@@ -1011,7 +998,7 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
       }
 
       if (this->_serialConflictResolution) break; // Break after first iteration.
-      if (this->_conflictlist && swap_work_arrays && (iter + 1< this->_max_num_iterations)){
+      if (this->_conflict_scheme != COLORING_NOCONFLICT && swap_work_arrays && (iter + 1< this->_max_num_iterations)){
         // Swap recolorList and vertexList
         nnz_lno_temp_work_view_t temp = current_vertexList;
         current_vertexList = next_iteration_recolorList;
@@ -1216,7 +1203,7 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
 
     swap_work_arrays = true;
     nnz_lno_t numUncolored = 0;
-    if (this->_conflictlist == 0){
+    if (this->_conflict_scheme == COLORING_NOCONFLICT){
       if (this->_use_color_set == 0 || this->_use_color_set == 2){
         functorFindConflicts_No_Conflist<adj_view_t> conf( this->nv, xadj_, adj_, vertex_colors_);
         Kokkos::parallel_reduce("KokkosGraph::GraphColoring::FindConflicts::CaseA", my_exec_space(0, current_vertexListLength_), conf, numUncolored);
@@ -1226,7 +1213,7 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
         Kokkos::parallel_reduce("KokkosGraph::GraphColoring::FindConflicts::CaseB", my_exec_space(0, current_vertexListLength_), conf, numUncolored);
       }
     }
-    else if (this->_conflictlist == 2){ //IF PPS
+    else if (this->_conflict_scheme == COLORING_PPS){ //IF PPS
       if (this->_use_color_set == 0 || this->_use_color_set == 2){
         // Check for conflicts. Compute numUncolored == numConflicts.
         functorFindConflicts_PPS<adj_view_t> conf(this->nv, xadj_, adj_,vertex_colors_,current_vertexList_,next_iteration_recolorList_);
@@ -1309,7 +1296,7 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
     nnz_lno_t end = _nv;
     typename nnz_lno_temp_work_view_t::HostMirror h_recolor_list;
 
-    if (this->_conflictlist){
+    if (this->_conflict_scheme != COLORING_NOCONFLICT){
       end = current_vertexListLength_;
       h_recolor_list = Kokkos::create_mirror_view (current_vertexList_);
       Kokkos::deep_copy (h_recolor_list, current_vertexList_);
@@ -1324,7 +1311,7 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
     Kokkos::deep_copy (h_adj, adj_);
 
     for (nnz_lno_t k=0; k <end; k++){
-      if (this->_conflictlist){
+      if (this->_conflict_scheme != COLORING_NOCONFLICT){
         i = h_recolor_list(k);
       }
       else {

From 79570ef05c390cef10d85f90be083c8aabb4d8f3 Mon Sep 17 00:00:00 2001
From: Brian Kelley <bmkelle@sandia.gov>
Date: Wed, 22 Jan 2020 17:06:20 -0700
Subject: [PATCH 2/3] Removed the need for pps work view, fused kernels

PPS worklist construction (VB and EB) now happens in a single scan,
without using a temporary array to store indices. Faster and saves
memory.
---
 .../impl/KokkosGraph_Distance1Color_impl.hpp  | 214 +++++-------------
 1 file changed, 59 insertions(+), 155 deletions(-)

diff --git a/src/graph/impl/KokkosGraph_Distance1Color_impl.hpp b/src/graph/impl/KokkosGraph_Distance1Color_impl.hpp
index 28c4668929..42de37d036 100644
--- a/src/graph/impl/KokkosGraph_Distance1Color_impl.hpp
+++ b/src/graph/impl/KokkosGraph_Distance1Color_impl.hpp
@@ -903,18 +903,12 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
 
     //the size of the next iteration's conflictlist
     single_dim_index_view_type next_iteration_recolorListLength;
-    //if parallel prefix sum is selected instead of atomic operations,
-    //we need one more work array to do the prefix sum.
-    nnz_lno_temp_work_view_t pps_work_view;
 
     // if a conflictlist is used
     if (this->_conflict_scheme!= COLORING_NOCONFLICT){
       // Vertices to recolor. Will swap with vertexList.
       next_iteration_recolorList = nnz_lno_temp_work_view_t(Kokkos::ViewAllocateWithoutInitializing("recolorList"), this->nv);
       next_iteration_recolorListLength = single_dim_index_view_type("recolorListLength");
-      if (this->_conflict_scheme == COLORING_PPS) {
-        pps_work_view = nnz_lno_temp_work_view_t("pps_view", this->nv);
-      }
     }
 
     nnz_lno_t numUncolored = this->nv;
@@ -974,8 +968,7 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
           this->xadj, adj_copy,
           colors, vertex_color_set,
           current_vertexList, current_vertexListLength,
-          next_iteration_recolorList, next_iteration_recolorListLength,
-          pps_work_view);
+          next_iteration_recolorList, next_iteration_recolorListLength);
       }
       else {
         numUncolored = this->findConflicts(
@@ -983,8 +976,7 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
             this->xadj, this->adj,
             colors, vertex_color_set,
             current_vertexList, current_vertexListLength,
-            next_iteration_recolorList, next_iteration_recolorListLength,
-            pps_work_view);
+            next_iteration_recolorList, next_iteration_recolorListLength);
       }
 
       MyExecSpace().fence();
@@ -1184,9 +1176,8 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
    *  \param vertex_color_set: if VBCS is used, color set of each vertex
    *  \param current_vertexList_: current conflictlist
    *  \param current_vertexListLength_: size of current conflictlist
-   *  \param next_iteration_recolorList_: current conflictlist
-   *  \param next_iteration_recolorListLength_: size of current conflictlist
-   *  \param pps_work_view: size of current conflictlist
+   *  \param next_iteration_recolorList_: next conflictlist
+   *  \param next_iteration_recolorListLength_: size of next conflictlist
    */
   template <typename adj_view_t>
   nnz_lno_t findConflicts(
@@ -1198,8 +1189,7 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
       nnz_lno_temp_work_view_t current_vertexList_,
       nnz_lno_t current_vertexListLength_,
       nnz_lno_temp_work_view_t next_iteration_recolorList_,
-      single_dim_index_view_type next_iteration_recolorListLength_,
-      nnz_lno_temp_work_view_t pps_work_view) {
+      single_dim_index_view_type next_iteration_recolorListLength_) {
 
     swap_work_arrays = true;
     nnz_lno_t numUncolored = 0;
@@ -1213,20 +1203,18 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
         Kokkos::parallel_reduce("KokkosGraph::GraphColoring::FindConflicts::CaseB", my_exec_space(0, current_vertexListLength_), conf, numUncolored);
       }
     }
-    else if (this->_conflict_scheme == COLORING_PPS){ //IF PPS
+    else if (this->_conflict_scheme == COLORING_PPS){
       if (this->_use_color_set == 0 || this->_use_color_set == 2){
         // Check for conflicts. Compute numUncolored == numConflicts.
-        functorFindConflicts_PPS<adj_view_t> conf(this->nv, xadj_, adj_,vertex_colors_,current_vertexList_,next_iteration_recolorList_);
+        functorFindConflicts_PPS<adj_view_t> conf(this->nv, xadj_, adj_,vertex_colors_,current_vertexList_);
         Kokkos::parallel_reduce("KokkosGraph::GraphColoring::FindConflicts::CaseC", my_exec_space(0, current_vertexListLength_), conf, numUncolored);
       }
       else {
-        functorFindConflicts_PPS_IMP<adj_view_t> conf(this->nv,
-            xadj_, adj_,vertex_colors_, vertex_color_set_,
-            current_vertexList_,next_iteration_recolorList_);
+        functorFindConflicts_PPS_IMP<adj_view_t> conf(
+            this->nv, xadj_, adj_,vertex_colors_, vertex_color_set_, current_vertexList_);
         Kokkos::parallel_reduce("KokkosGraph::GraphColoring::FindConflicts::CaseD", my_exec_space(0, current_vertexListLength_), conf, numUncolored);
       }
 
-
       if( numUncolored && (current_vertexListLength_ >= this->_min_vertex_cut_off) &&
           (double (numUncolored) / current_vertexListLength_  <  (1.0 - this->_pps_ratio))){
         if (this->_ticToc){
@@ -1235,23 +1223,15 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
         }
         single_dim_index_host_view_type h_numUncolored(&numUncolored);
         Kokkos::deep_copy (next_iteration_recolorListLength_, h_numUncolored);
-
-        MyExecSpace().fence();
-
         Kokkos::parallel_scan ("KokkosGraph::GraphColoring::PrefixSum",
             my_exec_space(0, current_vertexListLength_),
-            parallel_prefix_sum<nnz_lno_temp_work_view_t>(current_vertexList_, next_iteration_recolorList_, pps_work_view));
-
-        MyExecSpace().fence();
-        Kokkos::parallel_for ("KokkosGraph::GraphColoring::CreateNewWorkArray",
-            my_exec_space(0, current_vertexListLength_),
-            create_new_work_array<nnz_lno_temp_work_view_t>(current_vertexList_, next_iteration_recolorList_, pps_work_view));
+            ppsWorklistFunctorVB<nnz_lno_temp_work_view_t>(this->nv, current_vertexList_, next_iteration_recolorList_));
       }
       else {
         swap_work_arrays = false;
       }
     }
-    else { //IF ATOMIC
+    else { // worklist scheme COLORING_ATOMIC
       if (this->_use_color_set == 0 || this->_use_color_set == 2){
         // Check for conflicts. Compute numUncolored == numConflicts.
         functorFindConflicts_Atomic<adj_view_t> conf(this->nv,
@@ -1941,27 +1921,20 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
     adj_view_t _adj;
     color_view_type _colors;
     nnz_lno_temp_work_view_t _vertexList;
-    nnz_lno_temp_work_view_t _recolorList;
-
-
 
     functorFindConflicts_PPS(
         nnz_lno_t nv_,
-        const_lno_row_view_t xadj_,
-		adj_view_t adj_,
+        const_lno_row_view_t xadj_, adj_view_t adj_,
         color_view_type colors,
-        nnz_lno_temp_work_view_t vertexList,
-        nnz_lno_temp_work_view_t recolorList) :
+        nnz_lno_temp_work_view_t vertexList) :
           nv (nv_),
           _idx(xadj_), _adj(adj_), _colors(colors),
-          _vertexList(vertexList),
-          _recolorList(recolorList){}
+          _vertexList(vertexList) {}
 
     KOKKOS_INLINE_FUNCTION
     void operator()(const nnz_lno_t ii, nnz_lno_t &numConflicts) const {
       nnz_lno_t i = _vertexList(ii);
       color_t my_color = _colors(i);
-      _recolorList(i) = 0;
       // check vertex i conflicts
 
       size_type xadjend = _idx(i+1);
@@ -1982,7 +1955,7 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
 #endif
         ) {
           _colors(i) = 0; // Uncolor vertex i
-          _recolorList(i) = 1;
+          _vertexList(ii) += nv;
           numConflicts += 1;
           break; // Once i is uncolored and marked conflict
         }
@@ -2131,7 +2104,6 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
     color_view_type _colors;
     nnz_lno_temp_work_view_t _color_sets;
     nnz_lno_temp_work_view_t _vertexList;
-    nnz_lno_temp_work_view_t _recolorList;
 
     functorFindConflicts_PPS_IMP(
         nnz_lno_t nv_,
@@ -2139,20 +2111,18 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
 		adj_view_t adj_,
         color_view_type colors,
         nnz_lno_temp_work_view_t color_sets,
-        nnz_lno_temp_work_view_t vertexList,
-        nnz_lno_temp_work_view_t recolorList
+        nnz_lno_temp_work_view_t vertexList
     ) : nv (nv_),
       _xadj(xadj_), _adj(adj_), _colors(colors), _color_sets(color_sets),
-      _vertexList(vertexList),
-      _recolorList(recolorList){}
+      _vertexList(vertexList) {}
 
     KOKKOS_INLINE_FUNCTION
     void operator()(const nnz_lno_t ii, nnz_lno_t &numConflicts) const {
+      //go through vertices, marking in _vertexList those which are uncolored or in conflict.
       nnz_lno_t i = _vertexList(ii);
-      _recolorList(i) = 0;
       color_t my_color = _colors(i);
       if (my_color == 0){
-        _recolorList(i) = 1;
+        _vertexList(ii) += nv;
         numConflicts++;
       }
       else {
@@ -2178,7 +2148,7 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
           ) {
             _colors(i) = 0; // Uncolor vertex i
             _color_sets(i) = 0;
-            _recolorList(i) = 1;
+            _vertexList(ii) += nv;
             numConflicts++;
             break; // Once i is uncolored and marked conflict
           }
@@ -2280,63 +2250,32 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
   };
 
 
-  /**
-   * Functor for parallel prefix sum
-   */
   template <typename view_type>
-  struct parallel_prefix_sum{
+  struct ppsWorklistFunctorVB {
+    nnz_lno_t _nv;
     view_type _vertexList;
     view_type _recolorList;
-    view_type _pps_view;
-
-    parallel_prefix_sum(
-        view_type vertexList,
-        view_type recolorList,
-        view_type pps_view):
-          _vertexList(vertexList),_recolorList(recolorList),_pps_view(pps_view){}
 
-    KOKKOS_INLINE_FUNCTION
-    void operator()(const typename view_type::non_const_value_type ii, size_t& update, const bool final) const {
-      typename view_type::non_const_value_type w = _vertexList(ii);
-      update += _recolorList(w);
-      if (final) {
-        _pps_view(w) = (update);
-      }
-    }
-  };
-
-
-  /**
-   * Functor for creating new worklist using pps
-   */
-  template <typename view_type>
-  struct create_new_work_array{
-    view_type _vertexList;
-    view_type _recolorList;
-    view_type _pps_view;
-
-    create_new_work_array(
-        view_type vertexList,
-        view_type recolorList,
-        view_type pps_view):
-          _vertexList(vertexList),_recolorList(recolorList),_pps_view(pps_view){}
+    ppsWorklistFunctorVB(
+        nnz_lno_t nv,
+        const view_type& vertexList,
+        const view_type& recolorList)
+      : _nv(nv), _vertexList(vertexList), _recolorList(recolorList)
+    {}
 
     KOKKOS_INLINE_FUNCTION
-    void operator()(const typename view_type::non_const_value_type ii) const {
-      typename view_type::non_const_value_type w = _vertexList(ii);
-      typename view_type::non_const_value_type left_work = 0;
-      if (ii > 0){
-        left_work = _pps_view(_vertexList(ii - 1));
-      }
-      typename view_type::non_const_value_type pps_current = _pps_view(w);
-      if(pps_current != left_work){
-        typename view_type::non_const_value_type future_index = pps_current;
-        _recolorList(future_index - 1) = w;
+    void operator()(nnz_lno_t i, nnz_lno_t& update, const bool final) const
+    {
+      nnz_lno_t w = _vertexList(i);
+      if(w >= _nv)
+      {
+        if(final)
+          _recolorList(update) = w - _nv;
+        update++;
       }
     }
   };
 
-
   /**
    * Converting VBCS colors to final colors.
    */
@@ -3001,18 +2940,9 @@ class GraphColor_EB:public GraphColor <HandleType,in_row_index_view_type_,in_non
       {
         //use_pps = false;
         if (use_pps){
-          //calculate new positions of the edges in new worklist
           Kokkos::parallel_scan ("KokkosGraph::GraphColoring::CalcEdgePositions",
               my_exec_space(0, num_work_edges),
-              parallel_prefix_sum(edge_conflict_indices, edge_conflict_marker, pps)
-          );
-          MyExecSpace().fence();
-
-          //write the edge indices to new worklist.
-          Kokkos::parallel_for ("KokkosGraph::GraphColoring::CreateNewWorkArray",
-              my_exec_space(0, num_work_edges),
-              create_new_work_array(edge_conflict_indices, edge_conflict_marker, pps, new_edge_conflict_indices));
-          MyExecSpace().fence();
+              ppsWorklistFunctorEB(edge_conflict_indices, new_edge_conflict_indices, edge_conflict_marker));
         }
         else {
           //create new worklist
@@ -3274,62 +3204,36 @@ class GraphColor_EB:public GraphColor <HandleType,in_row_index_view_type_,in_non
     }
   };
 
-
   /**
-   * \brief Functor to perform parallel prefix sum for edges so that the position
-   * on the next conflictlist is calculated.
+   * \brief Functor to create the new work array with a parallel prefix sum.
    */
-  struct parallel_prefix_sum{
-    size_type_temp_work_view_t _edge_conflict_indices;
-    char_temp_work_view_type _edge_conflict_marker;
-    size_type_temp_work_view_t _pps_view;
-
-    parallel_prefix_sum(
-        size_type_temp_work_view_t edge_conflict_indices,
-        char_temp_work_view_type edge_conflict_marker,
-        size_type_temp_work_view_t pps_view):
-          _edge_conflict_indices(edge_conflict_indices),
-          _edge_conflict_marker(edge_conflict_marker),
-          _pps_view(pps_view){}
+  struct ppsWorklistFunctorEB {
+    using edge_view = size_type_temp_work_view_t ;
+    using char_view = char_temp_work_view_type;
+    edge_view _oldlist;
+    edge_view _newlist;
+    char_view _markers; //_markers(e) != 0 iff e has a conflict
+
+    ppsWorklistFunctorEB(
+        const edge_view& oldlist,
+        const edge_view& newlist,
+        const char_view& markers) :
+          _oldlist(oldlist), _newlist(newlist), _markers(markers)
+    {}
 
     KOKKOS_INLINE_FUNCTION
-    void operator()(const size_type ii, size_t& update, const bool final) const {
-      size_type w = _edge_conflict_indices(ii);
-      if (final) {
-        _pps_view(w) =  size_type(update);
+    void operator()(nnz_lno_t i, size_type& update, const bool final) const
+    {
+      size_type edge = _oldlist(i);
+      if(_markers(edge))
+      {
+        if(final)
+          _newlist(update) = edge;
+        update++;
       }
-      update += _edge_conflict_marker(w);
     }
   };
 
-  /**
-   * \brief Functor to create the new work array.
-   */
-  struct create_new_work_array{
-    size_type_temp_work_view_t _edge_conflict_indices;
-    char_temp_work_view_type _edge_conflict_marker;
-    size_type_temp_work_view_t _pps_view;
-    size_type_temp_work_view_t _new_edge_conflict_indices;
-
-    create_new_work_array(
-        size_type_temp_work_view_t edge_conflict_indices,
-        char_temp_work_view_type edge_conflict_marker,
-        size_type_temp_work_view_t pps_view,
-        size_type_temp_work_view_t new_edge_conflict_indices):
-          _edge_conflict_indices(edge_conflict_indices),
-          _edge_conflict_marker(edge_conflict_marker),
-          _pps_view(pps_view),
-          _new_edge_conflict_indices(new_edge_conflict_indices){}
-
-    KOKKOS_INLINE_FUNCTION
-    void operator()(const size_type ii) const {
-      size_type w = _edge_conflict_indices(ii);
-      if(_edge_conflict_marker(w)){
-        size_type future_index = _pps_view(w);
-        _new_edge_conflict_indices(future_index) = w;
-      }
-    }
-  };
 
   /**
    * \brief Functor to create the new work array with atomic operations.

From f1197524bebeee5a2a4cb473a3b3ae7885b85a08 Mon Sep 17 00:00:00 2001
From: Brian Kelley <bmkelle@sandia.gov>
Date: Wed, 22 Jan 2020 17:51:27 -0700
Subject: [PATCH 3/3] Fix shadow warning

---
 src/graph/impl/KokkosGraph_Distance1Color_impl.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/graph/impl/KokkosGraph_Distance1Color_impl.hpp b/src/graph/impl/KokkosGraph_Distance1Color_impl.hpp
index 42de37d036..f469f0a694 100644
--- a/src/graph/impl/KokkosGraph_Distance1Color_impl.hpp
+++ b/src/graph/impl/KokkosGraph_Distance1Color_impl.hpp
@@ -2257,10 +2257,10 @@ class GraphColor_VB:public GraphColor <HandleType,lno_row_view_t_,lno_nnz_view_t
     view_type _recolorList;
 
     ppsWorklistFunctorVB(
-        nnz_lno_t nv,
+        nnz_lno_t nv_,
         const view_type& vertexList,
         const view_type& recolorList)
-      : _nv(nv), _vertexList(vertexList), _recolorList(recolorList)
+      : _nv(nv_), _vertexList(vertexList), _recolorList(recolorList)
     {}
 
     KOKKOS_INLINE_FUNCTION