compute_unit 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82032a2c2110769430dd7b1a3f4b624227275eb5a3a3e62f6e0e42bdb41790c3
-  data.tar.gz: 7e45e2b1cd11b5cb0cfb40b00fee99a20ecc6e125064a2251372c4e14f22e1ca
+  metadata.gz: 95a51bd70b85087d18049b7fdcab55801859e1a6f240b58b3b26262431160b3d
+  data.tar.gz: 6c6da1daca1a6f46b3e9f651d0ca6c1ea9063cd78dc8ca0311cb68b99c6a6bb8
 SHA512:
-  metadata.gz: 8c818aa6ba28c5af8d57e8e99e4deb81a3eb4cc19532ce68d4888e6f644d780360c5568272667a9c5edc4807da90b49ee7c454c86164d925eab409c0332385c2
-  data.tar.gz: 2898757c00752709b8cfec4a4137f3bc65310d0e1af2a68637a1b3eba385f7e0188acb2790538b40e1fd2a650f65152175bfd99947cdd2d023baee3fa321aa64
+  metadata.gz: 7d7b0e432a47d65cae85ae48d86412702e037202404ece13c333495f805ed9eb75c4982e3d297d9f185ae24252b0bc559edb44a4b4168ceb5c70fbfb0c15ae3e
+  data.tar.gz: 4349a92b6b913d7e777ede290028bffcd6496392b2c8a7f63b36c9cec7e0d19dd7824013481a5d792d963e9138721b7ff9bec4ecf72a7f5efc4dab1bbe745c29

data/CHANGELOG.md

@@ -1,6 +1,28 @@
 # Compute Unit Changelog
 
 ## Unrleased
+## 0.4.0
+* Adds ability to list attached processes to compute_unit sorted by field
+* Adds ability to list top_x attached processes sorted by field
+
+## 0.3.3
+* Fix bug with default database not being created
+
+## 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

data/README.md

@@ -35,6 +35,12 @@ Or install it yourself as:
 
 ## Usage
 
+Ensure the pci database exist on your system.  You can update it at anytime with the built in linux command.
+
+`/usr/sbin/update-pciids` or the command from this gem `update_pcidb` installed in your gem bin directory.
+
+Additionally, when using the `ComputeUnit.find_all_with_database` method.
+
 Find all compute devices
 ```
 require 'compute_unit'

data/compute_unit.gemspec

@@ -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.md"
+  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.
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-
+  spec.add_dependency 'sys-proctable', '~> 1.2', '>= 1.2.0'
   spec.add_dependency 'opencl_ruby_ffi', '~> 1.3.4'
   spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 13'

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/misc/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
+    FileUtils.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/compute_base.rb

@@ -4,9 +4,12 @@ require 'time'
 require 'compute_unit/formatters'
 require 'compute_unit/logger'
 require 'compute_unit/device'
+require 'sys/proctable'
 
 module ComputeUnit
   class ComputeBase < Device
+    include Sys
+
     attr_reader :type, :serial, :meta, :uuid, :timestamp, :index, :compute_type
     attr_accessor :power_offset
 
@@ -26,6 +29,21 @@ module ComputeUnit
       end
     end
 
+    # @summary Finds all cpu attached processes and sorts by pctcpu
+    # @param field [Symbol] - the field to sort by
+    # @return [Array] - an array of attached processes
+    def attached_processes(_field = :pctcpu)
+      raise NotImplementedError
+    end
+
+    # @summary Find the processes consuming the most cpu
+    # @param x [Integer] the number of processes to return, defaults to 1
+    # @param field [Symbol] - the field to sort by
+    # @return [Array] - an array of attached processes
+    def top_processes(x = 1, field = :pctcpu)
+      attached_processes(field).last(x)
+    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,21 @@ 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
 
+    # @summary Finds all cpu attached processes and sorts by pctcpu
+    # @param field [Symbol] - the field to sort by
+    # @return [Array] - an array of attached processes
+    def attached_processes(field = :pctcpu)
+      Sys::ProcTable.ps(smaps: false).sort_by(&field)
+    end
+
     def model
       raw_cpu_data[:model_name]
     end

data/lib/compute_unit/device.rb

@@ -10,7 +10,7 @@ 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,
@@ -130,7 +130,7 @@ module ComputeUnit
     rescue Errno::EINVAL, Errno::EPERM
       default
     rescue Errno::ENOENT
-      logger.warn("File #{path} does not exist, using defaults")
+      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')
@@ -140,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
@@ -271,7 +271,7 @@ module ComputeUnit
                 logger.fatal(e.message)
                 default
               rescue Errno::ENOENT
-                logger.warn("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')

data/lib/compute_unit/gpu.rb

@@ -13,6 +13,17 @@ module ComputeUnit
       type
     end
 
+    # @summary Finds all cpu attached processes and sorts by pctcpu
+    # @param field [Symbol] - the field to sort by
+    # @return [Array] - an array of attached processes
+    def attached_processes(field = :pctcpu)
+      # looks for any fd device with dri or nvidia in the name
+      p = Sys::ProcTable.ps(smaps: false).find_all do |p|
+        p.fd.values.find { |f| f =~ %r{/dev/dri|nvidia\d+} }
+      end
+      p.sort_by(&field)
+    end
+
     # @return [OpenCL_Device]
     def opencl_device
       @opencl_device ||= self.class.opencl_devices.find_all { |cu| cu[:type] == make }[index] if use_opencl

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/version.rb

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

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: compute_unit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-07 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sys-proctable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: opencl_ruby_ffi
   requirement: !ruby/object:Gem::Requirement
@@ -113,13 +133,14 @@ files:
 - lib/compute_unit/monkey_patches.rb
 - lib/compute_unit/utils.rb
 - lib/compute_unit/version.rb
+- miner@192.168.0.119
 homepage: https://gitlab.com/blockops/compute_unit
 licenses:
 - MIT
 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.md
+  changelog_uri: https://gitlab.com/blockops/compute_unit/-/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: