cmdstan 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f52650c597cfa86c4e1bd0f095a2b321e906285df981f9f345bde5054fb8cc80
-  data.tar.gz: 3c98b6ff5c800ad9ecd28e325ed6f97d576306567a4ac8530bb117f948c6c321
+  metadata.gz: f0438de041affa64ca7db73cd65f35b67a80a389d76ed70d73a294f877db0071
+  data.tar.gz: 06da4d0a6ca5f5a84d05c442ef860efc2b0f0d619645139dede04a924564c5c6
 SHA512:
-  metadata.gz: ddab8b6b73175afcbee65f5653deee681b746fe2083015ec06b65866bc467ca2bb7ec6cc475a65bc83976ff4f13e8911ac08d999703c52e96d529f8b68408554
-  data.tar.gz: c8316343f62159e1963f7835bb231114275b15ab7fd982f3ae58f50c7168aad08e6448c6c2fd6110910f061595f586f3882a7a38a9e377c332b8b5a381bc4acb
+  metadata.gz: 86c6687ba6802f658b865f8f94a56d7f2bdc24abc5dc5606dc389b5fba2558648b1dc41b3b3762c4d38478caed95d47e35ba15a6434379af5d8f9eb5a1173f74
+  data.tar.gz: f52cc26a90504161e3f5df6848509a42341f0725e23936741447962f6777ea8706998870ee2d2b6e8c8efd50e08778678e45b9273ce4a7aabe848c54bbbd7ad2

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 0.1.5 (2020-11-21)
+
+- Added `tbb` to path for Linux
+
+## 0.1.4 (2020-11-01)
+
+- Updated CmdStan to 2.25.0
+
+## 0.1.3 (2020-05-29)
+
+- Added `tempfile` dependency
+- Use a single job for installation
+
+## 0.1.2 (2020-04-10)
+
+- Added `tbb` to path for Windows
+
+## 0.1.1 (2020-04-09)
+
+- Added support for Windows
+
 ## 0.1.0 (2020-04-08)
 
 - First release

data/LICENSE.txt

@@ -1,5 +1,6 @@
 BSD 3-Clause License
 
+Copyright (c) 2019, Stan Developers and their Assignees
 Copyright (c) 2020, Andrew Kane
 All rights reserved.
 

data/README.md

@@ -2,6 +2,8 @@
 
 Bayesian inference for Ruby, powered by [CmdStan](https://github.com/stan-dev/cmdstan)
 
+[![Build Status](https://github.com/ankane/cmdstan/workflows/build/badge.svg?branch=master)](https://github.com/ankane/cmdstan/actions)
+
 ## Installation
 
 Add this line to your application’s Gemfile:
@@ -79,6 +81,6 @@ To get started with development:
 git clone https://github.com/ankane/cmdstan.git
 cd cmdstan
 bundle install
-ruby ext/cmdstan/extconf.rb
+bundle exec ruby ext/cmdstan/extconf.rb
 bundle exec rake test
 ```

data/ext/cmdstan/extconf.rb

@@ -3,10 +3,12 @@ require "fileutils"
 require "net/http"
 require "tmpdir"
 
-version = "2.22.1"
-checksum = "d12e46bda4bd3db9e8abe0554712b56e41f8e7843900338446d9a3b1acc2d0ce"
+version = "2.25.0"
+checksum = "6bd90c6513d386f22007750f136c3f8db0132aa3e80c7298095516c68ab95a4a"
 url = "https://github.com/stan-dev/cmdstan/releases/download/v#{version}/cmdstan-#{version}.tar.gz"
 
+$stdout.sync = true
+
 def download_file(url, download_path, checksum)
   uri = URI(url)
   location = nil
@@ -54,7 +56,9 @@ path = ENV["CMDSTAN"] || File.expand_path("../../tmp/cmdstan", __dir__)
 FileUtils.mkdir_p(path)
 Dir.chdir(path)
 # TODO use Gem::Package::TarReader from Rubygems
-system "tar", "zxvf", download_path, "-C", path, "--strip-components=1"
+tar_args = Gem.win_platform? ? ["--force-local"] : []
+system "tar", "zxf", download_path, "-C", path, "--strip-components=1", *tar_args
 
 # build
-system "make", "build", "-j"
+make_command = Gem.win_platform? ? "mingw32-make" : "make"
+system make_command, "build"

data/lib/cmdstan.rb

@@ -2,6 +2,7 @@
 require "csv"
 require "json"
 require "open3"
+require "tempfile"
 
 # modules
 require "cmdstan/utils"

data/lib/cmdstan/mcmc.rb

@@ -26,7 +26,7 @@ module CmdStan
 
     def summary
       csv_file = Tempfile.new
-      run_command "#{CmdStan.path}/bin/stansummary", "--csv_file=#{csv_file.path}", *@output_files.map(&:path)
+      run_command "#{CmdStan.path}/bin/stansummary#{extension}", "--csv_file=#{csv_file.path}", *@output_files.map(&:path)
 
       result = {}
       CSV.foreach(csv_file.path, headers: true, converters: :numeric) do |row|

data/lib/cmdstan/mle.rb

@@ -12,6 +12,7 @@ module CmdStan
       CSV.foreach(@output_file.path, skip_lines: /^#/, headers: true, converters: :numeric) do |row|
         return row.to_h
       end
+      raise "Bug detected"
     end
 
     def column_names

data/lib/cmdstan/model.rb

@@ -9,8 +9,8 @@ module CmdStan
       stan_file = File.expand_path(stan_file) if stan_file
 
       @stan_file = stan_file
-      @exe_file = exe_file || stan_file.sub(/.stan\z/, "")
-      @name = File.basename(@exe_file)
+      @exe_file = exe_file || stan_file.sub(/.stan\z/, extension)
+      @name = File.basename(@exe_file, extension)
 
       if compile && !exe_file
         self.compile
@@ -19,7 +19,7 @@ module CmdStan
 
     def compile
       Dir.chdir(CmdStan.path) do
-        run_command "make", @exe_file
+        run_command make_command, @exe_file
       end
     end
 

data/lib/cmdstan/utils.rb

@@ -3,14 +3,42 @@ module CmdStan
     private
 
     def run_command(*args)
-      # use popen3 since it does escaping (like system)
-      Open3.popen3(*args) do |i, o, e, t|
-        if t.value.exitstatus != 0
-          $stderr.puts o.read
-          $stderr.puts e.read
-          raise Error, "Command failed"
-        end
+      env = {}
+      # add tbb to path
+      tbblib = ENV["STAN_TBB"] || File.join(CmdStan.path, "stan", "lib", "stan_math", "lib", "tbb")
+      if windows?
+        # uses ; for separator
+        raise "Invalid TBB path" if tbblib.include?(";")
+        env["PATH"] = "#{tbblib};#{ENV["PATH"]}"
+      elsif !mac?
+        # uses : for separator
+        raise "Invalid TBB path" if tbblib.include?(":")
+        env["LD_LIBRARY_PATH"] = "#{tbblib}:#{ENV["LD_LIBRARY_PATH"]}"
       end
+
+      # use an open3 method since it does escaping (like system)
+      # use capture2e so we don't need to worry about deadlocks
+      output, status = Open3.capture2e(env, *args)
+      if status.exitstatus != 0
+        $stderr.puts output
+        raise Error, "Command failed"
+      end
+    end
+
+    def make_command
+      windows? ? "mingw32-make" : "make"
+    end
+
+    def extension
+      windows? ? ".exe" : ""
+    end
+
+    def mac?
+      RbConfig::CONFIG["host_os"] =~ /darwin/i
+    end
+
+    def windows?
+      Gem.win_platform?
     end
   end
 end

data/lib/cmdstan/version.rb

@@ -1,3 +1,3 @@
 module CmdStan
-  VERSION = "0.1.0"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmdstan
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
-description: 
+description:
 email: andrew@chartkick.com
 executables: []
 extensions:
@@ -74,7 +74,7 @@ homepage: https://github.com/ankane/cmdstan
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -89,8 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Bayesian inference for Ruby, powered by CmdStan
 test_files: []