numo-narray-alt 0.9.12 → 0.9.13

data/ext/numo/narray/src/t_uint8.c

@@ -55,6 +55,11 @@ extern VALUE cRT;
 #include "mh/op/div.h"
 #include "mh/op/mod.h"
 #include "mh/divmod.h"
+#include "mh/pow.h"
+#include "mh/minus.h"
+#include "mh/reciprocal.h"
+#include "mh/sign.h"
+#include "mh/square.h"
 #include "mh/comp/eq.h"
 #include "mh/comp/ne.h"
 #include "mh/comp/gt.h"
@@ -106,6 +111,11 @@ DEF_NARRAY_INT8_MUL_METHOD_FUNC(uint8, numo_cUInt8)
 DEF_NARRAY_INT8_DIV_METHOD_FUNC(uint8, numo_cUInt8)
 DEF_NARRAY_INT8_MOD_METHOD_FUNC(uint8, numo_cUInt8)
 DEF_NARRAY_INT_DIVMOD_METHOD_FUNC(uint8, numo_cUInt8)
+DEF_NARRAY_POW_METHOD_FUNC(uint8, numo_cUInt8)
+DEF_NARRAY_INT8_MINUS_METHOD_FUNC(uint8, numo_cUInt8)
+DEF_NARRAY_INT8_RECIPROCAL_METHOD_FUNC(uint8, numo_cUInt8)
+DEF_NARRAY_INT8_SIGN_METHOD_FUNC(uint8, numo_cUInt8)
+DEF_NARRAY_INT8_SQUARE_METHOD_FUNC(uint8, numo_cUInt8)
 DEF_NARRAY_EQ_METHOD_FUNC(uint8, numo_cUInt8)
 DEF_NARRAY_NE_METHOD_FUNC(uint8, numo_cUInt8)
 DEF_NARRAY_GT_METHOD_FUNC(uint8, numo_cUInt8)
@@ -1611,306 +1621,6 @@ static VALUE uint8_abs(VALUE self) {
   return na_ndloop(&ndf, 1, self);
 }
 
-static void iter_uint8_pow(na_loop_t* const lp) {
-  size_t i;
-  char *p1, *p2, *p3;
-  ssize_t s1, s2, s3;
-  dtype x, y;
-  INIT_COUNTER(lp, i);
-  INIT_PTR(lp, 0, p1, s1);
-  INIT_PTR(lp, 1, p2, s2);
-  INIT_PTR(lp, 2, p3, s3);
-  for (; i--;) {
-    GET_DATA_STRIDE(p1, s1, dtype, x);
-    GET_DATA_STRIDE(p2, s2, dtype, y);
-    x = m_pow(x, y);
-    SET_DATA_STRIDE(p3, s3, dtype, x);
-  }
-}
-
-static void iter_uint8_pow_int32(na_loop_t* const lp) {
-  size_t i;
-  char *p1, *p2, *p3;
-  ssize_t s1, s2, s3;
-  dtype x;
-  int32_t y;
-  INIT_COUNTER(lp, i);
-  INIT_PTR(lp, 0, p1, s1);
-  INIT_PTR(lp, 1, p2, s2);
-  INIT_PTR(lp, 2, p3, s3);
-  for (; i--;) {
-    GET_DATA_STRIDE(p1, s1, dtype, x);
-    GET_DATA_STRIDE(p2, s2, int32_t, y);
-    x = m_pow_int(x, y);
-    SET_DATA_STRIDE(p3, s3, dtype, x);
-  }
-}
-
-static VALUE uint8_pow_self(VALUE self, VALUE other) {
-  ndfunc_arg_in_t ain[2] = { { cT, 0 }, { cT, 0 } };
-  ndfunc_arg_in_t ain_i[2] = { { cT, 0 }, { numo_cInt32, 0 } };
-  ndfunc_arg_out_t aout[1] = { { cT, 0 } };
-  ndfunc_t ndf = { iter_uint8_pow, STRIDE_LOOP, 2, 1, ain, aout };
-  ndfunc_t ndf_i = { iter_uint8_pow_int32, STRIDE_LOOP, 2, 1, ain_i, aout };
-
-  // fixme : use na.integer?
-  if (FIXNUM_P(other) || rb_obj_is_kind_of(other, numo_cInt32)) {
-    return na_ndloop(&ndf_i, 2, self, other);
-  } else {
-    return na_ndloop(&ndf, 2, self, other);
-  }
-}
-
-/*
-  Binary power.
-  @overload ** other
-    @param [Numo::NArray,Numeric] other
-    @return [Numo::NArray] self to the other-th power.
-*/
-static VALUE uint8_pow(VALUE self, VALUE other) {
-
-  VALUE klass, v;
-  klass = na_upcast(rb_obj_class(self), rb_obj_class(other));
-  if (klass == cT) {
-    return uint8_pow_self(self, other);
-  } else {
-    v = rb_funcall(klass, id_cast, 1, self);
-    return rb_funcall(v, id_pow, 1, other);
-  }
-}
-
-static void iter_uint8_minus(na_loop_t* const lp) {
-  size_t i, n;
-  char *p1, *p2;
-  ssize_t s1, s2;
-  size_t *idx1, *idx2;
-  dtype x;
-
-  INIT_COUNTER(lp, n);
-  INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-  INIT_PTR_IDX(lp, 1, p2, s2, idx2);
-
-  if (idx1) {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_minus(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_minus(x);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-      }
-    }
-  } else {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = m_minus(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      //
-      for (i = 0; i < n; i++) {
-        *(dtype*)p2 = m_minus(*(dtype*)p1);
-        p1 += s1;
-        p2 += s2;
-      }
-      return;
-      //
-    }
-  }
-}
-
-/*
-  Unary minus.
-  @overload -@
-    @return [Numo::UInt8] minus of self.
-*/
-static VALUE uint8_minus(VALUE self) {
-  ndfunc_arg_in_t ain[1] = { { cT, 0 } };
-  ndfunc_arg_out_t aout[1] = { { cT, 0 } };
-  ndfunc_t ndf = { iter_uint8_minus, FULL_LOOP, 1, 1, ain, aout };
-
-  return na_ndloop(&ndf, 1, self);
-}
-
-static void iter_uint8_reciprocal(na_loop_t* const lp) {
-  size_t i, n;
-  char *p1, *p2;
-  ssize_t s1, s2;
-  size_t *idx1, *idx2;
-  dtype x;
-
-  INIT_COUNTER(lp, n);
-  INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-  INIT_PTR_IDX(lp, 1, p2, s2, idx2);
-
-  if (idx1) {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_reciprocal(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_reciprocal(x);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-      }
-    }
-  } else {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = m_reciprocal(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      //
-      for (i = 0; i < n; i++) {
-        *(dtype*)p2 = m_reciprocal(*(dtype*)p1);
-        p1 += s1;
-        p2 += s2;
-      }
-      return;
-      //
-    }
-  }
-}
-
-/*
-  Unary reciprocal.
-  @overload reciprocal
-    @return [Numo::UInt8] reciprocal of self.
-*/
-static VALUE uint8_reciprocal(VALUE self) {
-  ndfunc_arg_in_t ain[1] = { { cT, 0 } };
-  ndfunc_arg_out_t aout[1] = { { cT, 0 } };
-  ndfunc_t ndf = { iter_uint8_reciprocal, FULL_LOOP, 1, 1, ain, aout };
-
-  return na_ndloop(&ndf, 1, self);
-}
-
-static void iter_uint8_sign(na_loop_t* const lp) {
-  size_t i, n;
-  char *p1, *p2;
-  ssize_t s1, s2;
-  size_t *idx1, *idx2;
-  dtype x;
-
-  INIT_COUNTER(lp, n);
-  INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-  INIT_PTR_IDX(lp, 1, p2, s2, idx2);
-
-  if (idx1) {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_sign(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_sign(x);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-      }
-    }
-  } else {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = m_sign(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      //
-      for (i = 0; i < n; i++) {
-        *(dtype*)p2 = m_sign(*(dtype*)p1);
-        p1 += s1;
-        p2 += s2;
-      }
-      return;
-      //
-    }
-  }
-}
-
-/*
-  Unary sign.
-  @overload sign
-    @return [Numo::UInt8] sign of self.
-*/
-static VALUE uint8_sign(VALUE self) {
-  ndfunc_arg_in_t ain[1] = { { cT, 0 } };
-  ndfunc_arg_out_t aout[1] = { { cT, 0 } };
-  ndfunc_t ndf = { iter_uint8_sign, FULL_LOOP, 1, 1, ain, aout };
-
-  return na_ndloop(&ndf, 1, self);
-}
-
-static void iter_uint8_square(na_loop_t* const lp) {
-  size_t i, n;
-  char *p1, *p2;
-  ssize_t s1, s2;
-  size_t *idx1, *idx2;
-  dtype x;
-
-  INIT_COUNTER(lp, n);
-  INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-  INIT_PTR_IDX(lp, 1, p2, s2, idx2);
-
-  if (idx1) {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_square(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_square(x);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-      }
-    }
-  } else {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = m_square(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      //
-      for (i = 0; i < n; i++) {
-        *(dtype*)p2 = m_square(*(dtype*)p1);
-        p1 += s1;
-        p2 += s2;
-      }
-      return;
-      //
-    }
-  }
-}
-
-/*
-  Unary square.
-  @overload square
-    @return [Numo::UInt8] square of self.
-*/
-static VALUE uint8_square(VALUE self) {
-  ndfunc_arg_in_t ain[1] = { { cT, 0 } };
-  ndfunc_arg_out_t aout[1] = { { cT, 0 } };
-  ndfunc_t ndf = { iter_uint8_square, FULL_LOOP, 1, 1, ain, aout };
-
-  return na_ndloop(&ndf, 1, self);
-}
-
 static void iter_uint8_poly(na_loop_t* const lp) {
   size_t i;
   dtype x, y, a;
@@ -2620,11 +2330,37 @@ void Init_numo_uint8(void) {
    *   @return [Numo::NArray] divmod of self and other.
    */
   rb_define_method(cT, "divmod", uint8_divmod, 1);
+  /**
+   * Binary power.
+   * @overload ** other
+   *   @param [Numo::NArray,Numeric] other
+   *   @return [Numo::NArray] self to the other-th power.
+   */
   rb_define_method(cT, "**", uint8_pow, 1);
   rb_define_alias(cT, "pow", "**");
+  /**
+   * Unary minus.
+   * @overload -@
+   *   @return [Numo::UInt8] minus of self.
+   */
   rb_define_method(cT, "-@", uint8_minus, 0);
+  /**
+   * Unary reciprocal.
+   * @overload reciprocal
+   *   @return [Numo::UInt8] reciprocal of self.
+   */
   rb_define_method(cT, "reciprocal", uint8_reciprocal, 0);
+  /**
+   * Unary sign.
+   * @overload sign
+   *   @return [Numo::UInt8] sign of self.
+   */
   rb_define_method(cT, "sign", uint8_sign, 0);
+  /**
+   * Unary square.
+   * @overload square
+   *   @return [Numo::UInt8] square of self.
+   */
   rb_define_method(cT, "square", uint8_square, 0);
   rb_define_alias(cT, "conj", "view");
   rb_define_alias(cT, "im", "view");

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray-alt
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors:
 - yoshoku
@@ -137,6 +137,7 @@ files:
 - ext/numo/narray/src/mh/min_index.h
 - ext/numo/narray/src/mh/minimum.h
 - ext/numo/narray/src/mh/minmax.h
+- ext/numo/narray/src/mh/minus.h
 - ext/numo/narray/src/mh/mulsum.h
 - ext/numo/narray/src/mh/op/add.h
 - ext/numo/narray/src/mh/op/binary_func.h
@@ -144,9 +145,12 @@ files:
 - ext/numo/narray/src/mh/op/mod.h
 - ext/numo/narray/src/mh/op/mul.h
 - ext/numo/narray/src/mh/op/sub.h
+- ext/numo/narray/src/mh/pow.h
 - ext/numo/narray/src/mh/prod.h
 - ext/numo/narray/src/mh/ptp.h
 - ext/numo/narray/src/mh/rand.h
+- ext/numo/narray/src/mh/rand_norm.h
+- ext/numo/narray/src/mh/reciprocal.h
 - ext/numo/narray/src/mh/rms.h
 - ext/numo/narray/src/mh/round/ceil.h
 - ext/numo/narray/src/mh/round/floor.h
@@ -155,6 +159,8 @@ files:
 - ext/numo/narray/src/mh/round/trunc.h
 - ext/numo/narray/src/mh/round/unary_func.h
 - ext/numo/narray/src/mh/seq.h
+- ext/numo/narray/src/mh/sign.h
+- ext/numo/narray/src/mh/square.h
 - ext/numo/narray/src/mh/stddev.h
 - ext/numo/narray/src/mh/sum.h
 - ext/numo/narray/src/mh/to_a.h
@@ -185,7 +191,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/yoshoku/numo-narray-alt
   changelog_uri: https://github.com/yoshoku/numo-narray-alt/blob/main/CHANGELOG.md
-  documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.9.12/
+  documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.9.13/
   rubygems_mfa_required: 'true'
 post_install_message: |
   ===