cmfrec 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c549b3c94d2b80e94938f61694636fc35b85bb0217bec39d5234f81dbba1684b
-  data.tar.gz: e953ddaa00c5ba4b13838300aad880175db5d2c1531bf284866348b69ff2075b
+  metadata.gz: ac5590ea6e166698a9a274b86cf8c8b5bfe6e995733002a4e5c3ab896f7b84c8
+  data.tar.gz: c8bf8c6bc93e78baf86a19b4583f5901402f239641a943c718848322111efab5
 SHA512:
-  metadata.gz: 53e65f7b6ab488238713ff468c438cf45ecdbe85608c505fe4a66f140486b279785355fbf4aaedd72f6c4d6bc5fad502c97d7d592c24c4952520186db83adef1
-  data.tar.gz: 4dd240635c221c6eada3c66f9fa244da90c342655ebcdf98731fbd805bec1015a51c72fdb87a1c6423b0994ccd9d4729a784d6af603a2f6154aa1178ef37bf6b
+  metadata.gz: 73f375181c7aa2af16b1bed8d1884f30e1e3f5ef81ead8f880dbbdd0d30b5b4b4c1e24406a82a8fb64768c91be2616a76f653821e250eb673953880ae3eb8906
+  data.tar.gz: d5281893b9e2d8f32fc994510bc776310aa25a1638452b416ed4d764964dc9a363ccd8c74c1b3954ead16248231aaf2f3080f2a213e6c1e592d069b83633f38e

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.3.3 (2025-09-30)
+
+- Fixed error with Rover 0.5+
+
+## 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

data/README.md

@@ -46,7 +46,7 @@ recommender.fit([
 ])
 ```
 
-> Use `value` instead of rating for implicit feedback
+> Use `value` instead of `rating` for implicit feedback
 
 Get recommendations for a user in the training data
 

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(
@@ -414,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
@@ -458,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
@@ -620,11 +620,7 @@ module Cmfrec
     def to_dataset(dataset)
       if defined?(Rover::DataFrame) && dataset.is_a?(Rover::DataFrame)
         # convert keys to symbols
-        dataset = dataset.dup
-        dataset.keys.each do |k, v|
-          dataset[k.to_sym] ||= dataset.delete(k)
-        end
-        dataset.to_a
+        dataset.each_row.map { |v| v.transform_keys(&:to_sym) }
       elsif defined?(Daru::DataFrame) && dataset.is_a?(Daru::DataFrame)
         # convert keys to symbols
         dataset = dataset.dup
@@ -689,8 +685,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
@@ -742,9 +738,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)
@@ -790,11 +785,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
@@ -811,7 +806,7 @@ module Cmfrec
     end
 
     def json_dump_ptr(ptr)
-      [ptr.to_s(ptr.size)].pack("m0") if ptr
+      [ptr.to_str(ptr.size)].pack("m0") if ptr
     end
 
     def json_load_ptr(str)

data/lib/cmfrec/version.rb

@@ -1,3 +1,3 @@
 module Cmfrec
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cmfrec
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Andrew Kane
 bindir: bin
 cert_chain: []
-date: 2024-12-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiddle
@@ -15,14 +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'
+        version: 1.1.7
 email: andrew@ankane.org
 executables: []
 extensions: []
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Recommendations for Ruby using collective matrix factorization
 test_files: []