pyerualjetwork 4.3.9b1__py3-none-any.whl → 4.3.9b3__py3-none-any.whl

pyerualjetwork/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.3.9b1"
+__version__ = "4.3.9b3"
 __update__ = "* Changes: https://github.com/HCB06/PyerualJetwork/blob/main/CHANGES\n* PyerualJetwork Homepage: https://github.com/HCB06/PyerualJetwork/tree/main\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/plan.py

@@ -44,7 +44,7 @@ def fit(
     y_train,
     activation_potentiation=['linear'],
     W=None,
-    normalization=False,
+    auto_normalization=False,
     dtype=np.float32
 ):
     """
@@ -60,7 +60,7 @@ def fit(
 
         W (numpy.ndarray): If you want to re-continue or update model
 
-        normalization (bool, optional): Normalization may solves overflow problem. Default: False
+        auto_normalization (bool, optional): Normalization may solves overflow problem. Default: False
 
         dtype (numpy.dtype): Data type for the arrays. np.float32 by default. Example: np.float64 or np.float16. [fp32 for balanced devices, fp64 for strong devices, fp16 for weak devices: not reccomended!] (optional)
 
@@ -74,8 +74,8 @@ def fit(
 
     weight = np.zeros((len(y_train[0]), len(x_train[0].ravel()))).astype(dtype, copy=False) if W is None else W
 
-    if normalization is True: x_train = normalization(apply_activation(x_train, activation_potentiation))
-    elif normalization is False: x_train = apply_activation(x_train, activation_potentiation)
+    if auto_normalization is True: x_train = normalization(apply_activation(x_train, activation_potentiation))
+    elif auto_normalization is False: x_train = apply_activation(x_train, activation_potentiation)
     else: raise ValueError('normalization parameter only be True or False')
     
     weight += y_train.T @ x_train
@@ -84,7 +84,7 @@ def fit(
 
 
 def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=None, batch_size=1, pop_size=None,
-           neural_web_history=False, show_current_activations=False, normalization=False,
+           neural_web_history=False, show_current_activations=False, auto_normalization=False,
            neurons_history=False, early_stop=False, loss='categorical_crossentropy', show_history=False,
            interval=33.33, target_acc=None, target_loss=None,
            start_this_act=None, start_this_W=None, dtype=np.float32):
@@ -136,7 +136,7 @@ def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=Non
 
         show_history (bool, optional): If True, displays the training history after optimization. Default is False.
 
-        normalization (bool, optional): Normalization may solves overflow problem. Default: False
+        auto_normalization (bool, optional): Normalization may solves overflow problem. Default: False
 
         loss (str, optional): For visualizing and monitoring. PLAN neural networks doesn't need any loss function in training. options: ('categorical_crossentropy' or 'binary_crossentropy') Default is 'categorical_crossentropy'.
 
@@ -188,12 +188,6 @@ def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=Non
     # Initialize visualization components
     viz_objects = initialize_visualization_for_learner(show_history, neurons_history, neural_web_history, x_train, y_train)
 
-    # Initialize progress bar
-    if batch_size == 1:
-        ncols = 78
-    else:
-        ncols = 49
-
     # Initialize variables
     best_acc = 0
     best_f1 = 0
@@ -204,7 +198,7 @@ def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=Non
     loss_list = []
     target_pop = []
 
-    progress = initialize_loading_bar(total=activation_potentiation_len, desc="", ncols=ncols, bar_format=bar_format_learner)
+    progress = initialize_loading_bar(total=activation_potentiation_len, desc="", ncols=78, bar_format=bar_format_learner)
 
     if fit_start is False or pop_size > activation_potentiation_len:
         weight_pop, act_pop = define_genomes(input_shape=len(x_train[0]), output_shape=len(y_train[0]), population_size=pop_size, dtype=dtype)
@@ -231,7 +225,7 @@ def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=Non
             
             if fit_start is True and i == 0 and j < activation_potentiation_len:
                 act_pop[j] = activation_potentiation[j]
-                W = fit(x_train_batch, y_train_batch, activation_potentiation=act_pop[j], normalization=normalization, dtype=dtype)
+                W = fit(x_train_batch, y_train_batch, activation_potentiation=act_pop[j], auto_normalization=auto_normalization, dtype=dtype)
                 weight_pop[j] = W
             
             model = evaluate(x_train_batch, y_train_batch, W=weight_pop[j], activation_potentiation=act_pop[j])
@@ -357,9 +351,6 @@ def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=Non
 
             progress.update(1)
 
-        best_acc_per_gen_list.append(best_acc)
-        loss_list.append(best_loss)
-
         if batch_size != 1:
             train_model = evaluate(x_train, y_train, best_weights, final_activations)
             
@@ -373,6 +364,13 @@ def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=Non
             postfix_dict[f"{data} Accuracy"] = np.round(train_model[get_acc()], 4)
             postfix_dict[f"{data} Loss"] = np.round(train_loss, 4)
             progress.set_postfix(postfix_dict)
+            
+            best_acc_per_gen_list.append(train_model[get_acc()])
+            loss_list.append(train_loss)
+
+        else:
+            best_acc_per_gen_list.append(best_acc)
+            loss_list.append(best_loss)
 
         weight_pop, act_pop = optimizer(np.array(weight_pop, copy=False, dtype=dtype), act_pop, i, np.array(target_pop, dtype=dtype, copy=False), bar_status=False)
         target_pop = []

pyerualjetwork/plan_cuda.py

@@ -44,7 +44,7 @@ def fit(
     y_train,
     activation_potentiation=['linear'],
     W=None,
-    normalization=False,
+    auto_normalization=False,
     dtype=cp.float32
 ):
     """
@@ -60,7 +60,7 @@ def fit(
 
         W (cupy.ndarray, optional): If you want to re-continue or update model
         
-        normalization (bool, optional): Normalization may solves overflow problem. Default: False
+        auto_normalization (bool, optional): Normalization may solves overflow problem. Default: False
 
         dtype (cupy.dtype, optional): Data type for the arrays. cp.float32 by default. Example: cp.float64 or cp.float16. [fp32 for balanced devices, fp64 for strong devices, fp16 for weak devices: not reccomended!] (optional)
 
@@ -73,8 +73,8 @@ def fit(
 
     weight = cp.zeros((len(y_train[0]), len(x_train[0].ravel()))).astype(dtype, copy=False) if W is None else W
 
-    if normalization is True: x_train = normalization(apply_activation(x_train, activation_potentiation))
-    elif normalization is False: x_train = apply_activation(x_train, activation_potentiation)
+    if auto_normalization is True: x_train = normalization(apply_activation(x_train, activation_potentiation))
+    elif auto_normalization is False: x_train = apply_activation(x_train, activation_potentiation)
     else: raise ValueError('normalization parameter only be True or False')
     
     weight += y_train.T @ x_train
@@ -83,7 +83,7 @@ def fit(
 
 
 def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=None, batch_size=1, pop_size=None,
-           neural_web_history=False, show_current_activations=False, normalization=False,
+           neural_web_history=False, show_current_activations=False, auto_normalization=False,
            neurons_history=False, early_stop=False, loss='categorical_crossentropy', show_history=False,
            interval=33.33, target_acc=None, target_loss=None,
            start_this_act=None, start_this_W=None, dtype=cp.float32, memory='gpu'):
@@ -136,7 +136,7 @@ def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=Non
 
         loss (str, optional): For visualizing and monitoring. PLAN neural networks doesn't need any loss function in training. options: ('categorical_crossentropy' or 'binary_crossentropy') Default is 'categorical_crossentropy'.
 
-        normalization (bool, optional): Normalization may solves overflow problem. Default: False
+        auto_normalization (bool, optional): Normalization may solves overflow problem. Default: False
         
         interval (int, optional): The interval at which evaluations are conducted during training. (33.33 = 30 FPS, 16.67 = 60 FPS) Default is 100.
     
@@ -196,12 +196,6 @@ def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=Non
     # Initialize visualization components
     viz_objects = initialize_visualization_for_learner(show_history, neurons_history, neural_web_history, x_train, y_train)
 
-    # Initialize progress bar
-    if batch_size == 1:
-        ncols = 76
-    else:
-        ncols = 49
-
     # Initialize variables
     best_acc = 0
     best_f1 = 0
@@ -212,7 +206,7 @@ def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=Non
     loss_list = []
     target_pop = []
 
-    progress = initialize_loading_bar(total=activation_potentiation_len, desc="", ncols=ncols, bar_format=bar_format_learner)
+    progress = initialize_loading_bar(total=activation_potentiation_len, desc="", ncols=78, bar_format=bar_format_learner)
 
     if fit_start is False or pop_size > activation_potentiation_len:
         weight_pop, act_pop = define_genomes(input_shape=len(x_train[0]), output_shape=len(y_train[0]), population_size=pop_size, dtype=dtype)
@@ -242,7 +236,7 @@ def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=Non
 
             if fit_start is True and i == 0 and j < activation_potentiation_len:
                 act_pop[j] = activation_potentiation[j]
-                W = fit(x_train_batch, y_train_batch, activation_potentiation=act_pop[j], normalization=normalization, dtype=dtype)
+                W = fit(x_train_batch, y_train_batch, activation_potentiation=act_pop[j], auto_normalization=auto_normalization, dtype=dtype)
                 weight_pop[j] = W
     
             model = evaluate(x_train_batch, y_train_batch, W=weight_pop[j], activation_potentiation=act_pop[j])
@@ -367,9 +361,6 @@ def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=Non
                     return best_weights, best_model[get_preds()], best_acc, final_activations
 
             progress.update(1)
-
-        best_acc_per_gen_list.append(best_acc)
-        loss_list.append(best_loss)
         
         if batch_size != 1:
             train_model = evaluate(x_train, y_train, best_weights, final_activations)
@@ -383,6 +374,13 @@ def learner(x_train, y_train, optimizer, fit_start, strategy='accuracy', gen=Non
             postfix_dict[f"{data} Loss"] = cp.round(train_loss, 4)
             progress.set_postfix(postfix_dict)
 
+            best_acc_per_gen_list.append(train_model[get_acc()])
+            loss_list.append(train_loss)
+
+        else:
+            best_acc_per_gen_list.append(best_acc)
+            loss_list.append(best_loss)
+
         weight_pop, act_pop = optimizer(cp.array(weight_pop, copy=False, dtype=dtype), act_pop, i, cp.array(target_pop, dtype=dtype, copy=False), bar_status=False)
         target_pop = []
 

{pyerualjetwork-4.3.9b1.dist-info → pyerualjetwork-4.3.9b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 4.3.9b1
+Version: 4.3.9b3
 Summary: PyerualJetwork is a machine learning library supported with GPU(CUDA) acceleration written in Python for professionals and researchers including with PLAN algorithm, PLANEAT algorithm (genetic optimization). Also includes data pre-process and memory manegament
 Author: Hasan Can Beydili
 Author-email: tchasancan@gmail.com

{pyerualjetwork-4.3.9b1.dist-info → pyerualjetwork-4.3.9b3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyerualjetwork/__init__.py,sha256=c1sm6eSTgJQBTjhfEfwJS9QRb_M0Fw_2lKhNGLObtds,641
+pyerualjetwork/__init__.py,sha256=yNG_jFSSI4rgzfAUhDROUGhgEAmQLOOUeGSHBuYgAJ0,641
 pyerualjetwork/activation_functions.py,sha256=bKf00lsuuLJNO-4vVp4OqBi4zJ-qZ8L3v-vl52notkY,7721
 pyerualjetwork/activation_functions_cuda.py,sha256=5y1Ti3GDfDteQDCUmODwe7tAyDAUlDTKmIikChQ8d6g,7772
 pyerualjetwork/data_operations.py,sha256=Flteouu6rfSo2uHMqBHuzO02dXmbNa-I5qWmUpGTZ5Y,14760
@@ -11,14 +11,14 @@ pyerualjetwork/metrics.py,sha256=q7MkhnZDRbCjFBDDfUgrl8lBYnUT_1ro1LxeBq105pI,607
 pyerualjetwork/metrics_cuda.py,sha256=73h9GC7XwmnFCVzFEEiPQfF8CwHIz2wsCbxpZrJtYgw,5061
 pyerualjetwork/model_operations.py,sha256=MCSCNYiiICRVZITobtS3ZIWmH5Q9gjyELuH32sAdgg4,12649
 pyerualjetwork/model_operations_cuda.py,sha256=NT01BK5nrDYE7H1x3KnSI8gmx0QTGGB0mP_LqEb1uuU,13157
-pyerualjetwork/plan.py,sha256=qafwPgZIWPCYfBaVJpU4K98MGU0ARMOjupNCZkT35bI,23463
-pyerualjetwork/plan_cuda.py,sha256=mwi9nekGghsLKvI2lEQk6PZqcmC6FBEuQ5LpEOrE4JI,24355
+pyerualjetwork/plan.py,sha256=uK-7GRXqH0ETIajOW6_B6pSyktKmHg1NE4COD7z1f7E,23536
+pyerualjetwork/plan_cuda.py,sha256=GS9_Bh6htFSxsAGSKm3x7LQQWhCX6GOjDu7qQdS3BM0,24416
 pyerualjetwork/planeat.py,sha256=Lq5R0aMS4UIdZdbUKsKDv5g0WLwYryomR3IQYb8vAa4,37573
 pyerualjetwork/planeat_cuda.py,sha256=SG7Oq1F2m3lJBbG9cgmu7q_ApmwSn2SvTpcbtEVAoDE,37630
 pyerualjetwork/ui.py,sha256=wu2BhU1k-w3Kcho5Jtq4SEKe68ftaUeRGneUOSCVDjU,575
 pyerualjetwork/visualizations.py,sha256=08O5uEewuYiovZRX1uHWEHjn19LcnhndWYvqVN74xs0,28290
 pyerualjetwork/visualizations_cuda.py,sha256=PYRqj4QYUbuYMYcNwO8yaTPB-jK7E6kZHhTrAi0lwPU,28749
-pyerualjetwork-4.3.9b1.dist-info/METADATA,sha256=O5ISY6Dipfqtm1ep307Umpq_bMUT-T4MajvoGS6F4iI,7476
-pyerualjetwork-4.3.9b1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-pyerualjetwork-4.3.9b1.dist-info/top_level.txt,sha256=BRyt62U_r3ZmJpj-wXNOoA345Bzamrj6RbaWsyW4tRg,15
-pyerualjetwork-4.3.9b1.dist-info/RECORD,,
+pyerualjetwork-4.3.9b3.dist-info/METADATA,sha256=01diXlEPFpR7H3i1jZe-ACbRo8d6mryS7WtkZmhyBOY,7476
+pyerualjetwork-4.3.9b3.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+pyerualjetwork-4.3.9b3.dist-info/top_level.txt,sha256=BRyt62U_r3ZmJpj-wXNOoA345Bzamrj6RbaWsyW4tRg,15
+pyerualjetwork-4.3.9b3.dist-info/RECORD,,