cleanup

Author: Z80coder

neurallogic/harden.py

@@ -8,51 +8,6 @@
 def harden_float(x: float) -> bool:
     return x > 0.5
 
-"""
-harden_array = jax.vmap(harden_float, 0, 0)
-
-def harden_dict(x: dict) -> dict:
-    return {k: harden(v) for k, v in x.items()}
-
-@dispatch
-def harden(x: float):
-    return harden_float(x)
-
-@dispatch
-def harden(x: list):
-    return [harden(xi) for xi in x]
-
-@dispatch
-def harden(x: flax.core.frozen_dict.FrozenDict):
-    return harden_dict(x)
-
-@dispatch
-def harden(x: dict):
-    return harden_dict(x)
-
-@dispatch
-def harden(x: numpy.ndarray):
-    if x.shape != ():
-        return harden_array(x)
-    else:
-        return numpy.array(harden(x.item()))
-
-@dispatch
-def harden(x: jax.numpy.ndarray):
-    if x.shape != ():
-        return harden_array(x)
-    else:
-        return numpy.array(harden(x.item()))
-
-@dispatch
-def harden(*args):
-    #print(f'harden: {args} of type {type(args)} with length {len(args)}')
-    #print(f'type of elements are {[type(arg) for arg in args]}')
-    #if len(args) == 1:
-    #    return harden(args[0])
-    return tuple([harden(arg) for arg in args])
-"""
-
 @dispatch
 def harden(x: float):
     return harden_float(x)

neurallogic/sym_gen.py

@@ -139,56 +139,33 @@ def eval_jaxpr_impl(jaxpr):
 @dispatch
 def make_symbolic(x: dict):
     return symbolic_primitives.map_at_elements(x, symbolic_primitives.to_boolean_value_string)
-@dispatch
-def make_numeric(x: dict):
-    return symbolic_primitives.map_at_elements(x, symbolic_primitives.to_numeric_value)
-
 
 @dispatch
 def make_symbolic(x: list):
     return symbolic_primitives.map_at_elements(x, symbolic_primitives.to_boolean_value_string)
-@dispatch
-def make_numeric(x: list):
-    return symbolic_primitives.map_at_elements(x, symbolic_primitives.to_numeric_value)
-
 
 @dispatch
 def make_symbolic(x: numpy.ndarray):
     return symbolic_primitives.map_at_elements(x, symbolic_primitives.to_boolean_value_string)
-@dispatch
-def make_numeric(x: numpy.ndarray):
-    return symbolic_primitives.map_at_elements(x, symbolic_primitives.to_numeric_value)
-
 
 @dispatch
 def make_symbolic(x: jax.numpy.ndarray):
     return symbolic_primitives.map_at_elements(convert_jax_to_numpy_arrays(x), symbolic_primitives.to_boolean_value_string)
-@dispatch
-def make_numeric(x: jax.numpy.ndarray):
-    return symbolic_primitives.map_at_elements(x, symbolic_primitives.to_numeric_value)
 
 
 @dispatch
 def make_symbolic(x: bool):
     return symbolic_primitives.to_boolean_value_string(x)
-@dispatch
-def make_numeric(x: bool):
-    return symbolic_primitives.to_numeric_value(x)
 
 
 @dispatch
 def make_symbolic(x: str):
     return symbolic_primitives.to_boolean_value_string(x)
-@dispatch
-def make_numeric(x: str):
-    return symbolic_primitives.to_numeric_value(x)
+
 
 @dispatch
 def make_symbolic(*args):
     return tuple([make_symbolic(arg) for arg in args])
-@dispatch
-def make_numeric(*args):
-    return tuple([make_numeric(arg) for arg in args])
 
 
 @dispatch
@@ -205,10 +182,6 @@ def convert_jax_to_numpy_arrays(x: dict):
 def make_symbolic(x: flax.core.FrozenDict):
     x = convert_jax_to_numpy_arrays(x.unfreeze())
     return flax.core.FrozenDict(make_symbolic(x))
-@dispatch
-def make_numeric(x: flax.core.FrozenDict):
-    x = x.unfreeze()
-    return flax.core.FrozenDict(make_numeric(x))
 
 
 @dispatch

neurallogic/symbolic_primitives.py

@@ -22,20 +22,6 @@ def convert(x):
     return map_at_elements(x, convert)
 
 
-# TODO: remove me
-def convert_iterable_type(x: list, new_type):
-    if new_type == list:
-        return x
-    elif new_type == numpy.ndarray:
-        return numpy.array(x, dtype=object)
-    elif new_type == jax.numpy.ndarray:
-        return jax.numpy.array(x, dtype=object)
-    elif new_type == jaxlib.xla_extension.DeviceArray:
-        return jax.numpy.array(x, dtype=object)
-    else:
-        raise NotImplementedError(
-            f"Cannot convert type {type(x)} to type {new_type}")
-
 # TODO: allow func callable to control the type of the numpy.array or jax.numpy.array
 
 # map_at_elements should alter the elements but not the type of the container