numo-pocketfft 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ad2588103f5bbf0f5c72ac5129f843bf7d0851e4af1357ac8d31cb2b1f2a6c2
-  data.tar.gz: '099615d79db3d7f7de0574b698dc501d18b23b881b5325d700d7eaa373491bc2'
+  metadata.gz: 150fc0381172fd37f443ab7dfad5135ca021a349d9329e19e5200505b9ee63c7
+  data.tar.gz: 1ce9009fab9dd438b610e71e6961701a42f65468c5cebba244a99a428624d269
 SHA512:
-  metadata.gz: d32eef0c2f4152ec800a722acd228630b507c3d175064b71c69082b859943abf4440a73edf3864b8a1b2fcd35ff82ee6cd78dc311566afb48e2d711551947367
-  data.tar.gz: bece0b9dfcddaa2e99f2de97dc24628d8f578a0a1233e45d71a978173d3fdfdd86a213f841ffabbf42b0817df39add3e9a52baa7a3d134c425bf85b060760369
+  metadata.gz: ee6aca46690b7582e170f185182e8559e943aeb2586bb8b56616bca4b4e0e82ac6ca198ee52e9dd5b50b5cf65b94d7fc569dc8d42ec4a965a803342a16cddb8c
+  data.tar.gz: ac488a978bbe89ee516856987b8f38cd9643b5857f04ed0f5525c61ae4e59307aa48434ce87a26ae1b433ea7594df8c0f64c28a00e4f043065855b1539602040

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.7.0
+
+- relax numo-narray-alt upper bound to < 0.12.0.
+
 # 0.6.0
 
 - relax numo-narray-alt version constraint to >= 0.9.9, < 0.11.0.

data/ext/numo/pocketfft/extconf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mkmf'
 require 'numo/narray/alt'
 
@@ -13,7 +15,7 @@ unless have_header('numo/narray.h')
   exit(1)
 end
 
-if RUBY_PLATFORM =~ /mswin|cygwin|mingw/
+if RUBY_PLATFORM.match?(/mswin|cygwin|mingw/)
   $LOAD_PATH.each do |lp|
     if File.exist?(File.join(lp, 'numo/narray/libnarray.a'))
       $LDFLAGS = "-L#{lp}/numo/narray #{$LDFLAGS}"
@@ -26,15 +28,15 @@ if RUBY_PLATFORM =~ /mswin|cygwin|mingw/
   end
 end
 
-if RUBY_PLATFORM.match?(/darwin/) && Gem::Version.new('3.1.0') <= Gem::Version.new(RUBY_VERSION)
-  if try_link('int main(void){return 0;}', '-Wl,-undefined,dynamic_lookup')
-    $LDFLAGS << ' -Wl,-undefined,dynamic_lookup'
-  end
+if RUBY_PLATFORM.include?('darwin') && Gem::Version.new('3.1.0') <= Gem::Version.new(RUBY_VERSION) && try_link(
+  'int main(void){return 0;}', '-Wl,-undefined,dynamic_lookup'
+)
+  $LDFLAGS << ' -Wl,-undefined,dynamic_lookup'
 end
 
 $CFLAGS = "#{$CFLAGS} -std=c99"
 
 $srcs = Dir.glob("#{$srcdir}/**/*.c").map { |path| File.basename(path) }
-$VPATH << "$(srcdir)/src"
+$VPATH << '$(srcdir)/src'
 
 create_makefile('numo/pocketfft/pocketfftext')

data/ext/numo/pocketfft/pocketfftext.c

@@ -34,7 +34,8 @@ VALUE numo_pocketfft_fft(VALUE x_val, int is_forward) {
   int n_repeats = (int)(NA_SIZE(x_nary)) / length;
   for (int i = 0; i < n_repeats; i++) {
     memcpy(z_pt, x_pt, 2 * length * sizeof(double));
-    if ((is_forward == 1 ? cfft_forward(plan, z_pt, fct) : cfft_backward(plan, z_pt, fct)) != 0) {
+    int scss = is_forward == 1 ? cfft_forward(plan, z_pt, fct) : cfft_backward(plan, z_pt, fct);
+    if (scss != 0) {
       fail = 1;
       break;
     }
@@ -60,12 +61,16 @@ VALUE numo_pocketfft_fft(VALUE x_val, int is_forward) {
 /**
  * @!visibility private
  */
-static VALUE numo_pocketfft_cfft(VALUE self, VALUE x_val) { return numo_pocketfft_fft(x_val, 1); }
+static VALUE numo_pocketfft_cfft(VALUE self, VALUE x_val) {
+  return numo_pocketfft_fft(x_val, 1);
+}
 
 /**
  * @!visibility private
  */
-static VALUE numo_pocketfft_icfft(VALUE self, VALUE x_val) { return numo_pocketfft_fft(x_val, 0); }
+static VALUE numo_pocketfft_icfft(VALUE self, VALUE x_val) {
+  return numo_pocketfft_fft(x_val, 0);
+}
 
 /**
  * @!visibility private
@@ -91,8 +96,9 @@ static VALUE numo_pocketfft_rfft(VALUE self, VALUE x_val) {
   }
 
   size_t* z_shape = ALLOCA_N(size_t, n_dims);
-  for (int i = 0; i < n_dims - 1; i++)
+  for (int i = 0; i < n_dims - 1; i++) {
     z_shape[i] = NA_SHAPE(x_nary)[i];
+  }
   z_shape[n_dims - 1] = length / 2 + 1;
   VALUE z_val = rb_narray_new(numo_cDComplex, n_dims, z_shape);
   double* z_pt = (double*)na_get_pointer_for_write(z_val);
@@ -194,7 +200,7 @@ static VALUE numo_pocketfft_irfft(VALUE self, VALUE x_val) {
   return z_val;
 }
 
-void Init_pocketfftext() {
+void Init_pocketfftext(void) {
   rb_require("numo/narray");
 
   mNumo = rb_define_module("Numo");

data/lib/numo/pocketfft/version.rb

@@ -5,6 +5,6 @@ module Numo
   # Numo::Pocketfft is the module that has functions for Fourier transform.
   module Pocketfft
     # The version of Numo::Pocketfft you are using.
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/lib/numo/pocketfft.rb

@@ -5,7 +5,7 @@ require 'numo/pocketfft/version'
 require 'numo/pocketfft/pocketfftext'
 
 module Numo
-  module Pocketfft
+  module Pocketfft # rubocop:disable Metrics/ModuleLength, Style/Documentation
     module_function
 
     # Compute the 1-dimensional discrete Fourier Transform.
@@ -189,22 +189,26 @@ module Numo
     # @param b [Numo::DFloat/Numo::DComplex] Second input array with the same number of dimensions as first input array.
     # @raise [ArgumentError] This error is raised if input arrays are not Numo::NArray, are not the same dimensionality, or are empty.
     # @return [Numo::DFloat/Numo::DComplex] The discrete linear convolution of 'a' with 'b'.
-    def fftconvolve(a, b)
-      raise ArgumentError, 'Expect class of input array to be Numo::NArray.' unless a.is_a?(Numo::NArray) && b.is_a?(Numo::NArray)
+    def fftconvolve(a, b) # rubocop:disable Metrics/AbcSize
+      unless a.is_a?(Numo::NArray) && b.is_a?(Numo::NArray)
+        raise ArgumentError, 'Expect class of input array to be Numo::NArray.'
+      end
       raise ArgumentError, 'Expect input array to be non-empty.' if a.empty? || b.empty?
       raise ArgumentError, 'Input arrays should have the same dimensionarity' if a.ndim != b.ndim
 
       ashp = a.shape
       bshp = b.shape
 
-      return a * b if (ashp + bshp).all? { |el| el == 1 }
+      return a * b if (ashp + bshp).all?(1)
 
       retshp = Array.new(a.ndim) { |n| ashp[n] + bshp[n] - 1 }
       a_zp = Numo::DComplex.zeros(*retshp).tap { |arr| arr[*ashp.map { |n| 0...n }] = a }
       b_zp = Numo::DComplex.zeros(*retshp).tap { |arr| arr[*bshp.map { |n| 0...n }] = b }
       ret = ifftn(fftn(a_zp) * fftn(b_zp))
 
-      return ret if a.is_a?(Numo::DComplex) || a.is_a?(Numo::SComplex) || b.is_a?(Numo::DComplex) || b.is_a?(Numo::SComplex)
+      if a.is_a?(Numo::DComplex) || a.is_a?(Numo::SComplex) || b.is_a?(Numo::DComplex) || b.is_a?(Numo::SComplex)
+        return ret
+      end
 
       ret.real
     end
@@ -226,19 +230,15 @@ module Numo
           else
             ext_rfft(a)
           end
+        elsif inverse
+          ext_icfft(a)
         else
-          if inverse
-            ext_icfft(a)
-          else
-            ext_cfft(a)
-          end
+          ext_cfft(a)
         end
+      elsif inverse
+        ext_icfft(a.swapaxes(axis_id, -1)).swapaxes(axis_id, -1).dup
       else
-        if inverse
-          ext_icfft(a.swapaxes(axis_id, -1)).swapaxes(axis_id, -1).dup
-        else
-          ext_cfft(a.swapaxes(axis_id, -1)).swapaxes(axis_id, -1).dup
-        end
+        ext_cfft(a.swapaxes(axis_id, -1)).swapaxes(axis_id, -1).dup
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-pocketfft
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - yoshoku
@@ -18,7 +18,7 @@ dependencies:
         version: 0.9.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
         version: 0.9.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 description: 'Numo::Pocketfft provides functions for descrete Fourier Transform based
   on pocketfft.
 
@@ -59,7 +59,7 @@ metadata:
   homepage_uri: https://github.com/yoshoku/numo-pocketfft
   changelog_uri: https://github.com/yoshoku/numo-pocketfft/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/yoshoku/numo-pocketfft
-  documentation_uri: https://gemdocs.org/gems/numo-pocketfft/0.6.0/
+  documentation_uri: https://gemdocs.org/gems/numo-pocketfft/0.7.0/
   bug_tracker_uri: https://github.com/yoshoku/numo-pocketfft/issues
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.13
 specification_version: 4
 summary: Numo::Pocketfft provides functions for descrete Fourier Transform based on
   pocketfft.