compute_unit 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7454de36f403e2803ee5b87ee989781de8b663d32cfe290b3c22ab0c18f598d
-  data.tar.gz: 6b6afa144e05011bec545ddbda688ae663650dce4d09070be9a3922f84bc9606
+  metadata.gz: f51ca7c79e4dfb8a97f4221a0798a59169ddf4c925978bd2cff52633412573ab
+  data.tar.gz: 8e5b1cf6adad26fac8c54cdc54f3178af1a8e2325657e997419f98d8306d9e86
 SHA512:
-  metadata.gz: 3821595267038d8424a7ae3558437339f87b871ce4e294ffe80cce1c928924a9ae1ebd7fa9b293c08a2b40217a71f7a4358e8a943456dd0c978cf7e4bfbb5a0a
-  data.tar.gz: 4fa97e267f9fd8c60999d8af1dd96e15e9e77435c98ece688e53386147e0e7470b1f9a7e149f702fbcb237fbf6c41085f051db9ad441e1388dbde6ce9d2469a5
+  metadata.gz: b18314336244f86d4c7417def3bf97d90762696df44cd9a1f6bced80b6dca142afe6deb5cd8954795e773c974061d8737bf7635307305e96d9018e1a59fcef17
+  data.tar.gz: 9f3bc81ca0e1a0694733880217b6574e959e4eef538ab24bae28b081dafc962d763aa02214598bfa846603d9d83dbf497e1559a690e707655a7dc9cfae532544

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Compute Unit Changelog
 
+## 0.5.1
+Released 12/30/2020
+
+* Add cpu uuid and bios methods
+* Remove formatters module
+* Fix stack level when root? is used
+* Ensure cpu power is an integer
 ## 0.5.0
 Released 10/5/2020
 

data/README.md

@@ -144,7 +144,7 @@ Instead of monkey patching this code you can simply subclass the objects.  The f
 
 ```ruby
 # coolproject/vegagpu.rb
-require 'cool_project/vega_gpu'
+require 'compute_unit/gpu/amdgpu'
 module CoolProject
   class VegaGpu < ::ComputeUnit::Gpu::AmdGpu
     include CoolProject::Metrics
@@ -189,7 +189,7 @@ The opencl_ruby_ffi gem is optionally used to gather additional info about the G
 
 There is some caution when using OpenCL.  If a GPU is dead, OpenCL tends to hang/freeze thus forcing a reboot.  This is not a bug in the compute_unit or opencl_ruby_ffi gem but in the OpenCL library instead.
 
-Getting data from OpenCL also takes a long time!  So if you have multiple GPUs in your system this could takes multiple seconds to return data.  Because of this we cache the responses for the next query.  This response is cached until the system checksum changes.  This checksum is a special calculate of all the devices present in the system.  So if you ever added or changed the equipment in the system, a new OpenCL query would ensue. 
+Getting data from OpenCL also takes a long time!  So if you have multiple GPUs in your system this could takes multiple seconds to return data.  Because of this we cache the responses for the next query.  This response is cached until the system checksum changes.  This checksum is a special calculatulation of all the devices present in the system.  So if you ever added or changed the equipment in the system, a new OpenCL query would ensue. 
 
 To enable OpenCL you just need to pass a boolean value to any of the find_all methods:
 
@@ -207,7 +207,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/logicminds/compute_unit. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://gitlab.com/blockops/compute_unit. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -215,4 +215,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the ComputeUnit project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/logicminds/compute_unit/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the ComputeUnit project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://gitlab.com/blockops/compute_unit/-/blob/master/CODE_OF_CONDUCT.md).

data/lib/compute_unit/compute_base.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'time'
-require 'compute_unit/formatters'
 require 'compute_unit/logger'
 require 'compute_unit/device'
 require 'sys/proctable'
@@ -13,7 +12,6 @@ module ComputeUnit
     attr_reader :type, :serial, :meta, :uuid, :timestamp, :index, :compute_type
     attr_accessor :power_offset
 
-    include ComputeUnit::Formatters
     include ComputeUnit::Logger
 
     # timeout value
@@ -73,24 +71,5 @@ module ComputeUnit
     def expired_metadata?
       (timestamp + CACHE_TIMEOUT) < Time.now.to_i
     end
-
-    def experimental_on?
-      unless ENV['XB_EXPERIMENTAL'].to_s == '1'
-        logger.warn('You must set environment variable XB_EXPERIMENTAL=1 to use this feature')
-        return false
-      end
-      true
-    end
-
-    def micro_formatter(item, add_unit = false)
-      data = {}
-      item.each do |key, value|
-        if %i[hourly_cost hourly_earnings kwh_cost].include?(key)
-          v = (value * 1_000_000).round(4)
-          data[key] = add_unit ? "#{v} \u00B5BTC" : v
-        end
-      end
-      item.merge(data)
-    end
   end
 end

data/lib/compute_unit/cpu.rb

@@ -15,6 +15,10 @@ module ComputeUnit
       end
     end
 
+    def bios
+      'N/A'
+    end
+
     def utilization
       1 # until we can calculate this.  Is loadavg a good metric? or load / cpus
     end
@@ -118,7 +122,7 @@ module ComputeUnit
     end
 
     def power
-      ENV.fetch('CPU_POWER', 60) # until we can calculate power we will just use 60
+      ENV.fetch('CPU_POWER', 60).to_i # until we can calculate power we will just use 60
     end
 
     def fan
@@ -134,7 +138,7 @@ module ComputeUnit
     end
 
     def status_info
-      { index: "CPU#{index}",
+      { index: uuid,
         name: model,
         bios: 'N/A',
         core_clock: current_freq_mhz,
@@ -149,6 +153,7 @@ module ComputeUnit
 
     def metrics
       {
+        uuid: uuid,
         temp: temp,
         minFreqMhz: min_freq_mhz,
         maxFreqMhz: max_freq_mhz,
@@ -169,9 +174,15 @@ module ComputeUnit
     def initialize(_device_path, opts)
       super
       @type = :CPU
-      @pci_loc = device_path,
-                 @index = opts[:index].to_i
+      @pci_loc = device_path
+      @index = opts[:index].to_i
       @power_offset = 0
+      @uuid = opts[:uuid] || opts[:serial]
+    end
+
+    # @return [String] - the type and index of the device
+    def uuid
+      @uuid ||= "#{type}#{index}"
     end
 
     def self.create_from_path(device_path, index)

data/lib/compute_unit/utils.rb

@@ -11,7 +11,7 @@ module ComputeUnit
 
     # @return [Boolean] - return true if the current user is root
     def root?
-      root?
+      ::Etc.getpwuid.name == 'root'
     end
 
     # @return [Boolean] - returns true if user is root

data/lib/compute_unit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ComputeUnit
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compute_unit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
@@ -125,7 +125,6 @@ files:
 - lib/compute_unit/cpu.rb
 - lib/compute_unit/device.rb
 - lib/compute_unit/exceptions.rb
-- lib/compute_unit/formatters.rb
 - lib/compute_unit/gpu.rb
 - lib/compute_unit/gpus/amd_gpu.rb
 - lib/compute_unit/gpus/nvidia_gpu.rb

data/lib/compute_unit/formatters.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module ComputeUnit
-  module Formatters
-    def micro_formatter(item, add_unit = false)
-      data = {}
-      item.each do |key, value|
-        if %i[hourly_cost hourly_earnings kwh_cost].include?(key)
-          v = (value * 1000000).round(4)
-          data[key] = add_unit ? "#{v} \u00B5BTC" : v
-        end
-      end
-      item.merge(data)
-    end
-
-    def value_micro_formatter(value, add_unit = false)
-      v = (value * 1000000).round(1)
-      add_unit ? "#{v} \u00B5BTC" : v
-    end
-  end
-end