yms-kan 0.0.1__py3-none-any.whl → 0.0.2__py3-none-any.whl

yms_kan/MultKAN.py

@@ -3,6 +3,7 @@ import math
 import os
 import random
 import sys
+from importlib.resources import files
 
 import matplotlib.pyplot as plt
 import numpy as np
@@ -1299,7 +1300,8 @@ class MultKAN(nn.Module):
             N = n = width_out[l + 1]
             for j in range(n):
                 id_ = j
-                path = os.path.dirname(os.path.abspath(__file__)) + "/assets/img/sum_symbol.png"
+                # path = os.path.dirname(os.path.abspath(__file__)) + "/assets/img/sum_symbol.png"
+                path = files('yms_kan') / "assets/img/sum_symbol.png"
                 im = plt.imread(path)
                 left = DC_to_NFC([1 / (2 * N) + id_ / N - y2, 0])[0]
                 right = DC_to_NFC([1 / (2 * N) + id_ / N + y2, 0])[0]
@@ -1315,7 +1317,8 @@ class MultKAN(nn.Module):
             n_mult = width[l + 1][1]
             for j in range(n_mult):
                 id_ = j + n_sum
-                path = os.path.dirname(os.path.abspath(__file__)) + "/assets/img/mult_symbol.png"
+                # path = os.path.dirname(os.path.abspath(__file__)) + "/assets/img/mult_symbol.png"
+                path = files('yms_kan') / "assets/img/mult_symbol.png"
                 im = plt.imread(path)
                 left = DC_to_NFC([1 / (2 * N) + id_ / N - y2, 0])[0]
                 right = DC_to_NFC([1 / (2 * N) + id_ / N + y2, 0])[0]

yms_kan/train_eval_utils.py

@@ -12,22 +12,14 @@ from tqdm import tqdm
 from yms_kan import LBFGS
 
 
-class TaskType(Enum):
-    classification = auto()
-    zlm = auto()
-
-
 def train_val(model, dataset: dict, batch_size, batch_size_test, opt="LBFGS", epochs=100, lamb=0.,
               lamb_l1=1., label=None, lamb_entropy=2., lamb_coef=0.,
               lamb_coefdiff=0., update_grid=True, grid_update_num=10, loss_fn=None, lr=1., start_grid_update_step=-1,
               stop_grid_update_step=100,
               save_fig=False, in_vars=None, out_vars=None, beta=3, save_fig_freq=1, img_folder='./video',
               singularity_avoiding=False, y_th=1000., reg_metric='edge_forward_spline_n'):
-    # result_info = ['epoch','train_losses', 'val_losses', 'regularize', 'accuracies',
-    #                'precisions', 'recalls', 'f1-scores']
-    # initialize_results_file(results_file, result_info)
-    all_predictions = []
-    all_labels = []
+    # all_predictions = []
+    # all_labels = []
     if lamb > 0. and not model.save_act:
         print('setting lamb=0. If you want to set lamb > 0, set model.save_act=True')
 
@@ -52,8 +44,8 @@ def train_val(model, dataset: dict, batch_size, batch_size_test, opt="LBFGS", ep
 
     lr_scheduler = ReduceLROnPlateau(optimizer, mode='min', factor=0.1, patience=5, min_lr=1e-9)
 
-    results = {'train_losses': [], 'val_losses': [], 'regularize': [], 'accuracies': [],
-               'precisions': [], 'recalls': [], 'f1-scores': []}
+    results = {'train_loss': .0, 'val_loss': .0, 'regularize': .0, 'all_predictions': [],
+               'all_labels': []}
 
     steps = math.ceil(dataset['train_input'].shape[0] / batch_size)
 
@@ -126,6 +118,7 @@ def train_val(model, dataset: dict, batch_size, batch_size_test, opt="LBFGS", ep
                 optimizer.step()
             train_pbar.set_postfix(loss=train_loss.item())
 
+        # print(f'{epoch}/{epochs}:train_loss:{train_loss.item()}')
         val_loss = torch.zeros(1).to(model.device)
         with torch.no_grad():
             test_indices = np.arange(dataset['test_input'].shape[0])
@@ -149,14 +142,14 @@ def train_val(model, dataset: dict, batch_size, batch_size_test, opt="LBFGS", ep
                     diffs = torch.abs(outputs - label)
                     closest_indices = torch.argmin(diffs, dim=1)
                     closest_values = label[closest_indices]
-                    all_predictions.extend(closest_values.detach().cpu().numpy())
-                    all_labels.extend(batch_test_label.detach().cpu().numpy())
+                    results['all_predictions'].extend(closest_values.detach().cpu().numpy())
+                    results['all_labels'].extend(batch_test_label.detach().cpu().numpy())
 
             lr_scheduler.step(val_loss)
 
-        results['train_losses'].append(train_loss.cpu().item())
-        results['val_losses'].append(val_loss.cpu().item())
-        results['regularize'].append(reg_.cpu().item())
+        results['train_loss'] = train_loss.item()
+        results['val_loss'] = val_loss.item()
+        results['regularize'] = reg_.item()
 
         if save_fig and epoch % save_fig_freq == 0:
             model.plot(folder=img_folder, in_vars=in_vars, out_vars=out_vars, title="Step {}".format(epoch),
@@ -170,6 +163,156 @@ def train_val(model, dataset: dict, batch_size, batch_size_test, opt="LBFGS", ep
     model.symbolic_enabled = old_symbolic_enabled
     return results
 
-
-if __name__ == '__main__':
-    print(TaskType.zlm.value)
+# def train_val(model, dataset: dict, batch_size, batch_size_test, opt="LBFGS", epochs=100, lamb=0.,
+#               lamb_l1=1., label=None, lamb_entropy=2., lamb_coef=0.,
+#               lamb_coefdiff=0., update_grid=True, grid_update_num=10, loss_fn=None, lr=1., start_grid_update_step=-1,
+#               stop_grid_update_step=100,
+#               save_fig=False, in_vars=None, out_vars=None, beta=3, save_fig_freq=1, img_folder='./video',
+#               singularity_avoiding=False, y_th=1000., reg_metric='edge_forward_spline_n'):
+#     # result_info = ['epoch','train_losses', 'val_losses', 'regularize', 'accuracies',
+#     #                'precisions', 'recalls', 'f1-scores']
+#     # initialize_results_file(results_file, result_info)
+#     all_predictions = []
+#     all_labels = []
+#     if lamb > 0. and not model.save_act:
+#         print('setting lamb=0. If you want to set lamb > 0, set model.save_act=True')
+#
+#     old_save_act, old_symbolic_enabled = model.disable_symbolic_in_fit(lamb)
+#     if label is not None:
+#         label = label.to(model.device)
+#
+#     if loss_fn is None:
+#         loss_fn = lambda x, y: torch.mean((x - y) ** 2)
+#     else:
+#         loss_fn = loss_fn
+#
+#     grid_update_freq = int(stop_grid_update_step / grid_update_num)
+#
+#     if opt == "Adam":
+#         optimizer = torch.optim.Adam(model.get_params(), lr=lr)
+#     elif opt == "LBFGS":
+#         optimizer = LBFGS(model.get_params(), lr=lr, history_size=10, line_search_fn="strong_wolfe",
+#                           tolerance_grad=1e-32, tolerance_change=1e-32, tolerance_ys=1e-32)
+#     else:
+#         optimizer = torch.optim.SGD(model.get_params(), lr=lr)
+#
+#     lr_scheduler = ReduceLROnPlateau(optimizer, mode='min', factor=0.1, patience=5, min_lr=1e-9)
+#
+#     results = {'train_losses': [], 'val_losses': [], 'regularize': [], 'accuracies': [],
+#                'precisions': [], 'recalls': [], 'f1-scores': []}
+#
+#     steps = math.ceil(dataset['train_input'].shape[0] / batch_size)
+#
+#     train_loss = torch.zeros(1).to(model.device)
+#     reg_ = torch.zeros(1).to(model.device)
+#
+#     def closure():
+#         nonlocal train_loss, reg_
+#         optimizer.zero_grad()
+#         pred = model.forward(batch_train_input, singularity_avoiding=singularity_avoiding, y_th=y_th)
+#         loss = loss_fn(pred, batch_train_label)
+#         if model.save_act:
+#             if reg_metric == 'edge_backward':
+#                 model.attribute()
+#             if reg_metric == 'node_backward':
+#                 model.node_attribute()
+#             reg_ = model.get_reg(reg_metric, lamb_l1, lamb_entropy, lamb_coef, lamb_coefdiff)
+#         else:
+#             reg_ = torch.tensor(0.)
+#         objective = loss + lamb * reg_
+#         train_loss = (train_loss * batch_num + objective.detach()) / (batch_num + 1)
+#         objective.backward()
+#         return objective
+#
+#     if save_fig:
+#         if not os.path.exists(img_folder):
+#             os.makedirs(img_folder)
+#
+#     for epoch in range(epochs):
+#
+#         if epoch == epochs - 1 and old_save_act:
+#             model.save_act = True
+#
+#         if save_fig and epoch % save_fig_freq == 0:
+#             save_act = model.save_act
+#             model.save_act = True
+#
+#         train_indices = np.arange(dataset['train_input'].shape[0])
+#         np.random.shuffle(train_indices)
+#         train_pbar = tqdm(range(steps), desc=f'Epoch {epoch + 1}/{epochs} Training', file=sys.stdout)
+#         for batch_num in train_pbar:
+#             step = epoch * steps + batch_num + 1
+#             i = batch_num * batch_size
+#             batch_train_id = train_indices[i:i + batch_size]
+#             batch_train_input = dataset['train_input'][batch_train_id].to(model.device)
+#             batch_train_label = dataset['train_label'][batch_train_id].to(model.device)
+#
+#             if step % grid_update_freq == 0 and step < stop_grid_update_step and update_grid and step >= start_grid_update_step:
+#                 model.update_grid(batch_train_input)
+#
+#             if opt == "LBFGS":
+#                 optimizer.step(closure)
+#
+#             else:
+#                 optimizer.zero_grad()
+#                 pred = model.forward(batch_train_input, singularity_avoiding=singularity_avoiding,
+#                                      y_th=y_th)
+#                 loss = loss_fn(pred, batch_train_label)
+#                 if model.save_act:
+#                     if reg_metric == 'edge_backward':
+#                         model.attribute()
+#                     if reg_metric == 'node_backward':
+#                         model.node_attribute()
+#                     reg_ = model.get_reg(reg_metric, lamb_l1, lamb_entropy, lamb_coef, lamb_coefdiff)
+#                 else:
+#                     reg_ = torch.tensor(0.)
+#                 loss = loss + lamb * reg_
+#                 train_loss = (train_loss * batch_num + loss.detach()) / (batch_num + 1)
+#                 loss.backward()
+#                 optimizer.step()
+#             train_pbar.set_postfix(loss=train_loss.item())
+#
+#         print(f'{epoch}/{epochs}:train_loss:{train_loss.item()}')
+#         val_loss = torch.zeros(1).to(model.device)
+#         with torch.no_grad():
+#             test_indices = np.arange(dataset['test_input'].shape[0])
+#             np.random.shuffle(test_indices)
+#             test_steps = math.ceil(dataset['test_input'].shape[0] / batch_size_test)
+#             test_pbar = tqdm(range(test_steps), desc=f'Epoch {epoch + 1}/{epochs} Validation', file=sys.stdout)
+#             for batch_num in test_pbar:
+#                 i = batch_num * batch_size_test
+#                 batch_test_id = test_indices[i:i + batch_size_test]
+#                 batch_test_input = dataset['test_input'][batch_test_id].to(model.device)
+#                 batch_test_label = dataset['test_label'][batch_test_id].to(model.device)
+#
+#                 outputs = model.forward(batch_test_input, singularity_avoiding=singularity_avoiding,
+#                                         y_th=y_th)
+#
+#                 loss = loss_fn(outputs, batch_test_label)
+#
+#                 val_loss = (val_loss * batch_num + loss.detach()) / (batch_num + 1)
+#                 test_pbar.set_postfix(loss=loss.item(), val_loss=val_loss.item())
+#                 if label is not None:
+#                     diffs = torch.abs(outputs - label)
+#                     closest_indices = torch.argmin(diffs, dim=1)
+#                     closest_values = label[closest_indices]
+#                     all_predictions.extend(closest_values.detach().cpu().numpy())
+#                     all_labels.extend(batch_test_label.detach().cpu().numpy())
+#
+#             lr_scheduler.step(val_loss)
+#
+#         results['train_losses'].append(train_loss.cpu().item())
+#         results['val_losses'].append(val_loss.cpu().item())
+#         results['regularize'].append(reg_.cpu().item())
+#
+#         if save_fig and epoch % save_fig_freq == 0:
+#             model.plot(folder=img_folder, in_vars=in_vars, out_vars=out_vars, title="Step {}".format(epoch),
+#                        beta=beta)
+#             plt.savefig(img_folder + '/' + str(epoch) + '.jpg', bbox_inches='tight', dpi=100)
+#             plt.close()
+#             model.save_act = save_act
+#
+#     # append_to_results_file(results_file, results, result_info)
+#     model.log_history('fit')
+#     model.symbolic_enabled = old_symbolic_enabled
+#     return results

yms_kan/version.py

@@ -1 +1 @@
-__version__ = "0.0.1"  # 初始版本
+__version__ = "0.0.2"  # 初始版本

{yms_kan-0.0.1.dist-info → yms_kan-0.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yms_kan
-Version: 0.0.1
+Version: 0.0.2
 Summary: My awesome package
 Author-email: yms <11@qq.com>
 License-Expression: MIT

{yms_kan-0.0.1.dist-info → yms_kan-0.0.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 yms_kan/KANLayer.py,sha256=-V2Fh5wvPYvfF1tmQVxJKWvvaAHiwo2EiFpd8VDgB1c,14149
 yms_kan/LBFGS.py,sha256=OPeRPDp40jaVH4qPoBDMEub7TPhyvw7pbqwQar3OZ1A,17620
 yms_kan/MLP.py,sha256=ryLzSuBrsGlSHRLwnQZCNj-Ru9BwXJYoHNkAwX14N64,12804
-yms_kan/MultKAN.py,sha256=sVVYmI5DSQPCU4y3s-JH7jPTS1dL9ztFCCB5KPbrjrU,121930
+yms_kan/MultKAN.py,sha256=n58W6tORBDuh_-pUVp-ER-R9KNJKdYjFaisDx8wJpWw,122113
 yms_kan/Symbolic_KANLayer.py,sha256=WhJzC5IMIpXI_K7aYamOrWTK7uckxVdsM9N4oLZMO3I,9897
 yms_kan/__init__.py,sha256=O2c6DIG4PHavXF2v7K9jNqMbJXWr4-gTN3Vs1YSlc64,120
 yms_kan/compiler.py,sha256=7bVwDNX0xmLAjQ8V1FdmkIIIibmy_W5eaeSKBlYL0Vc,18632
@@ -10,11 +10,13 @@ yms_kan/feynman.py,sha256=Eisf69K49s4C6UlPEi5LnNK_p5TUJQLBKxMp-sW0a9w,33687
 yms_kan/hypothesis.py,sha256=Ec20xadfgOSSWeZHQaGn-h9F2PY7LWFU3iniNI2Zd_4,23165
 yms_kan/spline.py,sha256=ZXyGwl2Sc-UrnrcuUXeUQkBOMnetaWcHrbpZaqatCvs,4345
 yms_kan/tool.py,sha256=CLIsOYWwG-A5PJvoyIP8cRBzX8iRhEssW-2uXdLfi-U,12124
-yms_kan/train_eval_utils.py,sha256=hLBBe60AaPvqT-VLPHXzxEj14dBQJZ4uJFIkEp3Neak,7612
+yms_kan/train_eval_utils.py,sha256=73pA3-HDPDik_yCsDW0oF1dIvVu_vPeHbvJ08o26ygQ,14867
 yms_kan/utils.py,sha256=J07L-tgmc1OfU6Tl6mGwHJRizjFN75EJK8BxejaZLUc,23860
-yms_kan/version.py,sha256=KHooFYaAikQv9yQmi9BTz3oq7Zm24uaNYJmVw0-8YCU,39
-yms_kan-0.0.1.dist-info/licenses/LICENSE,sha256=BJXDWyF4Groqtnp4Gi9puH4aLg7A2IC3MpHmC-cSxwc,1067
-yms_kan-0.0.1.dist-info/METADATA,sha256=K9MR1ucGkoyozsc7MZ2-FbboTyd1Xoau5GBCkCHV1vk,240
-yms_kan-0.0.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-yms_kan-0.0.1.dist-info/top_level.txt,sha256=Z_JDh6yZf-EiW1eKgL6ADsN2yqEMRMspi-o29JZ1WPo,8
-yms_kan-0.0.1.dist-info/RECORD,,
+yms_kan/version.py,sha256=qeSnHAh3t9Zb2L0FPUF5OaQvWEJcfTki6FmrfynjWz4,39
+yms_kan/assets/img/mult_symbol.png,sha256=2f4xUKdweft-qUbHjFI5h9-smnEtc0FWq8hNYZhPAXY,6392
+yms_kan/assets/img/sum_symbol.png,sha256=94QkMUzmEjlCq_yf14nMEQmettaq86FmlGfdl22b4XE,6210
+yms_kan-0.0.2.dist-info/licenses/LICENSE,sha256=BJXDWyF4Groqtnp4Gi9puH4aLg7A2IC3MpHmC-cSxwc,1067
+yms_kan-0.0.2.dist-info/METADATA,sha256=jTD-nNMWFF64GiFO2-bYQePNxJh4J1-yi4eniWT1djQ,240
+yms_kan-0.0.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+yms_kan-0.0.2.dist-info/top_level.txt,sha256=Z_JDh6yZf-EiW1eKgL6ADsN2yqEMRMspi-o29JZ1WPo,8
+yms_kan-0.0.2.dist-info/RECORD,,