tomoto 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a68366fa033b16f1a3c5ce77d1c62cd523dda6f873fb24cf25619706a7a0086f
-  data.tar.gz: 347f7c8c8cce63da9b5f922267123811bc1333ebdb685bbbb10b906fda24eeee
+  metadata.gz: e3e3aa3215e693030f3069cab0fd62686e9d28ad4df6e93ee2e9c7ba9e29286f
+  data.tar.gz: 98e4f18488132f6130bd9523d8540dd73626e8b3e5a58a1656ce3aa1ddf8234b
 SHA512:
-  metadata.gz: 72adc8f9e3fe3e9d04e3841d4ff9386d3f2bef710adaa0fa2e0406284eb814cff55e0603e3b3c3b344893011dc20ab9d17de68fbaceff48c73fc9b6e506971e2
-  data.tar.gz: 6ec20a814092d056917b5f1b455019a676f8ac54161c3a0f487670dbbba5ae8dbdf6ab634c17c4770ccbdbcd4be9b12304ccc92f6ed0279ee48eb2fe36a035c9
+  metadata.gz: 95b9d0697f58a9149c18cbbdcc7b93aa19dc7f335f12033fc80386a2ca6628bfc3c2a7a9c7299cd192459132f8d467663562de3da733cca00041da24361a6d9f
+  data.tar.gz: 9c0e12d32aedb8cb0689032f9b0fe54387b9b452a1e26b747137c4115e9813ea491fa09b6851b9e69ca6a3a86df159409d57322c3862b670ae3b3d4f8711469d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.0 (2022-10-03)
+
+- Added precompiled gems for Linux and Mac
+- Updated tomoto to 0.12.3
+- Dropped support for Ruby < 2.7
+
 ## 0.2.3 (2021-08-26)
 
 - Updated to Rice 4

data/README.md

@@ -1,19 +1,17 @@
-# tomoto
+# tomoto.rb
 
 :tomato: [tomoto](https://github.com/bab2min/tomotopy) - high performance topic modeling - for Ruby
 
-[![Build Status](https://github.com/ankane/tomoto/workflows/build/badge.svg?branch=master)](https://github.com/ankane/tomoto/actions)
+[![Build Status](https://github.com/ankane/tomoto-ruby/workflows/build/badge.svg?branch=master)](https://github.com/ankane/tomoto-ruby/actions)
 
 ## Installation
 
 Add this line to your application’s Gemfile:
 
 ```ruby
-gem 'tomoto'
+gem "tomoto"
 ```
 
-It can take 10-20 minutes to compile the extension.
-
 ## Getting Started
 
 Train a model
@@ -142,22 +140,22 @@ Supported values are `:default`, `:none`, `:copy_merge`, and `:partition`.
 
 ## History
 
-View the [changelog](https://github.com/ankane/tomoto/blob/master/CHANGELOG.md)
+View the [changelog](https://github.com/ankane/tomoto-ruby/blob/master/CHANGELOG.md)
 
 ## Contributing
 
 Everyone is encouraged to help improve this project. Here are a few ways you can help:
 
-- [Report bugs](https://github.com/ankane/tomoto/issues)
-- Fix bugs and [submit pull requests](https://github.com/ankane/tomoto/pulls)
+- [Report bugs](https://github.com/ankane/tomoto-ruby/issues)
+- Fix bugs and [submit pull requests](https://github.com/ankane/tomoto-ruby/pulls)
 - Write, clarify, or fix documentation
 - Suggest or add new features
 
 To get started with development:
 
 ```sh
-git clone --recursive https://github.com/ankane/tomoto.git
-cd tomoto
+git clone --recursive https://github.com/ankane/tomoto-ruby.git
+cd tomoto-ruby
 bundle install
 bundle exec rake compile
 bundle exec rake test

data/ext/tomoto/extconf.rb

@@ -2,7 +2,11 @@ require "mkmf-rice"
 
 $CXXFLAGS += " -std=c++17 $(optflags) -DEIGEN_MPL2_ONLY"
 
-$CXXFLAGS += " -march=native"
+unless ENV["RUBY_CC_VERSION"]
+  # AVX-512F not support yet
+  # https://github.com/bab2min/tomotopy/issues/188
+  $CXXFLAGS << " " << with_config("optflags", "-march=native -mno-avx512f")
+end
 
 apple_clang = RbConfig::CONFIG["CC_VERSION_MESSAGE"] =~ /apple clang/i
 
@@ -27,4 +31,4 @@ $srcs = Dir["{#{ext},#{tomoto}}/*.cpp"]
 $INCFLAGS += " -I#{tomoto} -I#{eigen} -I#{eigen_rand} -I#{variant}"
 $VPATH << tomoto
 
-create_makefile("tomoto/ext")
+create_makefile("tomoto/tomoto")

data/ext/tomoto/{ext.cpp → tomoto.cpp}

@@ -15,7 +15,7 @@ void init_plda(Rice::Module& m);
 void init_slda(Rice::Module& m);
 
 extern "C"
-void Init_ext()
+void Init_tomoto()
 {
   auto m = Rice::define_module("Tomoto")
     .define_singleton_function(

data/lib/tomoto/version.rb

@@ -1,3 +1,3 @@
 module Tomoto
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/lib/tomoto.rb

@@ -1,5 +1,9 @@
 # ext
-require "tomoto/ext"
+begin
+  require "tomoto/#{RUBY_VERSION.to_f}/tomoto"
+rescue LoadError
+  require "tomoto/tomoto"
+end
 
 # modules
 require "tomoto/ct"

data/vendor/EigenRand/EigenRand/Core.h

@@ -2,10 +2,10 @@
  * @file Core.h
  * @author bab2min (bab2min@gmail.com)
  * @brief 
- * @version 0.3.0
- * @date 2020-10-07
+ * @version 0.3.3
+ * @date 2021-03-31
  * 
- * @copyright Copyright (c) 2020
+ * @copyright Copyright (c) 2020-2021
  * 
  */
 
@@ -13,15 +13,15 @@
 #ifndef EIGENRAND_CORE_H
 #define EIGENRAND_CORE_H
 
-#include <EigenRand/RandUtils.h>
+#include "RandUtils.h"
 
-#include <EigenRand/Dists/Basic.h>
-#include <EigenRand/Dists/Discrete.h>
-#include <EigenRand/Dists/NormalExp.h>
-#include <EigenRand/Dists/GammaPoisson.h>
+#include "Dists/Basic.h"
+#include "Dists/Discrete.h"
+#include "Dists/NormalExp.h"
+#include "Dists/GammaPoisson.h"
 
-#include <EigenRand/MvDists/MvNormal.h>
-#include <EigenRand/MvDists/Multinomial.h>
+#include "MvDists/MvNormal.h"
+#include "MvDists/Multinomial.h"
 
 namespace Eigen
 {

data/vendor/EigenRand/EigenRand/Dists/Basic.h

@@ -2,10 +2,10 @@
  * @file Basic.h
  * @author bab2min (bab2min@gmail.com)
  * @brief 
- * @version 0.3.0
- * @date 2020-10-07
+ * @version 0.3.3
+ * @date 2021-03-31
  * 
- * @copyright Copyright (c) 2020
+ * @copyright Copyright (c) 2020-2021
  * 
  */
 
@@ -238,6 +238,31 @@ namespace Eigen
 
 		using OptCacheStore = CacheStore<EIGEN_MAX_ALIGN_BYTES>;
 
+		template<typename _Scalar>
+		struct ExtractFirstUint;
+
+		template<>
+		struct ExtractFirstUint<float>
+		{
+			template<typename Packet>
+			auto operator()(Packet v) -> decltype(Eigen::internal::pfirst(v))
+			{
+				return Eigen::internal::pfirst(v);
+			}
+		};
+
+		template<>
+		struct ExtractFirstUint<double>
+		{
+			template<typename Packet>
+			auto operator()(Packet v) -> uint64_t
+			{
+				uint64_t arr[sizeof(Packet) / 8];
+				Eigen::internal::pstoreu((Packet*)arr, v);
+				return arr[0];
+			}
+		};
+
 		/**
 		 * @brief Generator of random bits for integral scalars
 		 * 
@@ -296,13 +321,52 @@ namespace Eigen
 			}
 		};
 
+		/**
+		 * @brief Generator of reals in a range `[a, b]`
+		 *
+		 * @tparam _Scalar any real type
+		 */
+		template<typename _Scalar>
+		class Balanced2Gen : public GenBase<Balanced2Gen<_Scalar>, _Scalar>
+		{
+			static_assert(std::is_floating_point<_Scalar>::value, "balanced needs floating point types.");
+			_Scalar slope = 2, bias = -1;
+		public:
+			using Scalar = _Scalar;
+
+			/**
+			 * @brief Construct a new balanced generator
+			 *
+			 * @param _a,_b left and right boundary
+			 */
+			Balanced2Gen(_Scalar _a = -1, _Scalar _b = 1)
+				: slope{ _b - _a }, bias{ _a }
+			{
+			}
+
+			template<typename Rng>
+			EIGEN_STRONG_INLINE const _Scalar operator() (Rng&& rng)
+			{
+				using namespace Eigen::internal;
+				return ((_Scalar)((int32_t)pfirst(std::forward<Rng>(rng)()) & 0x7FFFFFFF) / 0x7FFFFFFF) * slope + bias;
+			}
+
+			template<typename Packet, typename Rng>
+			EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Packet packetOp(Rng&& rng)
+			{
+				using namespace Eigen::internal;
+				using RUtils = RandUtils<Packet, Rng>;
+				return RUtils{}.balanced(std::forward<Rng>(rng), slope, bias);
+			}
+		};
+
 		/**
 		 * @brief Generator of reals in a range `[0, 1)`
 		 * 
 		 * @tparam _Scalar any real type
 		 */
 		template<typename _Scalar>
-		class UniformRealGen : public GenBase<UniformRealGen<_Scalar>, _Scalar>
+		class StdUniformRealGen : public GenBase<StdUniformRealGen<_Scalar>, _Scalar>
 		{
 			static_assert(std::is_floating_point<_Scalar>::value, "uniformReal needs floating point types.");
 
@@ -313,14 +377,14 @@ namespace Eigen
 			EIGEN_STRONG_INLINE const _Scalar operator() (Rng&& rng)
 			{
 				using namespace Eigen::internal;
-				return bit_scalar<_Scalar>{}.to_ur(pfirst(std::forward<Rng>(rng)()));
+				return BitScalar<_Scalar>{}.to_ur(ExtractFirstUint<_Scalar>{}(std::forward<Rng>(rng)()));
 			}
 
 			template<typename Rng>
 			EIGEN_STRONG_INLINE const _Scalar nzur_scalar(Rng&& rng)
 			{
 				using namespace Eigen::internal;
-				return bit_scalar<_Scalar>{}.to_nzur(pfirst(std::forward<Rng>(rng)()));
+				return BitScalar<_Scalar>{}.to_nzur(ExtractFirstUint<_Scalar>{}(std::forward<Rng>(rng)()));
 			}
 
 			template<typename Packet, typename Rng>
@@ -332,6 +396,49 @@ namespace Eigen
 			}
 		};
 
+		/**
+		 * @brief Generator of reals in a range `[a, b)`
+		 * 
+		 * @tparam _Scalar any real type
+		 */
+		template<typename _Scalar>
+		class UniformRealGen : public GenBase<UniformRealGen<_Scalar>, _Scalar>
+		{
+			static_assert(std::is_floating_point<_Scalar>::value, "uniformReal needs floating point types.");
+			_Scalar bias, slope;
+
+		public:
+			using Scalar = _Scalar;
+
+			UniformRealGen(_Scalar _min = 0, _Scalar _max = 1)
+				: bias{ _min }, slope{ _max - _min }
+			{
+			}
+
+			UniformRealGen(const UniformRealGen&) = default;
+			UniformRealGen(UniformRealGen&&) = default;
+
+			UniformRealGen& operator=(const UniformRealGen&) = default;
+			UniformRealGen& operator=(UniformRealGen&&) = default;
+
+			template<typename Rng>
+			EIGEN_STRONG_INLINE const _Scalar operator() (Rng&& rng)
+			{
+				using namespace Eigen::internal;
+				return bias + BitScalar<_Scalar>{}.to_ur(pfirst(std::forward<Rng>(rng)())) * slope;
+			}
+
+			template<typename Packet, typename Rng>
+			EIGEN_STRONG_INLINE const Packet packetOp(Rng&& rng)
+			{
+				using namespace Eigen::internal;
+				using RUtils = RandUtils<Packet, Rng>;
+				return padd(pmul(
+					RUtils{}.uniform_real(std::forward<Rng>(rng)), pset1<Packet>(slope)
+				), pset1<Packet>(bias));
+			}
+		};
+
 
 		/**
 		 * @brief Generator of Bernoulli distribution
@@ -468,7 +575,53 @@ namespace Eigen
 		}
 
 		template<typename Derived, typename Urng>
-		using UniformRealType = CwiseNullaryOp<internal::scalar_rng_adaptor<UniformRealGen<typename Derived::Scalar>, typename Derived::Scalar, Urng, true>, const Derived>;
+		using Balanced2Type = CwiseNullaryOp<internal::scalar_rng_adaptor<Balanced2Gen<typename Derived::Scalar>, typename Derived::Scalar, Urng, true>, const Derived>;
+
+		/**
+		 * @brief generates reals in a range `[a, b]`
+		 *
+		 * @tparam Derived a type of Eigen::DenseBase
+		 * @tparam Urng
+		 * @param rows the number of rows being generated
+		 * @param cols the number of columns being generated
+		 * @param urng c++11-style random number generator
+		 * @param a,b left and right boundary
+		 * @return a random matrix expression with a shape (`rows`, `cols`)
+		 *
+		 * @see Eigen::Rand::BalancedGen
+		 */
+		template<typename Derived, typename Urng>
+		inline const Balanced2Type<Derived, Urng>
+			balanced(Index rows, Index cols, Urng&& urng, typename Derived::Scalar a, typename Derived::Scalar b)
+		{
+			return {
+				rows, cols, { std::forward<Urng>(urng), Balanced2Gen<typename Derived::Scalar>{a, b} }
+			};
+		}
+
+		/**
+		 * @brief generates reals in a range `[a, b]`
+		 *
+		 * @tparam Derived
+		 * @tparam Urng
+		 * @param o an instance of any type of Eigen::DenseBase
+		 * @param urng c++11-style random number generator
+		 * @param a,b left and right boundary
+		 * @return a random matrix expression of the same shape as `o`
+		 *
+		 * @see Eigen::Rand::BalancedGen
+		 */
+		template<typename Derived, typename Urng>
+		inline const Balanced2Type<Derived, Urng>
+			balancedLike(const Derived& o, Urng&& urng, typename Derived::Scalar a, typename Derived::Scalar b)
+		{
+			return {
+				o.rows(), o.cols(), { std::forward<Urng>(urng), Balanced2Gen<typename Derived::Scalar>{a, b} }
+			};
+		}
+
+		template<typename Derived, typename Urng>
+		using StdUniformRealType = CwiseNullaryOp<internal::scalar_rng_adaptor<StdUniformRealGen<typename Derived::Scalar>, typename Derived::Scalar, Urng, true>, const Derived>;
 
 		/**
 		 * @brief generates reals in a range `[0, 1)`
@@ -483,7 +636,7 @@ namespace Eigen
 		 * @see Eigen::Rand::UniformRealGen
 		 */
 		template<typename Derived, typename Urng>
-		inline const UniformRealType<Derived, Urng>
+		inline const StdUniformRealType<Derived, Urng>
 			uniformReal(Index rows, Index cols, Urng&& urng)
 		{
 			return {
@@ -503,7 +656,7 @@ namespace Eigen
 		 * @see Eigen::Rand::UniformRealGen
 		 */
 		template<typename Derived, typename Urng>
-		inline const UniformRealType<Derived, Urng>
+		inline const StdUniformRealType<Derived, Urng>
 			uniformRealLike(Derived& o, Urng&& urng)
 		{
 			return {
@@ -511,6 +664,52 @@ namespace Eigen
 			};
 		}
 
+		template<typename Derived, typename Urng>
+		using UniformRealType = CwiseNullaryOp<internal::scalar_rng_adaptor<UniformRealGen<typename Derived::Scalar>, typename Derived::Scalar, Urng, true>, const Derived>;
+
+		/**
+		 * @brief generates reals in a range `[min, max)`
+		 *
+		 * @tparam Derived a type of Eigen::DenseBase
+		 * @tparam Urng
+		 * @param rows the number of rows being generated
+		 * @param cols the number of columns being generated
+		 * @param urng c++11-style random number generator
+		 * @param min, max the range of reals being generated
+		 * @return a random matrix expression with a shape (`rows`, `cols`)
+		 *
+		 * @see Eigen::Rand::UniformRealGen
+		 */
+		template<typename Derived, typename Urng>
+		inline const UniformRealType<Derived, Urng>
+			uniformReal(Index rows, Index cols, Urng&& urng, typename Derived::Scalar min, typename Derived::Scalar max)
+		{
+			return {
+				rows, cols, { std::forward<Urng>(urng), UniformRealGen<typename Derived::Scalar>{ min, max } }
+			};
+		}
+
+		/**
+		 * @brief generates reals in a range `[min, max)`
+		 *
+		 * @tparam Derived
+		 * @tparam Urng
+		 * @param o an instance of any type of Eigen::DenseBase
+		 * @param urng c++11-style random number generator
+		 * @param min, max the range of reals being generated
+		 * @return a random matrix expression of the same shape as `o`
+		 *
+		 * @see Eigen::Rand::UniformRealGen
+		 */
+		template<typename Derived, typename Urng>
+		inline const UniformRealType<Derived, Urng>
+			uniformRealLike(Derived& o, Urng&& urng, typename Derived::Scalar min, typename Derived::Scalar max)
+		{
+			return {
+				o.rows(), o.cols(), { std::forward<Urng>(urng), UniformRealGen<typename Derived::Scalar>{ min, max } }
+			};
+		}
+
 		template<typename Derived, typename Urng>
 		using BernoulliType = CwiseNullaryOp<internal::scalar_rng_adaptor<BernoulliGen<typename Derived::Scalar>, typename Derived::Scalar, Urng, true>, const Derived>;