Fixing PyPi dependencies, minor fix in VPRTempo dataloader

QVPR · Aug 16, 2024 · 2ed1101 · 2ed1101
1 parent 6c78bd9
commit 2ed1101
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -4,4 +4,4 @@ numpy
 pandas
 tqdm
 prettytable
-scikit-learn
+matplotlib
diff --git a/setup.py b/setup.py
@@ -15,13 +15,13 @@
                 'pandas',
                 'tqdm',
                 'prettytable',
-                'scikit-learn'
+                'matplotlib'
                 ]
 
 # define the setup
 setup(
     name="VPRTempo",
-    version="1.1.6",
+    version="1.1.7",
     description='VPRTempo: A Fast Temporally Encoded Spiking Neural Network for Visual Place Recognition',
     long_description=long_description,
     long_description_content_type='text/markdown',

diff --git a/vprtempo/VPRTempo.py b/vprtempo/VPRTempo.py
@@ -290,8 +290,7 @@ def run_inference(models, model_name):
 
     # Initialize the data loader
     test_loader = DataLoader(test_dataset, 
-                             batch_size=1, 
-                             shuffle=model.shuffle,
+                             batch_size=1,
                              num_workers=8,
                              persistent_workers=True)
 

diff --git a/vprtempo/__init__.py b/vprtempo/__init__.py
@@ -1 +1 @@
-_version__ = '1.1.6'
+_version__ = '1.1.7'
diff --git a/vprtempo/src/loggers.py b/vprtempo/src/loggers.py
@@ -37,7 +37,7 @@ def model_logger():
     logger.info(' ╚████╔╝ ██║     ██║  ██║   ██║   ███████╗██║ ╚═╝ ██║██║     ╚██████╔╝')
     logger.info('  ╚═══╝  ╚═╝     ╚═╝  ╚═╝   ╚═╝   ╚══════╝╚═╝     ╚═╝╚═╝      ╚═════╝ ')
     logger.info('-----------------------------------------------------------------------')
-    logger.info('Temporally Encoded Spiking Neural Network for Visual Place Recognition v1.1.6')
+    logger.info('Temporally Encoded Spiking Neural Network for Visual Place Recognition v1.1.7')
     logger.info('Queensland University of Technology, Centre for Robotics')
     logger.info('')
     logger.info('© 2023 Adam D Hines, Peter G Stratton, Michael Milford, Tobias Fischer')
@@ -90,7 +90,7 @@ def model_logger_quant():
     logger.info(' ╚████╔╝ ██║     ██║  ██║   ██║   ███████╗██║ ╚═╝ ██║██║     ╚██████╔╝      ╚██████╔╝╚██████╔╝██║  ██║██║ ╚████║   ██║')   
     logger.info('  ╚═══╝  ╚═╝     ╚═╝  ╚═╝   ╚═╝   ╚══════╝╚═╝     ╚═╝╚═╝      ╚═════╝        ╚══▀▀═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝   ╚═╝')                                                                                                                     
     logger.info('-----------------------------------------------------------------------')
-    logger.info('Temporally Encoded Spiking Neural Network for Visual Place Recognition v1.1.6')
+    logger.info('Temporally Encoded Spiking Neural Network for Visual Place Recognition v1.1.7')
     logger.info('Queensland University of Technology, Centre for Robotics')
     logger.info('')
     logger.info('© 2023 Adam D Hines, Peter G Stratton, Michael Milford, Tobias Fischer')