ext/cumo/narray/gen/tmpl/eye.c in cumo-0.1.0 vs ext/cumo/narray/gen/tmpl/eye.c in cumo-0.1.1

- old
+ new

@@ -3,11 +3,11 @@ <% end %> #include <cuda_runtime.h> static void -<%=c_iter%>(na_loop_t *const lp) +<%=c_iter%>(cumo_na_loop_t *const lp) { size_t n0, n1; ssize_t s0, s1; char *p0; char *g; @@ -20,17 +20,17 @@ n0 = lp->args[0].shape[0]; n1 = lp->args[0].shape[1]; s0 = lp->args[0].iter[0].step; s1 = lp->args[0].iter[1].step; - p0 = NDL_PTR(lp,0); + p0 = CUMO_NDL_PTR(lp,0); <% if type_name == 'robject' %> { size_t i0, i1; char *p1; - SHOW_SYNCHRONIZE_FIXME_WARNING_ONCE("<%=name%>", "<%=type_name%>"); + CUMO_SHOW_SYNCHRONIZE_FIXME_WARNING_ONCE("<%=name%>", "<%=type_name%>"); for (i0=0; i0 < n0; i0++) { p1 = p0; for (i1=0; i1 < n1; i1++) { *(dtype*)p1 = (i0+kofs==i1) ? data : m_zero; p1 += s1; @@ -53,17 +53,17 @@ @return [Cumo::<%=class_name%>] <%=name%> of self. */ static VALUE <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self) { - ndfunc_arg_in_t ain[1] = {{OVERWRITE,2}}; - ndfunc_t ndf = {<%=c_iter%>, NO_LOOP, 1,0, ain,0}; + cumo_ndfunc_arg_in_t ain[1] = {{CUMO_OVERWRITE,2}}; + cumo_ndfunc_t ndf = {<%=c_iter%>, CUMO_NO_LOOP, 1,0, ain,0}; ssize_t kofs; dtype data; char *g; int nd; - narray_t *na; + cumo_narray_t *na; // check arguments if (argc > 2) { rb_raise(rb_eArgError,"too many arguments (%d for 0..2)",argc); } else if (argc == 2) { @@ -75,14 +75,14 @@ } else { data = m_one; kofs = 0; } - GetNArray(self,na); + CumoGetNArray(self,na); nd = na->ndim; if (nd < 2) { - rb_raise(nary_eDimensionError,"less than 2-d array"); + rb_raise(cumo_na_eDimensionError,"less than 2-d array"); } // Diagonal offset from the main diagonal. if (kofs >= 0) { if ((size_t)(kofs) >= na->shape[nd-1]) { @@ -98,8 +98,8 @@ g = ALLOCA_N(char,sizeof(ssize_t)+sizeof(dtype)); *(ssize_t*)g = kofs; *(dtype*)(g+sizeof(ssize_t)) = data; - na_ndloop3(&ndf, g, 1, self); + cumo_na_ndloop3(&ndf, g, 1, self); return self; }