get test_network working

Author: Z80coder

neurallogic/symbolic_primitives.py

@@ -157,6 +157,11 @@ def binary_infix_operator(operator: str, a: str, b: float):
 def binary_infix_operator(operator: str, a: numpy.ndarray, b: jax.numpy.ndarray):
     return binary_infix_operator(operator, a, numpy.array(b))
 
+@dispatch
+def binary_infix_operator(operator: str, a: bool, b: str):
+    return binary_infix_operator(operator, str(a), b)
+
+
 
 def all_concrete_values(data):
     if isinstance(data, str):

tests/test_mnist.py

@@ -26,12 +26,11 @@ def nln(type, x, width):
     x = hard_or.or_layer(type)(width, nn.initializers.uniform(
         1.0), dtype=jnp.float32)(x)  # >=1700 need for >98% accuracy
     x = hard_not.not_layer(type)(10, dtype=jnp.float32)(x)
-    x = primitives.nl_ravel(type)(x)  # flatten the outputs of the not layer
+    x = x.ravel()  # flatten the outputs of the not layer
     # harden the outputs of the not layer
     x = harden_layer.harden_layer(type)(x)
-    x = primitives.nl_reshape(type)((10, width))(
-        x)  # reshape to 10 ports, 100 bits each
-    x = primitives.nl_sum(type)(-1)(x)  # sum the 100 bits in each port
+    x = x.reshape((10, width))  # reshape to 10 ports, 100 bits each
+    x = x.sum(-1)  # sum the 100 bits in each port
     return x
 
 

tests/test_network.py

@@ -1,12 +1,14 @@
 from neurallogic import (hard_and, hard_not, hard_or, harden, harden_layer,
-                         neural_logic_net, primitives)
+                         neural_logic_net, symbolic_generation)
 from jax import random
 from flax.training import train_state
 from flax import linen as nn
 import optax
 import jax.numpy as jnp
 import jax
 from jax.config import config
+import numpy
+
 config.update("jax_enable_x64", True)
 
 
@@ -17,7 +19,7 @@ def test_net(type, x):
         x = hard_and.and_layer(type)(
             4, nn.initializers.uniform(1.0), jnp.float64)(x)
         x = hard_not.not_layer(type)(1, dtype=jnp.float64)(x)
-        x = primitives.nl_ravel(type)(x)
+        x = x.ravel()
         x = harden_layer.harden_layer(type)(x)
         return x
 
@@ -55,20 +57,27 @@ def test_net(type, x):
 
     # Test that the and layer (both soft and hard variants) correctly predicts y
     for input, expected in zip(x, y):
+        
         input = jnp.array(input)
         expected = jnp.array(expected)
         soft_result = soft.apply(best_weights, input)
         assert jnp.allclose(soft_result, expected)
+
         hard_input = harden.harden(input)
         hard_expected = harden.harden(expected)
         hard_weights = harden.hard_weights(best_weights)
         hard_result = hard.apply(hard_weights, hard_input)
         assert jnp.array_equal(hard_result, hard_expected)
-        symbolic_weights = harden.symbolic_weights(best_weights)
-        symbolic_result = symbolic.apply(symbolic_weights, hard_input.tolist())
+        
+        symbolic_weights = symbolic_generation.make_symbolic(hard_weights)
+        symbolic_result = symbolic.apply(symbolic_weights, hard_input)
+        symbolic_result = symbolic_generation.eval_symbolic_expression(symbolic_result)
         assert jnp.array_equal(symbolic_result, hard_expected)
+
         symbolic_input = ['x1', 'x2']
-        symbolic_expected = ['(not(((((x1 and False) or (x2 and True)) or not(True)) and (((x1 and True) or (x2 and False)) or not(False)) and (((x1 and False) or (x2 and True)) or not(True)) and (((x1 and False) or (x2 and False)) or not(True)) and (((x1 and True) or (x2 and False)) or not(False)) and (((x1 and True) or (x2 and True)) or not(True)) and (((x1 and True) or (x2 and False)) or not(True)) and (((x1 and True) or (x2 and True)) or not(True)) and (((x1 and False) or (x2 and True)) or not(True)) and (((x1 and True) or (x2 and False)) or not(True)) and (((x1 and True) or (x2 and True)) or not(False)) and (((x1 and True) or (x2 and True)) or not(True)) and (((x1 and False) or (x2 and False)) or not(False)) and (((x1 and False) or (x2 and True)) or not(False)) and (((x1 and True) or (x2 and True)) or not(True)) and (((x1 and True) or (x2 and True)) or not(True))) ^ False))', '(not(((((x1 and False) or (x2 and True)) or not(True)) and (((x1 and True) or (x2 and False)) or not(True)) and (((x1 and False) or (x2 and True)) or not(False)) and (((x1 and False) or (x2 and False)) or not(True)) and (((x1 and True) or (x2 and False)) or not(False)) and (((x1 and True) or (x2 and True)) or not(False)) and (((x1 and True) or (x2 and False)) or not(False)) and (((x1 and True) or (x2 and True)) or not(True)) and (((x1 and False) or (x2 and True)) or not(False)) and (((x1 and True) or (x2 and False)) or not(False)) and (((x1 and True) or (x2 and True)) or not(True)) and (((x1 and True) or (x2 and True)) or not(True)) and (((x1 and False) or (x2 and False)) or not(False)) and (((x1 and False) or (x2 and True)) or not(False)) and (((x1 and True) or (x2 and True)) or not(False)) and (((x1 and True) or (x2 and True)) or not(False))) ^ True))',
-                             '(not(((((x1 and False) or (x2 and True)) or not(True)) and (((x1 and True) or (x2 and False)) or not(False)) and (((x1 and False) or (x2 and True)) or not(False)) and (((x1 and False) or (x2 and False)) or not(False)) and (((x1 and True) or (x2 and False)) or not(False)) and (((x1 and True) or (x2 and True)) or not(False)) and (((x1 and True) or (x2 and False)) or not(True)) and (((x1 and True) or (x2 and True)) or not(False)) and (((x1 and False) or (x2 and True)) or not(True)) and (((x1 and True) or (x2 and False)) or not(False)) and (((x1 and True) or (x2 and True)) or not(True)) and (((x1 and True) or (x2 and True)) or not(True)) and (((x1 and False) or (x2 and False)) or not(True)) and (((x1 and False) or (x2 and True)) or not(False)) and (((x1 and True) or (x2 and True)) or not(False)) and (((x1 and True) or (x2 and True)) or not(True))) ^ False))', '(not(((((x1 and False) or (x2 and True)) or not(False)) and (((x1 and True) or (x2 and False)) or not(False)) and (((x1 and False) or (x2 and True)) or not(False)) and (((x1 and False) or (x2 and False)) or not(True)) and (((x1 and True) or (x2 and False)) or not(False)) and (((x1 and True) or (x2 and True)) or not(True)) and (((x1 and True) or (x2 and False)) or not(True)) and (((x1 and True) or (x2 and True)) or not(False)) and (((x1 and False) or (x2 and True)) or not(False)) and (((x1 and True) or (x2 and False)) or not(True)) and (((x1 and True) or (x2 and True)) or not(False)) and (((x1 and True) or (x2 and True)) or not(False)) and (((x1 and False) or (x2 and False)) or not(True)) and (((x1 and False) or (x2 and True)) or not(True)) and (((x1 and True) or (x2 and True)) or not(True)) and (((x1 and True) or (x2 and True)) or not(True))) ^ True))']
+        symbolic_expected = ['not((True and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (False != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (False != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) != 0) ^ (False != 0))',
+ 'not((True and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (False != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (False != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) != 0) ^ (True != 0))',
+ 'not((True and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (False != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (False != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) != 0) ^ (False != 0))',
+ 'not((True and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (False != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (False != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((False != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (False != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (False != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) and ((((False or (x1 != 0) and (True != 0)) or (x2 != 0) and (True != 0)) != 0) or not((True != 0))) != 0) ^ (True != 0))']
         symbolic_result = symbolic.apply(symbolic_weights, symbolic_input)
-        assert symbolic_result == symbolic_expected
+        assert numpy.array_equal(symbolic_result, symbolic_expected)