PyHierarchicalTsetlinMachineCUDA 0.3.0__tar.gz → 0.3.1__tar.gz

{PyHierarchicalTsetlinMachineCUDA-0.3.0 → PyHierarchicalTsetlinMachineCUDA-0.3.1}/PKG-INFO

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

{PyHierarchicalTsetlinMachineCUDA-0.3.0 → PyHierarchicalTsetlinMachineCUDA-0.3.1}/PyHierarchicalTsetlinMachineCUDA/kernels.py

@@ -321,15 +321,13 @@ code_update = """
 			int index = blockIdx.x * blockDim.x + threadIdx.x;
 			int stride = blockDim.x * gridDim.x;
 
-			int non_zero_children[MAX_NUMBER_OF_OR_GROUP_CHILDREN];
+			int child_input_sum;
 
 			/* Copy state to local memory for efficiency */  
 			curandState localState = state[index];
 
 			// If a group node is false, all children are made false.
 			for (int group_node = index; group_node < CLAUSES*number_of_group_nodes; group_node += stride) {
-				int number_of_non_zero_children = 0;
-
 				#if LOG_SCALE == 1
 					if (group_node_output[group_node] == -1) {
 						for (int or_addend = 0; or_addend < number_of_group_node_children; ++or_addend) {
@@ -342,10 +340,10 @@ code_update = """
 							}
 						}
 					} else {
+						child_input_sum = 0;
 						for (int or_addend = 0; or_addend < number_of_group_node_children; ++or_addend) {
 							if (child_input[group_node*number_of_group_node_children + or_addend] >= 0) {
-								non_zero_children[number_of_non_zero_children] = or_addend;
-								number_of_non_zero_children++;
+								child_input_sum += np.exp2f(child_input[group_node*number_of_group_node_children + or_addend]); // Needs normalization
 							}
 						}
 					}
@@ -361,23 +359,33 @@ code_update = """
 							}
 						}
 					} else {
+						child_input_sum = 0;
 						for (int or_addend = 0; or_addend < number_of_group_node_children; ++or_addend) {
-							if (child_input[group_node*number_of_group_node_children + or_addend] > 0) { // Or pick the largest.... picking randomly when a tie
-								non_zero_children[number_of_non_zero_children] = or_addend;
-								number_of_non_zero_children++;
+							if (child_input[group_node*number_of_group_node_children + or_addend] > 0) {
+								child_input_sum += child_input[group_node*number_of_group_node_children + or_addend];
 							}
 						}
 					}
 				#endif
 
+				// Skip node if "turned off" (-1)
 				if (group_node_output[group_node] != -1) {
 					int selected_child;
-					if (number_of_non_zero_children > 0) {
-						selected_child = non_zero_children[curand(&localState) % number_of_non_zero_children];
+					if (child_input_sum > 0) {
+						int random_child_value = curand(&localState) % child_input_sum;
+						child_input_sum = 0;
+						for (int or_addend = 0; or_addend < number_of_group_node_children; ++or_addend) {
+							child_input_sum += child_input[group_node*number_of_group_node_children + or_addend];
+							if (child_input_sum > random_child_value) {
+								selected_child = or_addend;
+								break;
+							}
+						}
 					} else {
 						selected_child = curand(&localState) % number_of_group_node_children;
 					}
 					
+					// "Turn off" the sub-hierarchies that were not selected 
 					for (int or_addend = 0; or_addend < number_of_group_node_children; ++or_addend) {
 						if (selected_child != or_addend) {
 							child_input[group_node*number_of_group_node_children + or_addend] = -1;

{PyHierarchicalTsetlinMachineCUDA-0.3.0 → PyHierarchicalTsetlinMachineCUDA-0.3.1}/PyHierarchicalTsetlinMachineCUDA/tm.py

@@ -97,12 +97,6 @@ class CommonTsetlinMachine():
 			if self.hierarchy_structure[d][0] != OR_GROUP: # OR_GROUP reuses the same TA
 				self.number_of_ta_teams = self.hierarchy_structure[self.depth - d - 1][1] * self.number_of_ta_teams
 
-		# Identifies the larget number of OR_GROUP children (for allocating local memory)
-		self.max_number_of_or_group_children = 0
-		for d in range(1, self.depth):
-			if self.hierarchy_structure[d][0] == OR_GROUP and self.max_number_of_or_group_children < self.hierarchy_structure[d][1]:
-				self.max_number_of_or_group_children = self.hierarchy_structure[d][1]
-
 		# Calculates number of literal chunks overall for the feature vector (ignores OR- and AND alternatives)
 		self.number_of_literal_chunks = self.number_of_literal_chunks_per_leaf
 		for d in range(self.depth - 1, 0, -1):
@@ -140,11 +134,9 @@ class CommonTsetlinMachine():
 	#define OR_GROUP %d
 	#define OR_ALTERNATIVES %d
 
-	#define MAX_NUMBER_OF_OR_GROUP_CHILDREN %d
-
 	#define NEGATIVE_CLAUSES %d
 	#define FLIP_POLARITY %d
-		""" % (self.number_of_clauses, self.depth, self.hierarchy_size[1], self.number_of_ta_teams, self.number_of_literals_per_leaf, self.number_of_literal_chunks_per_leaf, self.number_of_literal_chunks, self.number_of_state_bits, self.boost_true_positive_feedback, self.s, self.T, self.q, self.log_scale, AND_GROUP, AND_ALTERNATIVES, OR_GROUP, OR_ALTERNATIVES, self.max_number_of_or_group_children, self.negative_clauses, self.flip_polarity)
+		""" % (self.number_of_clauses, self.depth, self.hierarchy_size[1], self.number_of_ta_teams, self.number_of_literals_per_leaf, self.number_of_literal_chunks_per_leaf, self.number_of_literal_chunks, self.number_of_state_bits, self.boost_true_positive_feedback, self.s, self.T, self.q, self.log_scale, AND_GROUP, AND_ALTERNATIVES, OR_GROUP, OR_ALTERNATIVES, self.negative_clauses, self.flip_polarity)
 		
 		mod_prepare = SourceModule(parameters + kernels.code_header + kernels.code_prepare, no_extern_c=True)
 		self.prepare_weights = mod_prepare.get_function("prepare_weights")

{PyHierarchicalTsetlinMachineCUDA-0.3.0 → PyHierarchicalTsetlinMachineCUDA-0.3.1}/PyHierarchicalTsetlinMachineCUDA.egg-info/PKG-INFO

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

{PyHierarchicalTsetlinMachineCUDA-0.3.0 → PyHierarchicalTsetlinMachineCUDA-0.3.1}/setup.py

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