pyerualjetwork 4.1.8b7__tar.gz → 4.1.9__tar.gz

{pyerualjetwork-4.1.8b7 → pyerualjetwork-4.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 4.1.8b7
+Version: 4.1.9
 Summary: PyerualJetwork is a machine learning library written in Python for professionals, incorporating advanced, unique, new, and modern techniques.
 Author: Hasan Can Beydili
 Author-email: tchasancan@gmail.com

{pyerualjetwork-4.1.8b7 → pyerualjetwork-4.1.9}/pyerualjetwork/__init__.py

@@ -48,7 +48,7 @@ for package_name in package_names:
 
 print(f"PyerualJetwork is ready to use with {err} errors")
 
-__version__ = "4.1.8b7"
+__version__ = "4.1.9"
 __update__ = "* Changes: https://github.com/HCB06/PyerualJetwork/blob/main/CHANGES\n* PyerualJetwork document: https://github.com/HCB06/PyerualJetwork/blob/main/Welcome_to_PyerualJetwork/PYERUALJETWORK_USER_MANUEL_AND_LEGAL_INFORMATION(EN).pdf\n* YouTube tutorials: https://www.youtube.com/@HasanCanBeydili"
 
 def print_version(__version__):

{pyerualjetwork-4.1.8b7 → pyerualjetwork-4.1.9}/pyerualjetwork/data_operations.py

@@ -11,7 +11,7 @@ def encode_one_hot(y_train, y_test=None, summary=False):
     Args:
         y_train (numpy.ndarray): Train label data.
         y_test (numpy.ndarray): Test label data one-hot encoded. (optional).
-        summary (bool): If True, prints the class-to-index mapping. Default: False
+        summary (bool, optional): If True, prints the class-to-index mapping. Default: False
     
     Returns:
         tuple: One-hot encoded y_train and (if given) y_test.

{pyerualjetwork-4.1.8b7 → pyerualjetwork-4.1.9}/pyerualjetwork/plan.py

@@ -16,6 +16,7 @@ PYERUALJETWORK document: https://github.com/HCB06/PyerualJetwork/blob/main/Welco
 import numpy as np
 from colorama import Fore
 import math
+import random
 
 ### LIBRARY IMPORTS ###
 from .ui import loading_bars, initialize_loading_bar
@@ -24,6 +25,7 @@ from .loss_functions import binary_crossentropy, categorical_crossentropy
 from .activation_functions import apply_activation, Softmax, all_activations
 from .metrics import metrics
 from .model_operations import get_acc, get_preds, get_preds_softmax
+from .memory_operations import optimize_labels
 from .visualizations import (
     draw_neural_web,
     update_neural_web_for_fit,
@@ -261,45 +263,30 @@ def learner(x_train, y_train, optimizer, x_test=None, y_test=None, strategy='acc
     # Pre-checks
 
     x_train = x_train.astype(dtype, copy=False)
-
-    if len(y_train[0]) < 256:
-        if y_train.dtype != np.uint8:
-            y_train = np.array(y_train, copy=False).astype(np.uint8, copy=False)
-    elif len(y_train[0]) <= 32767:
-        if y_train.dtype != np.uint16:
-            y_train = np.array(y_train, copy=False).astype(np.uint16, copy=False)
-    else:
-        if y_train.dtype != np.uint32:
-            y_train = np.array(y_train, copy=False).astype(np.uint32, copy=False)
-
-    if x_test is not None:
-        x_test = x_test.astype(dtype, copy=False)
-
-        if len(y_test[0]) < 256:
-            if y_test.dtype != np.uint8:
-                y_test = np.array(y_test, copy=False).astype(np.uint8, copy=False)
-        elif len(y_test[0]) <= 32767:
-            if y_test.dtype != np.uint16:
-                y_test = np.array(y_test, copy=False).astype(np.uint16, copy=False)
-        else:
-            if y_test.dtype != np.uint32:
-                y_test = np.array(y_test, copy=False).astype(np.uint32, copy=False)
+    y_train = optimize_labels(y_train, cuda=False)
 
     if x_test is None and y_test is None:
         x_test = x_train
         y_test = y_train
         data = 'Train'
     else:
+        x_test = x_test.astype(dtype, copy=False)
+        y_test = optimize_labels(y_test, cuda=False)
         data = 'Test'
 
     # Filter activation functions
-    if only_this != None:
+    if only_this is not None:
         activation_potentiation = only_this
-    if except_this != None:
+    if except_this is not None:
         activation_potentiation = [item for item in activation_potentiation if item not in except_this]
     if gen is None:
         gen = len(activation_potentiation)
 
+    if strategy != 'accuracy' and strategy != 'f1' and strategy != 'recall' and strategy != 'precision': raise ValueError("Strategy parameter only be 'accuracy' or 'f1' or 'recall' or 'precision'.")
+
+    if start_this_act is None and len(activation_potentiation) % 2 != 0: raise ValueError("Activation length must be even number. Please use 'except_this' parameter and except some activation. For example: except_this=['linear']")
+    if start_this_act is not None and len(activation_potentiation) + 1 % 2 != 0: raise ValueError("You are using start_this parameter, activation length still must be even number. Please use 'except_this' parameter and except some activation. For example: except_this=['linear']")
+    
     # Initialize visualization components
     viz_objects = initialize_visualization_for_learner(show_history, neurons_history, neural_web_history, x_train, y_train)
 
@@ -336,34 +323,6 @@ def learner(x_train, y_train, optimizer, x_test=None, y_test=None, strategy='acc
     loss_list = []
     target_pop = []
 
-    for i in range(len(activation_potentiation)):
-
-        if i == 0 and start_this_act is not None:
-            act_pop[0] = activation_potentiation[i]
-
-        else:
-            act_pop.append(activation_potentiation[i])
-
-        x_test_batch, y_test_batch = batcher(x_test, y_test, batch_size=batch_size)
-        W = fit(x_train, y_train, activation_potentiation=act_pop[-1], train_bar=False, auto_normalization=auto_normalization, dtype=dtype)
-        model = evaluate(x_test_batch, y_test_batch, W=W, loading_bar_status=False, activation_potentiation=act_pop[-1], dtype=dtype)
-
-        if i == 0 and start_this_W is not None:
-            weight_pop[0] = W
-
-        else:
-            weight_pop.append(W)
-
-        if strategy == 'accuracy': target_pop.append(model[get_acc()])
-        elif strategy == 'f1' or strategy == 'precision' or strategy == 'recall':
-            precision_score, recall_score, f1_score = metrics(y_test_batch, model[get_preds()])
-            
-            if strategy == 'precision': target_pop.append(precision_score)
-            if strategy == 'recall': target_pop.append(recall_score)
-            if strategy == 'f1': target_pop.append(f1_score)
-
-        print(f"\rPre-Fit {i}/{len(activation_potentiation)}, {data} {strategy}: {target_pop[-1]}",end='')
-
     progress = initialize_loading_bar(total=len(activation_potentiation), desc="", ncols=ncols, bar_format=bar_format_learner)
 
     for i in range(gen):
@@ -373,16 +332,19 @@ def learner(x_train, y_train, optimizer, x_test=None, y_test=None, strategy='acc
         progress.n = 0
         progress.last_print_n = 0
         progress.update(0)
-        
-        weight_pop, act_pop = optimizer(np.array(weight_pop, dtype=dtype), act_pop, i, np.array(target_pop, dtype=dtype, copy=False), target_fitness=target_fitness, bar_status=False)
-        target_pop = []
 
         for j in range(len(activation_potentiation)):
 
             x_test_batch, y_test_batch = batcher(x_test, y_test, batch_size=batch_size)
-            model = evaluate(x_test_batch, y_test_batch, W=weight_pop[j], loading_bar_status=False, activation_potentiation=act_pop[j], dtype=dtype)
+            
+            if i == 0:
+                act_pop.append(activation_potentiation[j])
+                W = fit(x_train, y_train, activation_potentiation=act_pop[-1], train_bar=False, auto_normalization=auto_normalization, dtype=dtype)
+                weight_pop.append(W)
 
+            model = evaluate(x_test_batch, y_test_batch, W=weight_pop[j], loading_bar_status=False, activation_potentiation=act_pop[j], dtype=dtype)
             acc = model[get_acc()]
+            
             if strategy == 'accuracy': target_pop.append(acc)
 
             elif strategy == 'f1' or strategy == 'precision' or strategy == 'recall':
@@ -516,6 +478,9 @@ def learner(x_train, y_train, optimizer, x_test=None, y_test=None, strategy='acc
         best_acc_per_gen_list.append(best_acc)
         loss_list.append(best_loss)
 
+        weight_pop, act_pop = optimizer(np.array(weight_pop, dtype=dtype), act_pop, i, np.array(target_pop, dtype=dtype, copy=False), target_fitness=target_fitness, bar_status=False)
+        target_pop = []
+
         # Early stopping check
         if early_stop == True and i > 0:
             if best_acc_per_gen_list[i] == best_acc_per_gen_list[i-1]:

{pyerualjetwork-4.1.8b7 → pyerualjetwork-4.1.9}/pyerualjetwork/plan_cuda.py

@@ -25,7 +25,7 @@ from .loss_functions_cuda import binary_crossentropy, categorical_crossentropy
 from .activation_functions_cuda import apply_activation, Softmax, all_activations
 from .metrics_cuda import metrics
 from .model_operations_cuda import get_acc, get_preds, get_preds_softmax
-from .memory_operations import transfer_to_gpu, transfer_to_cpu
+from .memory_operations import transfer_to_gpu, transfer_to_cpu, optimize_labels
 from .visualizations_cuda import (
     draw_neural_web,
     update_neural_web_for_fit,
@@ -277,12 +277,15 @@ def learner(x_train, y_train, optimizer, x_test=None, y_test=None, strategy='acc
 
     activation_potentiation = all_activations()
 
+    y_train = optimize_labels(y_train, cuda=True)
+
     if x_test is None and y_test is None:
         x_test = x_train
         y_test = y_train
         data = 'Train'
     else:
         data = 'Test'
+        y_test = optimize_labels(y_test, cuda=True)
         
     if memory == 'gpu':
         x_train = transfer_to_gpu(x_train, dtype=dtype)
@@ -305,14 +308,19 @@ def learner(x_train, y_train, optimizer, x_test=None, y_test=None, strategy='acc
     else:
         raise ValueError("memory parameter must be 'cpu' or 'gpu'.")
 
+    if strategy != 'accuracy' and strategy != 'f1' and strategy != 'recall' and strategy != 'precision': raise ValueError("Strategy parameter only be 'accuracy' or 'f1' or 'recall' or 'precision'.")
+
     # Filter activation functions
-    if only_this != None:
+    if only_this is not None:
         activation_potentiation = only_this
-    if except_this != None:
+    if except_this is not None:
         activation_potentiation = [item for item in activation_potentiation if item not in except_this]
     if gen is None:
         gen = len(activation_potentiation)
 
+    if start_this_act is None and len(activation_potentiation) % 2 != 0: raise ValueError("Activation length must be even number. Please use 'except_this' parameter and except some activation. For example: except_this=['linear']")
+    if start_this_act is not None and len(activation_potentiation) + 1 % 2 != 0: raise ValueError("You are using start_this parameter, activation length still must be even number. Please use 'except_this' parameter and except some activation. For example: except_this=['linear']")
+    
     # Initialize visualization components
     viz_objects = initialize_visualization_for_learner(show_history, neurons_history, neural_web_history, x_train, y_train)
 
@@ -348,34 +356,6 @@ def learner(x_train, y_train, optimizer, x_test=None, y_test=None, strategy='acc
     loss_list = []
     target_pop = []
 
-    for i in range(len(activation_potentiation)):
-
-        if i == 0 and start_this_act is not None:
-            act_pop[0] = activation_potentiation[i]
-
-        else:
-            act_pop.append(activation_potentiation[i])
-
-        x_test_batch, y_test_batch = batcher(x_test, y_test, batch_size=batch_size)
-        W = fit(x_train, y_train, activation_potentiation=act_pop[-1], train_bar=False, auto_normalization=auto_normalization, dtype=dtype, memory=memory)
-        model = evaluate(x_test_batch, y_test_batch, W=W, loading_bar_status=False, activation_potentiation=act_pop[-1], dtype=dtype, memory=memory)
-
-        if i == 0 and start_this_W is not None:
-            weight_pop[0] = W
-
-        else:
-            weight_pop.append(W)
-
-        if strategy == 'accuracy': target_pop.append(model[get_acc()])
-        elif strategy == 'f1' or strategy == 'precision' or strategy == 'recall':
-            precision_score, recall_score, f1_score = metrics(y_test_batch, model[get_preds()])
-            
-            if strategy == 'precision': target_pop.append(precision_score)
-            if strategy == 'recall': target_pop.append(recall_score)
-            if strategy == 'f1': target_pop.append(f1_score)
-
-        print(f"\rPre-Fit {i}/{len(activation_potentiation)}, {data} {strategy}: {target_pop[-1]}",end='')
-
     progress = initialize_loading_bar(total=len(activation_potentiation), desc="", ncols=ncols, bar_format=bar_format_learner)
 
     for i in range(gen):
@@ -386,12 +366,15 @@ def learner(x_train, y_train, optimizer, x_test=None, y_test=None, strategy='acc
         progress.last_print_n = 0
         progress.update(0)
 
-        weight_pop, act_pop = optimizer(cp.array(weight_pop, dtype=dtype), act_pop, i, cp.array(target_pop, dtype=dtype, copy=False), target_fitness=target_fitness, bar_status=False)
-        target_pop = []
-
         for j in range(len(activation_potentiation)):
 
             x_test_batch, y_test_batch = batcher(x_test, y_test, batch_size=batch_size)
+            
+            if i == 0:
+                act_pop.append(activation_potentiation[j])
+                W = fit(x_train, y_train, activation_potentiation=act_pop[-1], train_bar=False, auto_normalization=auto_normalization, dtype=dtype)
+                weight_pop.append(W)
+
             model = evaluate(x_test_batch, y_test_batch, W=weight_pop[j], loading_bar_status=False, activation_potentiation=act_pop[j], dtype=dtype, memory=memory)
 
             acc = model[get_acc()]
@@ -527,6 +510,9 @@ def learner(x_train, y_train, optimizer, x_test=None, y_test=None, strategy='acc
 
         best_acc_per_gen_list.append(best_acc)
         loss_list.append(best_loss)
+        
+        weight_pop, act_pop = optimizer(cp.array(weight_pop, dtype=dtype), act_pop, i, cp.array(target_pop, dtype=dtype, copy=False), target_fitness=target_fitness, bar_status=False)
+        target_pop = []
 
         # Early stopping check
         if early_stop == True and i > 0:
@@ -656,7 +642,6 @@ def evaluate(
     Returns:
         tuple: Model (list).
     """
-    from memory_operations import transfer_to_cpu, transfer_to_gpu
 
     if memory == 'gpu':
         x_test = transfer_to_gpu(x_test, dtype=dtype)

{pyerualjetwork-4.1.8b7 → pyerualjetwork-4.1.9}/pyerualjetwork/planeat.py

@@ -255,7 +255,7 @@ Example:
    
    bar_format = loading_bars()[0]
    
-   if bar_status: progress = initialize_loading_bar(len(bad_weights), desc="GENERATION: " + str(what_gen), bar_format=bar_format, ncols=50, ascii="▱▰")
+   if bar_status: progress = initialize_loading_bar(len(bad_weights), desc="GENERATION: " + str(what_gen), bar_format=bar_format, ncols=50)
 
    for i in range(len(bad_weights)):
 

{pyerualjetwork-4.1.8b7 → pyerualjetwork-4.1.9}/pyerualjetwork/planeat_cuda.py

@@ -255,7 +255,7 @@ Example:
    
    bar_format = loading_bars()[0]
    
-   if bar_status: progress = initialize_loading_bar(len(bad_weights), desc="GENERATION: " + str(what_gen), bar_format=bar_format, ncols=50, ascii="▱▰")
+   if bar_status: progress = initialize_loading_bar(len(bad_weights), desc="GENERATION: " + str(what_gen), bar_format=bar_format, ncols=50)
 
    for i in range(len(bad_weights)):
 

{pyerualjetwork-4.1.8b7 → pyerualjetwork-4.1.9}/pyerualjetwork/visualizations_cuda.py

@@ -358,7 +358,7 @@ def plot_evaluate(x_test, y_test, y_preds, acc_list, W, activation_potentiation)
         fpr, tpr, thresholds = roc_curve(y_true, y_preds)
    
         roc_auc = cp.trapz(tpr, fpr)
-        axs[1, 0].plot(fpr, tpr, color='darkorange', lw=2, label=f'ROC curve (area = {roc_auc:.2f})')
+        axs[1, 0].plot(fpr.get(), tpr.get(), color='darkorange', lw=2, label=f'ROC curve (area = {roc_auc:.2f})')
         axs[1, 0].plot([0, 1], [0, 1], color='navy', lw=2, linestyle='--')
         axs[1, 0].set_xlim([0.0, 1.0])
         axs[1, 0].set_ylim([0.0, 1.05])

{pyerualjetwork-4.1.8b7 → pyerualjetwork-4.1.9}/pyerualjetwork.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 4.1.8b7
+Version: 4.1.9
 Summary: PyerualJetwork is a machine learning library written in Python for professionals, incorporating advanced, unique, new, and modern techniques.
 Author: Hasan Can Beydili
 Author-email: tchasancan@gmail.com

{pyerualjetwork-4.1.8b7 → pyerualjetwork-4.1.9}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 # Setting Up
 setup(
     name="pyerualjetwork",
-    version="4.1.8b7",
+    version="4.1.9",
     author="Hasan Can Beydili",
     author_email="tchasancan@gmail.com",
     description=(