Fixing repo structure for conda-forge release

QVPR · Dec 12, 2023 · a920ad8 · a920ad8
1 parent 34f1640
commit a920ad8
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 324 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ dataset/winter/
 dataset/event.csv/
 models/VPRTempo78415685001.pth
 models/VPRTempoQuant78415685001.pth
+VPRTempo.egg-info/
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ In this repository, we provide two networks:
 
 To use VPRTempo, please follow the instructions below for installation and usage.
 
-## :star: Update v1.1.1: What's new?
+## :star: Update v1.1: What's new?
   - Full integration of VPRTempo into torch.nn architecture
   - Quantization Aware Training (QAT) enabled to train weights in int8 space
   - Addition of tutorials in Jupyter Notebooks to learn how to use VPRTempo as well as explain the computational logic

diff --git a/dataset/test/images-00202.png b/dataset/test/images-00202.png
diff --git a/main.py b/main.py
@@ -26,9 +26,7 @@
 import argparse
 import sys
 sys.path.append('./src')
-sys.path.append('./networks/base')
-sys.path.append('./networks/quantized')
-
+sys.path.append('./vprtempo')
 import torch.quantization as quantization
 
 from VPRTempoTrain import VPRTempoTrain, generate_model_name, check_pretrained_model, train_new_model

diff --git a/networks/base/VPRTempoTest.py b/networks/base/VPRTempoTest.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,5 @@
 torch
 torchvision
-torchaudio
 numpy
 pandas
 tqdm

diff --git a/setup.py b/setup.py
@@ -11,7 +11,6 @@
 requirements = [ 
                 'torch',
                 'torchvision',
-                'torchaudio',
                 'numpy',
                 'pandas',
                 'tqdm',
@@ -22,7 +21,7 @@
 # define the setup
 setup(
     name="VPRTempo",
-    version="1.1.1",
+    version="1.1.2",
     description='VPRTempo: A Fast Temporally Encoded Spiking Neural Network for Visual Place Recognition',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -36,7 +35,7 @@
         #   3 - Alpha
         #   4 - Beta
         #   5 - Production/Stable
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 4 - Beta',
 
         # Indicate who your project is intended for
         'Intended Audience :: Developers',

diff --git a/test_vprtempo.py b/test_vprtempo.py
diff --git a/networks/base/VPRTempo.py → vprtempo/VPRTempo.py b/networks/base/VPRTempo.py → vprtempo/VPRTempo.py
diff --git a/networks/quantized/VPRTempoQuant.py → vprtempo/VPRTempoQuant.py b/networks/quantized/VPRTempoQuant.py → vprtempo/VPRTempoQuant.py
diff --git a/networks/quantized/VPRTempoQuantTrain.py → vprtempo/VPRTempoQuantTrain.py b/networks/quantized/VPRTempoQuantTrain.py → vprtempo/VPRTempoQuantTrain.py
diff --git a/networks/base/VPRTempoTrain.py → vprtempo/VPRTempoTrain.py b/networks/base/VPRTempoTrain.py → vprtempo/VPRTempoTrain.py
diff --git a/vprtempo/__init__.py b/vprtempo/__init__.py
@@ -0,0 +1,2 @@
+from .VPRTempo import VPRTempo
+from .VPRTempoQuantTrain import VPRTempoQuantTrain
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		from .VPRTempo import VPRTempo
		from .VPRTempoQuantTrain import VPRTempoQuantTrain