scs 0.4.3 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94397cc7650c5248dd5f8c7ac78335796fb75437a4508cb11531787b727c8a38
-  data.tar.gz: e7fda9f91ae911f2d67661bc0af926ec5ba8258ce81ea1c7398d9dc8916ec3f6
+  metadata.gz: '0383039079716cc0cd7087291d768ed2e9e5f615b78211a96e850e068c89e6bb'
+  data.tar.gz: 0dc5bd791bafcf2846e66e90ba7ac88fa93665e1b024c1041123df4e4c279007
 SHA512:
-  metadata.gz: 2c4a2d5c9bf85749a27d50da430f73b505e0690d4a8af7ae05734937bb0e8cc7e5bbe1c1a92f998f2672db4d2a8ce242c449f0ac8b634b99d709549670b5b02d
-  data.tar.gz: 032e6746c4ba7e8120dbbe7c635b9ae5ba5400a6e2f627e87ddbafe26ddcd68a8d5d06d0e53193228b7f5612c79edae9873c5d405a216e91f2ebb25f29ce921d
+  metadata.gz: 6268655afd2200a7132125d86e4bde71c36325a8741857ed38a3b6e07686a042b310771f84df57e6b1756c00cc1c8ed1bc61b2e604b71133ba98a87471d45931
+  data.tar.gz: fce49c2615c517adb0d13362a053c3dd2534a4579fc9f1bc5a219c21ac471833e61827ac8587ebb8a07001350b93eca5f820166d8a638e47d8e45bc279c83c72

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.5.1 (2025-05-04)
+
+- Fixed memory management
+
+## 0.5.0 (2024-10-23)
+
+- Dropped support for Ruby < 3.1
+
 ## 0.4.3 (2024-09-08)
 
 - Updated SCS to 3.2.7

data/lib/scs/solver.rb

@@ -2,6 +2,7 @@ module SCS
   class Solver
     def initialize(indirect: false)
       @ffi = indirect ? FFI::Indirect : FFI::Direct
+      @refs = []
     end
 
     def solve(data, cone, **settings)
@@ -10,7 +11,7 @@ module SCS
       ccone = create_cone(cone)
 
       solution = calloc(ffi::Solution.size) # alloc clear memory
-      info = ffi::Info.malloc
+      info = ffi::Info.malloc(Fiddle::RUBY_FREE)
 
       ffi.scs(cdata, ccone, settings, solution, info)
 
@@ -45,6 +46,8 @@ module SCS
         cone_time: info.cone_time,
         accel_time: info.accel_time
       }
+    ensure
+      @refs.clear
     end
 
     private
@@ -55,7 +58,9 @@ module SCS
 
     def float_array(arr)
       # SCS float = double
-      Fiddle::Pointer[arr.to_a.pack("d*")]
+      ptr = Fiddle::Pointer[arr.to_a.pack("d*")]
+      @refs << ptr
+      ptr
     end
 
     def read_float_array(ptr, size)
@@ -65,7 +70,9 @@ module SCS
 
     def int_array(arr)
       # SCS int = int
-      Fiddle::Pointer[arr.to_a.pack("i!*")]
+      ptr = Fiddle::Pointer[arr.to_a.pack("i!*")]
+      @refs << ptr
+      ptr
     end
 
     def read_string(char_ptr)
@@ -89,12 +96,13 @@ module SCS
       csc = mtx.to_csc
 
       # construct matrix
-      matrix = ffi::Matrix.malloc
+      matrix = ffi::Matrix.malloc(Fiddle::RUBY_FREE)
       matrix.x = float_array(csc[:value])
       matrix.i = int_array(csc[:index])
       matrix.p = int_array(csc[:start])
       matrix.m = mtx.m
       matrix.n = mtx.n
+      @refs << matrix
       matrix
     end
 
@@ -112,7 +120,7 @@ module SCS
 
     def create_data(data)
       m, n = shape(data[:a])
-      cdata = ffi::Data.malloc
+      cdata = ffi::Data.malloc(Fiddle::RUBY_FREE)
       cdata.m = m
       cdata.n = n
       cdata.a = csc_matrix(data[:a])
@@ -131,7 +139,7 @@ module SCS
     end
 
     def create_cone(cone)
-      ccone = ffi::Cone.malloc
+      ccone = ffi::Cone.malloc(Fiddle::RUBY_FREE)
       ccone.z = cone[:z].to_i
       ccone.l = cone[:l].to_i
       ccone.bu = float_array(cone[:bu])
@@ -152,7 +160,7 @@ module SCS
     end
 
     def create_settings(settings)
-      set = ffi::Settings.malloc
+      set = ffi::Settings.malloc(Fiddle::RUBY_FREE)
       ffi.scs_set_default_settings(set)
 
       # hack for setting members with []=

data/lib/scs/version.rb

@@ -1,3 +1,3 @@
 module SCS
-  VERSION = "0.4.3"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,16 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: scs
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.1
 platform: ruby
 authors:
 - Andrew Kane
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-09 00:00:00.000000000 Z
-dependencies: []
-description:
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: fiddle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email: andrew@ankane.org
 executables: []
 extensions:
@@ -124,7 +136,6 @@ homepage: https://github.com/ankane/scs-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,15 +143,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: SCS - the splitting conic solver - for Ruby
 test_files: []