umappp 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d88fcf9fcf8f61232a094afbf62a7aa421c564e644a854bd2efc1ba94dd1ab02
-  data.tar.gz: a92531b8da81479a4844ec5f5073423eefdf3fb9d32bed6f7cbe867771116087
+  metadata.gz: 715a0cccadbfa68578e1ff6b4998f539313fc31ede7dc1da6c28f51e4396ea91
+  data.tar.gz: '07851a541e04c0da5647b9787a889de05ed8d28605818a657b82eebed1b1ba95'
 SHA512:
-  metadata.gz: c56ce6be1fe5d9f296b512121be5e94cd844d2ea76ec75ad8e3224ace4023a45146da5cfe4fa779d557c99afbce85a22b951cd2b21a8b1f4f151c5911b13d12a
-  data.tar.gz: 21be7903f3aa0f03c0a60bf011415f115501e6741a94791465a6e25789ed2c411aed87042b11eeb15aa8ac43d39dff9000a30a7c79cdd0de1b310bd7f5b30044
+  metadata.gz: cee6f62c119793903786a0b983c7861f55d27a15b553846ae88d95fd40a335b01c0666e4cdb87b55d4b91218c5e48c5bda8304502716349b02453e7fdbdf5c04
+  data.tar.gz: 9cc07b731ead37a256335ae4067b95c41a008bd46bd643b7c82cd36158d26e0b65dcc536c017231ad1368a9b87c95fd02f1611fb2951a01886e18b95467319f4

data/ext/umappp/umappp.cpp

@@ -1,8 +1,12 @@
-// Uniform Manifold Approximation and Projection for Ruby
-// https://github.com/kojix2/ruby-umappp
+/*
+ * Uniform Manifold Approximation and Projection for Ruby
+ * https://github.com/kojix2/ruby-umappp
+ */
 
 #include <rice/rice.hpp>
 #include <rice/stl.hpp>
+#include <exception>
+#include <string>
 #include "numo.hpp"
 #include "Umap.hpp"
 
@@ -11,8 +15,45 @@ typedef typename umappp::Umap<Float> Umap;
 
 using namespace Rice;
 
-// This function is used to view default parameters from Ruby.
+extern "C" {
+  void *rb_thread_call_without_gvl(
+    void *(*func)(void *), void *data,
+    void (*ubf)(void *), void *ubf_data
+  );
+}
+
+// Data structure for running UMAP calculation without GVL.
+struct UmapRunData {
+  Umap* umap_ptr;
+  knncolle::Base<int, Float>* knncolle_ptr;
+  int ndim;
+  std::vector<Float>* embedding;
+  std::string exception_message;
+  bool exception_thrown = false;
+};
+
+// Callback for UMAP calculation (executed without GVL).
+static void* umap_run_without_gvl(void* data) {
+  UmapRunData* run_data = static_cast<UmapRunData*>(data);
+  try {
+    auto status = run_data->umap_ptr->initialize(
+      run_data->knncolle_ptr,
+      run_data->ndim,
+      run_data->embedding->data()
+    );
+    int epoch_limit = 0;
+    status.run(epoch_limit);
+  } catch (const std::exception& e) {
+    run_data->exception_message = e.what();
+    run_data->exception_thrown = true;
+  } catch (...) {
+    run_data->exception_message = "Unknown exception occurred in UMAP calculation.";
+    run_data->exception_thrown = true;
+  }
+  return nullptr;
+}
 
+// Returns default parameters from the Umappp C++ library.
 Hash umappp_default_parameters(Object self)
 {
   Hash d;
@@ -36,8 +77,7 @@ Hash umappp_default_parameters(Object self)
   return d;
 }
 
-// Function to perform umap.
-
+// Main function to perform UMAP.
 Object umappp_run(
     Object self,
     Hash params,
@@ -45,8 +85,6 @@ Object umappp_run(
     int ndim,
     int nn_method)
 {
-  // Parameters are taken from a Ruby Hash object.
-  // If there is key, set the value.
   if (ndim < 1)
   {
     throw std::runtime_error("ndim is less than 1");
@@ -166,8 +204,6 @@ Object umappp_run(
     umap_ptr->set_parallel_optimization(parallel_optimization);
   }
 
-  // initialize_from_matrix
-
   const float *y = data.read_ptr();
   size_t *shape = data.shape();
 
@@ -190,13 +226,25 @@ Object umappp_run(
 
   std::vector<Float> embedding(ndim * nobs);
 
-  auto status = umap_ptr->initialize(knncolle_ptr.get(), ndim, embedding.data());
-
-  int epoch_limit = 0;
-  // tick is not implemented yet
-  status.run(epoch_limit);
+  // Run UMAP calculation without GVL.
+  UmapRunData run_data = {
+    umap_ptr.get(),
+    knncolle_ptr.get(),
+    ndim,
+    &embedding
+  };
+
+  rb_thread_call_without_gvl(
+    umap_run_without_gvl,
+    &run_data,
+    NULL,
+    NULL
+  );
+
+  if (run_data.exception_thrown) {
+    throw std::runtime_error(run_data.exception_message);
+  }
 
-  // it is safe to cast to unsigned int
   auto na = numo::SFloat({(unsigned int)nobs, (unsigned int)ndim});
   std::copy(embedding.begin(), embedding.end(), na.write_ptr());
 

data/lib/umappp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Umappp
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: umappp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - kojix2