amdgpu_fan 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fb09354467c6ffeb603c4cbc72b131c626e83d4403148ebeb5fac342222ac29
-  data.tar.gz: b62420cbf660f704682f34565128c749216bb5605b3d57b843f4bc85671aa09c
+  metadata.gz: c56a24ac7feceacab33c70e7a59e6126653f9a8507f468a3ea948e2372b24ec1
+  data.tar.gz: 4c5b6634b9d805d0bcf5de22346b6865aae9d54aea515f75c25ff5476916de6b
 SHA512:
-  metadata.gz: f9a94891e8024c9e2c58c46feb4b7654e69978a9215278d9588065db177e8df447670cad9be726f608f16bd77f4a26e2a05fe16c536ce42bce0c9242489d2b43
-  data.tar.gz: 8046858789272ed17ce75304f53ee3915973193bc81bd301335448456c99bd8d4d774962668b2b98388a24301e158d4cffb18a65a28d27c7fd45c130c639740d
+  metadata.gz: 5fb3898d03b55097970f1cbffb1a9fe813e463564e905fa23025161aa783e73dfd9b03e0cd6842c2b69fc1552fbbd11cebcc8318a139e33d5868cc41a30023a8
+  data.tar.gz: 6b8417efa976498f35d2fdc5eb4c8360f38a8a645c0b5b1586a5b6f190cacbb07360c2da76be56123cf49838ae483e760eeebaefe84e38d9d44eda1ba03de5ac

data/README.md

@@ -1,7 +1,8 @@
 # amdgpu_fan
 
 [![Gem Version](https://badge.fury.io/rb/amdgpu_fan.svg)](https://badge.fury.io/rb/amdgpu_fan)
-[![Build Status](https://travis-ci.org/HarlemSquirrel/amdgpu-fan-rb.svg?branch=master)](https://travis-ci.org/HarlemSquirrel/amdgpu-fan-rb) [![Maintainability](https://api.codeclimate.com/v1/badges/27233cee17ef6a2c14fd/maintainability)](https://codeclimate.com/github/HarlemSquirrel/amdgpu-fan-rb/maintainability)
+[![Verify](https://github.com/HarlemSquirrel/amdgpu-fan-rb/actions/workflows/verify.yml/badge.svg)](https://github.com/HarlemSquirrel/amdgpu-fan-rb/actions/workflows/verify.yml)
+[![Maintainability](https://api.codeclimate.com/v1/badges/27233cee17ef6a2c14fd/maintainability)](https://codeclimate.com/github/HarlemSquirrel/amdgpu-fan-rb/maintainability)
 
 A Ruby CLI to read and set fan speed, power profiles, and more for AMD Radeon graphics cards running on the AMDGPU Linux driver.
 

data/config/icons.yml

@@ -3,8 +3,8 @@ clock: ⏰
 display: 📺
 fan: 🌀
 gpu: 👾
-load: "⚖ "
+load: "🚚"
 memory: 💾
 power: ⚡
-temp: "🌡 "
+temp: "🧯"
 vbios: 📄

data/lib/amdgpu_fan/cli.rb

@@ -9,10 +9,14 @@ module AmdgpuFan
   class Cli < Thor
     include CliOutputFormat
 
-    ICONS = YAML.safe_load(File.read(File.join(__dir__, '../../config/icons.yml')))
+    ICONS = YAML.safe_load_file(File.join(__dir__, '../../config/icons.yml'))
                 .transform_keys(&:to_sym).freeze
     WATCH_FIELD_SEPARATOR = ' | '
 
+    def self.exit_on_failure?
+      true
+    end
+
     desc 'connectors', 'View the status of the display connectors.'
     def connectors
       amdgpu_service.connectors.each do |connector|
@@ -58,19 +62,19 @@ module AmdgpuFan
     desc 'status [--logo]', 'View device info, current fan speed, and temperature.'
     def status(option = nil)
       puts radeon_logo if option == '--logo'
-      puts ICONS[:gpu] + ' GPU:'.ljust(9) + amdgpu_service.name
-      puts ICONS[:vbios] + ' vBIOS:'.ljust(9) + amdgpu_service.vbios_version
-      puts "#{ICONS[:display]} Displays:#{amdgpu_service.display_names.join(', ')}"
-      puts ICONS[:clock] + ' Clocks:'.ljust(9) + clock_status
-      puts ICONS[:memory] + ' Memory:'.ljust(9) + mem_total_mibibyes
-      puts ICONS[:fan] + ' Fan:'.ljust(9) + fan_status
-      puts ICONS[:temp] + ' Temp:'.ljust(9) + "#{amdgpu_service.temperature}°C"
-      puts ICONS[:power] + ' Power:'.ljust(9) +
+      puts ICONS[:gpu] + ' GPU:'.ljust(11) + amdgpu_service.name
+      puts ICONS[:vbios] + ' vBIOS:'.ljust(11) + amdgpu_service.vbios_version
+      puts "#{ICONS[:display]} Displays: #{amdgpu_service.display_names.join(', ')}"
+      puts ICONS[:clock] + ' Clocks:'.ljust(11) + clock_status
+      puts ICONS[:memory] + ' Memory:'.ljust(11) + mem_total_mibibyes
+      puts ICONS[:fan] + ' Fan:'.ljust(11) + fan_status
+      puts ICONS[:temp] + ' Temp:'.ljust(11) + "#{amdgpu_service.temperature}°C"
+      puts ICONS[:power] + ' Power:'.ljust(11) +
            "#{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} / #{amdgpu_service.power_max} Watts " \
            "(#{amdgpu_service.power_draw_percent}%)"
-      puts ICONS[:load] + ' Load:'.ljust(9) + percent_meter(amdgpu_service.busy_percent)
+      puts ICONS[:load] + ' Load:'.ljust(11) + percent_meter(amdgpu_service.busy_percent, 12)
     end
 
     desc 'version', 'Print the application version.'
@@ -121,9 +125,10 @@ module AmdgpuFan
 
       loop do
         watcher.measure
-        5.times { print "\033[K\033[A" } # move up a line and clear to end of line
+        6.times { print "\033[K\033[A" } # move up a line and clear to end of line
 
-        puts "#{ICONS[:clock]} Core clock  #{watcher.core_clock}",
+        puts "#{ICONS[:load]} Load        #{watcher.busy_percent}",
+             "#{ICONS[:clock]} Core clock  #{watcher.core_clock}",
              "#{ICONS[:memory]} Memory clk  #{watcher.memory_clock}",
              "#{ICONS[:fan]} Fan speed   #{watcher.fan_speed_rpm}",
              "#{ICONS[:power]} Power usage #{watcher.power_draw}",
@@ -137,7 +142,7 @@ module AmdgpuFan
     def watch_csv(seconds = 1)
       return puts 'Seconds must be from 1 to 600' unless (1..600).cover?(seconds.to_i)
 
-      puts 'Timestamp,Core Clock (Mhz),Memory Clock (Mhz),Fan speed (rpm),'\
+      puts 'Timestamp,Core Clock (Mhz),Memory Clock (Mhz),Fan speed (rpm),' \
            'Load (%),Power (Watts),Temp (°C)'
 
       trap 'SIGINT' do
@@ -165,6 +170,7 @@ module AmdgpuFan
     private
 
     def amdgpu_service
+      # Right now we're only looking at the first card.
       @amdgpu_service ||= AmdgpuFan::Service.new
     end
 
@@ -186,7 +192,7 @@ module AmdgpuFan
     end
 
     def summary_clock
-      "Core: #{amdgpu_service.core_clock.to_s.rjust(7)}#{WATCH_FIELD_SEPARATOR}"\
+      "Core: #{amdgpu_service.core_clock.to_s.rjust(7)}#{WATCH_FIELD_SEPARATOR}" \
         "Memory: #{amdgpu_service.memory_clock.to_s.rjust(7)}"
     end
 
@@ -200,8 +206,8 @@ module AmdgpuFan
     end
 
     def summary_power
-      "Power: #{format('%<num>0.02f', num: amdgpu_service.power_draw).rjust(power_max.length)} W" \
-        " #{percent_meter amdgpu_service.power_draw_percent}"
+      "Power: #{format('%<num>0.02f', num: amdgpu_service.power_draw).rjust(power_max.length)} W " \
+        "#{percent_meter amdgpu_service.power_draw_percent}"
     end
 
     def summary_temp

data/lib/amdgpu_fan/service.rb

@@ -22,12 +22,16 @@ module AmdgpuFan
 
     class Error < StandardError; end
 
-    def initialize(card_num: 0)
-      @card_num = card_num
+    def self.card_numbers
+      Dir["#{BASE_FOLDER}/card*"].filter_map { |path| path.split('/').last.slice(/(?<=card)\d+\Z/) }
+    end
+
+    def initialize(card_num: nil)
+      @card_num = card_num || self.class.card_numbers.first
     end
 
     def busy_percent
-      File.read("#{base_card_dir}/gpu_busy_percent").strip
+      File.read("#{base_card_dir}/gpu_busy_percent").strip.to_i
     end
 
     def connectors

data/lib/amdgpu_fan/stat_set.rb

@@ -12,7 +12,7 @@ module AmdgpuFan
     end
 
     def stats
-      { min: min, avg: avg, max: max, now: now }
+      { min:, avg:, max:, now: }
     end
 
     ##

data/lib/amdgpu_fan/version.rb

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

data/lib/amdgpu_fan/watcher.rb

@@ -7,8 +7,8 @@ require_relative 'stat_set'
 module AmdgpuFan
   # Keep track of stats over time.
   class Watcher
-    attr_reader :core_clock, :fan_speed_rpm, :num_measurements, :memory_clock, :power_draw,
-                :temperature
+    attr_reader :core_clock, :fan_speed_rpm, :busy_percent, :num_measurements, :memory_clock,
+                :power_draw, :temperature
 
     def initialize(amdgpu_service)
       @amdgpu_service = amdgpu_service
@@ -17,6 +17,7 @@ module AmdgpuFan
       @core_clock = StatSet.new 'MHz'
       @memory_clock = StatSet.new 'MHz'
       @fan_speed_rpm = StatSet.new 'RPM'
+      @busy_percent = StatSet.new '%'
       @power_draw = StatSet.new 'W'
       @temperature = StatSet.new '°C'
     end
@@ -28,7 +29,7 @@ module AmdgpuFan
       @num_measurements += 1
 
       Async do |task|
-        %i[core_clock fan_speed_rpm memory_clock power_draw temperature].each do |stat|
+        %i[busy_percent core_clock fan_speed_rpm memory_clock power_draw temperature].each do |stat|
           task.async do
             send(stat).now = amdgpu_service.send(stat)
             calculate_stats(send(stat))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amdgpu_fan
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Kevin McCormack
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -30,70 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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: rspec
-  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: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.2'
 description: A CLI for interacting with the amdgpu Linux driver
 email: harlemsquirrel@gmail.com
 executables:
@@ -136,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A CLI to view and set fan speeds for AMD graphics cards running on the open