compositional-explanations 0.0.2__tar.gz → 0.0.3.1__tar.gz

{compositional_explanations-0.0.2/src/compositional_explanations.egg-info → compositional_explanations-0.0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: compositional_explanations
-Version: 0.0.2
+Version: 0.0.3.1
 Summary: Package to compute Compositional Explanations both in their optimal and beam format.
 Author-email: Biagio La Rosa <bilarosa@ucsc.edu>
 License: MIT

{compositional_explanations-0.0.2 → compositional_explanations-0.0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "compositional_explanations"
-version = "0.0.2"
+version = "0.0.3.1"
 authors = [
   { name="Biagio La Rosa", email="bilarosa@ucsc.edu" },
 ]

{compositional_explanations-0.0.2 → compositional_explanations-0.0.3.1}/src/compositional_explanations/metrics.py

@@ -7,7 +7,7 @@ import functools
 
 import torch
 
-from utils import mask_utils
+from package_utils import mask_utils
 
 
 @functools.lru_cache(maxsize=10)

{compositional_explanations-0.0.2 → compositional_explanations-0.0.3.1}/src/compositional_explanations/optimal.py

@@ -8,8 +8,8 @@ import torch
 
 from compositional_explanations import formula as F
 from compositional_explanations import path_heuristic
-from utils import optimal_utils, mask_utils
-from utils.constants import INDEX_OR, INDEX_AND, INDEX_NOT
+from package_utils import optimal_utils, mask_utils, general_utils
+from package_utils.constants import INDEX_OR, INDEX_AND, INDEX_NOT
 
 
 def update_frontier_by_ancestors(
@@ -924,7 +924,7 @@ def compute_optimal_explanations(*, masks, bitmaps, disjoint_info, length, devic
     bitmaps = bitmaps.to(device)
     
     masks_info = mask_utils.get_dataset_info(masks, cache_dir)
-    max_size_mask = torch.numel(masks[0])
+    max_size_mask = torch.numel(general_utils.parse_mask_by_type(masks[0]))
 
     # Get quantities
     neuron_quantities, concept_quantities = optimal_utils.get_optimal_heuristic_info(

{compositional_explanations-0.0.2 → compositional_explanations-0.0.3.1}/src/compositional_explanations/optimal_sample_heuristic.py

@@ -3,9 +3,9 @@
 
 import numpy as np
 
-from utils import optimal_utils
+from package_utils import optimal_utils
 from compositional_explanations import formula as F
-from utils.constants import (
+from package_utils.constants import (
     TOP_INDEX_SAMPLE,
     BOTTOM_INDEX_SAMPLE,
     BOTTOM_INDEX_SUM,
@@ -227,7 +227,7 @@ def estimate_label_info(label, left_quantities, right_quantities, neuron_quantit
 
     # Quantities used by all the operators
     _, neuron_common_tuple, _, _, common_space_extras_tuple, _ = neuron_quantities
-    neuron_common, _ = neuron_common_tuple
+    neuron_common, neuron_common_sum = neuron_common_tuple
     common_space_extras, _ = common_space_extras_tuple
     max_left_common_intersection = optimal_utils.get_quantity(
         label_info=left_quantities,
@@ -308,6 +308,18 @@ def estimate_label_info(label, left_quantities, right_quantities, neuron_quantit
     )
 
     if isinstance(label, F.Or):
+        max_right_common_intersection_sum = optimal_utils.get_quantity(
+            label_info=right_quantities,
+            quantity_name="common_intersection",
+            quantity_type="max",
+            quantity_scope="sum",
+        )
+        max_left_common_intersection_sum = optimal_utils.get_quantity(
+            label_info=left_quantities,
+            quantity_name="common_intersection",
+            quantity_type="max",
+            quantity_scope="sum",
+        )
         # Auxiliary info: Sum of the right quantities, right unique extras and intersection
         right_unique_intersection_sum = optimal_utils.get_quantity(
             label_info=right_quantities,
@@ -315,6 +327,19 @@ def estimate_label_info(label, left_quantities, right_quantities, neuron_quantit
             quantity_type="max",
             quantity_scope="sum",
         )
+
+        min_left_common_intersection_sum = optimal_utils.get_quantity(
+            label_info=left_quantities,
+            quantity_name="common_intersection",
+            quantity_type="min",
+            quantity_scope="sum",
+        )
+        min_right_common_intersection_sum = optimal_utils.get_quantity(
+            label_info=right_quantities,
+            quantity_name="common_intersection",
+            quantity_type="min",
+            quantity_scope="sum",
+        )
         right_unique_extras_sum = optimal_utils.get_quantity(
             label_info=right_quantities,
             quantity_name="unique_extras",
@@ -334,6 +359,24 @@ def estimate_label_info(label, left_quantities, right_quantities, neuron_quantit
             quantity_scope="sample",
         )
 
+        if (right_unique_intersection_sum == 0 and max_right_common_intersection_sum == 0) or (
+            left_unique_intersection_sum == 0 and max_left_common_intersection_sum == 0) or (
+            right_unique_intersection_sum == 0 and min_left_common_intersection_sum == neuron_common_sum
+            ) or (
+            left_unique_intersection_sum == 0 and min_right_common_intersection_sum == neuron_common_sum):
+            # If one of the two side does not change to the intersection, we can discard this formula because
+            # OR can't reduce the extras
+            return None
+        
+        left_can_be_improved = np.where(min_left_common_intersection < neuron_common, True, False) & np.where(min_right_common_intersection > 0, True, False)
+        right_can_be_improved = np.where(min_right_common_intersection < neuron_common, True, False) & np.where(min_left_common_intersection > 0, True, False)
+        if (right_unique_intersection_sum == 0 and not left_can_be_improved.any()) or (left_unique_intersection_sum == 0 and not right_can_be_improved.any()):
+            # If for a sample the min left intersection is already maximum, the right component cannot improve the score
+            # Similarly, if the minimum common intersection of the right element is 0, it cannot improve the score for that sample
+            return None
+
+
+
         # OR simply sums the unique elements
         unique_intersection = left_unique_intersection + right_unique_intersection # I^u(L) + I^u(c)
 

{compositional_explanations-0.0.2 → compositional_explanations-0.0.3.1}/src/compositional_explanations/optimal_sum_heuristic.py

@@ -2,9 +2,9 @@
 
 import numpy as np
 
-from utils import optimal_utils
+from package_utils import optimal_utils
 from compositional_explanations import formula as F
-from utils.constants import TOP_INDEX_SUM, BOTTOM_INDEX_SUM
+from package_utils.constants import TOP_INDEX_SUM, BOTTOM_INDEX_SUM
 
 
 def estimate_disjoint_label_info(label, *, left_quantities, right_quantities):
@@ -245,9 +245,25 @@ def estimate_label_info(label, *, left_quantities, right_quantities, neuron_quan
         quantity_type="max",
         quantity_scope="sum",
     )
+    min_left_common_intersection_sum = optimal_utils.get_quantity(
+        label_info=left_quantities,
+        quantity_name="common_intersection",
+        quantity_type="min",
+        quantity_scope="sum",
+    )
 
-    if isinstance(label, F.Or):
 
+    if isinstance(label, F.Or):
+        if (right_unique_intersection_sum == 0 and max_right_common_intersection_sum == 0) or (
+            left_unique_intersection_sum == 0 and max_left_common_intersection_sum == 0) or (
+            right_unique_intersection_sum == 0 and min_left_common_intersection_sum == neuron_common_sum
+            ) or (
+            left_unique_intersection_sum == 0 and min_right_common_intersection_sum == neuron_common_sum):
+            # If one of the two side does not change to the intersection, we can discard this formula because
+            # OR can't reduce the extras
+            return None
+        
+        
         # Unique elements are additive since they are disjoint
         unique_intersection_sum = left_unique_intersection_sum + right_unique_intersection_sum
         unique_extras_sum = left_unique_extras_sum + right_unique_extras_sum

{compositional_explanations-0.0.2 → compositional_explanations-0.0.3.1/src/compositional_explanations.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: compositional_explanations
-Version: 0.0.2
+Version: 0.0.3.1
 Summary: Package to compute Compositional Explanations both in their optimal and beam format.
 Author-email: Biagio La Rosa <bilarosa@ucsc.edu>
 License: MIT

{compositional_explanations-0.0.2 → compositional_explanations-0.0.3.1}/src/compositional_explanations.egg-info/SOURCES.txt

@@ -13,7 +13,7 @@ src/compositional_explanations.egg-info/SOURCES.txt
 src/compositional_explanations.egg-info/dependency_links.txt
 src/compositional_explanations.egg-info/requires.txt
 src/compositional_explanations.egg-info/top_level.txt
-src/utils/constants.py
-src/utils/general_utils.py
-src/utils/mask_utils.py
-src/utils/optimal_utils.py
+src/package_utils/constants.py
+src/package_utils/general_utils.py
+src/package_utils/mask_utils.py
+src/package_utils/optimal_utils.py

{compositional_explanations-0.0.2 → compositional_explanations-0.0.3.1}/src/compositional_explanations.egg-info/top_level.txt

@@ -1,2 +1,2 @@
 compositional_explanations
-utils
+package_utils

{compositional_explanations-0.0.2/src/utils → compositional_explanations-0.0.3.1/src/package_utils}/mask_utils.py

@@ -4,7 +4,7 @@ import pickle
 
 import torch
 
-from utils import general_utils
+from package_utils import general_utils
 from compositional_explanations import formula as F
 
 
@@ -24,6 +24,7 @@ def get_dataset_info(masks, info_directory):
             print("Loading dataset info from cache...")
             common_elements, unique_elements, uncoverable_elements = pickle.load(file)
     else:
+        print("Computing dataset info...")
         # Compute unique elements
         sum_elements = torch.zeros_like(
             general_utils.parse_mask_by_type(masks[1]), dtype=torch.int32

{compositional_explanations-0.0.2/src/utils → compositional_explanations-0.0.3.1/src/package_utils}/optimal_utils.py

@@ -7,8 +7,8 @@ import torch
 import numpy as np
 
 from compositional_explanations import formula as F
-from utils import general_utils
-from utils.constants import (
+from package_utils import general_utils
+from package_utils.constants import (
     QUANTITIES,
     INDEX_TUPLE_MAX,
     INDEX_TUPLE_MIN,