Kokkos reduction

src/cc/CanopyHydrology_SnowWater_impl.hh

@@ -15,7 +15,7 @@ using std::max ;
 namespace ELM {
 
 template<typename Array_d>
-   NATURE1 void CanopyHydrology_SnowWater(const double& dtime,
+   NATURE void CanopyHydrology_SnowWater(const double& dtime,
     const double& qflx_floodg,
     const int& ltype,
     const int& ctype,

src/cc/CanopyHydrology_decl.hh

@@ -4,9 +4,6 @@
 #ifndef NATURE
 #define NATURE 
 #endif
-#ifndef NATURE1
-#define NATURE1
-#endif
 
 namespace ELM {
 
@@ -40,7 +37,7 @@ NATURE void CanopyHydrology_FracWet(const int& frac_veg_nosno,
 
 
 template<typename Array_d>
-NATURE1 void CanopyHydrology_SnowWater(const double& dtime,
+NATURE void CanopyHydrology_SnowWater(const double& dtime,
         const double& qflx_floodg,
         const int& ltype,
         const int& ctype,

tests/tests_kokkos_c/CanopyHydrology_module.cpp

@@ -280,12 +280,11 @@ int main(int argc, char ** argv)
   for (size_t t = 0; t != n_times; ++t) {
 
     typedef typename Kokkos::Experimental::MDRangePolicy< Kokkos::Experimental::Rank<2> > MDPolicyType_2D;
-    typedef typename MDPolicyType_2D::member_type  team_member;
         
     // Construct 2D MDRangePolicy: lower and upper bounds provided, tile dims defaulted
     MDPolicyType_2D mdpolicy_2d( {{0,0}}, {{n_grid_cells,n_pfts}} );
           
-    Kokkos::parallel_for("md2d",mdpolicy_2d,KOKKOS_LAMBDA (const team_member& thread, const size_t& g, const size_t& p) { 
+    Kokkos::parallel_for("md2d",mdpolicy_2d,KOKKOS_LAMBDA (const size_t& g, const size_t& p) { 
                 ELM::CanopyHydrology_Interception(dtime,
                   forc_rain(t,g), forc_snow(t,g), forc_irrig(t,g),
                   ltype, ctype, urbpoi, do_capsnow,
@@ -294,24 +293,38 @@ int main(int argc, char ** argv)
                   qflx_prec_intr(g,p), qflx_irrig(g,p), qflx_prec_grnd(g,p),
                   qflx_snwcp_liq(g,p), qflx_snwcp_ice(g,p),
                  qflx_snow_grnd_patch(g,p), qflx_rain_grnd(g,p)); 
+
                 double fwet = 0., fdry = 0.;
                 ELM::CanopyHydrology_FracWet(frac_veg_nosno, h2ocan(g,p), elai(g,p), esai(g,p), dewmx, fwet, fdry); 
+    });
       
       // Column level operations
       // NOTE: this is effectively an accumulation kernel/task! --etc
-      double* qpatch = &qflx_snow_grnd_patch(n_grid_cells-1, n_pfts-1);
-      double sum = 0 ;    
-      Kokkos::parallel_reduce(TeamThreadRange (thread, 99), 
-      [=] (size_t& g, double& lsum) {
-      lsum += qflx_snow_grnd_patch(g,p);
+    typedef Kokkos::TeamPolicy<>              team_policy ;
+    typedef typename team_policy::member_type team_type ;
+    Kokkos::parallel_for (Kokkos::TeamPolicy<> (n_grid_cells, n_pfts),
+                     KOKKOS_LAMBDA (const team_type& team) {
+      
+      double sum = 0;
+      Kokkos::parallel_reduce (Kokkos::TeamThreadRange (team, team.team_size()),
+        [=] (const size_t& p, double& lsum) {
+        lsum += qflx_snow_grnd_patch(team.league_rank(),p);
         }, sum);
-      qflx_snow_grnd_col(g) = sum ; 
+      qflx_snow_grnd_col(team.league_rank()) = sum ;
+    });
+    // Kokkos::parallel_reduce( Kokkos::RangePolicy<execution_space>(0,n_grid_cells), KOKKOS_LAMBDA (const size_t& g, double& upd) {
+    // upd += qflx_snow_grnd_patch(g,p);
+    // }, sum);
+    // qflx_snow_grnd_col(g) = sum ;
 
          
       // Calculate ?water balance? on the snow column, adding throughfall,
       // removing melt, etc.
       //
       // local outputs
+
+    Kokkos::parallel_for (n_grid_cells,
+                     KOKKOS_LAMBDA (const size_t& g) {
       int newnode;
       ELM::CanopyHydrology_SnowWater(dtime, qflx_floodg,
               ltype, ctype, urbpoi, do_capsnow, oldfflag,

tests/tests_kokkos_c/KokkosCore_config.h

 /* ---------------------------------------------
 Makefile constructed configuration:
-Tue Jul  9 12:40:47 EDT 2019
+Tue Jul  9 15:36:27 EDT 2019
 ----------------------------------------------*/
 #if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
 #error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."

tests/tests_kokkos_c/KokkosCore_config.tmp

 /* ---------------------------------------------
 Makefile constructed configuration:
-Tue Jul  9 12:41:12 EDT 2019
+Tue Jul  9 15:36:27 EDT 2019
 ----------------------------------------------*/
 #if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
 #error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."

tests/tests_kokkos_c/Makefile

@@ -34,7 +34,7 @@ KOKKOS_ARCH = "BSW"
 endif
 
 # Set the Kernel programming model
-CXXFLAGS += -DNATURE=KOKKOS_INLINE_FUNCTION -DNATURE1=KOKKOS_INLINE_FUNCTION
+CXXFLAGS += -DNATURE=KOKKOS_INLINE_FUNCTION 
 
 default: Serial