PyHierarchicalTsetlinMachineCUDA 0.2.6__tar.gz → 0.2.7__tar.gz

{PyHierarchicalTsetlinMachineCUDA-0.2.6 → PyHierarchicalTsetlinMachineCUDA-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyHierarchicalTsetlinMachineCUDA
-Version: 0.2.6
+Version: 0.2.7
 Summary: Hierarchical Tsetlin Machine Architecture.
 Home-page: https://github.com/cair/PyHierarchicalTsetlinMachineCUDA/
 Author: Ole-Christoffer Granmo

{PyHierarchicalTsetlinMachineCUDA-0.2.6 → PyHierarchicalTsetlinMachineCUDA-0.2.7}/PyHierarchicalTsetlinMachineCUDA/kernels.py

@@ -238,7 +238,7 @@ code_update = """
 					}
 				}
 
-				// or_group_node_output[or_group_node] = or_group_vote_sum;
+				//or_group_node_output[or_group_node] = or_group_vote_sum;
 				or_group_node_output[or_group_node] = max_vote_sum;
 			}
 		}
@@ -252,12 +252,17 @@ code_update = """
 			for (int and_group_node = index; and_group_node < CLAUSES*number_of_and_group_nodes; and_group_node += stride) {
 				// Multiply and factors
 				int and_group_vote_product = 1;
+				int max_vote_sum = 0;
 				for (int and_factor = 0; and_factor < number_of_and_group_factors; ++and_factor) {
 					// Aggregate votes from each child node through multiplication
 					
 					int previous_and_group_vote_product = and_group_vote_product;
 					and_group_vote_product *= child_input[and_group_node*number_of_and_group_factors + and_factor];
 
+					if (child_input[and_group_node*number_of_and_group_factors + and_factor] > max_vote_sum) {
+						max_vote_sum = child_input[and_group_node*number_of_and_group_factors + and_factor];
+					}
+
 					if (and_group_vote_product < 0) {
 						printf("AND OVERFLOW %d -> %d\\n", previous_and_group_vote_product, and_group_vote_product);						
 						and_group_vote_product = previous_and_group_vote_product;
@@ -266,6 +271,7 @@ code_update = """
 
 				// Store and group product as node output
 				and_group_node_output[and_group_node] = and_group_vote_product;
+				//and_group_node_output[and_group_node] = max_vote_sum;
 			}
 		}
 
@@ -583,7 +589,7 @@ code_clauses = """
 		int index = blockIdx.x * blockDim.x + threadIdx.x;
 		int stride = blockDim.x * gridDim.x;
 
-		for (unsigned long long i = index; i < CLAUSES * COMPONENTS * LITERALS_PER_LEAF; i += stride) {
+		for (unsigned long long i = index; i < 1LLU * CLAUSES * COMPONENTS * LITERALS_PER_LEAF; i += stride) {
 			unsigned long long clause = i / (COMPONENTS * LITERALS_PER_LEAF);
 			unsigned long long comp   = (i / LITERALS_PER_LEAF) % COMPONENTS;
 			unsigned long long ta_idx = i % LITERALS_PER_LEAF;

{PyHierarchicalTsetlinMachineCUDA-0.2.6 → PyHierarchicalTsetlinMachineCUDA-0.2.7}/PyHierarchicalTsetlinMachineCUDA/tm.py

@@ -539,10 +539,16 @@ class CommonTsetlinMachine():
 				left = []
 				right = []
 				inside = []
+				feature_base = 0
+				size = self.hierarchy_structure[0][1]
 				for d in range(1, self.depth):
 					depth_d_node_index = component_remainder % self.hierarchy_structure[d][1]
 					component_remainder = component_remainder // self.hierarchy_structure[d][1]
 
+					if self.hierarchy_structure[d][0] != OR_ALTERNATIVES:
+						feature_base += size * depth_d_node_index 
+						size *= self.hierarchy_structure[d][1];
+
 					if previous_index[d-1] == -1:
 						left.append("(")
 					elif depth_d_node_index == 0 and previous_index[d-1] != depth_d_node_index:
@@ -567,14 +573,14 @@ class CommonTsetlinMachine():
 					if self.ta_action(i, j, k):
 						if k < self.number_of_literals_per_leaf // 2:
 							if print_ta_state:
-								l.append("x%d(%d)" % (k, self.ta_state(i, j, k)))
+								l.append("x%d(%d)" % (feature_base + k, self.ta_state(i, j, k)))
 							else:
-								l.append("x%d" % (k,))
+								l.append("x%d" % (feature_base + k,))
 						else:
 							if print_ta_state:
-								l.append("¬x%d(%d)" % (k - self.number_of_literals_per_leaf // 2, self.ta_state(i, j, k)))
+								l.append("¬x%d(%d)" % (feature_base + k - self.number_of_literals_per_leaf // 2, self.ta_state(i, j, k)))
 							else:
-								l.append("¬x%d" % (k - self.number_of_literals_per_leaf // 2,))
+								l.append("¬x%d" % (feature_base + k - self.number_of_literals_per_leaf // 2,))
 				
 				if len(l) > 1:
 					print("(" + " ∧ ".join(l) + ")", end = '')

{PyHierarchicalTsetlinMachineCUDA-0.2.6 → PyHierarchicalTsetlinMachineCUDA-0.2.7}/PyHierarchicalTsetlinMachineCUDA.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyHierarchicalTsetlinMachineCUDA
-Version: 0.2.6
+Version: 0.2.7
 Summary: Hierarchical Tsetlin Machine Architecture.
 Home-page: https://github.com/cair/PyHierarchicalTsetlinMachineCUDA/
 Author: Ole-Christoffer Granmo

{PyHierarchicalTsetlinMachineCUDA-0.2.6 → PyHierarchicalTsetlinMachineCUDA-0.2.7}/README.md

@@ -1,10 +1,6 @@
 # Hierarchical Tsetlin Machine in CUDA
 Implements the [Hierarchical Tsetlin Machine](https://github.com/cair/HierarchicalTsetlinMachine) in CUDA.
 
-<p align="center">
-  <img width="60%" src="https://github.com/cair/PyHierarchicalTsetlinMachineCUDA/blob/main/figures/Visualization_voting.png">
-</p>
-
 ## Installation
 
 ```bash
@@ -15,13 +11,17 @@ or
 git clone git@github.com:cair/PyHierarchicalTsetlinMachineCUDA.git
 cd PyHierarchicalTsetlinMachineCUDA
 python ./setup.py sdist
-pip install dist/PyHierarchicalTsetlinMachineCUDA-0.2.2.tar.gz 
+pip install dist/PyHierarchicalTsetlinMachineCUDA-0.2.6.tar.gz 
 ```
 
 ## Examples
 
 ### Noisy Parity Demo
 
+<p align="center">
+  <img width="60%" src="https://github.com/cair/PyHierarchicalTsetlinMachineCUDA/blob/main/figures/Visualization_voting.png">
+</p>
+
 #### Code: NoisyParityDemo.py
 
 ```python

{PyHierarchicalTsetlinMachineCUDA-0.2.6 → PyHierarchicalTsetlinMachineCUDA-0.2.7}/setup.py

@@ -2,7 +2,7 @@ from setuptools import *
 
 setup(
    name='PyHierarchicalTsetlinMachineCUDA',
-   version='0.2.6',
+   version='0.2.7',
    author='Ole-Christoffer Granmo',
    author_email='ole.granmo@uia.no',
    url='https://github.com/cair/PyHierarchicalTsetlinMachineCUDA/',