osqp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81100b0a27916edf758ca568e9213b8ea451c1efa664f00ddb84155c1c50f650
-  data.tar.gz: af59920235f7c6c4c1f13ab61861fbbb4f27bf2aebbbab59cb9a3beaef6c2099
+  metadata.gz: eec3a6f84d3330d75ac4bd3293ecfa4a13fd6bd1134ccf663a885db6f9d38fe1
+  data.tar.gz: 40330861bf996109a354d294100532fa8b56f1f1e523cbd8422a5123322f5dd0
 SHA512:
-  metadata.gz: b480edb450da31e0ef2714452db49caa36e0089b61fbcd8b89e0a92bba0cd2a81c3442cca7fa84e0f1947dfc7f36e50fe3b1dd773f42fe80203584be2ce6fb12
-  data.tar.gz: ac74d1ec489c286618ebe8d10f1f1bf4ca4408966972e8ecbfbf8f80c918a42abdb9eb780dfbcac8dbc8016a8909727e82c53dc68c9b3c9da31564d16bd19405
+  metadata.gz: 51f93c37d11a8804b01813a0523aa7cce9b71babf794527c1208004534501dcdc3ae8334214a9ed01794dce38297f03714f8c35ab67e3754a1265b607900fe16
+  data.tar.gz: d848c6cbf0bc426bbfc77142d16095117f53351ec42bd36115903307e32353b0e5a0a74baf9800f8c1c6a0aab5b78608fc9df592b13077695c93159f1306ee86

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.2 (2021-01-05)
+
+- Added ARM shared library for Mac
+- Updated OSQP to 0.6.2
+
 ## 0.1.1 (2020-04-10)
 
 - Changed to Apache 2.0 license to match OSQP

data/NOTICE.txt

@@ -1,4 +1,18 @@
-Copyright 2019-2020 Andrew Kane
+Copyright (c) 2019-2020 Andrew Kane
+
+OSQP
+Copyright (c) 2019 Bartolomeo Stellato, Goran Banjac, Paul Goulart, Stephen Boyd
+
+This product includes software developed at Stanford University and at the University of Oxford.
+
+
+The following external modules are included in this software library
+
+QDLDL
+Copyright (c) 2018, Paul Goulart, Bartolomeo Stellato, Goran Banjac.
+
+AMD
+Copyright (c) 1996-2015, Timothy A. Davis, Patrick R. Amestoy, and Iain S. Duff.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -2,7 +2,7 @@
 
 The [OSQP](https://osqp.org/) (Operator Splitting Quadratic Program) solver for Ruby
 
-[![Build Status](https://travis-ci.org/ankane/osqp.svg?branch=master)](https://travis-ci.org/ankane/osqp) [![Build status](https://ci.appveyor.com/api/projects/status/o93q4b56anxmnvwn/branch/master?svg=true)](https://ci.appveyor.com/project/ankane/osqp/branch/master)
+[![Build Status](https://github.com/ankane/osqp/workflows/build/badge.svg?branch=master)](https://github.com/ankane/osqp/actions)
 
 ## Installation
 
@@ -82,5 +82,6 @@ To get started with development:
 git clone https://github.com/ankane/osqp.git
 cd osqp
 bundle install
+bundle exec rake vendor:all
 bundle exec rake test
 ```

data/lib/osqp.rb

@@ -8,10 +8,28 @@ require "osqp/version"
 module OSQP
   class Error < StandardError; end
 
-  def self.lib_version
-    FFI.osqp_version.to_s
+  class << self
+    attr_accessor :ffi_lib
   end
+  lib_name =
+    if Gem.win_platform?
+      "libosqp.dll"
+    elsif RbConfig::CONFIG["host_os"] =~ /darwin/i
+      if RbConfig::CONFIG["host_cpu"] =~ /arm/i
+        "libosqp.arm64.dylib"
+      else
+        "libosqp.dylib"
+      end
+    else
+      "libosqp.so"
+    end
+  vendor_lib = File.expand_path("../vendor/#{lib_name}", __dir__)
+  self.ffi_lib = [vendor_lib]
 
   # friendlier error message
   autoload :FFI, "osqp/ffi"
+
+  def self.lib_version
+    FFI.osqp_version.to_s
+  end
 end

data/lib/osqp/ffi.rb

@@ -2,16 +2,13 @@ module OSQP
   module FFI
     extend Fiddle::Importer
 
-    lib =
-      if Gem.win_platform?
-        "libosqp.dll"
-      elsif RbConfig::CONFIG["host_os"] =~ /darwin/i
-        "libosqp.dylib"
-      else
-        "libosqp.so"
-      end
-
-    dlload File.expand_path("../../vendor/#{lib}", __dir__)
+    libs = Array(OSQP.ffi_lib).dup
+    begin
+      dlload Fiddle.dlopen(libs.shift)
+    rescue Fiddle::DLError => e
+      retry if libs.any?
+      raise e
+    end
 
     typealias "c_float", "double"
     typealias "c_int", "long long"

data/lib/osqp/version.rb

@@ -1,3 +1,3 @@
 module OSQP
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,72 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: osqp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: numo-narray
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 
+date: 2021-01-06 00:00:00.000000000 Z
+dependencies: []
+description:
 email: andrew@chartkick.com
 executables: []
 extensions: []
@@ -82,6 +26,7 @@ files:
 - lib/osqp/version.rb
 - vendor/LICENSE
 - vendor/NOTICE
+- vendor/libosqp.arm64.dylib
 - vendor/libosqp.dll
 - vendor/libosqp.dylib
 - vendor/libosqp.so
@@ -89,7 +34,7 @@ homepage: https://github.com/ankane/osqp
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -104,8 +49,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.2.3
+signing_key:
 specification_version: 4
 summary: OSQP (Operator Splitting Quadratic Program) solver for Ruby
 test_files: []