accum.c in cumo-0.1.1

- old
+ new

@@ -3,47 +3,47 @@
 
 <% unless type_name == 'robject' %>
 //<% unless indexer_ops.include?(name) %>
 void cumo_<%=type_name%>_<%=name%><%=nan%>_kernel_launch(size_t n, char *p1, ssize_t s1, char *p2);
 <% else %>
-void cumo_<%=type_name%>_<%=name%><%=nan%>_kernel_launch(na_reduction_arg_t* arg);
+void cumo_<%=type_name%>_<%=name%><%=nan%>_kernel_launch(cumo_na_reduction_arg_t* arg);
 <% end %>
 <% end %>
 
 static void
-<%=c_iter%><%=nan%>(na_loop_t *const lp)
+<%=c_iter%><%=nan%>(cumo_na_loop_t *const lp)
 {
     <% if type_name == 'robject' || name == 'kahan_sum' || nan == '_nan' %>
     {
         size_t   n;
         char    *p1, *p2;
         ssize_t  s1;
 
-        INIT_COUNTER(lp, n);
-        INIT_PTR(lp, 0, p1, s1);
+        CUMO_INIT_COUNTER(lp, n);
+        CUMO_INIT_PTR(lp, 0, p1, s1);
         p2 = lp->args[1].ptr + lp->args[1].iter[0].pos;
 
-        SHOW_SYNCHRONIZE_FIXME_WARNING_ONCE("<%=name%><%=nan%>", "<%=type_name%>");
+        CUMO_SHOW_SYNCHRONIZE_FIXME_WARNING_ONCE("<%=name%><%=nan%>", "<%=type_name%>");
         *(<%=dtype%>*)p2 = f_<%=name%><%=nan%>(n,p1,s1);
     }
     //<% elsif !indexer_ops.include?(name) %>
     {
         size_t   n;
         char    *p1, *p2;
         ssize_t  s1;
 
-        INIT_COUNTER(lp, n);
-        INIT_PTR(lp, 0, p1, s1);
+        CUMO_INIT_COUNTER(lp, n);
+        CUMO_INIT_PTR(lp, 0, p1, s1);
         p2 = lp->args[1].ptr + lp->args[1].iter[0].pos;
 
         cumo_<%=type_name%>_<%=name%><%=nan%>_kernel_launch(n,p1,s1,p2);
     }
     <% else %>
     {
         // TODO(sonots): How to compute Kahan summation algorithm in parallel?
         // TODO(sonots): Implement nan CUDA version
-        na_reduction_arg_t arg = na_make_reduction_arg(lp);
+        cumo_na_reduction_arg_t arg = cumo_na_make_reduction_arg(lp);
         cumo_<%=type_name%>_<%=name%><%=nan%>_kernel_launch(&arg);
     }
     <% end %>
 }
 <% end %>
@@ -62,23 +62,23 @@
 */
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
     VALUE v, reduce;
-    ndfunc_arg_in_t ain[2] = {{cT,0},{sym_reduce,0}};
-    ndfunc_arg_out_t aout[1] = {{<%=result_class%>,0}};
+    cumo_ndfunc_arg_in_t ain[2] = {{cT,0},{cumo_sym_reduce,0}};
+    cumo_ndfunc_arg_out_t aout[1] = {{<%=result_class%>,0}};
     //<% if type_name == 'robject' || !indexer_ops.include?(name) %>
-    ndfunc_t ndf = { <%=c_iter%>, STRIDE_LOOP_NIP|NDF_FLAT_REDUCE, 2, 1, ain, aout };
+    cumo_ndfunc_t ndf = { <%=c_iter%>, CUMO_STRIDE_LOOP_NIP|CUMO_NDF_FLAT_REDUCE, 2, 1, ain, aout };
     <% else %>
-    ndfunc_t ndf = { <%=c_iter%>, STRIDE_LOOP_NIP|NDF_FLAT_REDUCE|NDF_INDEXER_LOOP, 2, 1, ain, aout };
+    cumo_ndfunc_t ndf = { <%=c_iter%>, CUMO_STRIDE_LOOP_NIP|CUMO_NDF_FLAT_REDUCE|CUMO_NDF_INDEXER_LOOP, 2, 1, ain, aout };
     <% end %>
 
   <% if is_float %>
-    reduce = na_reduce_dimension(argc, argv, 1, &self, &ndf, <%=c_iter%>_nan);
+    reduce = cumo_na_reduce_dimension(argc, argv, 1, &self, &ndf, <%=c_iter%>_nan);
   <% else %>
-    reduce = na_reduce_dimension(argc, argv, 1, &self, &ndf, 0);
+    reduce = cumo_na_reduce_dimension(argc, argv, 1, &self, &ndf, 0);
   <% end %>
-    v =  na_ndloop(&ndf, 2, self, reduce);
+    v =  cumo_na_ndloop(&ndf, 2, self, reduce);
   <% if result_class == "cT" %>
     return <%=type_name%>_extract(v);
   <% else %>
     return rb_funcall(v,rb_intern("extract"),0);
   <% end %>