pyerualjetwork 4.3.9b2__py3-none-any.whl → 4.3.9b4__py3-none-any.whl

pyerualjetwork/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.3.9b2"
+__version__ = "4.3.9b4"
 __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

@@ -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)
@@ -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

@@ -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)
@@ -367,22 +361,26 @@ 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)
             
             if loss == 'categorical_crossentropy':
-                train_loss = categorical_crossentropy(y_true_batch=transfer_to_gpu(y_train_batch, dtype=y_train_batch.dtype), y_pred_batch=train_model[get_preds_softmax()])
+                train_loss = categorical_crossentropy(y_true_batch=transfer_to_gpu(y_train, dtype=y_train.dtype), y_pred_batch=train_model[get_preds_softmax()])
             else:
-                train_loss = binary_crossentropy(y_true_batch=transfer_to_gpu(y_train_batch, dtype=y_train_batch.dtype), y_pred_batch=train_model[get_preds_softmax()])
+                train_loss = binary_crossentropy(y_true_batch=transfer_to_gpu(y_train, dtype=y_train.dtype), y_pred_batch=train_model[get_preds_softmax()])
 
             postfix_dict[f"{data} Accuracy"] = cp.round(train_model[get_acc()], 4)
             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.9b2.dist-info → pyerualjetwork-4.3.9b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 4.3.9b2
+Version: 4.3.9b4
 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.9b2.dist-info → pyerualjetwork-4.3.9b4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyerualjetwork/__init__.py,sha256=Xq17ymoPeZ0UU0jM2XmXY2oG85-nGR6-4scDvbFco4I,641
+pyerualjetwork/__init__.py,sha256=i1UoaTGfwx70UIzWUX_-6AfbU-_k7Gvd086YS6rPJ08,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=yqtiPUTpvO-Ty8SRJd5RFdbIKMgGGGkMVxdgbVHhfjQ,23503
-pyerualjetwork/plan_cuda.py,sha256=4_AXa1IvDcqvHiK7CKbQXJBlO-UP6eVtK-ubDHmLGWk,24395
+pyerualjetwork/plan.py,sha256=uK-7GRXqH0ETIajOW6_B6pSyktKmHg1NE4COD7z1f7E,23536
+pyerualjetwork/plan_cuda.py,sha256=tNez_xvK6yuUiwotopqtERAJUCc7RiLx7W8VEG7RoQY,24392
 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.9b2.dist-info/METADATA,sha256=AQn9V-32uZrqHfQXYB0DBx47o_K5-dBBhGzCKysiKgw,7476
-pyerualjetwork-4.3.9b2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-pyerualjetwork-4.3.9b2.dist-info/top_level.txt,sha256=BRyt62U_r3ZmJpj-wXNOoA345Bzamrj6RbaWsyW4tRg,15
-pyerualjetwork-4.3.9b2.dist-info/RECORD,,
+pyerualjetwork-4.3.9b4.dist-info/METADATA,sha256=KAOOz0a3m7sBMQ4Y2n6Ki_4ZU_eT-HN2oZF_T-9jMJU,7476
+pyerualjetwork-4.3.9b4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+pyerualjetwork-4.3.9b4.dist-info/top_level.txt,sha256=BRyt62U_r3ZmJpj-wXNOoA345Bzamrj6RbaWsyW4tRg,15
+pyerualjetwork-4.3.9b4.dist-info/RECORD,,