cmfrec 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3cc7d70530eefc7b13324753b454d03573da7d832c46cb4dee2ab9213eafcdd
-  data.tar.gz: 662af2ec4ab1a1bd33a39c18773d0c48967422286a2fa137960772b7e67d437a
+  metadata.gz: 9d530b650bba045d26a7c683ca7c8b8e7321c2043a8e80556c3c7c865a441432
+  data.tar.gz: d49736337135bc7b956a96f631ad54b88b354d3fbbe91e925962ba15fbd3735d
 SHA512:
-  metadata.gz: 8fd6f1f8f0bd7d7c870c28fb57a0cec89aacf2d27aed53b5d68fb6935f5071dbe73931a5ff776f4a864f0cc91a17c793eabfe2a2b21f9b368a4c36ada5cb929d
-  data.tar.gz: 116d26ddafeeb439ef0895e30805afa0d2d2a453aeb369cf7122f13f5bf3ad457dac65c974d26debc84f353baf5f0c889c559e56620ef7458af4968ee9f5262a
+  metadata.gz: 36d8fcfd4cd87539f728afd2d927bc8c4ea9a75a437bc32617dabb416ba9b322dcdc135855fa7144615955b42013029ada465c6209c38f9beca2e77f2d1059e9
+  data.tar.gz: c21ca152c2ec3edcf134ac9c915ca8ee3bd06c7ebd2c09e95bce592e9d5d64ac1dbbb8f7791756377b7febc899113ce255b4a8054b843fc1a6042ea50b8acaa3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.3.2 (2025-05-04)
+
+- Fixed crash with Fiddle 1.1.7+
+- Fixed memory leaks
+
+## 0.3.1 (2024-12-29)
+
+- Removed dependency on `base64` gem for serialization
+
 ## 0.3.0 (2024-10-23)
 
 - Changed dataset directory to match XDG Base Directory Specification

data/lib/cmfrec/data.rb

@@ -30,7 +30,7 @@ module Cmfrec
         next if movie_names[row[1]]
         movie_names[row[1]] = true
 
-        item = {item_id: row[1], year: !row[2].empty? ? Date.parse(row[2]).year : 1970}
+        item = {item_id: row[1], year: !row[2].empty? ? Date.strptime(row[2], "%d-%b-%Y").year : 1970}
         genres.each_with_index do |genre, i|
           item[:"genre_#{genre}"] = row[i + 5].to_i
         end

data/lib/cmfrec/ffi.rb

@@ -12,7 +12,6 @@ module Cmfrec
 
     # https://github.com/david-cortes/cmfrec/blob/master/src/cmfrec.h
 
-    typealias "bool", "char"
     # determined by CMakeLists.txt
     typealias "int_t", "int"
     typealias "real_t", "double"

data/lib/cmfrec/recommender.rb

@@ -35,7 +35,7 @@ module Cmfrec
       row = int_ptr(u)
       col = int_ptr(i)
       n_predict = data.size
-      predicted = Fiddle::Pointer.malloc(n_predict * Fiddle::SIZEOF_DOUBLE)
+      predicted = Fiddle::Pointer.malloc(n_predict * Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE)
 
       if @implicit
         check_status FFI.predict_X_old_collective_implicit(
@@ -250,7 +250,6 @@ module Cmfrec
     end
 
     def to_json
-      require "base64"
       require "json"
 
       obj = {
@@ -415,16 +414,16 @@ module Cmfrec
       # initialize w/ normal distribution
       reset_values = !@fit
 
-      @a = Fiddle::Pointer.malloc([@m, @m_u].max * (@k_user + @k + @k_main) * Fiddle::SIZEOF_DOUBLE)
-      @b = Fiddle::Pointer.malloc([@n, @n_i].max * (@k_item + @k + @k_main) * Fiddle::SIZEOF_DOUBLE)
-      @c = p_ > 0 ? Fiddle::Pointer.malloc(p_ * (@k_user + @k) * Fiddle::SIZEOF_DOUBLE) : nil
-      @d = q > 0 ? Fiddle::Pointer.malloc(q * (@k_item + @k) * Fiddle::SIZEOF_DOUBLE) : nil
+      @a = Fiddle::Pointer.malloc([@m, @m_u].max * (@k_user + @k + @k_main) * Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE)
+      @b = Fiddle::Pointer.malloc([@n, @n_i].max * (@k_item + @k + @k_main) * Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE)
+      @c = p_ > 0 ? Fiddle::Pointer.malloc(p_ * (@k_user + @k) * Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE) : nil
+      @d = q > 0 ? Fiddle::Pointer.malloc(q * (@k_item + @k) * Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE) : nil
 
       @bias_a = nil
       @bias_b = nil
 
-      u_colmeans = Fiddle::Pointer.malloc(p_ * Fiddle::SIZEOF_DOUBLE)
-      i_colmeans = Fiddle::Pointer.malloc(q * Fiddle::SIZEOF_DOUBLE)
+      u_colmeans = Fiddle::Pointer.malloc(p_ * Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE)
+      i_colmeans = Fiddle::Pointer.malloc(q * Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE)
 
       if @implicit
         set_implicit_vars
@@ -459,18 +458,18 @@ module Cmfrec
 
         @global_mean = 0
       else
-        @bias_a = Fiddle::Pointer.malloc([@m, @m_u].max * Fiddle::SIZEOF_DOUBLE) if @user_bias
-        @bias_b = Fiddle::Pointer.malloc([@n, @n_i].max * Fiddle::SIZEOF_DOUBLE) if @item_bias
+        @bias_a = Fiddle::Pointer.malloc([@m, @m_u].max * Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE) if @user_bias
+        @bias_b = Fiddle::Pointer.malloc([@n, @n_i].max * Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE) if @item_bias
 
         if @add_implicit_features
-          @ai = Fiddle::Pointer.malloc([@m, @m_u].max * (@k + @k_main) * Fiddle::SIZEOF_DOUBLE)
-          @bi = Fiddle::Pointer.malloc([@n, @n_i].max * (@k + @k_main) * Fiddle::SIZEOF_DOUBLE)
+          @ai = Fiddle::Pointer.malloc([@m, @m_u].max * (@k + @k_main) * Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE)
+          @bi = Fiddle::Pointer.malloc([@n, @n_i].max * (@k + @k_main) * Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE)
         else
           @ai = nil
           @bi = nil
         end
 
-        glob_mean = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DOUBLE)
+        glob_mean = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE)
 
         # TODO add
         scaling_bias_a = nil
@@ -690,8 +689,8 @@ module Cmfrec
         n_exclude = 0
       end
 
-      outp_ix = Fiddle::Pointer.malloc(count * Fiddle::SIZEOF_INT)
-      outp_score = Fiddle::Pointer.malloc(count * Fiddle::SIZEOF_DOUBLE)
+      outp_ix = Fiddle::Pointer.malloc(count * Fiddle::SIZEOF_INT, Fiddle::RUBY_FREE)
+      outp_score = Fiddle::Pointer.malloc(count * Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE)
 
       [include_ix, n_include, exclude_ix, n_exclude, outp_ix, outp_score, count]
     end
@@ -743,9 +742,8 @@ module Cmfrec
       end
     end
 
-    # convert boolean to int
     def fiddle_args(args)
-      args.map { |v| v == true || v == false ? (v ? 1 : 0) : v }
+      args
     end
 
     def check_status(ret_val)
@@ -791,11 +789,11 @@ module Cmfrec
     end
 
     def int_array(ptr)
-      ptr.to_s(ptr.size).unpack("i*")
+      ptr.to_str(ptr.size).unpack("i*")
     end
 
     def real_array(ptr)
-      ptr.to_s(ptr.size).unpack("d*")
+      ptr.to_str(ptr.size).unpack("d*")
     end
 
     def set_implicit_vars
@@ -812,16 +810,14 @@ module Cmfrec
     end
 
     def json_dump_ptr(ptr)
-      Base64.strict_encode64(ptr.to_s(ptr.size)) if ptr
+      [ptr.to_str(ptr.size)].pack("m0") if ptr
     end
 
     def json_load_ptr(str)
-      Fiddle::Pointer[Base64.strict_decode64(str)] if str
+      Fiddle::Pointer[str.unpack1("m0")] if str
     end
 
     def json_load(obj)
-      require "base64"
-
       @implicit = obj["implicit"]
 
       # options

data/lib/cmfrec/version.rb

@@ -1,3 +1,3 @@
 module Cmfrec
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

data/lib/cmfrec.rb

@@ -3,9 +3,9 @@ require "etc"
 require "fiddle/import"
 
 # modules
-require "cmfrec/data"
-require "cmfrec/recommender"
-require "cmfrec/version"
+require_relative "cmfrec/data"
+require_relative "cmfrec/recommender"
+require_relative "cmfrec/version"
 
 module Cmfrec
   class Error < StandardError; end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cmfrec
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Andrew Kane
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiddle
@@ -16,15 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description:
+        version: 1.1.7
 email: andrew@ankane.org
 executables: []
 extensions: []
@@ -51,7 +49,6 @@ homepage: https://github.com/ankane/cmfrec-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -66,8 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Recommendations for Ruby using collective matrix factorization
 test_files: []