Add bylibrarydedupall

oo-method-test-split.py

@@ -41,9 +41,15 @@ class OOMethodTestDataset(datasets.ArrowBasedBuilder):
         datasets.BuilderConfig(
             name="bylibrarydedup",
             version=datasets.Version("1.0.0"),
+            description="Split so that library functions (those appearing in >1 exe) are used for training, and non-library functions are used for testing. Only one example per function name is retained per program.",
+        ),
+        datasets.BuilderConfig(
+            name="bylibrarydedupall",
+            version=datasets.Version("1.0.0"),
             description="Split so that library functions (those appearing in >1 exe) are used for training, and non-library functions are used for testing. Only one example per function name is retained.",
         )
 
+
     ]
 
     def __init__(self, *args, **kwargs):
@@ -123,11 +129,11 @@ class OOMethodTestDataset(datasets.ArrowBasedBuilder):
 
             ]
         
-        elif self.config.name in ["bylibrary", "bylibrarydedup"]:
+        elif self.config.name in ["bylibrary", "bylibrarydedup", "bylibrarydedupall"]:
             # A function (name) is a library function if it appears in more than one Exename
 
             # this is (('func', 'oo.exe'): 123)
-            testcount = set(zip(ds['Name'], ds['Exename']))
+            testcount = set(zip(ds['Name'], zip(ds['Binary'], ds['Exename'])))
 
             # sorted pairs by function name
             testcount = sorted(testcount, key=lambda x: x[0])
@@ -138,7 +144,12 @@ class OOMethodTestDataset(datasets.ArrowBasedBuilder):
             grouped = {k: [b for _,b in g] for k, g in grouped}
 
             library_func_names = {f for f, exes in grouped.items() if len(exes) > 1}
-            library_func_names_dedup = {(f, exes[0]) for f, exes in grouped.items() if len(exes) > 1}
+                                                  # Exename
+                                                  # v
+            library_func_names_dedup = {(f, exes[0][1]) for f, exes in grouped.items() if len(exes) > 1}
+                                                      # Binary
+                                                      # v
+            library_func_names_dedup_all = {(f, exes[0][0]) for f, exes in grouped.items() if len(exes) > 1}
             nonlibrary_func_names = {f for f, exes in grouped.items() if len(exes) == 1}
 
             train_filter_fun = None
@@ -146,6 +157,8 @@ class OOMethodTestDataset(datasets.ArrowBasedBuilder):
                 train_filter_fun = lambda r: r['Name'] in library_func_names
             elif self.config.name == "bylibrarydedup":
                 train_filter_fun = lambda r: (r['Name'], r['Exename']) in library_func_names_dedup
+            elif self.config.name == "bylibrarydedupall":
+                train_filter_fun = lambda r: (r['Name'], r['Binary']) in library_func_names_dedup_all
             else:
                 assert False, "Invalid configuration"