pyerualjetwork 4.6.6__py3-none-any.whl → 4.6.7__py3-none-any.whl

pyerualjetwork/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.6.6"
+__version__ = "4.6.7"
 __update__ = """* Changes: https://github.com/HCB06/PyerualJetwork/blob/main/CHANGES
 * PyerualJetwork Homepage: https://github.com/HCB06/PyerualJetwork/tree/main
 * PyerualJetwork document: https://github.com/HCB06/PyerualJetwork/blob/main/Welcome_to_PyerualJetwork/PYERUALJETWORK_USER_MANUEL_AND_LEGAL_INFORMATION(EN).pdf

pyerualjetwork/model_operations.py

@@ -142,64 +142,56 @@ def save_model(model_name,
     df = pd.DataFrame(data)
     df.to_pickle(model_path + model_name + '.pkl')
 
-    if isinstance(W, list): max_file = len(W)
-    else: max_file = 1
-
-    for i in range(max_file):
-
-        if max_file > 1: weight = W[i]
-        else: weight = W
+    try:
 
-        try:
+        if weights_type == 'txt' and weights_format == 'f':
 
-            if weights_type == 'txt' and weights_format == 'f':
+                np.savetxt(model_path + model_name + f'_weights.txt',  W, fmt='%f')
 
-                    np.savetxt(model_path + model_name + f'weights{i}.txt',  weight, fmt='%f')
+        if weights_type == 'txt' and weights_format == 'raw':
 
-            if weights_type == 'txt' and weights_format == 'raw':
+                np.savetxt(model_path + model_name + f'_weights.txt',  W)
 
-                    np.savetxt(model_path + model_name + f'weights{i}.txt',  weight)
+        ###
 
-            ###
+        
+        if weights_type == 'pkl' and weights_format == 'f':
 
-            
-            if weights_type == 'pkl' and weights_format == 'f':
+            with open(model_path + model_name + f'_weights.pkl', 'wb') as f:
+                pickle.dump(W.astype(float), f)
 
-                with open(model_path + model_name + f'weights{i}.pkl', 'wb') as f:
-                    pickle.dump(weight.astype(float), f)
+        if weights_type == 'pkl' and weights_format =='raw':
+        
+            with open(model_path + model_name + f'_weights.pkl', 'wb') as f:
+                pickle.dump(W, f)
 
-            if weights_type == 'pkl' and weights_format =='raw':
-            
-                with open(model_path + model_name + f'weights{i}.pkl', 'wb') as f:
-                    pickle.dump(weight, f)
+        ###
 
-            ###
+        if weights_type == 'npy' and weights_format == 'f':
 
-            if weights_type == 'npy' and weights_format == 'f':
+                np.save(model_path + model_name + f'_weights.npy',  W, W.astype(float))
 
-                    np.save(model_path + model_name + f'weights{i}.npy',  weight, weight.astype(float))
+        if weights_type == 'npy' and weights_format == 'raw':
 
-            if weights_type == 'npy' and weights_format == 'raw':
+                np.save(model_path + model_name + f'_weights.npy',  W)
 
-                    np.save(model_path + model_name + f'weights{i}.npy',  weight)
+        ###
 
-            ###
+        if weights_type == 'mat' and weights_format == 'f':
 
-            if weights_type == 'mat' and weights_format == 'f':
+                w = {'w': W.astype(float)}
+                io.savemat(model_path + model_name + f'_weights.mat', w)
 
-                    w = {'w': weight.astype(float)}
-                    io.savemat(model_path + model_name + f'weights{i}.mat', w)
+        if weights_type == 'mat' and weights_format == 'raw':
+                
+                w = {'w': W}
+                io.savemat(model_path + model_name + f'_weights.mat', w)
 
-            if weights_type == 'mat' and weights_format == 'raw':
-                    
-                    w = {'w': weight}
-                    io.savemat(model_path + model_name + f'weights{i}.mat', w)
+    except:
 
-        except:
+        print(Fore.RED + "ERROR: Model Weights not saved. Check the Weight parameters. SaveFilePath expl: 'C:/Users/hasancanbeydili/Desktop/denemePLAN/' from: save_model" + Style.RESET_ALL)
+        sys.exit()
 
-            print(Fore.RED + "ERROR: Model Weights not saved. Check the Weight parameters. SaveFilePath expl: 'C:/Users/hasancanbeydili/Desktop/denemePLAN/' from: save_model" + Style.RESET_ALL)
-            sys.exit()
-    
     if show_info:
         print(df)
     
@@ -258,33 +250,26 @@ def load_model(model_name,
     model_name = str(df['MODEL NAME'].iloc[0])
     model_type = str(df['MODEL TYPE'].iloc[0])
     WeightType = str(df['WEIGHTS TYPE'].iloc[0])
-    layers = list(df['NEURON COUNT'])
-
-    if model_type == 'MLP': max_file = len(layers)-1
-    else: max_file = 1
-
-    W = []
-
-    for i in range(max_file):
-         
-        if WeightType == 'txt':
-                W.append(np.loadtxt(model_path + model_name + f'weights{i}.txt'))
-        elif WeightType == 'npy':
-                W.append(np.load(model_path + model_name + f'weights{i}.npy'))
-        elif WeightType == 'mat':
-                W.append(sio.loadmat(model_path + model_name + f'weights{i}.mat'))
-        elif WeightType == 'pkl':
-            with open(model_path + model_name + f'weights{i}.pkl', 'rb') as f:
-                W = pickle.load(f)
-        else:
 
-            raise ValueError(
-                Fore.RED + "Incorrect weight type value. Value must be 'txt', 'npy', 'pkl' or 'mat' from: load_model." + Style.RESET_ALL)
-            
-        if WeightType == 'mat':
-            W[-1] = W[-1]['w']
-
-    if model_type == 'PLAN': W = np.array(W[0], dtype=W[0].dtype)
+    if model_type == 'MLP': allow_pickle = True
+    else: allow_pickle = False
+
+    if WeightType == 'txt':
+            W = (np.loadtxt(model_path + model_name + f'_weights.txt'))
+    elif WeightType == 'npy':
+            W = (np.load(model_path + model_name + f'_weights.npy', allow_pickle=allow_pickle))
+    elif WeightType == 'mat':
+            W = (sio.loadmat(model_path + model_name + f'_weights.mat'))
+    elif WeightType == 'pkl':
+        with open(model_path + model_name + f'_weights.pkl', 'rb') as f:
+            W = pickle.load(f)
+    else:
+
+        raise ValueError(
+            Fore.RED + "Incorrect weight type value. Value must be 'txt', 'npy', 'pkl' or 'mat' from: load_model." + Style.RESET_ALL)
+        
+    if WeightType == 'mat':
+        W = W['w']
 
     return W, None, None, activation_potentiation, scaler_params, None, model_type
 

pyerualjetwork/model_operations_cuda.py

@@ -148,64 +148,56 @@ def save_model(model_name,
     df = pd.DataFrame(data)
     df.to_pickle(model_path + model_name + '.pkl')
 
-    if isinstance(W, list): max_file = len(W)
-    else: max_file = 1
-
-    for i in range(max_file):
-
-        if max_file > 1: weight = W[i]
-        else: weight = W
+    try:
 
-        try:
+        if weights_type == 'txt' and weights_format == 'f':
 
-            if weights_type == 'txt' and weights_format == 'f':
+                cp.savetxt(model_path + model_name + f'_weights.txt',  W, fmt='%f')
 
-                    cp.savetxt(model_path + model_name + f'weights{i}.txt',  weight, fmt='%f')
+        if weights_type == 'txt' and weights_format == 'raw':
 
-            if weights_type == 'txt' and weights_format == 'raw':
+                cp.savetxt(model_path + model_name + f'_weights.txt',  W)
 
-                    cp.savetxt(model_path + model_name + f'weights{i}.txt',  weight)
+        ###
 
-            ###
+        
+        if weights_type == 'pkl' and weights_format == 'f':
 
-            
-            if weights_type == 'pkl' and weights_format == 'f':
+            with open(model_path + model_name + f'_weights.pkl', 'wb') as f:
+                pickle.dump(W.astype(float), f)
 
-                with open(model_path + model_name + f'weights{i}.pkl', 'wb') as f:
-                    pickle.dump(weight.astype(float), f)
+        if weights_type == 'pkl' and weights_format =='raw':
+        
+            with open(model_path + model_name + f'_weights.pkl', 'wb') as f:
+                pickle.dump(W, f)
 
-            if weights_type == 'pkl' and weights_format =='raw':
-            
-                with open(model_path + model_name + f'weights{i}.pkl', 'wb') as f:
-                    pickle.dump(weight, f)
+        ###
 
-            ###
+        if weights_type == 'npy' and weights_format == 'f':
 
-            if weights_type == 'npy' and weights_format == 'f':
+                cp.save(model_path + model_name + f'_weights.npy',  W, W.astype(float))
 
-                    cp.save(model_path + model_name + f'weights{i}.npy',  weight, weight.astype(float))
+        if weights_type == 'npy' and weights_format == 'raw':
 
-            if weights_type == 'npy' and weights_format == 'raw':
+                cp.save(model_path + model_name + f'_weights.npy',  W)
 
-                    cp.save(model_path + model_name + f'weights{i}.npy',  weight)
+        ###
 
-            ###
+        if weights_type == 'mat' and weights_format == 'f':
 
-            if weights_type == 'mat' and weights_format == 'f':
+                w = {'w': W.astype(float)}
+                io.savemat(model_path + model_name + f'_weights.mat', w)
 
-                    w = {'w': weight.astype(float)}
-                    io.savemat(model_path + model_name + f'weights{i}.mat', w)
+        if weights_type == 'mat' and weights_format == 'raw':
+                
+                w = {'w': W}
+                io.savemat(model_path + model_name + f'_weights.mat', w)
 
-            if weights_type == 'mat' and weights_format == 'raw':
-                    
-                    w = {'w': weight}
-                    io.savemat(model_path + model_name + f'weights{i}.mat', w)
+    except:
 
-        except:
+        print(Fore.RED + "ERROR: Model Weights not saved. Check the Weight parameters. SaveFilePath expl: 'C:/Users/hasancanbeydili/Desktop/denemePLAN/' from: save_model" + Style.RESET_ALL)
+        sys.exit()
 
-            print(Fore.RED + "ERROR: Model Weights not saved. Check the Weight parameters. SaveFilePath expl: 'C:/Users/hasancanbeydili/Desktop/denemePLAN/' from: save_model" + Style.RESET_ALL)
-            sys.exit()
-    
     if show_info:
         print(df)
     
@@ -266,33 +258,26 @@ def load_model(model_name,
     model_name = str(df['MODEL NAME'].iloc[0])
     model_type = str(df['MODEL TYPE'].iloc[0])
     WeightType = str(df['WEIGHTS TYPE'].iloc[0])
-    layers = list(df['NEURON COUNT'])
-
-    if model_type == 'MLP': max_file = len(layers)-1
-    else: max_file = 1
-
-    W = []
-
-    for i in range(max_file):
 
-        if WeightType == 'txt':
-                W.append(cp.loadtxt(model_path + model_name + f'weights{i}.txt'))
-        elif WeightType == 'npy':
-                W.append(cp.load(model_path + model_name + f'weights{i}.npy'))
-        elif WeightType == 'mat':
-                W.append(sio.loadmat(model_path + model_name + f'weights{i}.mat'))
-        elif WeightType == 'pkl':
-            with open(model_path + model_name + f'weights{i}.pkl', 'rb') as f:
-                W = pickle.load(f)
-        else:
-
-            raise ValueError(
-                Fore.RED + "Incorrect weight type value. Value must be 'txt', 'npy', 'pkl' or 'mat' from: load_model." + Style.RESET_ALL)
-            
-        if WeightType == 'mat':
-            W[-1] = W[-1]['w']
-
-    if model_type == 'PLAN': W = cp.array(W[0], dtype=W[0].dtype)
+    if model_type == 'MLP': allow_pickle = True
+    else: allow_pickle = False
+
+    if WeightType == 'txt':
+            W = (cp.loadtxt(model_path + model_name + f'_weights.txt'))
+    elif WeightType == 'npy':
+            W = (cp.load(model_path + model_name + f'_weights.npy', allow_pickle=allow_pickle))
+    elif WeightType == 'mat':
+            W = (sio.loadmat(model_path + model_name + f'_weights.mat'))
+    elif WeightType == 'pkl':
+        with open(model_path + model_name + f'_weights.pkl', 'rb') as f:
+            W = pickle.load(f)
+    else:
+
+        raise ValueError(
+            Fore.RED + "Incorrect weight type value. Value must be 'txt', 'npy', 'pkl' or 'mat' from: load_model." + Style.RESET_ALL)
+        
+    if WeightType == 'mat':
+        W = W['w']
 
     return W, None, None, activation_potentiation, scaler_params, None, model_type
 

{pyerualjetwork-4.6.6.dist-info → pyerualjetwork-4.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 4.6.6
+Version: 4.6.7
 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.6.6.dist-info → pyerualjetwork-4.6.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyerualjetwork/__init__.py,sha256=uKOppTDMmBVI819Q_jQUWyvm_UZH3QzdKF3q9SCfXU0,1279
+pyerualjetwork/__init__.py,sha256=qAWAFwiPtMCcyatR3z8bCv1Q33nVY7aqHH7j712tyoc,1279
 pyerualjetwork/activation_functions.py,sha256=Ms0AGBqkJuCA42ht64MSQnO54Td_1eDGquedpoBDVbc,7642
 pyerualjetwork/activation_functions_cuda.py,sha256=5y1Ti3GDfDteQDCUmODwe7tAyDAUlDTKmIikChQ8d6g,7772
 pyerualjetwork/data_operations.py,sha256=Y_RdxkjLEszFgeo4VDWIX1keF2syP-88KesLXA5sRyY,15280
@@ -10,8 +10,8 @@ pyerualjetwork/loss_functions_cuda.py,sha256=C93IZJcrOpT6HMK9x1O4AHJWXYTkN5WZiqd
 pyerualjetwork/memory_operations.py,sha256=0yCOHcgiNyF4ccMcRlL1Q9F_byG4nzjhmkbpXE_yU6E,13401
 pyerualjetwork/metrics.py,sha256=q7MkhnZDRbCjFBDDfUgrl8lBYnUT_1ro1LxeBq105pI,6077
 pyerualjetwork/metrics_cuda.py,sha256=73h9GC7XwmnFCVzFEEiPQfF8CwHIz2wsCbxpZrJtYgw,5061
-pyerualjetwork/model_operations.py,sha256=fr64XCwgl1YRh5nP3sEkvQORKHb-2lF_a4KjclNkZfY,15522
-pyerualjetwork/model_operations_cuda.py,sha256=-Kv8fYqHSU0L9FalOsQ7EWCwCEwjgUySObyueOqCH_o,16134
+pyerualjetwork/model_operations.py,sha256=KaJS2IM5Uk527DqN2ENdKX99yJElymfTmE3226j2HwM,14941
+pyerualjetwork/model_operations_cuda.py,sha256=0MyokoskDTnMKugu4kU8PP4F5tLN6RYNUx_5SWvqoyg,15562
 pyerualjetwork/plan.py,sha256=UyIvPmvHCHwczlc9KHolE4y6CPEeBfhnRN5yznSbnoM,23028
 pyerualjetwork/plan_cuda.py,sha256=iteqgv7x9Z2Pj4vGOZs6HXS3r0bNaF_smr7ZXaOdRnw,23990
 pyerualjetwork/planeat.py,sha256=prbkUIrD37Y_b7MmTuGg4rGHXfqHIjLFMbs7TnnEy9E,44645
@@ -19,7 +19,7 @@ pyerualjetwork/planeat_cuda.py,sha256=i6WDHkUEAMK7IHNBilM29xyYWq2qvPNpF9idcAkC1E
 pyerualjetwork/ui.py,sha256=JBTFYz5R24XwNKhA3GSW-oYAoiIBxAE3kFGXkvm5gqw,656
 pyerualjetwork/visualizations.py,sha256=utnX9zQhzmtvBJLOLNGm2jecVVk4zHXABQdjb0XzJac,28352
 pyerualjetwork/visualizations_cuda.py,sha256=gnoaaazZ-nc9E1ImqXrZBRgQ4Rnpi2qh2yGJ2eLKMlE,28807
-pyerualjetwork-4.6.6.dist-info/METADATA,sha256=nrasvgqmd7Tb2-NEqbkmaS4FWNIaHmyttYaLLzKm0_Q,7505
-pyerualjetwork-4.6.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-pyerualjetwork-4.6.6.dist-info/top_level.txt,sha256=BRyt62U_r3ZmJpj-wXNOoA345Bzamrj6RbaWsyW4tRg,15
-pyerualjetwork-4.6.6.dist-info/RECORD,,
+pyerualjetwork-4.6.7.dist-info/METADATA,sha256=191yqow3K5p68q4nmtWhIx95BDSOSj-xlwcT7w6Tmms,7505
+pyerualjetwork-4.6.7.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+pyerualjetwork-4.6.7.dist-info/top_level.txt,sha256=BRyt62U_r3ZmJpj-wXNOoA345Bzamrj6RbaWsyW4tRg,15
+pyerualjetwork-4.6.7.dist-info/RECORD,,