training edge pred ok

Author: mishadr

docs/source/api/aux.rst

@@ -15,3 +15,6 @@ aux
 .. automodule:: aux.declaration
    :members:
 
+.. automodule:: aux.prefix_storage
+   :members:
+

docs/source/api/data_structures.rst

@@ -6,11 +6,6 @@ data_structures
    :toctree: generated
 
 
-Prefix storage
-==============
-.. automodule:: data_structures.prefix_storage
-   :members:
-
 Configs
 =======
 .. automodule:: data_structures.configs

docs/source/api/datasets.rst

@@ -17,8 +17,6 @@ Short overview
     datasets.ptg_datasets.PTGDataset
     datasets.known_format_datasets.KnownFormatDataset
     datasets.datasets_manager.DatasetManager
-    datasets.visible_part.DatasetData
-    datasets.visible_part.DatasetVarData
 
 
 Base classes
@@ -47,5 +45,3 @@ Additional dataset related modules
     :members:
 .. automodule:: datasets.dataset_stats
     :members:
-.. automodule:: datasets.visible_part
-    :members:

docs/source/api/models_builder.rst

@@ -16,8 +16,6 @@ Base classes
    :members:
 .. automodule:: models_builder.gnn_constructor
    :members:
-.. automodule:: models_builder.gnn_models
-   :members:
 .. automodule:: models_builder.models_utils
    :members:
 .. automodule:: models_builder.models_zoo

experiments/various_tasks.py

@@ -171,19 +171,20 @@ def link_prediction():
     manager_config = ConfigPattern(
         _config_class="ModelManagerConfig",
         _config_kwargs={
-            "batch": 64,
+            "batch": 128,
             "mask_features": [],
             "optimizer": {
                 "_class_name": "Adam",
                 "_config_kwargs": {},
             },
             "loss_function": {
                 "_config_class": "Config",
-                "_class_name": "CrossEntropyLoss",
+                "_class_name": "BCEWithLogitsLoss",
                 "_import_path": FUNCTIONS_PARAMETERS_PATH,
                 "_class_import_info": ["torch.nn"],
                 "_config_kwargs": {},
             },
+            "neg_samples_ratio": 2
         }
     )
 
@@ -208,10 +209,14 @@ def link_prediction():
     )
     print("Training was successful")
 
-    # res = gnn_model_manager.run_model(
-    #     gen_dataset=gen_dataset,
-    #     mask='all'
-    # )
+    res = gnn_model_manager.run_model(
+        gen_dataset=gen_dataset,
+        mask='all',
+        out='predictions'
+    )
+    print(json.dumps(res.tolist(), indent=2))
+    return
+
     from gnn_aid.aux.utils import EVASION_ATTACK_PARAMETERS_PATH
     evasion_attack_config = ConfigPattern(
         _class_name="FGSM",
@@ -227,17 +232,17 @@ def link_prediction():
     # атака
     # gnn_model_manager.set_evasion_attacker(evasion_attack_config=evasion_attack_config)
     #
-    # res = gnn_model_manager.evaluate_model(
-    #     gen_dataset=gen_dataset,
-    #     metrics=[
-    #         Metric("Accuracy", mask='all'),
-    #         Metric("AUC", mask='test'),
-    #         # Metric("Precision@k", mask='test', k=50),
-    #         # Metric("Precision@k", mask='test', k=500000),
-    #         # Metric("Recall@k", mask='test', k=500000),
-    #     ]
-    # )
-    # print(json.dumps(res, indent=2))
+    res = gnn_model_manager.evaluate_model(
+        gen_dataset=gen_dataset,
+        metrics=[
+            Metric("Accuracy", mask='all'),
+            Metric("AUC", mask='test'),
+            # Metric("Precision@k", mask='test', k=50),
+            # Metric("Precision@k", mask='test', k=500000),
+            # Metric("Recall@k", mask='test', k=500000),
+        ]
+    )
+    print(json.dumps(res, indent=2))
 
     # explainer
     from gnn_aid.aux.utils import EXPLAINERS_INIT_PARAMETERS_PATH, EXPLAINERS_LOCAL_RUN_PARAMETERS_PATH

gnn_aid/attacks/evasion_attacks.py

@@ -884,4 +884,3 @@ def dataset_diff(
             self
     ) -> GraphModificationArtifact:
         return self.attack_diff
-

gnn_aid/aux/prefix_storage.py

@@ -542,34 +542,34 @@ def remap(
         Change keys order and combination.
         """
         raise NotImplementedError
-        # Check consistency
-        ms = set()
-        for m in mapping:
-            if isinstance(m, (list, tuple)):
-                ms.update(m)
-            else:
-                ms.add(m)
-        assert ms == set(range(len(self.keys))),\
-            f"mapping should contain key indices from 0 to {len(self.keys)-1}"
-
-        keys = [",".join(self.keys[i] for i in m) if isinstance(m, (list, tuple)) else self.keys[m]
-                for m in mapping]
-        ps = FixedKeysPrefixStorage(keys)
-
-        for item in self:
-            values = []
-            for m in mapping:
-                if isinstance(m, (list, tuple)):
-                    if only_values:
-                        v = ",".join(str(item[i]) for i in m)
-                    else:
-                        v = ",".join(f"{self.keys[i]}={item[i]}" for i in m)
-                else:
-                    v = item[m]
-                values.append(v)
-            ps.add(values)
-
-        return ps
+        # # Check consistency
+        # ms = set()
+        # for m in mapping:
+        #     if isinstance(m, (list, tuple)):
+        #         ms.update(m)
+        #     else:
+        #         ms.add(m)
+        # assert ms == set(range(len(self.keys))),\
+        #     f"mapping should contain key indices from 0 to {len(self.keys)-1}"
+        #
+        # keys = [",".join(self.keys[i] for i in m) if isinstance(m, (list, tuple)) else self.keys[m]
+        #         for m in mapping]
+        # ps = FixedKeysPrefixStorage(keys)
+        #
+        # for item in self:
+        #     values = []
+        #     for m in mapping:
+        #         if isinstance(m, (list, tuple)):
+        #             if only_values:
+        #                 v = ",".join(str(item[i]) for i in m)
+        #             else:
+        #                 v = ",".join(f"{self.keys[i]}={item[i]}" for i in m)
+        #         else:
+        #             v = item[m]
+        #         values.append(v)
+        #     ps.add(values)
+        #
+        # return ps
 
     def __str__(
             self

gnn_aid/aux/utils.py

@@ -349,11 +349,10 @@ def reset(
             total: Union[float, None] = None,
             **kwargs
     ):
-        res = super().reset(total=total)
+        super().reset(total=total)
         self.kwargs = kwargs
         if self._on_reset_hook:
             self._on_reset_hook()
-        return res
 
     def update(
             self,

gnn_aid/datasets/__init__.py

@@ -1,10 +1,10 @@
 from .dataset_converter import DatasetConverter
 from .dataset_info import DatasetInfo
 from .dataset_stats import DatasetStats
-from .datasets_manager import DatasetManager
 from .gen_dataset import GeneralDataset, LocalDataset
 from .known_format_datasets import KnownFormatDataset
 from .ptg_datasets import PTGDataset, LibPTGDataset
+from .datasets_manager import DatasetManager
 
 __all__ = [
     'DatasetConverter',