From 7e8d2d2c0e2e0730ce6734da4ee37546de18c8ad Mon Sep 17 00:00:00 2001
From: Fei Zheng <44449748+feizheng10@users.noreply.github.com>
Date: Mon, 10 Mar 2025 21:05:40 -0600
Subject: [PATCH] Fix counter collection inconsistency with rocprofv3

---
 src/rocprof_compute_soc/soc_base.py | 4 ++--
 src/utils/file_io.py                | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/rocprof_compute_soc/soc_base.py b/src/rocprof_compute_soc/soc_base.py
index ff6eff4eb8..eb7612f0cd 100644
--- a/src/rocprof_compute_soc/soc_base.py
+++ b/src/rocprof_compute_soc/soc_base.py
@@ -371,9 +371,9 @@ class CounterFile:
         return self.blocks[block].add(counter)
 
 
-# TODO: This is a HACK
+# FIXME: This is a HACK
 def using_v3():
-    return "ROCPROF" in os.environ.keys() and os.environ["ROCPROF"] == "rocprofv3"
+    return "ROCPROF" in os.environ.keys() and os.environ["ROCPROF"].endswith("rocprofv3")
 
 
 @demarcate
diff --git a/src/utils/file_io.py b/src/utils/file_io.py
index 982a3d85e5..8aa2f5acb1 100644
--- a/src/utils/file_io.py
+++ b/src/utils/file_io.py
@@ -224,7 +224,8 @@ def create_df_pmc(
                     dfs.append(tmp_df)
                     coll_levels.append(f[:-4])
 
-        final_df = pd.concat(dfs, keys=coll_levels, axis=1, copy=False)
+        # TODO: double check the case if all tmp_df.shape[0] are not on the same page
+        final_df = pd.concat(dfs, keys=coll_levels, axis=1, join="inner", copy=False)
         if verbose >= 2:
             console_debug("pmc_raw_data final_single_df %s" % final_df.info)
         return final_df