predicateneuron 0.1.0__tar.gz → 0.1.2__tar.gz

predicateneuron-0.1.2/.idea/workspace.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="559a1296-1549-4b57-aea7-e3c5fde5b111" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/predicateneuron.iml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/CITATION.cff" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/LICENSE" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pyproject.toml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/reference/original_tf.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/predicateneuron/__init__.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/predicateneuron/keras/__init__.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/predicateneuron/keras/functional.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/predicateneuron/keras/layers.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/predicateneuron/tf.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/predicateneuron/torch/__init__.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/predicateneuron/torch/functional.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/predicateneuron/torch/layers.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tests/test_keras.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tests/test_parity_with_original.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tests/test_torch.py" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectId" id="3L4p8byrBjmgCn1f0kxoOtLdrTO" />
+  <component name="ProjectViewState">
+    <option name="autoscrollFromSource" value="true" />
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="559a1296-1549-4b57-aea7-e3c5fde5b111" name="Changes" comment="" />
+      <created>1792723035825</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1792723035825</updated>
+      <workItem from="1792723037060" duration="8477000" />
+    </task>
+    <task id="LOCAL-00001" summary="-initial commit">
+      <created>1792727916775</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1792727916775</updated>
+    </task>
+    <task id="LOCAL-00002" summary="-fix tests">
+      <created>1792728400664</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1792728400664</updated>
+    </task>
+    <task id="LOCAL-00003" summary="-fix tests">
+      <created>1792729978834</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1792729978834</updated>
+    </task>
+    <task id="LOCAL-00004" summary="-fix docs">
+      <created>1792730252536</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1792730252536</updated>
+    </task>
+    <task id="LOCAL-00005" summary="-fix docs">
+      <created>1792739970105</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1792739970105</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="-initial commit" />
+    <MESSAGE value="-fix tests" />
+    <MESSAGE value="-fix docs" />
+    <option name="LAST_COMMIT_MESSAGE" value="-fix docs" />
+  </component>
+</project>

{predicateneuron-0.1.0 → predicateneuron-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: predicateneuron
-Version: 0.1.0
+Version: 0.1.2
 Summary: Differentiable predicate neuron (intersection / union / symmetric difference) and predicate layers for Keras, TensorFlow and PyTorch
 Project-URL: Homepage, https://github.com/IoannisKonstantoulas/predicateneuron
 Project-URL: Paper, https://TODO
@@ -70,10 +70,10 @@ from predicateneuron.torch import PredicateLayer
 
 model = torch.nn.Sequential(
     PredicateLayer(in_features=8, temperature=0.06, theta_init=0.5,
-                   hard_forward=False, hard_backward=False,
-                   torch.nn.Linear(28, 1),  # 8 inputs -> 8*7/2 = 28 pairs
-                   torch.nn.Sigmoid(),
-                   )
+                   hard_forward=False, hard_backward=False),
+    torch.nn.Linear(28, 1),  # 8 inputs -> 8*7/2 = 28 pairs
+    torch.nn.Sigmoid(),
+)
 ```
 
 Inputs are expected to lie in [0, 1], for example sigmoid outputs or normalized features.
@@ -100,7 +100,7 @@ Two independent switches control how the neuron behaves.
 | `hard_backward`           | input gradients from the selected operation only     | input gradients from the exact derivative of the soft mixture       |
 
 The gradient with respect to `theta` always comes from the softmax surrogate, in every mode. All four combinations are
-valid. The defaults are (`hard_forward=False`, `hard_backward=False`)
+valid. The defaults are (`hard_forward=False`, `hard_backward=False`).
 
 ## Layers
 

{predicateneuron-0.1.0 → predicateneuron-0.1.2}/README.md

@@ -45,10 +45,10 @@ from predicateneuron.torch import PredicateLayer
 
 model = torch.nn.Sequential(
     PredicateLayer(in_features=8, temperature=0.06, theta_init=0.5,
-                   hard_forward=False, hard_backward=False,
-                   torch.nn.Linear(28, 1),  # 8 inputs -> 8*7/2 = 28 pairs
-                   torch.nn.Sigmoid(),
-                   )
+                   hard_forward=False, hard_backward=False),
+    torch.nn.Linear(28, 1),  # 8 inputs -> 8*7/2 = 28 pairs
+    torch.nn.Sigmoid(),
+)
 ```
 
 Inputs are expected to lie in [0, 1], for example sigmoid outputs or normalized features.
@@ -75,7 +75,7 @@ Two independent switches control how the neuron behaves.
 | `hard_backward`           | input gradients from the selected operation only     | input gradients from the exact derivative of the soft mixture       |
 
 The gradient with respect to `theta` always comes from the softmax surrogate, in every mode. All four combinations are
-valid. The defaults are (`hard_forward=False`, `hard_backward=False`)
+valid. The defaults are (`hard_forward=False`, `hard_backward=False`).
 
 ## Layers
 

{predicateneuron-0.1.0 → predicateneuron-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "predicateneuron"
-version = "0.1.0"
+version = "0.1.2"
 description = "Differentiable predicate neuron (intersection / union / symmetric difference) and predicate layers for Keras, TensorFlow and PyTorch"
 readme = "README.md"
 requires-python = ">=3.9"

{predicateneuron-0.1.0 → predicateneuron-0.1.2}/src/predicateneuron/__init__.py

@@ -5,4 +5,4 @@ from predicateneuron.keras import PredicateLayer, MinimalPredicateLayer, Minimal
 from predicateneuron.tf    import PredicateLayer, MinimalPredicateLayer, MinimalJointPredicateLayer   # tf.keras users
 from predicateneuron.torch import PredicateLayer, MinimalPredicateLayer, MinimalJointPredicateLayer   # PyTorch
 """
-__version__ = "0.1.0"
+__version__ = "0.1.2"

{predicateneuron-0.1.0 → predicateneuron-0.1.2}/src/predicateneuron/keras/functional.py

@@ -13,27 +13,25 @@ def predicate_neuron(x1, x2, theta, temperature=0.06, hard_forward=True, hard_ba
                                      (behaviour of the original paper code).
                 hard_backward=False: exact derivative of the soft mixture,
                                      sum_k p_k * d(op_k)/dx.
-    Implemented with stop_gradient, so it works on every Keras backend.
     """
+
     sg = ops.stop_gradient
 
     intersection = x1 * x2
     union = x1 + x2 - intersection
     symmetric_diff = x1 + x2 - 2.0 * intersection
 
-    # hard path (differentiable w.r.t. x only; the gate itself is a constant)
     t = sg(theta)
     gate = ops.where(t < 0.25, 0, ops.where(t < 0.75, 1, 2))
     y_hard = ops.where(gate == 0, intersection, ops.where(gate == 1, union, symmetric_diff))
 
-    # soft path
     positions = ops.cast(ops.convert_to_tensor([0.0, 0.5, 1.0]), x1.dtype)
     values = ops.stack([intersection, union, symmetric_diff], axis=-1)
     logits = -ops.square(ops.expand_dims(theta, -1) - positions) / temperature
     p = ops.softmax(logits, axis=-1)
-    y_soft_theta = ops.sum(sg(values) * p, axis=-1)    # gradient only to theta
-    y_soft_x = ops.sum(values * sg(p), axis=-1)        # gradient only to x
+    y_soft_theta = ops.sum(sg(values) * p, axis=-1)
+    y_soft_x = ops.sum(values * sg(p), axis=-1)
 
     forward = ops.where(hard_forward, y_hard, y_soft_theta)
-    y_x = ops.where(hard_backward, y_hard, y_soft_x)   # what x "sees" in backward
+    y_x = ops.where(hard_backward, y_hard, y_soft_x)
     return sg(forward) + (y_soft_theta - sg(y_soft_theta)) + (y_x - sg(y_x))

{predicateneuron-0.1.0 → predicateneuron-0.1.2}/src/predicateneuron/torch/functional.py

@@ -13,21 +13,22 @@ def predicate_neuron(x1, x2, theta, temperature=0.06, hard_forward=True, hard_ba
                                      (behaviour of the original paper code).
                 hard_backward=False: exact derivative of the soft mixture,
                                      sum_k p_k * d(op_k)/dx.
-    Works with autograd, torch.compile, double backward."""
+    """
+
     intersection = x1 * x2
     union = x1 + x2 - intersection
     symmetric_diff = x1 + x2 - 2.0 * intersection
 
     t = theta.detach()
-    gate = (t >= 0.25).long() + (t >= 0.75).long()  # 0,1,2 as in the original
+    gate = (t >= 0.25).long() + (t >= 0.75).long()
     y_hard = torch.where(gate == 0, intersection, torch.where(gate == 1, union, symmetric_diff))
 
     positions = torch.tensor([0.0, 0.5, 1.0], dtype=x1.dtype, device=x1.device)
     values = torch.stack([intersection, union, symmetric_diff], dim=-1)
     logits = -torch.square(theta.unsqueeze(-1) - positions) / temperature
     p = torch.softmax(logits, dim=-1)
-    y_soft_theta = (values.detach() * p).sum(dim=-1)  # gradient only to theta
-    y_soft_x = (values * p.detach()).sum(dim=-1)  # gradient only to x
+    y_soft_theta = (values.detach() * p).sum(dim=-1)
+    y_soft_x = (values * p.detach()).sum(dim=-1)
 
     hf = torch.as_tensor(hard_forward, dtype=torch.bool, device=x1.device)
     hb = torch.as_tensor(hard_backward, dtype=torch.bool, device=x1.device)

predicateneuron-0.1.0/.idea/workspace.xml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="559a1296-1549-4b57-aea7-e3c5fde5b111" name="Changes" comment="" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectId" id="3L4p8byrBjmgCn1f0kxoOtLdrTO" />
-  <component name="ProjectViewState">
-    <option name="autoscrollFromSource" value="true" />
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="559a1296-1549-4b57-aea7-e3c5fde5b111" name="Changes" comment="" />
-      <created>1792723035825</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1792723035825</updated>
-      <workItem from="1792723037060" duration="6169000" />
-    </task>
-    <task id="LOCAL-00001" summary="-initial commit">
-      <created>1792727916775</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1792727916775</updated>
-    </task>
-    <task id="LOCAL-00002" summary="-fix tests">
-      <created>1792728400664</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1792728400664</updated>
-    </task>
-    <option name="localTasksCounter" value="3" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="-initial commit" />
-    <MESSAGE value="-fix tests" />
-    <option name="LAST_COMMIT_MESSAGE" value="-fix tests" />
-  </component>
-</project>