From 044f7d32a804b6eb00a2ea370834002f75cbade9 Mon Sep 17 00:00:00 2001
From: Celyn Walters <celyn.walters@surrey.ac.uk>
Date: Sat, 6 May 2023 15:15:15 +0100
Subject: [PATCH] Fix things for end-user run through

---
 README.md       | 18 ++++++++----------
 data/.gitkeep   |  0
 environment.yml |  2 --
 3 files changed, 8 insertions(+), 12 deletions(-)
 create mode 100644 data/.gitkeep

diff --git a/README.md b/README.md
index 5591619..ef62c54 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Brings the characteristics of convolutions to event cameras, while acting on the
 1. Clone this repository
 
 	```bash
-	git clone https://github.com/celynw/edenn.git
+	git clone https://gitlab.surrey.ac.uk/cw0071/edenn.git
 	cd ./edenn/
 	```
 
@@ -20,16 +20,14 @@ Brings the characteristics of convolutions to event cameras, while acting on the
 	```bash
 	conda env create -f environment.yml
 	conda activate edenn
-	pip install -e ./edenn/
+	pip install -e .
 	```
 
 	For reproducing the other benchmarks, install SLAYER manually:
 
 	```bash
-	# cd submodules/slayerPytorch/
-	cd slayerPytorch/
-	python setup.py install
-	cd -
+	# pip install submodules/slayerPytorch/
+	pip install ./slayerpytorch/
 	```
 
 1. Download dataset(s)
@@ -39,21 +37,21 @@ Brings the characteristics of convolutions to event cameras, while acting on the
 	wget "http://rpg.ifi.uzh.ch/data/snn_angular_velocity/dataset/train.tar.zst" -O ./data/train.tar.zst
 	zstd -vd ./data/train.tar.zst
 	rm ./data/train.tar.zst
-	tar -xvf ./data/train.tar
+	tar -xvf ./data/train.tar -C ./data/
 	rm ./data/train.tar
 
 	# Validation set (2.7 GB download, 7.7 GB extracted)
 	wget "http://rpg.ifi.uzh.ch/data/snn_angular_velocity/dataset/val.tar.zst" -O ./data/val.tar.zst
 	zstd -vd ./data/val.tar.zst
 	rm ./data/val.tar.zst
-	tar -xvf ./data/val.tar
+	tar -xvf ./data/val.tar -C ./data/
 	rm ./data/val.tar
 
 	# Test set (2.6 GB download, 7.4 GB extracted)
 	wget "http://rpg.ifi.uzh.ch/data/snn_angular_velocity/dataset/test.tar.zst" -O ./data/test.tar.zst
 	zstd -vd ./data/test.tar.zst
 	rm ./data/test.tar.zst
-	tar -xvf ./data/test.tar
+	tar -xvf ./data/test.tar -C ./data/
 	rm ./data/test.tar
 	```
 
@@ -97,7 +95,7 @@ wget "http://rpg.ifi.uzh.ch/data/snn_angular_velocity/models/pretrained.pt" -O c
 Then run *this* test script:
 
 ```bash
-./test_snn.py SNN_baseline cnn-avgp-fc1.pt path-to-dataset/
+./test_snn.py SNN_baseline cnn5-avgp-fc1.pt data/ --nolog
 ```
 
 ```none
diff --git a/data/.gitkeep b/data/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/environment.yml b/environment.yml
index 9bb4422..96ecba8 100644
--- a/environment.yml
+++ b/environment.yml
@@ -326,5 +326,3 @@ dependencies:
   - zipp=3.15.0=pyhd8ed1ab_0
   - zlib=1.2.13=h166bdaf_4
   - zstd=1.5.2=h3eb15da_6
-  - pip:
-      - slayercuda==0.0.0
-- 
GitLab