#2338: determine ids of encoded objects via bit stripping

DARMA-tasking · Aug 27, 2024 · 7c7e96f · 7c7e96f
1 parent a596377
commit 7c7e96f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/src/vt/vrt/collection/balance/lb_data_holder.cc b/src/vt/vrt/collection/balance/lb_data_holder.cc
@@ -315,9 +315,18 @@ LBDataHolder::LBDataHolder(nlohmann::json const& j)
               task["entity"].find("collection_id") != task["entity"].end() and
               task["entity"].find("index") != task["entity"].end()
             ) {
-              elm = elm::ElmIDBits::createCollectionImpl(migratable, object, home, node);
+              using Field = uint64_t;
+              auto strippedObject = BitPackerType::getField<
+                                      vt::elm::eElmIDProxyBitsNonObjGroup::ID,
+                                      vt::elm::elm_id_num_bits,
+                                      Field
+                                    >(static_cast<Field>(object));
               auto cid = task["entity"]["collection_id"];
               auto idx = task["entity"]["index"];
+              elm = elm::ElmIDBits::createCollectionImpl(migratable,
+                                                         strippedObject,
+                                                         home,
+                                                         node);
               if (cid.is_number() && idx.is_array()) {
                 std::vector<uint64_t> arr = idx;
                 auto proxy = static_cast<VirtualProxyType>(cid);

diff --git a/src/vt/vrt/collection/balance/workload_replay.cc b/src/vt/vrt/collection/balance/workload_replay.cc
@@ -51,7 +51,6 @@
 #include <nlohmann/json.hpp>
 
 #include <set>
-#include <iostream>
 
 namespace vt { namespace vrt { namespace collection {
 namespace balance { namespace replay {
@@ -61,7 +60,6 @@ void replayWorkloads(
 ) {
   // read in object loads from json files
   auto const filename = theConfig()->getLBDataFileIn();
-  std::cout << "Reading in file: " << filename << std::endl;
   auto workloads = readInWorkloads(filename);
 
   // use the default stats handler

diff --git a/tests/unit/utils/test_bit_packing.nompi.cc b/tests/unit/utils/test_bit_packing.nompi.cc
@@ -44,6 +44,7 @@
 #include <gtest/gtest.h>
 
 #include "vt/utils/bits/bits_packer.h"
+#include "vt/elm/elm_id_bits.h"
 #include "test_harness.h"
 
 namespace vt { namespace tests { namespace unit {
@@ -125,4 +126,20 @@ TEST_F(TestBitPacking, test_bit_packing_dynamic_check_masking_5) {
   EXPECT_EQ(x, 0x0000FCCD0000FEEDull);
 }
 
+TEST_F(TestBitPacking, test_bit_packing_and_create_collection) {
+  using Field = uint64_t;
+  bool migratable = true;
+  int home = 0;
+  int node = 0;
+  auto seq_id = 3;
+  auto init_elm = elm::ElmIDBits::createCollectionImpl(migratable, seq_id, home, node);
+  auto derived_id = BitPackerType::getField<
+                                      vt::elm::eElmIDProxyBitsNonObjGroup::ID,
+                                      vt::elm::elm_id_num_bits,
+                                      Field
+                                   >(init_elm.id);
+  auto derived_elm = elm::ElmIDBits::createCollectionImpl(migratable, derived_id, home, node);
+  EXPECT_EQ(init_elm.id, derived_elm.id);
+}
+
 }}} /* end namespace vt::tests::unit */