compute_unit 0.1.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5caf721411458c1307f2714ba330c737ddd5987433a51d7753b6004649a92429
-  data.tar.gz: ef3bacd1c4662e1ffe33dafad9c48f44c6fc3cefe161098957cc476e7ecac78d
+  metadata.gz: d3fe6b765613752707aca6037a41159d6a3d1d0f33638b3ab5b20ed7d693d844
+  data.tar.gz: bbc7c51a56dcca030098341bfe587ff4263d28d44859b13e9ad2efffb5614a46
 SHA512:
-  metadata.gz: 73b107433ce4ffcb3d6a5d35a8711cf39489ed111ccc368cb66d5f788f36690382242a3437c0bd6d40147c2ca727856d2fffd48b8b5edbaa8f4dd22b5ab228da
-  data.tar.gz: 2debc1c284e7200efd00ca0e064d3b48f55a935d55409cc77f33db2db9344efabcdaadc3cd2bfd909174e58ba38727ed4ed845dad0395a19e08dc5ee0f54a428
+  metadata.gz: 4653e9bd5a0c9da77403b6afa8fd3cd9b07c95399c074b140b82201742ef50fb80cbfd4221c792aee17d2b60547f96db2265d2a4d6797b3558bab7ffb9e97416
+  data.tar.gz: ef104cce6547acdc6390e5d1ab315b11eed5aaa5dcf548198f531b2bca30bec58220f23d062f2e7e7076bfc137056980fc35f34517577bdb2331e77b5d8ad840

data/CHANGELOG.md

@@ -1,3 +1,31 @@
 # Compute Unit Changelog
 
+## Unrleased
+## 0.3.2
+* Fix bug with default database not being created
+
+## 0.3.1
+Released 9/24/2020
+
+* Use the default system pcidb file instead of throwing error
+* Return default data if no hmon value exist
+
+## 0.3.0
+Released 6/16/2020
+
+* Add name method to the cpu class
+* Use constant for proc path
+* Use debug when kernel file doesn't exist
+
+## 0.2.1
+Released 6/6/2020
+
+* update rake and other gems
+
+## 0.2.0
+Released 6/5/2020
+* Added more cpu methods for various POI.
+* Ensure constants exist when side loaded
+* Add descendent discovery mechanism to GPU class
+
 ## initial version 0.1.0

data/Gemfile

@@ -2,17 +2,11 @@
 
 source 'https://rubygems.org'
 
-
-gem 'opencl_ruby_ffi', '~> 1.3.4'
-gem 'compute_unit', path: '.'
-
 group :test do
   gem 'pry'
   gem 'rubocop'
   gem 'rubocop-rspec'
   gem 'ruby-prof'
   gem 'simplecov'
-  gem 'rake', '~> 10.0'
-  gem 'rspec', '~> 3.0'
-  gem 'bundler', '~> 2.0'
 end
+gemspec

data/README.md

@@ -1,9 +1,9 @@
 # Compute Unit Ruby Library
-The compute unit library helps you write future abstractions and tooling for crypto mining, machine learning or just general purpose usage.  This library was extracted out of the crypto mining tool [Crossbelt](https://crossbelt.blockops.party) to help spur more tooling to ruby. 
+The compute unit library helps you write future abstractions and tooling for crypto mining, machine learning or just general purpose.  This library was extracted out of the crypto mining tool [Crossbelt](https://crossbelt.blockops.party) to help spur more tooling for ruby. 
 
 Uses the sysfs filesystem to quickly read and write compute unit data. More information about sysfs can be found [here](https://www.kernel.org/doc/Documentation/filesystems/sysfs-pci.txt)
 
-This library will:
+This library has the ability to:
 
  * Detect all compute devices such as cpu, gpu, and anything else we add to this library. 
  * Provide the ability to control GPU fans.
@@ -11,6 +11,7 @@ This library will:
  * Change or view voltage, core clock, memory clock and other tunning parameters used for overclocking.
  * Provide inventory data of all the devices with make, model and other important information. 
  * Provide realtime status information of various data points. Useful for real-time tunning. 
+ * Interact with the compute device via ruby.
 
 This library was open sourced to allow further refinement and usage throughout the ruby community. 
 Since machine learning is not popular on ruby due to device and program support, I hope this gem will 
@@ -34,12 +35,133 @@ Or install it yourself as:
 
 ## Usage
 
+Find all compute devices
 ```
 require 'compute_unit'
 devices = ComputeUnit.find_all
 
 ```
 
+Find just GPU devices and list the voltage table
+
+```ruby
+require 'compute_unit/gpu'
+
+gpu = ComputeUnit::Gpu.find_all.first
+gpu.voltage_table
+=> [{:pstate=>0, :clk=>852, :volt=>800, :type=>:sclk},
+ {:pstate=>1, :clk=>997, :volt=>860, :type=>:sclk},
+ {:pstate=>2, :clk=>1084, :volt=>860, :type=>:sclk},
+ {:pstate=>3, :clk=>1138, :volt=>860, :type=>:sclk},
+ {:pstate=>4, :clk=>1200, :volt=>860, :type=>:sclk},
+ {:pstate=>5, :clk=>1401, :volt=>860, :type=>:sclk},
+ {:pstate=>6, :clk=>1536, :volt=>860, :type=>:sclk},
+ {:pstate=>7, :clk=>1630, :volt=>1200, :type=>:sclk}]
+
+gpu.amdgpu_pm_info
+=> {:mclk=>{:value=>"1020", :unit=>"MHz"},
+ :sclk=>{:value=>"994", :unit=>"MHz"},
+ :pstate_sclk=>{:value=>"1138", :unit=>"MHz"},
+ :pstate_mclk=>{:value=>"800", :unit=>"MHz"},
+ :vddgfx=>{:value=>"862", :unit=>"mV"},
+ :average_gpu=>{:value=>"121.0", :unit=>"W"},
+ :temperature=>{:value=>"57", :unit=>"C"},
+ :load=>{:value=>"100", :unit=>"%"}} 
+
+```
+
+## Example CLI command
+There is a `list_computes` command that will enumerate all the compute devices found on the system.
+
+```ruby
+list_computes
+[
+  {
+    "uuid": "GPU0",
+    "gpuId": "GPU0",
+    "syspath": "/sys/bus/pci/devices/0000:03:00.0",
+    "pciLoc": "0000:03:00.0",
+    "name": "RX Vega56",
+    "bios": "113-D0500100-102",
+    "subType": "amdgpu",
+    "make": "AMD",
+    "model": "RX Vega56",
+    "vendor": "AMD",
+    "power": 121,
+    "utilization": 100,
+    "temperature": 57,
+    "status": 0,
+    "pstate": -1,
+    "fanSpeed": 2946,
+    "type": "GPU",
+    "maxTemp": null,
+    "mem": 1020,
+    "cor": 997,
+    "vlt": 862,
+    "mem_temp": 75,
+    "maxFan": null,
+    "dpm": null,
+    "vddci": null,
+    "maxPower": null,
+    "ocProfile": null,
+    "opencl_enabled": false
+  },
+  {
+    "chip_make": "GenuineIntel",
+    "make": "GenuineIntel",
+    "model": "Intel(R) Core(TM) i3-7100 CPU @ 3.90GHz",
+    "device_id": "590f",
+    "vendor_id": "8086",
+    "subsystem_device_id": "7a59",
+    "subsystem_vendor_id": "1462",
+    "device_class": "060000",
+    "temp": 33,
+    "minFreqMhz": 800,
+    "maxFreqMhz": 3900,
+    "currentFreqMhz": 3600,
+    "numCores": 2,
+    "numThreads": 2,
+    "nproc": 4,
+    "temps": {
+      "package_id_0": 33,
+      "core_0": 26,
+      "core_1": 33
+    }
+  }
+]
+```
+
+### Subclassing a compute object
+Instead of monkey patching this code you can simply subclass the objects.  The find_all methods are intelligent enough to locate your subclass by searching the Objectspace for all decendants of `ComputeUnit::ComputeBase`.  This makes it dead simple to add new functionality without having to wrap any code.  This gives you the ability to include new modules or override existing methods.  Just make sure you load your class before using the find_all method.
+
+
+
+```ruby
+# coolproject/vegagpu.rb
+require 'cool_project/vega_gpu'
+module CoolProject
+  class VegaGpu < ::ComputeUnit::Gpu::AmdGpu
+    include CoolProject::Metrics
+
+    def initialize(device_path, opts)
+        super(device_path, opts)
+        @is_vega = true
+    end
+  end
+end
+
+```
+
+Once you have your new class created all you need to do is load the class before running find all.
+
+```ruby
+require 'compute_unit'
+require 'coolproject/vegagpu'
+require 'yaml'
+
+puts ComputeUnit.find_all.to_yaml
+
+```
 
 ## Make and Model information
 This library uses the pci database maintained here https://pci-ids.ucw.cz/ which is also used by `lspci` and other linux tools. If your device is giving the wrong info the problem is likely due to the database being incorrect. 
@@ -51,9 +173,25 @@ If you want to refresh the database every time with finding all the devices you
 Or you can also run the simple cli tool. `update_pcidb` that comes with this library. 
 
 ## Kernel support
-There will likely be changes with reading and writing information to sysfs as new kerneles are released.  This library has been tested against. 
+There will likely be changes with reading and writing information to sysfs as new kernels are released.  This library has been tested against. 
 
 * 4.15 - 4.20
+* 5.x 
+
+## OpenCL Usage
+The opencl_ruby_ffi gem is optionally used to gather additional info about the GPU.  This can sometimes result in better model info.  
+
+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. 
+
+To enable OpenCL you just need to pass a boolean value to any of the find_all methods:
+
+```ruby
+require 'compute_unit'
+devices = ComputeUnit.find_all(true)
+
+```
 
 ## Development
 
@@ -67,7 +205,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/logicm
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT.
 
 ## Code of Conduct
 

data/compute_unit.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |spec|
   spec.summary       = 'A ruby library for compute unit devices'
   spec.description   = <<~EOF
 
-    A ruby library that searches uses the linux sysfs file system for compute unit devices such as
-    CPUS, GPUs and other ASIC compute devices. Allows programmatic access collect real time metrics from the kernel or relatated driver toolchain.
-    Is meant to be used as a toolchain to future build tooling on. This library also makes use of opencl toolchain and requires
+    A ruby library that searches the linux sysfs file system for compute unit devices such as
+    CPUS, GPUs and other ASIC compute devices. Allows programmatic access to collect real time metrics from the kernel or relatated driver toolchain.
+    Is meant to be used as a toolchain for future tools. This library also makes use of opencl library and requires
     the opencl_ruby_ffi gem.
 
   EOF
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
-  spec.metadata['changelog_uri'] = "#{spec.homepage}/CHANGELOG"
+  spec.metadata['changelog_uri'] = "#{spec.homepage}/-/blob/master/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -36,8 +36,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'opencl_ruby_ffi', '~> 1.3.0'
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_dependency 'opencl_ruby_ffi', '~> 1.3.4'
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'rake', '~> 13'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/compute_unit.rb

@@ -11,23 +11,36 @@ module ComputeUnit
   SYS_DEVICE_PATH = File.join(SYSFS_PATH, 'bus/pci/devices')
   PCI_DATABASE_PATH = File.join(File.dirname(__dir__), 'pci.ids')
   PCI_DATABASE_URL = 'http://pci-ids.ucw.cz/v2.2/pci.ids'
+  DEFAULT_PCIDB_PATH = '/usr/share/hwdata/pci.ids'
 
+  # @param use_opencl [Boolean]
+  # @return [Array] - return a list of compute units
   def self.find_all(use_opencl = false)
     require 'compute_unit/gpu'
     require 'compute_unit/cpu'
     require 'compute_unit/asic'
-    raise Exceptions::InvalidPCIDatabase.new('Run: ComputeUnit.refresh_pci_database') unless File.exist?(PCI_DATABASE_PATH)
+
+    copy_default_database unless File.exist?(PCI_DATABASE_PATH)
 
     ComputeUnit::Gpu.find_all(use_opencl) +
       ComputeUnit::Cpu.find_all +
       ComputeUnit::Asic.find_all
   end
 
+  # copies the default pci database from linux filesystem over to the gem path
+  def self.copy_default_database
+    File.cp(DEFAULT_PCIDB_PATH, PCI_DATABASE_PATH)
+  end
+
+  # get a fresh copy of the database and then use find_all
+  # @param use_opencl [Boolean]
+  # @return [Array] - return a list of compute units
   def self.find_all_with_database(use_opencl = false)
     refresh_pci_database
     find_all(use_opencl)
   end
 
+  # downloads the pci database
   def self.refresh_pci_database
     ComputeUnit::Utils.check_for_root
     require 'net/http'

data/lib/compute_unit/asic.rb

@@ -9,6 +9,25 @@ module ComputeUnit
       []
     end
 
+    def self.create_from_path(device_path, index)
+      opts = {
+        device_class_id: device_class(device_path),
+        device_id: device(device_path),
+        device_vendor_id: device_vendor(device_path),
+        subsystem_vendor_id: subsystem_vendor(device_path),
+        subsystem_device_id: subsystem_device(device_path),
+        index: index
+      }
+      new(device_path, opts)
+    end
+
+    def self.find_all
+      return []
+      devices.sort.map.with_index do |device_path, index|
+        create_from_path(device_path, index)
+      end
+    end
+
     # /sys/devices/platform $ more coretemp.0/hwmon/hwmon1/temp1_input / 1000
   end
 end

data/lib/compute_unit/compute_base.rb

@@ -16,6 +16,16 @@ module ComputeUnit
     # timeout value
     CACHE_TIMEOUT = 30
 
+    # @return [Array] - find all the decendants of thyself
+    def self.compute_classes
+      ObjectSpace.each_object(Class).select do |klass|
+        # <Class:#<Crossbelt::ComputeUnit::NvidiaGpu:0x00007fddc5c02a10>>
+        #  We have to filter out these kinds of Ojbects as they don't respond to :new
+        #  without a singleton error.
+        klass < self && !klass.to_s.include?('Class')
+      end
+    end
+
     # @param value [Float] a value to offset the power calculation, either a whole number, or decimal
     # @return [Integer] the value set as the offset
     def power_offset=(value)

data/lib/compute_unit/cpu.rb

@@ -7,12 +7,86 @@ module ComputeUnit
     DEVICE_CLASS = '060000'
     DEVICE_CLASS_NAME = 'CPU'
     # @return [Array] - returns a list of device paths of all devices considered for display
+    alias name model
+
     def self.devices
       ComputeUnit::ComputeBase.devices.find_all do |device|
         ComputeUnit::Device.device_class(device) == DEVICE_CLASS
       end
     end
 
+    def model
+      raw_cpu_data[:model_name]
+    end
+
+    def make
+      raw_cpu_data[:vendor_id]
+    end
+
+    def num_cores
+      raw_cpu_data[:cores_per_socket].to_i
+    end
+
+    def num_threads
+      raw_cpu_data[:threads_per_core].to_i
+    end
+
+    def nproc
+      raw_cpu_data[:cpus].to_i
+    end
+
+    def current_freq_mhz
+      raw_cpu_data[:cpu_mhz].to_f.round(0)
+    end
+
+    def max_freq_mhz
+      raw_cpu_data[:cpu_max_mhz].to_f.round(0)
+    end
+
+    def min_freq_mhz
+      raw_cpu_data[:cpu_min_mhz].to_f.round(0)
+    end
+
+    def base_hwmon_path
+      File.join(ComputeUnit::SYSFS_PATH, 'devices/platform/coretemp.0/hwmon')
+    end
+
+    # @return [Hash] - a hash of temp readings and their labels
+    # @example temps => {:core_0=>31, :core_1=>31, :package_id_0=>27}
+    def temps
+      Dir.glob(File.join(hwmon_path, 'temp*_label')).each_with_object({}) do |label_file, acc|
+        temp_file = label_file.sub('label', 'input')
+        label = normalize_name(read_file(label_file))
+        reading = read_file(temp_file).to_f.round(0) / 1000
+        acc[label] = reading
+        acc
+      end
+    end
+
+    # @return [Integer] - the temperature of the cpu package in Celsius
+    def temp
+      read_hwmon_data('temp1_input', 0).to_f.round(0) / 1000
+    end
+
+    def metrics
+      {
+        temp: temp,
+        minFreqMhz: min_freq_mhz,
+        maxFreqMhz: max_freq_mhz,
+        currentFreqMhz: current_freq_mhz,
+        model: model,
+        make: make,
+        numCores: num_cores,
+        numThreads: num_threads,
+        nproc: nproc,
+        temps: temps
+      }
+    end
+
+    def to_h
+      super.merge(metrics)
+    end
+
     def self.create_from_path(device_path, index)
       opts = {
         device_class_id: device_class(device_path),
@@ -26,11 +100,51 @@ module ComputeUnit
     end
 
     def self.find_all
-      return [] # not quite ready to show cpu data
       devices.sort.map.with_index do |device_path, index|
         create_from_path(device_path, index)
       end
     end
-    # /sys/devices/platform $ more coretemp.0/hwmon/hwmon1/temp1_input / 1000
+
+    private
+
+    # @param value [String]
+    # @return [String]
+    # @summary downcases and transforms spaces into underscores
+    def normalize_name(value)
+      value.downcase.gsub(/\s/, '_').gsub('(s)', 's').to_sym
+    end
+
+    # @return [Hash] - a hash of cpu info returned from lscpu
+    # normalizes the key name by downcasing and removing spaces
+    # @example
+    #   raw_cpu_data() =>
+    # {"architecture"=>"x86_64", "cpu_op-modes"=>"32-bit, 64-bit", "byte_order"=>"Little Endian",
+    #   "cpus"=>"4", "on-line_cpus list"=>"0-3", "threads_per core"=>"2", "cores_per socket"=>"2",
+    #   "sockets"=>"1", "numa_nodes"=>"1", "vendor_id"=>"GenuineIntel", "cpu_family"=>"6",
+    #   "model"=>"158", "model_name"=>"Intel(R) Core(TM) i3-7100 CPU @ 3.90GHz", "stepping"=>"9",
+    #   "cpu_mhz"=>"800.545", "cpu_max mhz"=>"3900.0000", "cpu_min mhz"=>"800.0000",
+    #   "bogomips"=>"7799.87", "virtualization"=>"VT-x", "l1d_cache"=>"32K", "l1i_cache"=>"32K",
+    #   "l2_cache"=>"256K", "l3_cache"=>"3072K", "numa_node0 cpus"=>"0-3",
+    #   "flags"=>"fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36
+    #    clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc
+    #   art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni
+    #   pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1
+    #   sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm
+    #   3dnowprefetch cpuid_fault invpcid_single tpr_shadow vnmi flexpriority ept vpid ept_ad
+    #   fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt intel_pt
+    #   xsaveopt xsavec xgetbv1 xsaves dtherm arat pln pts hwp hwp_notify hwp_act_window hwp_epp"
+    # }
+    def raw_cpu_data
+      @raw_cpu_data ||= begin
+        # turns each line into a hash of key value pairs
+        regex = /(?<name>[\s\w\-\(\)]+)\:\s+(?<value>[@\s\w\-\,\.\(\)]+)$/
+        `lscpu`.lines.each_with_object({}) do |line, acc|
+          m = line.match(regex)
+          name = normalize_name(m.named_captures['name'])
+          acc[name] = m.named_captures['value'].chomp if m
+          acc
+        end
+      end
+    end
   end
 end

data/lib/compute_unit/device.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
+require 'compute_unit'
 require 'compute_unit/logger'
 require 'compute_unit/cache_store'
 require 'compute_unit/utils'
-
 # This file supports reading from sysfs
 # More information about sysfs can be found here - https://www.kernel.org/doc/Documentation/filesystems/sysfs-pci.txt
 module ComputeUnit
   class Device
     # We can supply a mock sysfs path in order to test with containers and other scenarios
     SYSFS_DEVICES_PATH = File.join(ComputeUnit::SYSFS_PATH, 'bus', 'pci', 'devices')
-
+    PROC_PATH = ENV['PROC_PATH'] || '/proc'
     attr_reader :device_class_id,
                 :device_id,
                 :device_vendor_id,
@@ -127,7 +127,10 @@ module ComputeUnit
 
     def read_file(path, default = nil)
       File.read(path).chomp
-    rescue Errno::EINVAL, Errno::EPERM, Errno::ENOENT
+    rescue Errno::EINVAL, Errno::EPERM
+      default
+    rescue Errno::ENOENT
+      logger.debug("File #{path} does not exist, using defaults")
       default
     rescue Errno::EACCES
       logger.fatal('run this command as root or with sudo, using default value')
@@ -137,9 +140,9 @@ module ComputeUnit
     # @param item [String] - the name of the hwmon file to read from
     # @param default [Object] - the default value to return if the file is empty or not readable
     # @return [String] - the value of the item looked up
-    def read_hwmon_data(item, _default = nil)
+    def read_hwmon_data(item, default = nil)
       path = File.join(hwmon_path, item)
-      read_file(path)
+      read_file(path, default)
     end
 
     # @param item [String] - the name of the hwmon file to write to
@@ -268,7 +271,7 @@ module ComputeUnit
                 logger.fatal(e.message)
                 default
               rescue Errno::ENOENT
-                logger.fatal("File #{path} does not exist")
+                logger.debug("File #{path} does not exist")
                 default
               rescue Errno::EACCES
                 logger.fatal('Run this command as root or with sudo')
@@ -286,7 +289,7 @@ module ComputeUnit
     rescue Errno::EINVAL, Errno::EPERM => e
       logger.fatal(e.message)
     rescue Errno::ENOENT
-      logger.fatal("File #{path} does not exist")
+      logger.warn("File #{path} does not exist")
     rescue Errno::EACCES
       logger.fatal('Run this command as root or with sudo')
     end

data/lib/compute_unit/gpu.rb

@@ -265,7 +265,7 @@ module ComputeUnit
     def self.find_all(use_opencl = false)
       require 'compute_unit/gpus/amd_gpu'
       require 'compute_unit/gpus/nvidia_gpu'
-      g = ComputeUnit::AmdGpu.find_all(use_opencl) + ComputeUnit::NvidiaGpu.find_all(use_opencl)
+      g = compute_classes.map { |klass| klass.find_all(use_opencl) }.flatten
       g.sort_by(&:index)
     end
 

data/lib/compute_unit/gpus/amd_gpu.rb

@@ -90,6 +90,16 @@ module ComputeUnit
       utilization
     end
 
+    # @return [Integer] - the temperature of the asic chip
+    def asic_temp
+      read_hwmon_data('temp2_input', 0).to_i / 1000
+    end
+
+    # @return [Integer] - temperature of the memory
+    def mem_temp
+      read_hwmon_data('temp3_input', 0).to_i / 1000
+    end
+
     # @return [Integer] - returns temp of gpu in celius
     def temp
       read_hwmon_data('temp1_input', 0).to_i / 1000
@@ -421,16 +431,6 @@ module ComputeUnit
       vddci_voltage_table.first[:volt]
     end
 
-    # @return [Integer] - the temperature of the asic chip
-    def asic_temp
-      read_hwmon_data('temp2_input', 0).to_i / 1000
-    end
-
-    # @return [Integer] - the temperature of the memory chips
-    def mem_temp
-      read_hwmon_data('temp3_input', 0).to_i / 1000
-    end
-
     def set_mem_clock_and_vddc(mem_clock, mem_volt)
       return unless experimental_on?
 

data/lib/compute_unit/gpus/nvidia_gpu.rb

@@ -8,6 +8,7 @@ module ComputeUnit
     MAKE = 'Nvidia'
     SUBTYPE = 'nvidia'
     NVIDIA_SMI = '/usr/bin/nvidia-smi'
+    NVIDIA_PROC_PATH = ENV['NVIDIA_PROC_PATH'] || File.join(ComputeUnit::Device::PROC_PATH, 'driver', 'nvidia', 'gpus')
 
     def initialize(device_path, opts = {})
       data = self.class.read_information_file(device_path).merge(opts)
@@ -159,7 +160,7 @@ module ComputeUnit
     def information_file
       @information_file ||= begin
         device_name = File.basename(device_path)
-        File.join('/proc/driver/nvidia/gpus', device_name, 'information')
+        File.join(NVIDIA_PROC_PATH, device_name, 'information')
       end
     end
 
@@ -209,7 +210,8 @@ module ComputeUnit
     #  :device_minor=>"7"}
     def self.read_information_file(device_path)
       device_name = File.basename(device_path)
-      information_file = "/proc/driver/nvidia/gpus/#{device_name}/information"
+      information_file = File.join(NVIDIA_PROC_PATH, device_name, 'information')
+
       File.open(information_file, 'r') do |file|
         content = file.read
         content.scan(/\n?([\w\s]*):\s+(.*)/).map { |key, value| [key.downcase.tr(' ', '_').to_sym, value] }.to_h

data/lib/compute_unit/logger.rb

@@ -8,7 +8,7 @@ module ComputeUnit
       if ENV['LOG_FILENAME'] && File.exist?(ENV['LOG_FILENAME'])
         ENV['LOG_FILENAME']
       else
-        STDOUT
+        STDERR
       end
     end
 
@@ -18,7 +18,7 @@ module ComputeUnit
         log.level = log_level
         log.progname = 'ComputeUnit'
         log.formatter = proc do |severity, datetime, progname, msg|
-          if Logger.log_file == STDOUT
+          if Logger.log_file == STDERR
             "#{severity} - #{progname}: #{msg}\n".send(color(severity))
           else
             "#{datetime} #{severity} - #{progname}: #{msg}\n".send(color(severity))

data/lib/compute_unit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compute_unit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opencl_ruby_ffi
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -68,9 +68,9 @@ dependencies:
         version: '3.0'
 description: |2+
 
-  A ruby library that searches uses the linux sysfs file system for compute unit devices such as
-  CPUS, GPUs and other ASIC compute devices. Allows programmatic access collect real time metrics from the kernel or relatated driver toolchain.
-  Is meant to be used as a toolchain to future build tooling on. This library also makes use of opencl toolchain and requires
+  A ruby library that searches the linux sysfs file system for compute unit devices such as
+  CPUS, GPUs and other ASIC compute devices. Allows programmatic access to collect real time metrics from the kernel or relatated driver toolchain.
+  Is meant to be used as a toolchain for future tools. This library also makes use of opencl library and requires
   the opencl_ruby_ffi gem.
 
 email:
@@ -119,7 +119,7 @@ licenses:
 metadata:
   homepage_uri: https://gitlab.com/blockops/compute_unit
   source_code_uri: https://gitlab.com/blockops/compute_unit
-  changelog_uri: https://gitlab.com/blockops/compute_unit/CHANGELOG
+  changelog_uri: https://gitlab.com/blockops/compute_unit/-/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: