numo-narray-alt 0.9.5 → 0.9.7

data/ext/numo/narray/struct.c

@@ -670,8 +670,8 @@ static inline VALUE nary_struct_store_array(VALUE self, VALUE obj) {
 /*
   Store elements to Numo::Struct from other.
   @overload store(other)
-  @param [Object] other
-  @return [Numo::Struct] self
+    @param [Object] other
+    @return [Numo::Struct] self
 */
 static VALUE nary_struct_store(VALUE self, VALUE obj) {
   if (TYPE(obj) == T_ARRAY) {
@@ -742,10 +742,10 @@ static VALUE nst_s_add_type(int argc, VALUE* argv, VALUE mod) {
   return Qnil;
 }
 
-#define NST_TYPEDEF(tpname, tpclass)                              \
-  static VALUE nst_s_##tpname(int argc, VALUE* argv, VALUE mod) { \
-    nstruct_add_type(tpclass, argc, argv, mod);                   \
-    return Qnil;                                                  \
+#define NST_TYPEDEF(tpname, tpclass)                                                           \
+  static VALUE nst_s_##tpname(int argc, VALUE* argv, VALUE mod) {                              \
+    nstruct_add_type(tpclass, argc, argv, mod);                                                \
+    return Qnil;                                                                               \
   }
 
 NST_TYPEDEF(int8, numo_cInt8)
@@ -761,10 +761,15 @@ NST_TYPEDEF(dcomplex, numo_cDComplex)
 NST_TYPEDEF(sfloat, numo_cSFloat)
 NST_TYPEDEF(scomplex, numo_cSComplex)
 
-#define rb_define_singleton_alias(klass, name1, name2) \
+#define rb_define_singleton_alias(klass, name1, name2)                                         \
   rb_define_alias(rb_singleton_class(klass), name1, name2)
 
 void Init_nary_struct(void) {
+  /**
+   * Document-class: Numo::Struct
+   *
+   * Structured array class.
+   */
   cT = rb_define_class_under(mNumo, "Struct", numo_cNArray);
   // cNStMember = rb_define_class_under(cT, "Member", rb_cObject);
 

data/lib/numo/narray/extra.rb

@@ -114,6 +114,7 @@ module Numo
       end
     end
 
+    # Convert the argument to an narray.
     def self.asarray(a)
       case a
       when NArray
@@ -710,6 +711,12 @@ module Numo
       end
     end
 
+    # Split an array into multiple sub-arrays vertically
+    def vsplit(indices_or_sections)
+      split(indices_or_sections, axis: 0)
+    end
+
+    # Split an array into multiple sub-arrays horizontally
     # @example
     #   x = Numo::DFloat.new(4,4).seq
     #   # => Numo::DFloat#shape=[4,4]
@@ -742,15 +749,11 @@ module Numo
     #   #  [11],
     #   #  [15]],
     #   #  Numo::DFloat(view)#shape=[4,0][]]
-
-    def vsplit(indices_or_sections)
-      split(indices_or_sections, axis: 0)
-    end
-
     def hsplit(indices_or_sections)
       split(indices_or_sections, axis: 1)
     end
 
+    # Split an array into multiple sub-arrays along the depth
     def dsplit(indices_or_sections)
       split(indices_or_sections, axis: 2)
     end
@@ -1042,6 +1045,83 @@ module Numo
       a
     end
 
+    # Returns an index array of sort result.
+    #
+    # @example
+    #   require 'numo/narray'
+    #
+    #   a = Numo::DFloat[[0.1, 0.7],
+    #                    [0.4, 0.2],
+    #                    [0.2, 0.5]]
+    #   pp a.argsort
+    #   # =>
+    #   # Numo::Int32#shape=[3,2]
+    #   # [[0, 1],
+    #   #  [1, 0],
+    #   #  [0, 1]]
+    #   pp a.argsort(axis: 0)
+    #   # =>
+    #   # Numo::Int32#shape=[3,2]
+    #   # [[0, 1],
+    #   #  [2, 2],
+    #   #  [1, 0]]
+    #   pp a.argsort(axis: 1)
+    #   # =>
+    #   # Numo::Int32#shape=[3,2]
+    #   # [[0, 1],
+    #   #  [1, 0],
+    #   #  [0, 1]]
+    #   pp a.argsort(axis: nil)
+    #   # =>
+    #   # Numo::Int32#shape=[6]
+    #   # [0, 3, 4, 2, 5, 1]
+    #
+    # @overload argsort(axis: -1)
+    #   @param axis [Integer, nil] Axis along which to sort. Default is -1 (the last axis).
+    #     If `nil` is given, the array is flattened before sorting.
+    #   @return [Numo::Int32] An array of indices that would sort the array.
+    def argsort(axis_ = 'none', axis: -1)
+      raise NotImplementedError, "argsort is not implemented for #{self.class}" unless respond_to?(:sort_index)
+
+      axis = axis_ unless axis_ == 'none'
+
+      return flatten.sort_index if axis.nil?
+
+      axis = ndim + axis if axis.negative?
+      raise Numo::NArray::DimensionError, 'dimension is out of range' if axis.negative? || axis >= ndim
+
+      case ndim
+      when 1
+        sort_index
+      when 2
+        case axis
+        when 0
+          indices = transpose.sort_index(1)
+          indices.transpose - indices.min(1)
+        when 1
+          indices = sort_index(1)
+          indices - indices.min(1).expand_dims(1)
+        end
+      else
+        res = Numo::Int32.zeros(*shape)
+        slicer = Array.new(ndim)
+        slicer[axis] = true
+        other_axes = Array.new(ndim) { |i| i } - [axis]
+        axis_ids = other_axes.map do |d|
+          Array.new(shape[d]) { |i| i }
+        end
+        axis_ids.inject(:product).each do |indices|
+          indices = indices.flatten
+          other_axes.each_with_index do |d, i|
+            slicer[d] = indices[i]
+          end
+          sorted_indices = self[*slicer].sort_index
+          res[*slicer] = sorted_indices - sorted_indices.min
+        end
+        res
+      end
+    end
+
     # Return the sum along diagonals of the array.
     #
     # If 2-D array, computes the summation along its diagonal with the

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray-alt
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.7
 platform: ruby
 authors:
 - yoshoku
@@ -63,6 +63,10 @@ files:
 - ext/numo/narray/numo/types/uint_macro.h
 - ext/numo/narray/numo/types/xint_macro.h
 - ext/numo/narray/rand.c
+- ext/numo/narray/src/mh/mean.h
+- ext/numo/narray/src/mh/rms.h
+- ext/numo/narray/src/mh/stddev.h
+- ext/numo/narray/src/mh/var.h
 - ext/numo/narray/src/t_bit.c
 - ext/numo/narray/src/t_dcomplex.c
 - ext/numo/narray/src/t_dfloat.c
@@ -70,7 +74,6 @@ files:
 - ext/numo/narray/src/t_int32.c
 - ext/numo/narray/src/t_int64.c
 - ext/numo/narray/src/t_int8.c
-- ext/numo/narray/src/t_mean.c
 - ext/numo/narray/src/t_robject.c
 - ext/numo/narray/src/t_scomplex.c
 - ext/numo/narray/src/t_sfloat.c
@@ -90,7 +93,7 @@ metadata:
   homepage_uri: https://github.com/yoshoku/numo-narray-alt
   source_code_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.5/
+  documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.9.7/
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:

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

@@ -1,105 +0,0 @@
-/*
-  t_mean.c
-  Numo::NArray Alternative
-
-  created on: 2025-10-08
-  Copyright (C) 2025 Atsushi Tatsuma
-*/
-#include <ruby.h>
-
-#include "numo/narray.h"
-#include "numo/template.h"
-
-// Type aliases for shorter notation following the codebase naming convention.
-typedef BIT_DIGIT bit;
-typedef int8_t int8;
-typedef int16_t int16;
-typedef int32_t int32;
-typedef int64_t int64;
-typedef u_int8_t uint8;
-typedef u_int16_t uint16;
-typedef u_int32_t uint32;
-typedef u_int64_t uint64;
-
-#define DEF_INT_MEAN_FUNC(tDType, tRtDType, tNAryClass, tRtNAryClass)                         \
-  static void iter_##tDType##_mean(na_loop_t* const lp) {                                     \
-    size_t n;                                                                                 \
-    char* p1;                                                                                 \
-    char* p2;                                                                                 \
-    ssize_t s1;                                                                               \
-                                                                                              \
-    INIT_COUNTER(lp, n);                                                                      \
-    INIT_PTR(lp, 0, p1, s1);                                                                  \
-    p2 = NDL_PTR(lp, 1);                                                                      \
-                                                                                              \
-    size_t count = 0;                                                                         \
-    tRtDType sum = 0;                                                                         \
-    for (size_t i = n; i--;) {                                                                \
-      sum += (tRtDType)(*(tDType*)p1);                                                        \
-      p1 += s1;                                                                               \
-      count++;                                                                                \
-    }                                                                                         \
-                                                                                              \
-    *(tRtDType*)p2 = sum / (tRtDType)count;                                                   \
-  }                                                                                           \
-                                                                                              \
-  static void iter_##tDType##_mean_nan(na_loop_t* const lp) {                                 \
-    size_t n;                                                                                 \
-    char* p1;                                                                                 \
-    char* p2;                                                                                 \
-    ssize_t s1;                                                                               \
-                                                                                              \
-    INIT_COUNTER(lp, n);                                                                      \
-    INIT_PTR(lp, 0, p1, s1);                                                                  \
-    p2 = NDL_PTR(lp, 1);                                                                      \
-                                                                                              \
-    size_t count = 0;                                                                         \
-    tRtDType tmp = 0;                                                                         \
-    tRtDType sum = 0;                                                                         \
-    for (size_t i = n; i--;) {                                                                \
-      tmp = (tRtDType)(*(tDType*)p1);                                                         \
-      p1 += s1;                                                                               \
-      if (tmp == tmp) {                                                                       \
-        sum += tmp;                                                                           \
-        count++;                                                                              \
-      }                                                                                       \
-    }                                                                                         \
-                                                                                              \
-    *(tRtDType*)p2 = sum / (tRtDType)count;                                                   \
-  }                                                                                           \
-                                                                                              \
-  static VALUE tDType##_mean(int argc, VALUE* argv, VALUE self) {                             \
-    ndfunc_arg_in_t ain[2] = { { tNAryClass, 0 }, { sym_reduce, 0 } };                        \
-    ndfunc_arg_out_t aout[1] = { { tRtNAryClass, 0 } };                                       \
-    ndfunc_t ndf = {                                                                          \
-      iter_##tDType##_mean, STRIDE_LOOP_NIP | NDF_FLAT_REDUCE, 2, 1, ain, aout                \
-    };                                                                                        \
-    VALUE reduce = na_reduce_dimension(argc, argv, 1, &self, &ndf, iter_##tDType##_mean_nan); \
-    VALUE v = na_ndloop(&ndf, 2, self, reduce);                                               \
-                                                                                              \
-    return rb_funcall(v, rb_intern("extract"), 0);                                            \
-  }
-
-DEF_INT_MEAN_FUNC(bit, double, numo_cBit, numo_cDFloat)
-DEF_INT_MEAN_FUNC(int8, double, numo_cInt8, numo_cDFloat)
-DEF_INT_MEAN_FUNC(int16, double, numo_cInt16, numo_cDFloat)
-DEF_INT_MEAN_FUNC(int32, double, numo_cInt32, numo_cDFloat)
-DEF_INT_MEAN_FUNC(int64, double, numo_cInt64, numo_cDFloat)
-DEF_INT_MEAN_FUNC(uint8, double, numo_cUInt8, numo_cDFloat)
-DEF_INT_MEAN_FUNC(uint16, double, numo_cUInt16, numo_cDFloat)
-DEF_INT_MEAN_FUNC(uint32, double, numo_cUInt32, numo_cDFloat)
-DEF_INT_MEAN_FUNC(uint64, double, numo_cUInt64, numo_cDFloat)
-
-#undef DEF_INT_MEAN_FUNC
-
-void Init_nary_mean(void) {
-  rb_define_method(numo_cBit, "mean", bit_mean, -1);
-  rb_define_method(numo_cInt8, "mean", int8_mean, -1);
-  rb_define_method(numo_cInt16, "mean", int16_mean, -1);
-  rb_define_method(numo_cInt32, "mean", int32_mean, -1);
-  rb_define_method(numo_cInt64, "mean", int64_mean, -1);
-  rb_define_method(numo_cUInt8, "mean", uint8_mean, -1);
-  rb_define_method(numo_cUInt16, "mean", uint16_mean, -1);
-  rb_define_method(numo_cUInt32, "mean", uint32_mean, -1);
-  rb_define_method(numo_cUInt64, "mean", uint64_mean, -1);
-}