tonic 1.4.4.dev45__tar.gz → 1.5.1.dev13__tar.gz

{tonic-1.4.4.dev45 → tonic-1.5.1.dev13}/AUTHORS

@@ -2,6 +2,7 @@ Anindya Ghosh <anindya128@yahoo.com>
 Antoine Grimaldi <antoine.grimaldi@univ-amu.fr>
 AntoineGrimaldi <antoine.grimaldi@univ-amu.fr>
 Carsten Nielsen <carstenlau.nielsen@uzh.ch>
+Danny  Rosen <dannyrosen@mac.mynetworksettings.com>
 Dhia Zerrari <dhia.zerrari@outlook.com>
 Elias Martinsson <131291250+e-martinsson@users.noreply.github.com>
 Fabrizio Ottati <45739782+fabhertz95@users.noreply.github.com>

{tonic-1.4.4.dev45 → tonic-1.5.1.dev13}/ChangeLog

@@ -1,6 +1,22 @@
 CHANGES
 =======
 
+* updated pytorch versions
+* reverted pre-commit file
+* reverted pre-commit file
+* reverted pre-commit file
+* reverted pre-commit file
+* reverted pre-commit file
+* added max version to torchdata
+* formatted dataset\_utils
+* commmented test skip
+* fixed commented test
+* removed testing print
+* fixed bug with inclusion of ~ in path
+
+v1.5.0
+------
+
 * Update ci-pipeline.yml
 * add reset\_time parameter to SliceByTime slicer
 * add start\_time and end\_time to ToFrame

{tonic-1.4.4.dev45 → tonic-1.5.1.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tonic
-Version: 1.4.4.dev45
+Version: 1.5.1.dev13
 Summary: Neuromorphic datasets and transformations.
 Home-page: UNKNOWN
 Author: The Neuromorphs of Telluride

{tonic-1.4.4.dev45 → tonic-1.5.1.dev13}/test/dataset_utils.py

@@ -2,14 +2,18 @@ import shutil
 import unittest
 from typing import Any, Dict, Union
 from unittest.mock import patch
-
+import pytest
 import numpy as np
+import os
+
+# Location of the files to be saved and extracted by the datasets during testing
+TEST_LOCATION_ON_SYSTEM = "~/../../tmp"
+TEST_LOCATION_ON_SYSTEM = os.path.expanduser(TEST_LOCATION_ON_SYSTEM)
 
 
 class DatasetTestCase(unittest.TestCase):
     DATASET_CLASS = None
     FEATURE_TYPES = None
-
     _CHECK_FUNCTIONS = {"check_md5", "check_integrity", "check_exists"}
     _DOWNLOAD_EXTRACT_FUNCTIONS = {
         "download_url",
@@ -41,8 +45,7 @@ class DatasetTestCase(unittest.TestCase):
         )
 
     def create_dataset(self, inject_fake_data: bool = True, **kwargs: Any):
-        tmpdir = "/tmp/"
-        info = self._inject_fake_data(tmpdir)
+        info = self._inject_fake_data(TEST_LOCATION_ON_SYSTEM)
 
         if inject_fake_data:
             with patch.object(self.DATASET_CLASS, "_check_exists", return_value=True):
@@ -81,7 +84,7 @@ class DatasetTestCase(unittest.TestCase):
         assert len(data) == len(self.FEATURE_TYPES)
         assert len(target) == len(self.TARGET_TYPES)
 
-        for (data_piece, feature_type) in zip(data, self.FEATURE_TYPES):
+        for data_piece, feature_type in zip(data, self.FEATURE_TYPES):
             if type(data_piece) == np.ndarray:
                 assert data_piece.dtype == feature_type
             else:
@@ -93,6 +96,9 @@ class DatasetTestCase(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.KWARGS.update({"save_to": "/tmp"})
-        shutil.rmtree("/tmp/" + cls.DATASET_CLASS.__name__, ignore_errors=True)
+        cls.KWARGS.update({"save_to": TEST_LOCATION_ON_SYSTEM})
+        shutil.rmtree(
+            f"{TEST_LOCATION_ON_SYSTEM}/" + cls.DATASET_CLASS.__name__,
+            ignore_errors=True,
+        )
         super().setUpClass()

tonic-1.5.1.dev13/test/torch_requirements.txt

@@ -0,0 +1,5 @@
+--index-url https://download.pytorch.org/whl/cpu
+torch==2.3.0
+torchaudio==2.3.0
+torchvision==0.18.0
+torchdata<=0.8.0

{tonic-1.4.4.dev45 → tonic-1.5.1.dev13}/tonic/dataset.py

@@ -18,7 +18,7 @@ class Dataset:
         target_transform: Optional[Callable] = None,
         transforms: Optional[Callable] = None,
     ):
-        self.location_on_system = os.path.join(save_to, self.__class__.__name__)
+        self.location_on_system = os.path.join(os.path.expanduser(save_to), self.__class__.__name__)
         self.transform = transform
         self.target_transform = target_transform
         self.transforms = transforms

{tonic-1.4.4.dev45 → tonic-1.5.1.dev13}/tonic/download_utils.py

@@ -159,9 +159,9 @@ def _extract_zip(from_path: str, to_path: str, compression: Optional[str]) -> No
     with zipfile.ZipFile(
         from_path,
         "r",
-        compression=_ZIP_COMPRESSION_MAP[compression]
-        if compression
-        else zipfile.ZIP_STORED,
+        compression=(
+            _ZIP_COMPRESSION_MAP[compression] if compression else zipfile.ZIP_STORED
+        ),
     ) as zip:
         zip.extractall(to_path)
 
@@ -313,12 +313,10 @@ def download_and_extract_archive(
     md5: Optional[str] = None,
     remove_finished: bool = False,
 ) -> None:
-    download_root = os.path.expanduser(download_root)
     if extract_root is None:
         extract_root = download_root
     if not filename:
         filename = os.path.basename(url)
-
     download_url(url, download_root, filename, md5)
 
     archive = os.path.join(download_root, filename)

{tonic-1.4.4.dev45 → tonic-1.5.1.dev13}/tonic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tonic
-Version: 1.4.4.dev45
+Version: 1.5.1.dev13
 Summary: Neuromorphic datasets and transformations.
 Home-page: UNKNOWN
 Author: The Neuromorphs of Telluride

tonic-1.5.1.dev13/tonic.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "82ff84c", "is_release": false}

tonic-1.4.4.dev45/test/torch_requirements.txt

@@ -1,5 +0,0 @@
---index-url https://download.pytorch.org/whl/cpu
-torch==2.1.0
-torchaudio==2.1.0
-torchvision==0.16.0
-torchdata

tonic-1.4.4.dev45/tonic.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "c62db86", "is_release": false}