amdgpu_fan 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f57ebc2011d08efe82baa67964bf75a17dfe7c85a518249a93c7b6eeadf207e
-  data.tar.gz: 1e1fa6d5af4f3cecc5346003949eb4a1edeb1c1ef943e60478f09cd8e3600099
+  metadata.gz: a499ce52639612b25843b04c3497c7c36f23f3a960d0946b7dc2e249e9a18874
+  data.tar.gz: fa87ca342988d97a91773b1272829a3b825b88dbd65420d6abd26fed8d97ac92
 SHA512:
-  metadata.gz: a185688066129ae01860f6dcf15fa75d84b5441f0cf3fbf23df812986c8da194eb6ed00557afe607299d6d3640beed3b5dc60483b1e6155d09d4e40180865793
-  data.tar.gz: 2ef75cd3c949fd579eaf855c63ca985a1ddff172e41fceb46dd10b5f1177e0ddaf7f74427e3ce64c26a86ac15da473806f400014abaf428fb7275f075cd79069
+  metadata.gz: 06b3bd73191b39da57ac9c14e7ada8fa2cf1a069e8401f45af10eab6ede0bf79a5ebd2f80ba5c464e60f960e24d11783cf20d698c640a38e36c80846b305772e
+  data.tar.gz: 794e28fd6ae71a898b1e897a0fd612add4585e901ece8bc3928e62de9d8245107767848352fe7203d4aa5b6ec60c4e78b28523cc0c893d4d0bcb2f67fdd52044

data/README.md

@@ -93,7 +93,7 @@ And now the watch is ended.
 
 - [Ruby](https://www.ruby-lang.org) with [Bundler](https://bundler.io)
 - [Thor](http://whatisthor.com/) (installed with `bundle install`)
-- [`lspci`](https://linux.die.net/man/8/lspci) (included with most Linux distributions)
+- Internet connection - Device info is retrieved from https://pci-ids.ucw.cz/
 
 ## Building a binary
 

data/config/environment.rb

@@ -10,5 +10,6 @@ require_relative '../lib/amdgpu_fan/mixin/sys_write'
 
 require_relative '../lib/amdgpu_fan/service'
 require_relative '../lib/amdgpu_fan/cli'
+require_relative '../lib/amdgpu_fan/pci'
 require_relative '../lib/amdgpu_fan/stat_set'
 require_relative '../lib/amdgpu_fan/watcher'

data/lib/amdgpu_fan/cli.rb

@@ -7,7 +7,7 @@ module AmdgpuFan
   class Cli < Thor
     include CliOutputFormat
 
-    ICONS = YAML.load(File.read(File.join(__dir__, '../../config/icons.yml')))
+    ICONS = YAML.safe_load(File.read(File.join(__dir__, '../../config/icons.yml')))
                 .transform_keys(&:to_sym).freeze
     WATCH_FIELD_SEPARATOR = ' | '
 
@@ -57,13 +57,13 @@ module AmdgpuFan
     def status(option = nil)
       puts radeon_logo if option == '--logo'
       puts ICONS[:gpu] + ' GPU:'.ljust(9) + amdgpu_service.name,
-           ICONS[:vbios]+ ' vBIOS:'.ljust(9) + amdgpu_service.vbios_version,
-           ICONS[:display]  + ' Displays:' + amdgpu_service.display_names.join(', '),
+           ICONS[:vbios] + ' vBIOS:'.ljust(9) + amdgpu_service.vbios_version,
+           ICONS[:display] + ' Displays:' + amdgpu_service.display_names.join(', '),
            ICONS[:clock] + ' Clocks:'.ljust(9) + clock_status,
            ICONS[:memory] + ' Memory:'.ljust(9) + mem_total_mibibyes,
            ICONS[:fan] + ' Fan:'.ljust(9) + fan_status,
            ICONS[:temp] + ' Temp:'.ljust(9) + "#{amdgpu_service.temperature}°C",
-           ICONS[:power] + ' Power:'.ljust(9) +  "#{amdgpu_service.profile_mode} profile in " \
+           ICONS[:power] + ' Power:'.ljust(9) + "#{amdgpu_service.profile_mode} profile in " \
             "#{amdgpu_service.power_dpm_state} mode using " \
             "#{amdgpu_service.power_draw} / #{amdgpu_service.power_max} Watts "\
             "(#{amdgpu_service.power_draw_percent}%)",

data/lib/amdgpu_fan/connector.rb

@@ -11,7 +11,6 @@ module AmdgpuFan
       index_range: (54..125)
     }.freeze
 
-
     attr_reader :card_num, :dir_path, :index, :type
 
     class << self

data/lib/amdgpu_fan/mixin/fan.rb

@@ -4,7 +4,6 @@ module AmdgpuFan
   ##
   # A mixin to read fan details and validate input
   module Fan
-
     private
 
     def fan_file(type)

data/lib/amdgpu_fan/mixin/sys_write.rb

@@ -3,11 +3,10 @@
 module AmdgpuFan
   # A mixin to help with writing to system files
   module SysWrite
-
     private
 
     ##
-    # Write to a system file with elevated priviledges. 
+    # Write to a system file with elevated priviledges.
     def sudo_write(file_path, value)
       `echo "#{value}" | sudo tee #{file_path}`
     end

data/lib/amdgpu_fan/pci.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'net/http'
+
+module AmdgpuFan
+  ## PCI
+  #
+  # Retrieve device information from PCI IDs.
+  # https://pci-ids.ucw.cz/
+  #
+  class PCI
+    TMP_FILE = '/tmp/pci.ids.txt'
+    URL = 'https://pci-ids.ucw.cz/v2.2/pci.ids'
+
+    ##
+    # Return the device name if available
+    #
+    def self.device_name(vendor_id, device_id, subdevice_id)
+      device = info.dig vendor_id, :devices, device_id
+
+      device.dig(subdevice_id, :name) || device[:name]
+    end
+
+    def self.vendor_name(vendor_id)
+      info.dig vendor_id, :name
+    end
+
+    def self.info
+      current_vendor_id = nil
+      current_device_id = nil
+
+      @info = raw.each_line.with_object({}) do |line, hash|
+        next if line.empty? || line.start_with?('#')
+
+        if line[0] =~ /(\d|[a-z])/
+          # Vendor line
+          current_vendor_id = line.split('  ').first.to_i(16)
+          vendor_name = line.split('  ').last.strip
+          hash[current_vendor_id] = { name: vendor_name, devices: {} }
+        elsif line[0..1] =~ /\t\w/
+          # Device line
+          current_device_id = line.split('  ').first.to_i(16)
+          device_name = line.split('  ').last.strip
+          hash[current_vendor_id][:devices][current_device_id] = { name: device_name }
+        elsif line[0..2] =~ /\t\t\w/
+          # Subvendor line
+          subvendor_id = line.split(' ').first.to_i(16)
+          subdevice_id = line.split(' ')[1].to_i(16)
+          subdevice_name = line.split('  ')[1].strip
+          hash[current_vendor_id][:devices][current_device_id][subdevice_id] =
+            { name: subdevice_name }
+        end
+      end
+    end
+
+    def self.raw
+      File.write(TMP_FILE, Net::HTTP.get(URI(URL))) unless File.exist?(TMP_FILE)
+
+      @raw ||= File.read(TMP_FILE)
+    end
+  end
+end

data/lib/amdgpu_fan/service.rb

@@ -4,6 +4,7 @@ require_relative 'mixin/fan'
 require_relative 'mixin/sys_write'
 
 require_relative 'connector'
+require_relative 'pci'
 
 module AmdgpuFan
   ## AmdgpuService
@@ -45,10 +46,16 @@ module AmdgpuFan
       FAN_MODES[File.read(fan_mode_file).strip] || 'unknown'
     end
 
+    ##
+    # Set the fan mode to auto or manual.
+    #
     def fan_mode=(mode)
       sudo_write fan_mode_file, FAN_MODES.key(mode.to_s)
     end
 
+    ##
+    # Set the fan speed to a percentage if <= 100 or a raw value
+    #
     def fan_speed=(value)
       if valid_fan_percent_speed?(value)
         new_raw = (value.to_f / 100 * fan_raw_speeds(:max).to_i).round
@@ -67,20 +74,37 @@ module AmdgpuFan
       (fan_speed_raw.to_f / fan_raw_speeds(:max).to_i * 100).round
     end
 
+    ##
+    # Return the fan speed in revolutions per minute
+    #
     def fan_speed_rpm
       File.read(fan_file(:input)).strip
     end
 
+    ##
+    # Return the current memory clock speed.
+    #
     def memory_clock
       clock_from_pp_file "#{base_card_dir}/pp_dpm_mclk"
     end
 
+    ##
+    # Return the total memory on the card in bytes
+    #
     def memory_total
       File.read("#{base_card_dir}/mem_info_vram_total").to_i
     end
 
+    def model_id
+      @model_id ||= File.read(File.join(base_card_dir, '/subsystem_device')).gsub(/\A0x/, '').upcase
+    end
+
     def name
-      lspci_subsystem.split(': ')[1].strip
+      return 'Unknown' unless PCI.vendor_name(vendor_id)
+
+      [PCI.vendor_name(vendor_id),
+       PCI.device_name(vendor_id, device_id, subdevice_id) || 'unknown']
+        .join(' ')
     end
 
     def power_dpm_state
@@ -138,12 +162,8 @@ module AmdgpuFan
       File.read(file).slice(/\w+(?= \*)/)
     end
 
-    def gpu_pci_id
-      @gpu_pci_id ||= `lspci -v | grep VGA`.split(' ').first
-    end
-
-    def lspci_subsystem
-      @lspci_subsystem ||= `lspci -v -s #{gpu_pci_id} | grep "Subsystem:"`
+    def device_id
+      @device_id ||= File.read(File.join(base_card_dir, 'device')).to_i(16)
     end
 
     def power_avg_file
@@ -154,8 +174,16 @@ module AmdgpuFan
       (raw_string.strip.to_f / 1_000_000).round(2)
     end
 
+    def subdevice_id
+      @subdevice_id ||= File.read(File.join(base_card_dir, 'subsystem_device')).to_i(16)
+    end
+
     def temperature_file
       @temperature_file ||= Dir.glob("#{base_card_dir}/**/temp1_input").first
     end
+
+    def vendor_id
+      @vendor_id ||= File.read(File.join(base_card_dir, 'vendor')).to_i(16)
+    end
   end
 end

data/lib/amdgpu_fan/stat_set.rb

@@ -18,7 +18,7 @@ module AmdgpuFan
     # Return a string containing all the stats with units.
     #
     def to_s
-      stats.map { |k,v| "#{k}: #{v.to_s.rjust(6)} #{unit.ljust(3)} " }.join
+      stats.map { |k, v| "#{k}: #{v.to_s.rjust(6)} #{unit.ljust(3)} " }.join
     end
   end
 end

data/lib/amdgpu_fan/version.rb

@@ -2,5 +2,5 @@
 
 module AmdgpuFan
   # Current version of RSpec Core, in semantic versioning format.
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/amdgpu_fan/watcher.rb

@@ -47,8 +47,8 @@ module AmdgpuFan
 
       stat_set.min = stat_set.now if stat_set.now < stat_set.min
       stat_set.avg =
-       ((stat_set.now + stat_set.avg * (num_measurements - 1)) / num_measurements.to_f)
-         .round(1)
+        ((stat_set.now + stat_set.avg * (num_measurements - 1)) / num_measurements.to_f)
+        .round(1)
       stat_set.max = stat_set.now if stat_set.now > stat_set.max
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amdgpu_fan
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Kevin McCormack
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -69,6 +69,7 @@ files:
 - lib/amdgpu_fan/mixin/cli_output_format.rb
 - lib/amdgpu_fan/mixin/fan.rb
 - lib/amdgpu_fan/mixin/sys_write.rb
+- lib/amdgpu_fan/pci.rb
 - lib/amdgpu_fan/service.rb
 - lib/amdgpu_fan/stat_set.rb
 - lib/amdgpu_fan/version.rb
@@ -77,7 +78,7 @@ homepage: https://github.com/HarlemSquirrel/amdgpu-fan-rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A CLI to view and set fan speeds for AMD graphics cards running on the open
   source amdgpu Linux driver