Merge pull request #149 from pyt-team/merge-thrd-batch

Fix third batch of PRs
pyt-team · Aug 24, 2023 · f862ec0 · f862ec0
2 parents 733895e + d65d3e8
commit f862ec0
Show file tree

Hide file tree

Showing 8 changed files with 266 additions and 164 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,5 @@
 default_language_version :
   python : python3
-fail_fast: true
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.0.1

diff --git a/test/nn/hypergraph/test_uniGCNII_layer.py → test/nn/hypergraph/test_unigcnii_layer.py b/test/nn/hypergraph/test_uniGCNII_layer.py → test/nn/hypergraph/test_unigcnii_layer.py
diff --git a/tutorials/hypergraph/dhgcn_train.ipynb b/tutorials/hypergraph/dhgcn_train.ipynb
@@ -25,7 +25,6 @@
     "import numpy as np\n",
     "from sklearn.model_selection import train_test_split\n",
     "\n",
-    "from toponetx import SimplicialComplex\n",
     "import toponetx.datasets as datasets\n",
     "from topomodelx.nn.hypergraph.dhgcn_layer import DHGCNLayer"
    ]
@@ -368,13 +367,6 @@
     "y_train, y_test = train_test_split(ys, test_size=test_size, shuffle=False)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
   {
    "attachments": {},
    "cell_type": "markdown",

diff --git a/tutorials/hypergraph/unigin_train.ipynb b/tutorials/hypergraph/unigin_train.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -11,7 +11,7 @@
     "from sklearn.model_selection import train_test_split\n",
     "from torch_geometric.datasets import TUDataset\n",
     "from torch_geometric.utils.convert import to_networkx\n",
-    "from toponetx import SimplicialComplex\n",
+    "from toponetx.classes.simplicial_complex import SimplicialComplex\n",
     "from topomodelx.nn.hypergraph.unigin_layer import UniGINLayer"
    ]
   },
@@ -365,7 +365,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "TNN",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -380,9 +380,8 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.11.3"
-  },
-  "orig_nbformat": 4
+  }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/tutorials/hypergraph/uniSAGE_train.ipynb → tutorials/hypergraph/unisage_train.ipynb b/tutorials/hypergraph/uniSAGE_train.ipynb → tutorials/hypergraph/unisage_train.ipynb
@@ -2,10 +2,19 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 2,
    "id": "babbfc35",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "The autoreload extension is already loaded. To reload it, use:\n",
+      "  %reload_ext autoreload\n"
+     ]
+    }
+   ],
    "source": [
     "%load_ext autoreload\n",
     "%autoreload 2\n",
@@ -15,7 +24,7 @@
     "from sklearn.model_selection import train_test_split\n",
     "from torch_geometric.datasets import TUDataset\n",
     "from torch_geometric.utils.convert import to_networkx\n",
-    "from toponetx import SimplicialComplex\n",
+    "from toponetx.classes.simplicial_complex import SimplicialComplex\n",
     "from topomodelx.nn.hypergraph.unisage_layer import UniSAGELayer\n",
     "import warnings\n",
     "\n",
@@ -40,10 +49,21 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 3,
    "id": "b9e6b0d0",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "Downloading https://www.chrsmrrs.com/graphkerneldatasets/MUTAG.zip\n",
+      "Extracting /tmp/MUTAG/MUTAG/MUTAG.zip\n",
+      "Processing...\n",
+      "Done!\n"
+     ]
+    }
+   ],
    "source": [
     "dataset = TUDataset(root=\"/tmp/MUTAG\", name=\"MUTAG\", use_edge_attr=True)\n",
     "dataset = dataset[:100]\n",
@@ -365,7 +385,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.8"
+   "version": "3.11.3"
   }
  },
  "nbformat": 4,

diff --git a/tutorials/simplicial/sccnn_train.ipynb b/tutorials/simplicial/sccnn_train.ipynb
@@ -66,7 +66,6 @@
     "import torch\n",
     "import numpy as np\n",
     "from sklearn.model_selection import train_test_split\n",
-    "from toponetx import SimplicialComplex\n",
     "import toponetx.datasets as datasets\n",
     "from topomodelx.nn.simplicial.sccnn_layer import SCCNNLayer"
    ]
@@ -546,7 +545,6 @@
     "import torch\n",
     "import numpy as np\n",
     "\n",
-    "from toponetx import SimplicialComplex\n",
     "import toponetx.datasets.graph as graph\n",
     "\n",
     "from topomodelx.nn.simplicial.sccnn_layer import SCCNNLayer"