tgraphx 0.3.0__tar.gz → 0.3.1__tar.gz

{tgraphx-0.3.0 → tgraphx-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tgraphx
-Version: 0.3.0
+Version: 0.3.1
 Summary: Tensor-aware graph neural networks preserving spatial node feature layouts
 Author-email: Arash Sajjadi <arash.sajjadi@usask.ca>
 Maintainer-email: Arash Sajjadi <arash.sajjadi@usask.ca>
@@ -18,7 +18,6 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -26,7 +25,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Scientific/Engineering :: Image Recognition
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: torch>=1.13

{tgraphx-0.3.0 → tgraphx-0.3.1}/pyproject.toml

@@ -5,10 +5,10 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "tgraphx"
 # Keep this in sync with tgraphx/__init__.py::__version__
-version = "0.3.0"
+version = "0.3.1"
 description = "Tensor-aware graph neural networks preserving spatial node feature layouts"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = {text = "MIT"}
 authors = [
     {name = "Arash Sajjadi", email = "arash.sajjadi@usask.ca"},
@@ -35,7 +35,6 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",

{tgraphx-0.3.0 → tgraphx-0.3.1}/tests/test_imports.py

@@ -113,6 +113,7 @@ def test_import_performance_from_top():
 
 def test_import_model_classes_from_top():
     from tgraphx import (  # noqa: F401
+        CNNEncoder,
         GraphClassifier,
         NodeClassifier,
         EdgePredictor,

{tgraphx-0.3.0 → tgraphx-0.3.1}/tests/test_synthetic_datasets.py

@@ -79,7 +79,7 @@ class TestPatchGraph:
             loss = torch.nn.functional.cross_entropy(logits, batch.graph_labels.long())
             loss.backward()
             opt.step()
-            losses.append(float(loss))
+            losses.append(loss.detach().item())
         assert losses[-1] < losses[0]
         assert all(torch.isfinite(p.grad).all() for p in model.parameters() if p.grad is not None)
 

{tgraphx-0.3.0 → tgraphx-0.3.1}/tests/test_tiny_overfit_v030.py

@@ -102,7 +102,7 @@ class TestTinyOverfit:
             )
             loss.backward()
             opt.step()
-            losses.append(float(loss))
+            losses.append(loss.detach().item())
         assert losses[-1] < losses[0]
 
     def test_graph_regression_loss_decreases(self):
@@ -126,7 +126,7 @@ class TestTinyOverfit:
             )
             loss.backward()
             opt.step()
-            losses.append(float(loss))
+            losses.append(loss.detach().item())
         assert losses[-1] < losses[0]
 
     def test_gcn_zoo_classifier_overfits(self):
@@ -151,7 +151,7 @@ class TestTinyOverfit:
             loss = torch.nn.functional.cross_entropy(logits, labels)
             loss.backward()
             opt.step()
-            losses.append(float(loss))
+            losses.append(loss.detach().item())
         assert losses[-1] < losses[0]
 
     def test_gatv2_classifier_finite_gradients(self):

{tgraphx-0.3.0 → tgraphx-0.3.1}/tgraphx/__init__.py

@@ -10,7 +10,7 @@ Common one-liner imports::
 """
 
 # Keep this in sync with [project].version in pyproject.toml.
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 
 # ── Core data structures ──────────────────────────────────────────────────────
 from .core.graph import Graph, GraphBatch
@@ -57,6 +57,7 @@ from .layers.factory import make_layer
 from .models.factory import build_model, build_model_from_config
 
 # ── Model classes ─────────────────────────────────────────────────────────────
+from .models.cnn_encoder import CNNEncoder
 from .models.edge_predictor import EdgePredictor
 from .models.regressors import NodeRegressor, GraphRegressor
 from .models.graph_classifier import GraphClassifier
@@ -173,6 +174,7 @@ __all__ = [
     "build_model",
     "build_model_from_config",
     # Model classes
+    "CNNEncoder",
     "EdgePredictor",
     "NodeRegressor",
     "GraphRegressor",

{tgraphx-0.3.0 → tgraphx-0.3.1}/tgraphx/datasets/folder.py

@@ -148,6 +148,7 @@ class ImageFolderPatchGraphDataset(InMemoryGraphDataset):
 
     def _populate(self) -> None:
         self._require_pil()
+        import numpy as _np
         from PIL import Image  # local import (lazy)
 
         graphs: List[Graph] = []
@@ -160,9 +161,9 @@ class ImageFolderPatchGraphDataset(InMemoryGraphDataset):
             for path in files:
                 with Image.open(path) as im:
                     im = im.convert("RGB")
-                    arr = torch.tensor(
-                        list(im.getdata()), dtype=torch.uint8,
-                    ).view(im.height, im.width, 3).permute(2, 0, 1).contiguous()
+                    arr = torch.from_numpy(
+                        _np.array(im, dtype=_np.uint8)
+                    ).permute(2, 0, 1).contiguous()
                 img = arr.to(dtype=torch.float)
                 if self.normalize:
                     img = img / 255.0

{tgraphx-0.3.0 → tgraphx-0.3.1}/tgraphx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tgraphx
-Version: 0.3.0
+Version: 0.3.1
 Summary: Tensor-aware graph neural networks preserving spatial node feature layouts
 Author-email: Arash Sajjadi <arash.sajjadi@usask.ca>
 Maintainer-email: Arash Sajjadi <arash.sajjadi@usask.ca>
@@ -18,7 +18,6 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -26,7 +25,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Scientific/Engineering :: Image Recognition
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: torch>=1.13