fixes

LLNL · Jan 13, 2024 · 3456017 · 3456017
1 parent 11f5512
commit 3456017
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/src/variorum/AMD_GPU/amd_gpu_power_features.h b/src/variorum/AMD_GPU/amd_gpu_power_features.h
@@ -12,7 +12,6 @@
 
 #include <rocm_smi/rocm_smi.h>
 
-<<<<<<< Updated upstream
 void get_power_data(
     int chipid,
     int total_sockets,

diff --git a/src/variorum/Intel/clocks_features.h b/src/variorum/Intel/clocks_features.h
@@ -150,13 +150,15 @@ void get_available_frequencies_skx(
     off_t *msr_config_tdp_l2
 );
 
-int get_clocks_data_json(json_t *output,
-                         off_t msr_aperf,
-                         off_t msr_mperf,
-                         off_t msr_tsc,
-                         off_t msr_perf_status,
-                         off_t msr_platform_info,
-                         enum ctl_domains_e control_domain);
+int get_clocks_data_json(
+    json_t *output,
+    off_t msr_aperf,
+    off_t msr_mperf,
+    off_t msr_tsc,
+    off_t msr_perf_status,
+    off_t msr_platform_info,
+    enum ctl_domains_e control_domain
+);
 
 ///// @brief Print current p-state.
 /////

diff --git a/src/variorum/Nvidia_GPU/config_nvidia.c b/src/variorum/Nvidia_GPU/config_nvidia.c
@@ -33,7 +33,8 @@ int set_nvidia_func_ptrs(int idx)
         g_platform[idx].variorum_get_thermals_json = volta_get_thermals_json;
         g_platform[idx].variorum_get_frequency_json = volta_get_clocks_json;
         /* Initialize control interfaces */
-        g_platform[idx].variorum_cap_each_gpu_power_limit = volta_cap_each_gpu_power_limit;
+        g_platform[idx].variorum_cap_each_gpu_power_limit =
+            volta_cap_each_gpu_power_limit;
     }
     else
     {

diff --git a/src/variorum/Nvidia_GPU/nvidia_gpu_power_features.h b/src/variorum/Nvidia_GPU/nvidia_gpu_power_features.h
@@ -64,6 +64,9 @@ void nvidia_gpu_get_thermal_json(
     json_t *output
 );
 
-void nvidia_gpu_get_clocks_json(int chipid, json_t *output);
+void nvidia_gpu_get_clocks_json(
+    int chipid,
+    json_t *output
+);
 
 #endif