Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bring GPU support to CMake and improve how Make handles the ROCm library build #671

Merged
merged 7 commits into from
Nov 27, 2023
Merged

Bring GPU support to CMake and improve how Make handles the ROCm library build #671

merged 7 commits into from
Nov 27, 2023

Conversation

imwints
Copy link
Contributor

@imwints imwints commented Nov 27, 2023

No description provided.

@imwints
Add GPU options for cmake based builds
2f59e61
@imwints
Remove ROCm object files with make clean/distclean
831be26
@imwints
Suppress all output from ROCm build
0585bc9 
Similar to including external include files with `-isystem`, ignore
output from ROCm build since these warnings aren't a concern here
@aristocratos
Copy link
Owner

@imwints
Great!
Let me know when ready to merge.

@imwints
Properly invoke CMake to build ROCm
6f12e35 
* Build an optimized library by default
* Only build the library target
* ROCm is build with debug symbols when `make DEBUG=true`
* Enable LTO
* Use the more generic CMake build command instead of calling make
  directly, this always uses all cores by default and makes it easier to
  switch to another generator e.g. Ninja
* Use a variable to store the ROCm source directory. The directory can
  be changed with `make ROCM_DIR=<dir>`
* The static library is now directly linked by CMake and not created off
  of the object files from a shared library build
* The C++ compiler used to compile btop is now used to compile ROCm to
  avoid name mangling when `CXX` from the environment and `make CXX=`
  differ
* CMake is invoked from btop's root directory
@imwints
Copy link
Contributor Author

imwints commented Nov 27, 2023

If CI passes this is done.
To sum up:

  • CMake can build with GPU support
  • CMake can statically link to ROCm
  • Improved the build of ROCm from Make
    • Only build the static library
    • Build an optimized library
    • Respect DEBUG=true
    • Build with LTO
    • Add clean/distclean for ROCm

@imwints
Copy link
Contributor Author

imwints commented Nov 27, 2023

@aristocratos
Also tried the 5.7.x branch of ROCm which at least compiles... I have no way of testing the runtime behavior.

@aristocratos aristocratos merged commit d1384c9 into aristocratos:main Nov 27, 2023
44 of 45 checks passed
@imwints imwints deleted the cmake-gpu branch November 28, 2023 16:12
aristocratos added a commit to joske/btop that referenced this pull request Jan 2, 2024
@aristocratos
Squashed commit of the following:
934a9e3 
commit 285fb21
Author: aristocratos <gnmjpl@gmail.com>
Date:   Thu Dec 28 13:10:18 2023 +0100

    Proc::draw() -> Use std::erase_if() instead of for loops

commit 2fba934
Author: aristocratos <gnmjpl@gmail.com>
Date:   Wed Dec 27 00:54:28 2023 +0100

    Fixed leftover code in GPU init logging false errors

commit ad14554
Author: aristocratos <gnmjpl@gmail.com>
Date:   Tue Dec 26 19:32:43 2023 +0100

    Try alternative names for GPU libraries during GPU init

commit a8fda16
Merge: e15e0b7 2796af3
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Tue Dec 26 19:19:14 2023 +0100

    Merge pull request aristocratos#696 from aristocratos/map_safety

commit 2796af3
Author: aristocratos <gnmjpl@gmail.com>
Date:   Tue Dec 26 19:18:37 2023 +0100

    Document DEBUG flag for Makefile

commit f484326
Merge: b4eb397 e15e0b7
Author: aristocratos <gnmjpl@gmail.com>
Date:   Tue Dec 26 19:11:26 2023 +0100

    Merge branch 'main' into map_safety

commit b4eb397
Author: aristocratos <gnmjpl@gmail.com>
Date:   Mon Dec 25 10:52:52 2023 +0100

    Fix errors

commit 3c04a7a
Author: aristocratos <gnmjpl@gmail.com>
Date:   Mon Dec 25 10:41:15 2023 +0100

    Added more checks and debug logging

commit 8b81c4a
Author: aristocratos <gnmjpl@gmail.com>
Date:   Mon Dec 25 03:28:35 2023 +0100

    Return const refs

commit f836233
Author: aristocratos <gnmjpl@gmail.com>
Date:   Mon Dec 25 02:49:24 2023 +0100

    Remove robin_hood.h

commit 3a8ceac
Author: aristocratos <gnmjpl@gmail.com>
Date:   Mon Dec 25 02:37:32 2023 +0100

    Fix call to compact and missing utility include

commit e15e0b7
Author: aristocratos <gnmjpl@gmail.com>
Date:   Mon Dec 25 02:27:38 2023 +0100

    Revert "Replace robin_hood map and set with STD alternative and add safeVal() function for map/vector access with fallback"

    This reverts commit 6c87ab6.

commit ced47a9
Author: aristocratos <gnmjpl@gmail.com>
Date:   Mon Dec 25 02:26:13 2023 +0100

    Replace robin_hood map and set with STD alternative and add safeVal() function for map/vector access with fallback

commit 6c87ab6
Author: aristocratos <gnmjpl@gmail.com>
Date:   Mon Dec 25 02:16:15 2023 +0100

    Replace robin_hood map and set with STD alternative and add safeVal() function for map/vector access with fallback

commit a232537
Merge: aab2e8c b598f02
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sun Dec 17 19:56:31 2023 +0100

    Merge pull request aristocratos#690 from aristocratos/osx-fix

commit b598f02
Merge: b1fe377 aab2e8c
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sun Dec 17 12:06:39 2023 +0100

    Merge branch 'main' into osx-fix

commit aab2e8c
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sun Dec 17 12:03:47 2023 +0100

    Fixed test-snap-can-build.yml

commit b1fe377
Merge: 7805242 2d15c41
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sun Dec 17 11:56:14 2023 +0100

    Merge branch 'main' into osx-fix

commit 2d15c41
Merge: fe699b4 2d3e453
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sun Dec 17 11:54:49 2023 +0100

    Merge pull request aristocratos#684 from kz6fittycent/main

commit 2d3e453
Merge: 0a38864 fe699b4
Author: kz6fittycent <jimmy.tigert@gmail.com>
Date:   Fri Dec 15 12:02:11 2023 -0600

    Merge branch 'main' into main

commit 0a38864
Author: kz6fittycent <jimmy.tigert@gmail.com>
Date:   Fri Dec 15 12:01:45 2023 -0600

    Update test-snap-can-build.yml

    whoops

commit 49f425f
Author: kz6fittycent <jimmy.tigert@gmail.com>
Date:   Fri Dec 15 12:00:48 2023 -0600

    Update test-snap-can-build.yml

    aristocratos#684 (comment)

commit 7805242
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Dec 15 09:02:57 2023 +0100

    conditional compile on Big Sur and up

commit fe699b4
Author: aristocratos <gnmjpl@gmail.com>
Date:   Tue Dec 12 23:20:09 2023 +0100

    Version bump to 1.3.0 in preparation for upcoming release

commit 2d2df23
Merge: d7b581e b71538e
Author: aristocratos <gnmjpl@gmail.com>
Date:   Tue Dec 12 23:19:31 2023 +0100

    Merge branch 'main' of github.com:aristocratos/btop

commit d7b581e
Author: aristocratos <gnmjpl@gmail.com>
Date:   Tue Dec 12 23:17:36 2023 +0100

    Updated changes

commit b71538e
Merge: a017056 730af5d
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Tue Dec 12 23:07:39 2023 +0100

    Merge pull request aristocratos#666 from muneebmahmed/macos-clang

commit 730af5d
Merge: 0246b1b a017056
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Tue Dec 12 23:05:52 2023 +0100

    Merge branch 'main' into macos-clang

commit a017056
Author: aristocratos <gnmjpl@gmail.com>
Date:   Tue Dec 12 23:05:07 2023 +0100

    Added swap to ignore for statvfs() since it will always fail

commit e770ccc
Author: aristocratos <gnmjpl@gmail.com>
Date:   Tue Dec 12 22:55:48 2023 +0100

    Added try->catch for get_zfs_stat_file() to avoid fs error

commit 0246b1b
Author: Muneeb Ahmed <32603485+muneebmahmed@users.noreply.github.com>
Date:   Mon Nov 20 12:18:40 2023 -0800

    Enable macos clang

    Apple clang uses different versioning from LLVM, so 15.0.0 is compatible

commit 6282f36
Merge: cfd20a3 be73160
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Tue Dec 12 22:06:02 2023 +0100

    Merge pull request aristocratos#675 from imwints/cmake

commit be73160
Merge: f4b14ce cfd20a3
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Tue Dec 12 22:01:21 2023 +0100

    Merge branch 'main' into cmake

commit 450b59b
Merge: 875f08b cfd20a3
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Tue Dec 12 21:55:27 2023 +0100

    Merge branch 'main' into main

commit cfd20a3
Merge: 14e664e b6a8696
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Tue Dec 12 21:48:55 2023 +0100

    Merge pull request aristocratos#677 from imwints/cpu-model

commit b6a8696
Merge: 8096433 14e664e
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Tue Dec 12 21:47:01 2023 +0100

    Merge branch 'main' into cpu-model

commit 14e664e
Merge: 0d35746 5902484
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Tue Dec 12 21:41:55 2023 +0100

    Merge pull request aristocratos#679 from masiboss/main

commit 875f08b
Author: kz6fittycent <jimmy.tigert@gmail.com>
Date:   Tue Dec 12 14:27:16 2023 -0600

    Update snapcraft.yaml - opengl

    - Testing opengl plug

commit 3ee4b18
Author: kz6fittycent <jimmy.tigert@gmail.com>
Date:   Tue Dec 12 14:14:59 2023 -0600

    Update bug_report.md

      - added snap info for bug reports to delineate

commit 2973a76
Merge: fb782a2 0d35746
Author: kz6fittycent <jimmy.tigert@gmail.com>
Date:   Tue Dec 12 14:06:44 2023 -0600

    Merge branch 'aristocratos:main' into main

commit fb782a2
Author: kz6fittycent <jimmy.tigert@gmail.com>
Date:   Tue Dec 12 14:02:27 2023 -0600

    Create test-snap-can-build.yml

commit 5902484
Author: masiboss <32394683+masiboss@users.noreply.github.com>
Date:   Thu Dec 7 21:42:11 2023 +0100

    simplify removal of "Apple"

commit 5beb9e1
Author: masiboss <32394683+masiboss@users.noreply.github.com>
Date:   Thu Dec 7 20:56:40 2023 +0100

    in case apple decides to add another suffix to the cpu name

commit 1b2f11b
Author: masiboss <32394683+masiboss@users.noreply.github.com>
Date:   Thu Dec 7 20:49:34 2023 +0100

    cut less of cpu name if frequency is not shown

commit bcf4ad8
Author: masiboss <32394683+masiboss@users.noreply.github.com>
Date:   Thu Dec 7 19:50:12 2023 +0100

    fix array out of bounds on regular m chip

commit aeefcac
Author: masiboss <32394683+masiboss@users.noreply.github.com>
Date:   Thu Dec 7 19:34:11 2023 +0100

    fix cpu version not included

commit 2369894
Author: masiboss <32394683+masiboss@users.noreply.github.com>
Date:   Thu Dec 7 19:23:58 2023 +0100

    strip "Apple" from name of Apple silicon chips

commit 8096433
Author: Steffen Winter <steffen.winter@proton.me>
Date:   Tue Dec 5 02:34:24 2023 +0100

    Fix printed model name for older Intel CPU

commit f4b14ce
Author: Steffen Winter <steffen.winter@proton.me>
Date:   Tue Dec 5 01:00:14 2023 +0100

    Add CMake compile instructions for macOS

commit 97b35d9
Author: Steffen Winter <steffen.winter@proton.me>
Date:   Sat Dec 2 00:35:13 2023 +0100

    Add cmake workflow for all platforms

commit e35538f
Author: Steffen Winter <steffen.winter@proton.me>
Date:   Sat Dec 2 00:34:32 2023 +0100

    Patch RPATH on FreeBSD, support OSX and format

commit 0d35746
Merge: ebc46ca 00f58b6
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Fri Dec 1 22:52:51 2023 +0100

    Merge pull request aristocratos#674 from imwints/bsd-workflow

    Provide FreeBSD static release binaries

commit 00f58b6
Author: Steffen Winter <steffen.winter@proton.me>
Date:   Thu Nov 30 23:07:52 2023 +0100

    Provide FreeBSD static release binaries

    Bumps vmaction@freesdb-vm to version 1 which runs on Linux and doesn't
    hang all the time. Also uses clang for full static compilation

commit ebc46ca
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Mon Nov 27 18:21:42 2023 +0100

    Clean up compile instructions

commit d1384c9
Merge: 2b0cc37 6f12e35
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Mon Nov 27 17:53:39 2023 +0100

    Merge pull request aristocratos#671 from imwints/cmake-gpu

    Bring GPU support to CMake and improve how Make handles the ROCm library build

commit 6f12e35
Author: Steffen Winter <steffen.winter@proton.me>
Date:   Mon Nov 27 00:33:11 2023 +0100

    Properly invoke CMake to build ROCm

    * Build an optimized library by default
    * Only build the library target
    * ROCm is build with debug symbols when `make DEBUG=true`
    * Enable LTO
    * Use the more generic CMake build command instead of calling make
      directly, this always uses all cores by default and makes it easier to
      switch to another generator e.g. Ninja
    * Use a variable to store the ROCm source directory. The directory can
      be changed with `make ROCM_DIR=<dir>`
    * The static library is now directly linked by CMake and not created off
      of the object files from a shared library build
    * The C++ compiler used to compile btop is now used to compile ROCm to
      avoid name mangling when `CXX` from the environment and `make CXX=`
      differ
    * CMake is invoked from btop's root directory

commit 0585bc9
Author: Steffen Winter <steffen.winter@proton.me>
Date:   Mon Nov 27 00:31:10 2023 +0100

    Suppress all output from ROCm build

    Similar to including external include files with `-isystem`, ignore
    output from ROCm build since these warnings aren't a concern here

commit 831be26
Author: Steffen Winter <steffen.winter@proton.me>
Date:   Mon Nov 27 00:29:14 2023 +0100

    Remove ROCm object files with `make clean/distclean`

commit 2f59e61
Author: Steffen Winter <steffen.winter@proton.me>
Date:   Sun Nov 26 22:56:58 2023 +0100

    Add GPU options for cmake based builds

commit 7588d96
Author: Steffen Winter <steffen.winter@proton.me>
Date:   Sun Nov 26 21:40:29 2023 +0100

    Add check for <ranges> header

commit ebbb769
Author: Steffen Winter <steffen.winter@proton.me>
Date:   Sun Nov 26 21:39:13 2023 +0100

    Move calls to find_package to where they're required

commit ed0fa34
Author: Steffen Winter <steffen.winter@proton.me>
Date:   Sun Nov 26 19:39:29 2023 +0100

    Bump required CMake version

commit 2b0cc37
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sat Nov 25 23:11:54 2023 +0100

    Update compile instructions for Gpu support

commit 359c671
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sat Nov 25 22:49:26 2023 +0100

    Update changelog

commit 5b01235
Merge: 0267eba 0bb8599
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sat Nov 25 21:57:32 2023 +0100

    Merge pull request aristocratos#529 from romner-set/main

    Add GPU monitoring support

commit 0bb8599
Merge: 94d4502 0267eba
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sat Nov 25 21:51:09 2023 +0100

    Merge branch 'main' into main

commit 94d4502
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sat Nov 25 21:48:50 2023 +0100

    Readme update and Makfile fixes.

commit 19bcff8
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sat Nov 25 21:01:11 2023 +0100

    Squashed commit of the following:

    commit 0267eba
    Merge: 50bbab0 e81cf2b
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Wed Nov 15 21:43:18 2023 +0100

        Merge pull request aristocratos#659 from ivanp7/patch-1

        Add alternative key codes for Delete, Insert, Home, End

    commit 50bbab0
    Merge: 9edbf27 5a14c7b
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Wed Nov 15 21:35:50 2023 +0100

        Merge pull request aristocratos#660 from stradicat/feature/elementarish

        Elementarish theme: color update according to Elementary palette

    commit 5a14c7b
    Merge: 979506f 71eb414
    Author: Dennis Mayr <dmayr.dev@gmail.com>
    Date:   Wed Nov 15 17:27:34 2023 -0300

        Merge branch 'main' of https://github.com/stradicat/btop

    commit 979506f
    Author: Dennis Mayr <dmayr.dev@gmail.com>
    Date:   Wed Nov 8 11:17:47 2023 -0300

        Elementarish theme: color update according to Elementary palette

    commit 71eb414
    Author: Dennis Mayr <dmayr.dev@gmail.com>
    Date:   Wed Nov 8 11:17:47 2023 -0300

        Elementarish theme: color update according to Elementary palette

    commit e81cf2b
    Author: vân <3432246+ivanp7@users.noreply.github.com>
    Date:   Tue Nov 7 15:12:27 2023 +0000

        Add alternative key codes for Insert, Home, End

    commit f9452ff
    Author: vân <3432246+ivanp7@users.noreply.github.com>
    Date:   Mon Nov 6 13:31:53 2023 +0000

        Add alternative Delete key code

        Delete key not always produces ^[[3~, on some terminals (like st) it produces ^[[P.

    commit 9edbf27
    Merge: 2a864f6 ff1f51c
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Sat Oct 21 02:09:55 2023 +0200

        Merge pull request aristocratos#649 from nobounce/workflow-timeout

        Set FreeBSD workflow timeout

    commit ff1f51c
    Author: Steffen Winter <steffen.winter@proton.me>
    Date:   Wed Oct 18 22:26:36 2023 +0200

        Set FreeBSD workflow timeout

        Recently the FreeBSD workflow has started to hang in a boot loop when
        the VM starts up. The issue is being tracked upstream but there is not
        response at the moment.

        To work around this set a timeout to not waste CI minutes. Other
        workflows might also want this change since they don't take 20 minutes
        anyway.

    commit 2a864f6
    Merge: 636eb25 b2bf8ef
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Sat Oct 7 10:40:54 2023 +0200

        Merge pull request aristocratos#643 from DecklynKern/main

        Fix scrollbar not clearing sometimes.

    commit b2bf8ef
    Author: DecklynKern <DecklynKern@gmail.com>
    Date:   Fri Oct 6 17:33:38 2023 -0600

        Fix scrollbar not clearing sometimes.

    commit 636eb25
    Merge: 260c0f6 b5ba2fc
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Sat Sep 30 19:51:03 2023 +0200

        Merge pull request aristocratos#623 from rahulaggarwal965/main

        Add keybind for toggling memory display mode in PROC box

    commit b5ba2fc
    Author: Rahul Aggarwal <rahulaggarwal965@gmail.com>
    Date:   Wed Sep 20 22:55:56 2023 -0400

        Add keybind for toggling memory display mode in PROC box

    commit 260c0f6
    Merge: 52bfff7 e6a06eb
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Sat Sep 30 18:56:25 2023 +0200

        Merge pull request aristocratos#635 from lvxnull/editorconfig

        Add hpp files to .editorconfig

    commit e6a06eb
    Author: lvxnull <86745229+lvxnull@users.noreply.github.com>
    Date:   Thu Sep 28 19:44:47 2023 +0200

        Add hpp files to .editorconfig

    commit 52bfff7
    Merge: 1f72e56 19dbbe1
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Sat Sep 30 18:55:08 2023 +0200

        Merge pull request aristocratos#636 from nobounce/performance-iili

        Minor string initialization improvement

    commit 19dbbe1
    Author: nobounce <steffen.winter@proton.me>
    Date:   Fri Sep 29 12:20:59 2023 +0200

        Minor string initialization improvement

    commit 1f72e56
    Merge: 278a0e6 cdcf8bc
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Fri Sep 29 10:43:21 2023 +0200

        Merge pull request aristocratos#633 from crestfallnatwork/main

        [fix] Made disks statvfs logic asynchronous.

    commit cdcf8bc
    Author: crestfalln <guptahiman01@gmail.com>
    Date:   Fri Sep 29 09:07:27 2023 +0530

        fixed bug where updated disks stats overrided disk io data

    commit 9b4e85f
    Author: crestfalln <no-reply@crestfalln.com>
    Date:   Thu Sep 28 04:57:05 2023 +0530

        fixed bug where updated disks stats overrided disk io data

    commit 8896238
    Author: crestfalln <no-reply@crestfalln.com>
    Date:   Wed Sep 27 23:57:06 2023 +0530

        made disks stat logic async

    commit 278a0e6
    Merge: d16adc9 e89519f
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Thu Sep 28 18:32:09 2023 +0200

        Merge pull request aristocratos#630 from lvxnull/signal-list

        Fix signal list on non-linux/weird linux platforms

    commit e89519f
    Author: lvxnull <86745229+lvxnull@users.noreply.github.com>
    Date:   Sun Sep 24 21:44:38 2023 +0200

        Fix signal list on non-linux/weird linux platforms

    commit d16adc9
    Merge: 2c3ac48 f34b408
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Thu Sep 28 18:20:42 2023 +0200

        Merge pull request aristocratos#618 from nobounce/aggregate-child-processes

        Add option to accumulate a child's resources in parent in tree-view

    commit f34b408
    Author: nobounce <steffen.winter@proton.me>
    Date:   Sun Sep 24 16:34:50 2023 +0200

        Make process thread count better readable when wider than 5 digits

    commit 6027ced
    Author: nobounce <steffen.winter@proton.me>
    Date:   Thu Sep 14 23:27:05 2023 +0200

        Add option to accumulate a child's resources in parent in tree-view

    commit 2c3ac48
    Merge: f90dc37 5c6a281
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Wed Sep 13 21:14:56 2023 +0200

        Merge pull request aristocratos#589 from nobounce/cmake

        Add CMake support for Linux

    commit f90dc37
    Merge: 0cac861 68a49c1
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Wed Sep 13 20:27:05 2023 +0200

        Merge pull request aristocratos#610 from SidVeld/feature/horizon-theme

        Horizon theme

    commit 5c6a281
    Author: nobounce <steffen.winter@proton.me>
    Date:   Tue Aug 29 20:39:00 2023 +0200

        Add CMake support

        Linux is completly supported

        FreeBSD is not able to create a static executable for now. See
        https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273398

        MacOS was not tested

    commit 68a49c1
    Author: SidVeld <sidveld@gmail.com>
    Date:   Wed Sep 6 18:03:31 2023 +0300

        Add horizon theme

    commit 0cac861
    Merge: 31be436 f798acd
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Tue Sep 5 19:27:38 2023 +0200

        Merge pull request aristocratos#609 from scorpion-26/byteconv

        Fix short conversion of 1000-1023 *iB

    commit f798acd
    Author: scorpion-26 <dev.scorpion26@gmail.com>
    Date:   Tue Sep 5 18:00:47 2023 +0200

        Fix short conversion of 1000-1023*iB

        floating_humanizer([1000-1024], true) with base 8 returns "2K", whereas it should return
        "1.0K" to align with other formats. The conversion is also broken for
        all other units(e.g. 1023M is also broken and returns "2G")

    commit 31be436
    Author: aristocratos <gnmjpl@gmail.com>
    Date:   Sun Aug 27 02:00:07 2023 +0200

        FreeBSD Github action 13.1 -> 13.2 and static libgcc and libstdc++

    commit fc523fd
    Author: aristocratos <gnmjpl@gmail.com>
    Date:   Sun Aug 27 01:36:26 2023 +0200

        Fix for FreeBSD github action not failing "correctly"...

commit b877726
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sat Nov 25 20:44:45 2023 +0100

    Added definition GPU_SUPPORT to toggle GPU related code

commit 0267eba
Merge: 50bbab0 e81cf2b
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Wed Nov 15 21:43:18 2023 +0100

    Merge pull request aristocratos#659 from ivanp7/patch-1

    Add alternative key codes for Delete, Insert, Home, End

commit 50bbab0
Merge: 9edbf27 5a14c7b
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Wed Nov 15 21:35:50 2023 +0100

    Merge pull request aristocratos#660 from stradicat/feature/elementarish

    Elementarish theme: color update according to Elementary palette

commit 5a14c7b
Merge: 979506f 71eb414
Author: Dennis Mayr <dmayr.dev@gmail.com>
Date:   Wed Nov 15 17:27:34 2023 -0300

    Merge branch 'main' of https://github.com/stradicat/btop

commit 979506f
Author: Dennis Mayr <dmayr.dev@gmail.com>
Date:   Wed Nov 8 11:17:47 2023 -0300

    Elementarish theme: color update according to Elementary palette

commit 71eb414
Author: Dennis Mayr <dmayr.dev@gmail.com>
Date:   Wed Nov 8 11:17:47 2023 -0300

    Elementarish theme: color update according to Elementary palette

commit e81cf2b
Author: vân <3432246+ivanp7@users.noreply.github.com>
Date:   Tue Nov 7 15:12:27 2023 +0000

    Add alternative key codes for Insert, Home, End

commit f9452ff
Author: vân <3432246+ivanp7@users.noreply.github.com>
Date:   Mon Nov 6 13:31:53 2023 +0000

    Add alternative Delete key code

    Delete key not always produces ^[[3~, on some terminals (like st) it produces ^[[P.

commit 9edbf27
Merge: 2a864f6 ff1f51c
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sat Oct 21 02:09:55 2023 +0200

    Merge pull request aristocratos#649 from nobounce/workflow-timeout

    Set FreeBSD workflow timeout

commit ff1f51c
Author: Steffen Winter <steffen.winter@proton.me>
Date:   Wed Oct 18 22:26:36 2023 +0200

    Set FreeBSD workflow timeout

    Recently the FreeBSD workflow has started to hang in a boot loop when
    the VM starts up. The issue is being tracked upstream but there is not
    response at the moment.

    To work around this set a timeout to not waste CI minutes. Other
    workflows might also want this change since they don't take 20 minutes
    anyway.

commit 2a864f6
Merge: 636eb25 b2bf8ef
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sat Oct 7 10:40:54 2023 +0200

    Merge pull request aristocratos#643 from DecklynKern/main

    Fix scrollbar not clearing sometimes.

commit b2bf8ef
Author: DecklynKern <DecklynKern@gmail.com>
Date:   Fri Oct 6 17:33:38 2023 -0600

    Fix scrollbar not clearing sometimes.

commit 636eb25
Merge: 260c0f6 b5ba2fc
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sat Sep 30 19:51:03 2023 +0200

    Merge pull request aristocratos#623 from rahulaggarwal965/main

    Add keybind for toggling memory display mode in PROC box

commit b5ba2fc
Author: Rahul Aggarwal <rahulaggarwal965@gmail.com>
Date:   Wed Sep 20 22:55:56 2023 -0400

    Add keybind for toggling memory display mode in PROC box

commit 260c0f6
Merge: 52bfff7 e6a06eb
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sat Sep 30 18:56:25 2023 +0200

    Merge pull request aristocratos#635 from lvxnull/editorconfig

    Add hpp files to .editorconfig

commit e6a06eb
Author: lvxnull <86745229+lvxnull@users.noreply.github.com>
Date:   Thu Sep 28 19:44:47 2023 +0200

    Add hpp files to .editorconfig

commit 52bfff7
Merge: 1f72e56 19dbbe1
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sat Sep 30 18:55:08 2023 +0200

    Merge pull request aristocratos#636 from nobounce/performance-iili

    Minor string initialization improvement

commit 19dbbe1
Author: nobounce <steffen.winter@proton.me>
Date:   Fri Sep 29 12:20:59 2023 +0200

    Minor string initialization improvement

commit 1f72e56
Merge: 278a0e6 cdcf8bc
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Fri Sep 29 10:43:21 2023 +0200

    Merge pull request aristocratos#633 from crestfallnatwork/main

    [fix] Made disks statvfs logic asynchronous.

commit cdcf8bc
Author: crestfalln <guptahiman01@gmail.com>
Date:   Fri Sep 29 09:07:27 2023 +0530

    fixed bug where updated disks stats overrided disk io data

commit 9b4e85f
Author: crestfalln <no-reply@crestfalln.com>
Date:   Thu Sep 28 04:57:05 2023 +0530

    fixed bug where updated disks stats overrided disk io data

commit 8896238
Author: crestfalln <no-reply@crestfalln.com>
Date:   Wed Sep 27 23:57:06 2023 +0530

    made disks stat logic async

commit 278a0e6
Merge: d16adc9 e89519f
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Thu Sep 28 18:32:09 2023 +0200

    Merge pull request aristocratos#630 from lvxnull/signal-list

    Fix signal list on non-linux/weird linux platforms

commit e89519f
Author: lvxnull <86745229+lvxnull@users.noreply.github.com>
Date:   Sun Sep 24 21:44:38 2023 +0200

    Fix signal list on non-linux/weird linux platforms

commit d16adc9
Merge: 2c3ac48 f34b408
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Thu Sep 28 18:20:42 2023 +0200

    Merge pull request aristocratos#618 from nobounce/aggregate-child-processes

    Add option to accumulate a child's resources in parent in tree-view

commit f34b408
Author: nobounce <steffen.winter@proton.me>
Date:   Sun Sep 24 16:34:50 2023 +0200

    Make process thread count better readable when wider than 5 digits

commit 6027ced
Author: nobounce <steffen.winter@proton.me>
Date:   Thu Sep 14 23:27:05 2023 +0200

    Add option to accumulate a child's resources in parent in tree-view

commit 2c3ac48
Merge: f90dc37 5c6a281
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Wed Sep 13 21:14:56 2023 +0200

    Merge pull request aristocratos#589 from nobounce/cmake

    Add CMake support for Linux

commit f90dc37
Merge: 0cac861 68a49c1
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Wed Sep 13 20:27:05 2023 +0200

    Merge pull request aristocratos#610 from SidVeld/feature/horizon-theme

    Horizon theme

commit 5c6a281
Author: nobounce <steffen.winter@proton.me>
Date:   Tue Aug 29 20:39:00 2023 +0200

    Add CMake support

    Linux is completly supported

    FreeBSD is not able to create a static executable for now. See
    https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273398

    MacOS was not tested

commit 68a49c1
Author: SidVeld <sidveld@gmail.com>
Date:   Wed Sep 6 18:03:31 2023 +0300

    Add horizon theme

commit 0cac861
Merge: 31be436 f798acd
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Tue Sep 5 19:27:38 2023 +0200

    Merge pull request aristocratos#609 from scorpion-26/byteconv

    Fix short conversion of 1000-1023 *iB

commit f798acd
Author: scorpion-26 <dev.scorpion26@gmail.com>
Date:   Tue Sep 5 18:00:47 2023 +0200

    Fix short conversion of 1000-1023*iB

    floating_humanizer([1000-1024], true) with base 8 returns "2K", whereas it should return
    "1.0K" to align with other formats. The conversion is also broken for
    all other units(e.g. 1023M is also broken and returns "2G")

commit 975525d
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sun Aug 27 12:34:46 2023 +0200

    Fix: Cpu gpu stats always shown when show_gpu_info is On and sizing issues

commit 08abf0b
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sun Aug 27 01:28:36 2023 +0200

    Quickfixes for MacOS and FreeBSD compilation.

commit 7290109
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sun Aug 27 00:58:30 2023 +0200

    Merge fix

commit 283d463
Merge: efddad4 c296ac1
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sun Aug 27 00:56:22 2023 +0200

    Merge branch 'main' into pr/romner-set/529

commit efddad4
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sun Aug 27 00:39:57 2023 +0200

    Changed: cpu_graph_lower Auto defaults to cpu_graph_upper when show_gpu_info is Off

commit a9bc087
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sun Aug 27 00:31:07 2023 +0200

    Added show_gpu_info setting and Auto options for cpu graphs

commit b3970ee
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sat Aug 26 20:52:59 2023 +0200

    Fixed: Key 5-0 gpu box toggle

commit bd5d697
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sat Aug 26 20:29:43 2023 +0200

    Squashed commit of the following:

    commit c296ac1
    Merge: 9a1e760 091c30a
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Sat Aug 26 19:29:57 2023 +0200

        Merge pull request aristocratos#590 from nobounce/dangling-reference-config

        Convert parameters and config keys to std::string_view

    commit 9a1e760
    Merge: 9c8af4d 22e64ca
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Sat Aug 26 19:20:18 2023 +0200

        Merge pull request aristocratos#602 from jfouquart/main

        Fix getting zfs pool name with '.' char in freebsd

    commit 9c8af4d
    Merge: 8a49d8c 2217cbe
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Sat Aug 26 19:18:55 2023 +0200

        Merge pull request aristocratos#601 from joske/cleanup

        [macos] don't check /sys on macos

    commit 8a49d8c
    Merge: 1556388 008fcd8
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Sat Aug 26 19:18:07 2023 +0200

        Merge pull request aristocratos#600 from joske/makefile

        [macos/freebsd] support gcc13

    commit 1556388
    Merge: 1b126f5 d17e1a2
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Sat Aug 26 19:14:00 2023 +0200

        Merge pull request aristocratos#599 from joske/main

        [macos] fix temp sensor on system with many cores

    commit d17e1a2
    Author: Jos Dehaes <jos.dehaes@gmail.com>
    Date:   Fri Aug 25 16:18:39 2023 +0200

        fix some warnings

    commit 4d8aa6b
    Author: Jos Dehaes <jos.dehaes@gmail.com>
    Date:   Fri Aug 25 15:52:58 2023 +0200

        fix core check

    commit 22e64ca
    Author: Jonathan Fouquart <jfouquart@hotmail.fr>
    Date:   Fri Aug 25 09:37:49 2023 +0200

        Fix getting zfs pool name with '.' char in freebsd

    commit 2217cbe
    Author: Jos Dehaes <jos.dehaes@gmail.com>
    Date:   Wed Aug 23 16:01:04 2023 +0200

        [macos] don't check /sys on macos

    commit 008fcd8
    Author: Jos Dehaes <jos.dehaes@gmail.com>
    Date:   Wed Aug 23 16:05:00 2023 +0200

        also add g++13

    commit 0fdca5e
    Author: Jos Dehaes <jos.dehaes@gmail.com>
    Date:   Wed Aug 23 15:54:07 2023 +0200

        support gcc13

    commit dcbdb73
    Author: Jos Dehaes <jos.dehaes@gmail.com>
    Date:   Wed Aug 23 15:46:47 2023 +0200

        [macos] fix temp sensor on system with many cores

    commit 1b126f5
    Author: aristocratos <gnmjpl@gmail.com>
    Date:   Fri Aug 4 01:08:27 2023 +0200

        Update Makefile for partial static compilation on freebsd

    commit c8ec6bb
    Author: aristocratos <gnmjpl@gmail.com>
    Date:   Thu Aug 3 23:08:33 2023 +0200

        Fix freebsd nullptr changes and makefile for gcc12 and newer

    commit 8a33aab
    Merge: 94e5c02 e4abcef
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Sun Jul 30 13:21:48 2023 +0200

        Merge pull request aristocratos#539 from nobounce/replace-NULL-nullptr

        Modernize using nullptr.

    commit 94e5c02
    Author: aristocratos <gnmjpl@gmail.com>
    Date:   Thu Jul 27 20:51:21 2023 +0200

        Better text editing

    commit 091c30a
    Author: nobounce <steffen.winter@proton.me>
    Date:   Thu Jul 27 14:17:54 2023 +0200

        Convert parameters and config keys to std::string_view

        Using std::string_view instead of std::string& silences a new warning
        from GCC 13, -Wdangling-reference

        Also switch return type of `getI` from int& to int, trivial types are
        cheaper to copy by value

    commit e4abcef
    Author: nobounce <steffen.winter@proton.me>
    Date:   Wed Jul 26 16:19:17 2023 +0200

        Use nullptr instead of NULL.

        See https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf
        TLDR: NULL is of type int and relies on proper implicit pointer
        conversion which may lead to issues when using overloaded functions

        It is also considered a 'best practise' for modern C++ and
        conveys the programmers intention more precisly.

    commit d53307f
    Author: nobounce <steffen.winter@proton.me>
    Date:   Sun Jul 23 19:53:36 2023 +0200

        Fix path to Linux CI file in itself

        The CI file has a list of dependent files including itself. The path was
        not updated when the CI was split into different files

    commit 594f42b
    Merge: aca2e4b 53d6eba
    Author: Jakob P. Liljenberg <admin@qvantnet.com>
    Date:   Wed Jul 26 15:38:01 2023 +0200

        Merge pull request aristocratos#584 from nobounce/nb/fix-ci-path

        Fix path to Linux CI file in itself

    commit aca2e4b
    Author: aristocratos <gnmjpl@gmail.com>
    Date:   Wed Jul 26 14:38:48 2023 +0200

        Fix whitespace indent -> tab indent

    commit 33faa01
    Author: aristocratos <gnmjpl@gmail.com>
    Date:   Wed Jul 26 14:34:15 2023 +0200

        Revert fmt submodule to static fmt folder in include

    commit 53d6eba
    Author: nobounce <steffen.winter@proton.me>
    Date:   Sun Jul 23 19:53:36 2023 +0200

        Fix path to Linux CI file in itself

        The CI file has a list of dependent files including itself. The path was
        not updated when the CI was split into different files

commit 346c9e4
Author: romner <roman@skotnica.com>
Date:   Wed Jul 19 16:53:58 2023 +0200

    Fix GPU text overflow in CPU panel, again

commit 3a5e5fd
Author: romner <roman@skotnica.com>
Date:   Wed Jul 19 16:22:45 2023 +0200

    Improve 0-10 key input

commit 972b2b6
Author: romner <roman@skotnica.com>
Date:   Wed Jul 19 15:54:35 2023 +0200

    Fix available boxes in menu & config description

commit 1f73453
Author: romner <roman@skotnica.com>
Date:   Wed Jul 19 15:34:23 2023 +0200

    Fix crashes when trying to open nth GPU box with only n-1 GPUs in the system

commit 46c6be0
Author: romner <roman@skotnica.com>
Date:   Sun Jul 16 17:19:09 2023 +0200

    Fix GPU horizontal text overflow in CPU panel

commit 85fb28c
Author: romner <roman@skotnica.com>
Date:   Fri Jul 14 02:39:44 2023 +0200

    Fix RSMI_STATIC=true and add GPU section to README.md

commit 3fad8a6
Author: romner-set <roman@skotnica.com>
Date:   Mon Jun 26 13:10:31 2023 +0200

    Add GPU options

commit 746f716
Author: romner-set <roman@skotnica.com>
Date:   Fri Jun 16 11:11:57 2023 +0200

    Remove lib/rocm_smi_lib and add instructions for obtaining it to README

commit d8ebbe1
Author: romner <roman@skotnica.com>
Date:   Thu Jun 8 20:24:01 2023 +0200

    Join NVML PCIe threads only if PCIe TX/RX is supported by GPU

commit be10989
Author: romner <roman@skotnica.com>
Date:   Tue Jun 6 19:47:07 2023 +0200

    Parallelize NVML PCIe TX/RX data collection

commit 85892a9
Author: aristocratos <gnmjpl@gmail.com>
Date:   Mon Jun 5 21:59:26 2023 +0200

    Fix type: ulong -> size_t and compare std::cmp_less

commit 85a10f0
Author: romner <roman@skotnica.com>
Date:   Fri Jun 2 16:14:24 2023 +0200

    Fix ROCm SMI makefile flags

commit cd69792
Author: romner <roman@skotnica.com>
Date:   Fri Jun 2 15:44:44 2023 +0200

    Fix error when ROCm SMI static compilation fails

commit daaa453
Author: romner <roman@skotnica.com>
Date:   Fri Jun 2 15:34:12 2023 +0200

    Load ROCm SMI dynamically by default, optionally statically compile and link

commit 093edfe
Author: aristocratos <gnmjpl@gmail.com>
Date:   Thu Jun 1 19:49:00 2023 +0200

    Minor changes in wording...

commit b9a4d31
Author: aristocratos <gnmjpl@gmail.com>
Date:   Thu Jun 1 19:37:53 2023 +0200

    Fix Makefile dependency order and layout

commit a0163ce
Author: romner <roman@skotnica.com>
Date:   Thu Jun 1 16:42:02 2023 +0200

    Statically link ROCm SMI

commit b2df069
Author: romner-set <roman@skotnica.com>
Date:   Thu Jun 1 03:41:56 2023 +0200

    Dynamically load NVML

commit 547f17d
Author: romner-set <roman@skotnica.com>
Date:   Tue May 30 18:24:50 2023 +0200

    Add more GPU graph types to the CPU panel

commit 842c761
Author: romner-set <roman@skotnica.com>
Date:   Mon May 22 09:46:20 2023 +0200

    Fix crash when all GPU panels are open but the CPU panel is closed

commit 8c96bd5
Author: romner <roman@skotnica.com>
Date:   Sun May 21 20:34:47 2023 +0200

    Handle GPUs which cannot report certain stats in GPU panel

commit 414d7eb
Author: romner <roman@skotnica.com>
Date:   Sun May 21 18:02:50 2023 +0200

    Handle GPUs which cannot report certain stats in btop_collect.cpp and CPU panel

commit 005de97
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sun May 21 13:58:11 2023 +0200

    Add missing fmt prefixes

commit 1fee2bc
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sun May 21 13:52:19 2023 +0200

    Add DebugTimer class and change some Logger::error calls to Logger::debug

commit 2e68c0b
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sat May 20 17:27:20 2023 +0200

    Fixed key > gpu_names check

commit 04ed16a
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sat May 20 17:15:45 2023 +0200

    Merged changes from main

commit 8c710a2
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sat May 20 01:41:04 2023 +0200

    Makefile auto detection and initial logic for excluding gpu code when libs are missing

commit 8bae1ec
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sat May 20 00:13:00 2023 +0200

    Fixed debug timer for gpu

commit 01acfd6
Author: romner-set <roman@skotnica.com>
Date:   Fri May 19 16:42:32 2023 +0200

    Bind GPU panel to 5,6,7,8,9,0 and fully implement multi-GPU support

commit 22a4639
Author: romner <roman@skotnica.com>
Date:   Thu May 18 16:07:05 2023 +0200

    Add GPU info to CPU panel

commit c352bf2
Author: romner-set <roman@skotnica.com>
Date:   Mon May 15 19:42:55 2023 +0200

    Add ROCm SMI backend for AMD GPU support

commit 917d568
Author: romner-set <roman@skotnica.com>
Date:   Mon May 15 13:58:54 2023 +0200

    Add multi-GPU support for NVML data collection

commit 2d27f2f
Author: romner <roman@skotnica.com>
Date:   Sun May 14 17:40:50 2023 +0200

    Fix crash when no nvidia GPU is detected

commit 0e0025a
Author: romner <roman@skotnica.com>
Date:   Sun May 14 17:31:39 2023 +0200

    Update makefile text, fix typo and adhere to contibuting guidelines

commit bcffcdf
Author: romner <roman@skotnica.com>
Date:   Sun May 14 16:53:06 2023 +0200

    Make GPU window's size dynamic and integrate it with the rest of btop

commit 95b3228
Author: romner <roman@skotnica.com>
Date:   Sat May 13 19:41:51 2023 +0200

    Improve GPU side panel

commit adcdc58
Author: romner <roman@skotnica.com>
Date:   Sat May 13 00:27:23 2023 +0200

    Add GPU side panel

commit d522a91
Author: romner <roman@skotnica.com>
Date:   Fri May 12 19:34:47 2023 +0200

    Add rudimentary, fullscreen single-GPU NVML utilization graph
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aristocratos aristocratos aristocratos approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@imwints @aristocratos