Reseted

Author: Ruaneri-Portela

.clang-format

@@ -0,0 +1,45 @@
+---
+# BasedOnStyle: LLVM
+Language: Cpp
+
+IndentWidth: 4
+ContinuationIndentWidth: 4
+UseTab: Never
+ColumnLimit: 130
+PPIndentWidth: -1
+
+AlignAfterOpenBracket: BlockIndent
+AlignOperands: AlignAfterOperator
+AllowShortBlocksOnASingleLine: Empty
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackLongBracedList: false
+BinPackParameters: OnePerLine
+ExperimentalAutoDetectBinPacking: true
+IndentPPDirectives: AfterHash
+NamespaceIndentation: All
+PenaltyReturnTypeOnItsOwnLine: 300
+PointerAlignment: Left
+QualifierAlignment: Left
+SpaceAfterTemplateKeyword: false
+SpaceBeforeCpp11BracedList: true
+
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex: '^".*"'
+    Priority: 1
+  - Regex: '^<[a-z0-9_]+>$'
+    Priority: 2
+  # Make sure 'net/if.h' comes before 'ifaddrs.h'
+  - Regex: '^<net/if\.h>$'
+    Priority: 3
+  - Regex: '^<[^/]+\.h>$'
+    Priority: 3
+    SortPriority: 4
+  - Regex: '^<(arpa|linux|net(inet)?|prop|sys|u?vm)/'
+    Priority: 3
+    SortPriority: 4
+  - Regex: '.*'
+    Priority: 5

CMakeLists.txt

@@ -67,7 +67,7 @@ if(BTOP_LTO)
 endif()
 
 if(APPLE)
-  target_sources(libbtop PRIVATE src/osx/btop_collect.cpp src/osx/sensors.cpp src/osx/smc.cpp)
+  target_sources(libbtop PRIVATE src/osx/btop_collect.cpp src/osx/sensors.cpp src/osx/smc.cpp src/osx/iokit.cpp src/osx/gpu.cpp)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD")
   target_sources(libbtop PRIVATE src/freebsd/btop_collect.cpp)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
@@ -161,35 +161,36 @@ find_package(Threads REQUIRED)
 target_link_libraries(libbtop Threads::Threads)
 
 # Enable GPU support
-if(LINUX AND BTOP_GPU)
+if(BTOP_GPU AND (LINUX OR APPLE))
   target_compile_definitions(libbtop PUBLIC GPU_SUPPORT)
-
-  if(BTOP_RSMI_STATIC)
-    # ROCm doesn't properly add it's folders to the module path if `CMAKE_MODULE_PATH` is already
-    # set
-    # We could also manually append ROCm's path here
-    set(_CMAKE_MODULE_PATH CMAKE_MODULE_PATH)
-    unset(CMAKE_MODULE_PATH)
-
-    # NOTE: This might be problematic in the future if other sub projects depend on this or if
-    # btop starts producing libraries
-    # Build a static ROCm library
-    set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
-
-    add_subdirectory(lib/rocm_smi_lib EXCLUDE_FROM_ALL)
-
-    add_library(ROCm INTERFACE)
-    # Export ROCm's properties to a target
-    target_compile_definitions(ROCm INTERFACE RSMI_STATIC)
-    target_include_directories(ROCm INTERFACE lib/rocm_smi_lib/include)
-    target_link_libraries(ROCm INTERFACE rocm_smi64)
-
-    set(CMAKE_MODULE_PATH _CMAKE_MODULE_PATH)
-
-    target_link_libraries(libbtop ROCm)
-  endif()
-  if(NOT BTOP_STATIC)
-    target_link_libraries(libbtop ${CMAKE_DL_LIBS})
+  if(LINUX)
+    if(BTOP_RSMI_STATIC)
+      # ROCm doesn't properly add it's folders to the module path if `CMAKE_MODULE_PATH` is already
+      # set
+      # We could also manually append ROCm's path here
+      set(_CMAKE_MODULE_PATH CMAKE_MODULE_PATH)
+      unset(CMAKE_MODULE_PATH)
+
+      # NOTE: This might be problematic in the future if other sub projects depend on this or if
+      # btop starts producing libraries
+      # Build a static ROCm library
+      set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+
+      add_subdirectory(lib/rocm_smi_lib EXCLUDE_FROM_ALL)
+
+      add_library(ROCm INTERFACE)
+      # Export ROCm's properties to a target
+      target_compile_definitions(ROCm INTERFACE RSMI_STATIC)
+      target_include_directories(ROCm INTERFACE lib/rocm_smi_lib/include)
+      target_link_libraries(ROCm INTERFACE rocm_smi64)
+
+      set(CMAKE_MODULE_PATH _CMAKE_MODULE_PATH)
+
+      target_link_libraries(libbtop ROCm)
+    endif()
+    if(NOT BTOP_STATIC)
+      target_link_libraries(libbtop ${CMAKE_DL_LIBS})
+    endif()
   endif()
 endif()
 

Makefile

@@ -43,9 +43,17 @@ ifeq ($(PLATFORM_LC)$(ARCH),linuxx86_64)
 		INTEL_GPU_SUPPORT := true
 	endif
 endif
+<<<<<<< HEAD
+
+ifeq ($(PLATFORM_LC)$(ARCH),macosarm64)
+	GPU_SUPPORT := true
+endif
+
+=======
 ifeq ($(PLATFORM_LC),macos)
 	GPU_SUPPORT := true
 endif
+>>>>>>> official
 ifneq ($(GPU_SUPPORT),true)
 	GPU_SUPPORT := false
 endif

src/btop.cpp

@@ -229,11 +229,18 @@ void clean_quit(int sig) {
 	}
 
 #ifdef GPU_SUPPORT
+#ifndef __APPLE__
 	Gpu::Nvml::shutdown();
 	Gpu::Rsmi::shutdown();
+<<<<<<< HEAD
+#else 
+	Gpu::IOAccelerator::shutdown();
+#endif
+=======
 	#ifdef __APPLE__
 	Gpu::AppleSilicon::shutdown();
 	#endif
+>>>>>>> official
 #endif