feat: replace narray with numo-narray

oleksii-leonov · oleksii-leonov · commit df08ac8d9b5c · 2026-01-28T17:37:37.000Z
diff --git a/ffi-gdal.gemspec b/ffi-gdal.gemspec
@@ -25,6 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ffi"
   spec.add_dependency "log_switch", "~> 1.0.0"
   spec.add_dependency "multi_xml"
-  spec.add_dependency "narray", "~> 0.6.0"
   spec.add_dependency "numo-narray"
 end
diff --git a/lib/ext/narray_ext.rb b/lib/ext/narray_ext.rb
diff --git a/lib/ffi-gdal.rb b/lib/ffi-gdal.rb
@@ -2,7 +2,6 @@
 
 require "ffi"
 require_relative "ext/ffi_library_function_checks"
-require_relative "ext/narray_ext"
 require_relative "ext/numeric_as_data_type"
 require_relative "ext/float_ext"
 
diff --git a/lib/gdal/extensions/dataset/extensions.rb b/lib/gdal/extensions/dataset/extensions.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "narray"
+require "numo/narray"
 require "ffi-gdal"
 require "gdal/dataset"
 require "gdal/raster_band"
@@ -193,11 +193,9 @@ def contains_geometry?(wkt_geometry_string, wkt_srid = 4326)
       #
       #   # This array would look like:
       #   [[0, 10, 99, 2], [0, 10, 99, 150], [0, 10, 99, 250]]
-      # @return NArray
+      # @return Numo::NArray
       def to_na(to_data_type = nil)
-        na = NMatrix.to_na(raster_bands.map { |r| r.to_na(to_data_type) })
-
-        NArray[*na.transpose]
+        Numo::NArray[*raster_bands.map { |r| r.to_na(to_data_type) }.transpose]
       end
     end
   end
diff --git a/lib/gdal/extensions/gridder.rb b/lib/gdal/extensions/gridder.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "narray"
 require "gdal"
 require "gdal/options"
 require "ogr"
diff --git a/lib/gdal/extensions/raster_band/extensions.rb b/lib/gdal/extensions/raster_band/extensions.rb
@@ -26,34 +26,35 @@ def to_a
         read_lines_by_block.to_a
       end
 
-      # Iterates through all lines and builds an NArray of pixels.
+      # Iterates through all lines and builds a Numo::NArray of pixels.
       #
-      # @return [NArray]
+      # @return [Numo::NArray]
       def to_na(to_data_type = nil)
-        narray = NArray.to_na(to_a)
-
-        return narray unless to_data_type
+        data_array = to_a
+        target_type = to_data_type || data_type
+        numo_type = GDAL._gdal_data_type_to_numo_narray_type_constant(target_type)
 
-        narray_type = GDAL._gdal_data_type_to_narray_type_constant(to_data_type)
-
-        narray.to_type(narray_type)
+        # Create a typed array from the nested array structure
+        # to_a returns [y_size][x_size] which matches Numo's row-major order [y_size, x_size]
+        numo_type.cast(data_array)
       end
 
-      # Iterates through all lines and builds an NArray of pixels.
+      # Iterates through all lines and builds a Numo::NArray of pixels.
       #
       # @return [Numo::NArray]
       def to_nna
-        Numo::NArray[*to_a]
+        to_na
       end
 
       # Each pixel of the raster projected using the dataset's geo_transform.
       # The output NArray is a 3D array where the inner-most array is a the
       # lat an lon, those are contained in an array per pixel line, and finally
       # the outer array contains each of the pixel lines.
       #
-      # @return [NArray]
+      # @return [Numo::NArray]
       def projected_points
-        narray = GDAL._narray_from_data_type(data_type, 2, x_size, y_size)
+        numo_type = GDAL._gdal_data_type_to_numo_narray_type_constant(data_type)
+        narray = numo_type.zeros(2, x_size, y_size)
         geo_transform = dataset.geo_transform
 
         y_size.times do |y_point|
diff --git a/lib/gdal/grid.rb b/lib/gdal/grid.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "forwardable"
-require "narray"
+require "numo/narray"
 require_relative "../gdal"
 require_relative "grid_algorithms"
 
@@ -24,7 +24,7 @@ def initialize(algorithm_type, data_type: :GDT_Float32)
       @data_type = data_type
     end
 
-    # @param points [Array,NArray] An Array containing all x, y, and z points.
+    # @param points [Array,Numo::NArray] An Array containing all x, y, and z points.
     # @param extents [Hash{x_min: Integer, y_min: Integer, x_max: Integer, y_max: Integer}]
     # @param data_pointer [FFI::Pointer] Pointer that will contain the gridded
     #   data (after this method is done).
@@ -35,7 +35,7 @@ def initialize(algorithm_type, data_type: :GDT_Float32)
     # @return [FFI::MemoryPointer] Pointer to the grid data.
     def create(points, extents, data_pointer, output_size = { x: 256, y: 256 },
       progress_block = nil, progress_arg = nil)
-      points = points.to_a if points.is_a? NArray
+      points = points.to_a if points.is_a? Numo::NArray
       point_count = points.length
       log "Number of points: #{point_count}"
       raise GDAL::NoValuesToGrid, "No points to grid" if point_count.zero?
diff --git a/lib/gdal/internal_helpers.rb b/lib/gdal/internal_helpers.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "numo/narray"
+
 module GDAL
   # @private
   module InternalHelpers
@@ -62,14 +64,15 @@ def _buffer_from_data_type(data_type, size = nil)
         end
       end
 
+      # DEPRECATED: Use Numo::NArray directly instead.
       # @param data_type [FFI::GDAL::GDAL::DataType]
       # @param narray_args Args to pass to the NArray initializer.
-      # @return [NArray]
+      # @return [Numo::NArray]
       def _narray_from_data_type(data_type, *narray_args)
-        init_meth = _gdal_data_type_to_narray(data_type)
-        narray_args = 0 if narray_args.empty?
+        numo_type = _gdal_data_type_to_numo_narray_type_constant(data_type)
+        narray_args = [1] if narray_args.empty?
 
-        NArray.send(init_meth, *narray_args)
+        numo_type.zeros(*narray_args)
       end
 
       # Takes an array of strings (or things that should be converted to
@@ -155,42 +158,24 @@ def _gdal_data_type_to_ffi(data_type)
         end
       end
 
-      # Maps GDAL DataTypes to NArray types.
+      # DEPRECATED: These methods are deprecated. Use _gdal_data_type_to_numo_narray_type_constant instead.
+      # Maps GDAL DataTypes to NArray types (deprecated).
       #
       # @param data_type [FFI::GDAL::GDAL::DataType]
       # @return [Symbol]
       def _gdal_data_type_to_narray(data_type)
-        case data_type
-        when :GDT_Byte                                then :byte
-        when :GDT_Int16                               then :sint
-        when :GDT_UInt16, :GDT_Int32, :GDT_UInt32     then :int
-        when :GDT_Float32                             then :float
-        when :GDT_Float64                             then :dfloat
-        when :GDT_CInt16, :GDT_CInt32                 then :scomplex
-        when :GDT_CFloat32                            then :complex
-        when :GDT_CFloat64                            then :dcomplex
-        else
-          raise GDAL::InvalidDataType, "Unknown data type: #{data_type}"
-        end
+        # Delegate to Numo::NArray method
+        _gdal_data_type_to_numo_narray_type_constant(data_type)
       end
 
-      # Maps GDAL DataTypes to NArray type constants.
+      # DEPRECATED: Use _gdal_data_type_to_numo_narray_type_constant instead.
+      # Maps GDAL DataTypes to NArray type constants (deprecated).
       #
       # @param data_type [FFI::GDAL::GDAL::DataType]
-      # @return [Symbol]
+      # @return [Class]
       def _gdal_data_type_to_narray_type_constant(data_type)
-        case data_type
-        when :GDT_Byte                            then NArray::BYTE
-        when :GDT_Int16                           then NArray::SINT
-        when :GDT_UInt16, :GDT_Int32, :GDT_UInt32 then NArray::INT
-        when :GDT_Float32                         then NArray::FLOAT
-        when :GDT_Float64                         then NArray::DFLOAT
-        when :GDT_CInt16, :GDT_CInt32             then NArray::SCOMPLEX
-        when :GDT_CFloat32                        then NArray::COMPLEX
-        when :GDT_CFloat64                        then NArray::DCOMPLEX
-        else
-          raise GDAL::InvalidDataType, "Unknown data type: #{data_type}"
-        end
+        # Delegate to Numo::NArray method
+        _gdal_data_type_to_numo_narray_type_constant(data_type)
       end
 
       # Maps GDAL DataTypes to [Numo::NArray] type constants.
@@ -199,12 +184,15 @@ def _gdal_data_type_to_narray_type_constant(data_type)
       # @return [Class]
       def _gdal_data_type_to_numo_narray_type_constant(data_type)
         case data_type
-        when :GDT_Byte                                              then Numo::UInt8
-        when :GDT_Int16                                             then Numo::Int16
-        when :GDT_UInt16, :GDT_Int32, :GDT_UInt32                   then Numo::Int32
-        when :GDT_Float32                                           then Numo::SFloat
-        when :GDT_Float64                                           then Numo::DFloat
-        when :GDT_CInt16, :GDT_CInt32, :GDT_CFloat32, :GDT_CFloat64 then Numo::SComplex
+        when :GDT_Byte                               then Numo::UInt8
+        when :GDT_Int16                              then Numo::Int16
+        when :GDT_UInt16                             then Numo::UInt16
+        when :GDT_Int32                              then Numo::Int32
+        when :GDT_UInt32                             then Numo::UInt32
+        when :GDT_Float32                            then Numo::SFloat
+        when :GDT_Float64                            then Numo::DFloat
+        when :GDT_CInt16, :GDT_CInt32, :GDT_CFloat32 then Numo::SComplex
+        when :GDT_CFloat64                           then Numo::DComplex
         else
           raise GDAL::InvalidDataType, "Unknown data type: #{data_type}"
         end
diff --git a/lib/gdal/raster_band.rb b/lib/gdal/raster_band.rb
@@ -2,7 +2,6 @@
 
 require "bigdecimal"
 require "bigdecimal/util"
-require "narray"
 require_relative "../gdal"
 require_relative "raster_band_mixins/algorithm_methods"
 require_relative "major_object"
diff --git a/lib/ogr/coordinate_transformation.rb b/lib/ogr/coordinate_transformation.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "narray"
 require_relative "../ogr"
 require_relative "../gdal"
 
diff --git a/spec/unit/gdal/extensions/raster_band/extensions_spec.rb b/spec/unit/gdal/extensions/raster_band/extensions_spec.rb
@@ -16,57 +16,57 @@
   describe "#to_na" do
     context "no conversion" do
       subject { raster_band.to_na }
-      it { is_expected.to eq(NArray.byte(15, 25)) }
+      it { is_expected.to eq(Numo::UInt8.zeros(25, 15)) }
     end
 
     context "convert to Int16" do
       subject { raster_band.to_na(:GDT_Int16) }
-      it { is_expected.to eq(NArray.sint(15, 25)) }
+      it { is_expected.to eq(Numo::Int16.zeros(25, 15)) }
     end
 
     context "convert to UInt16" do
       subject { raster_band.to_na(:GDT_UInt16) }
-      it { is_expected.to eq(NArray.int(15, 25)) }
+      it { is_expected.to eq(Numo::UInt16.zeros(25, 15)) }
     end
 
     context "convert to Int32" do
       subject { raster_band.to_na(:GDT_Int32) }
-      it { is_expected.to eq(NArray.int(15, 25)) }
+      it { is_expected.to eq(Numo::Int32.zeros(25, 15)) }
     end
 
     context "convert to UInt32" do
       subject { raster_band.to_na(:GDT_UInt32) }
-      it { is_expected.to eq(NArray.int(15, 25)) }
+      it { is_expected.to eq(Numo::UInt32.zeros(25, 15)) }
     end
 
     context "convert to Float32" do
       subject { raster_band.to_na(:GDT_Float32) }
-      it { is_expected.to eq(NArray.sfloat(15, 25)) }
+      it { is_expected.to eq(Numo::SFloat.zeros(25, 15)) }
     end
 
     context "convert to Float64" do
       subject { raster_band.to_na(:GDT_Float64) }
-      it { is_expected.to eq(NArray.float(15, 25)) }
+      it { is_expected.to eq(Numo::DFloat.zeros(25, 15)) }
     end
 
     context "convert to CInt16" do
       subject { raster_band.to_na(:GDT_CInt16) }
-      it { is_expected.to eq(NArray.scomplex(15, 25)) }
+      it { is_expected.to eq(Numo::SComplex.zeros(25, 15)) }
     end
 
     context "convert to CInt32" do
       subject { raster_band.to_na(:GDT_CInt32) }
-      it { is_expected.to eq(NArray.scomplex(15, 25)) }
+      it { is_expected.to eq(Numo::SComplex.zeros(25, 15)) }
     end
 
     context "convert to CFloat32" do
       subject { raster_band.to_na(:GDT_CFloat32) }
-      it { is_expected.to eq(NArray.scomplex(15, 25)) }
+      it { is_expected.to eq(Numo::SComplex.zeros(25, 15)) }
     end
 
     context "convert to CFloat64" do
       subject { raster_band.to_na(:GDT_CFloat64) }
-      it { is_expected.to eq(NArray.complex(15, 25)) }
+      it { is_expected.to eq(Numo::DComplex.zeros(25, 15)) }
     end
   end
 end
diff --git a/spec/unit/gdal/extensions/raster_band/io_extensions_spec.rb b/spec/unit/gdal/extensions/raster_band/io_extensions_spec.rb
@@ -27,15 +27,15 @@
       row1 = Array.new(64) { 2 }
       row2 = Array.new(64) { 3 }
       row3 = Array.new(64) { 4 }
-      narray = NArray[row0, row1, row2, row3]
+      narray = Numo::NArray[row0, row1, row2, row3]
 
       raster_band.write_xy_narray(narray)
 
       pixels = raster_band.to_na
-      expect(pixels[true, 0]).to eq(NArray.to_na(row0))
-      expect(pixels[true, 1]).to eq(NArray.to_na(row1))
-      expect(pixels[true, 2]).to eq(NArray.to_na(row2))
-      expect(pixels[true, 3]).to eq(NArray.to_na(row3))
+      expect(pixels[0, true].to_a).to eq(row0)
+      expect(pixels[1, true].to_a).to eq(row1)
+      expect(pixels[2, true].to_a).to eq(row2)
+      expect(pixels[3, true].to_a).to eq(row3)
     end
   end
 
@@ -163,7 +163,7 @@
         filename = "/tmp/#{SecureRandom.uuid}.tif"
         options = { BLOCKXSIZE: 256, BLOCKYSIZE: 256, TILED: "YES" }
         GDAL::Driver.by_name("GTiff").create_dataset(filename, 15, 4, **options) do |dataset|
-          dataset.raster_band(1).write_xy_narray(NArray.to_na(rows))
+          dataset.raster_band(1).write_xy_narray(Numo::NArray[*rows])
         end
         filename
       end
diff --git a/spec/unit/gdal/extensions/raster_band_classifier_spec.rb b/spec/unit/gdal/extensions/raster_band_classifier_spec.rb
@@ -10,7 +10,8 @@
   let(:dataset) do
     d = driver.create_dataset("test dataset", 640, 480)
     band = d.raster_band 1
-    new_values = band.to_na.indgen!
+    new_values = band.to_na
+    new_values[] = new_values.new_narray.seq
     band.write_xy_narray(new_values)
 
     d
@@ -70,7 +71,8 @@
     context "band type is :GDT_Float32" do
       let(:raster_band) do
         band = float_dataset.raster_band 1
-        new_values = band.to_na.indgen!
+        new_values = band.to_na
+        new_values[] = new_values.new_narray.seq
         band.write_xy_narray(new_values)
         band
       end
@@ -166,8 +168,9 @@
         d = driver.create_dataset("test dataset", 640, 480, data_type: :GDT_Float32)
         band = d.raster_band 1
         band.no_data_value = -9999.0
-        new_values = band.to_na.indgen!
-        new_values[true, 0] = -9999.0
+        new_values = band.to_na
+        new_values[] = new_values.new_narray.seq
+        new_values[0, true] = -9999.0 # Set first row (y=0, all x values)
         band.write_xy_narray(new_values)
 
         d
diff --git a/spec/unit/gdal/internal_helpers_spec.rb b/spec/unit/gdal/internal_helpers_spec.rb
