From 394026c077c1e708fad37af9e1790790a03ee101 Mon Sep 17 00:00:00 2001
From: Phil Hawkins <phil.a.hawkins@gmail.com>
Date: Wed, 10 Nov 2021 10:05:54 +1100
Subject: [PATCH 1/5] Update icosahedron laplacian calculation
---
deepsphere/utils/laplacian_funcs.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/deepsphere/utils/laplacian_funcs.py b/deepsphere/utils/laplacian_funcs.py
index d578235..7611e53 100644
--- a/deepsphere/utils/laplacian_funcs.py
+++ b/deepsphere/utils/laplacian_funcs.py
@@ -3,9 +3,9 @@
import numpy as np
import torch
-from pygsp.graphs.nngraphs.spherehealpix import SphereHealpix
-from pygsp.graphs.nngraphs.sphereicosahedron import SphereIcosahedron
-from pygsp.graphs.sphereequiangular import SphereEquiangular
+from pygsp.graphs import SphereHealpix
+from pygsp.graphs import SphereIcosahedral
+from pygsp.graphs import SphereEquiangular
from scipy import sparse
from scipy.sparse import coo_matrix
@@ -79,7 +79,7 @@ def get_icosahedron_laplacians(nodes, depth, laplacian_type):
for _ in range(depth):
nodes = icosahedron_nodes_calculator(order)
order_initial = icosahedron_order_calculator(nodes)
- G = SphereIcosahedron(level=int(order_initial))
+ G = SphereIcosahedral(subdivisions=2**int(order_initial))
G.compute_laplacian(laplacian_type)
laplacian = prepare_laplacian(G.L)
laps.append(laplacian)
From 5f494e37ab14d924c1fff202098d0a742051fe9b Mon Sep 17 00:00:00 2001
From: Phil Hawkins <phil.a.hawkins@gmail.com>
Date: Wed, 10 Nov 2021 13:37:42 +1100
Subject: [PATCH 2/5] add requirement for trimesh package
---
requirements.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/requirements.txt b/requirements.txt
index 004a58f..4dff5fb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,3 +8,4 @@ pyyaml==5.2
jupyter==1.0.0
pytorch-ignite==0.2.1
pillow==6.2.2
+trimesh==3.9.35
From 8b7530886918d5b22b8c7acffddf5eba52daeede Mon Sep 17 00:00:00 2001
From: Phil Hawkins <phil.a.hawkins@gmail.com>
Date: Wed, 10 Nov 2021 14:11:26 +1100
Subject: [PATCH 3/5] update conda env creation instructions
---
README.md | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index f32fd65..09f2072 100644
--- a/README.md
+++ b/README.md
@@ -4,15 +4,16 @@
This is a PyTorch implementation of DeepSphere.
-- [Resources](#resources)
-- [Data](#data)
-- [Quick Start](#quick-start)
-- [Mathematical Background](#mathematical-background)
-- [U-Net](#unet)
-- [Temporality](#communication)
-- [Metric](#metric)
-- [Tools](#tools)
-- [License & co](#license--co)
+- [DeepSphere: a graph-based spherical CNN](#deepsphere-a-graph-based-spherical-cnn)
+ - [Resources](#resources)
+ - [Data](#data)
+ - [Quick Start](#quick-start)
+ - [Mathematical Background](#mathematical-background)
+ - [Unet](#unet)
+ - [Temporality](#temporality)
+ - [Metric](#metric)
+ - [Tools](#tools)
+ - [License & co](#license--co)
## Resources
@@ -57,7 +58,7 @@ Our recommendation for a linux based machine is:
```
conda create --name deepsphere python=3.7
-source activate deepsphere
+conda activate deepsphere
pip install git+https://github.com/epfl-lts2/pygsp.git@39a0665f637191152605911cf209fc16a36e5ae9#egg=PyGSP
From 35b110b6a4c394dbc71575cf39f8743956484c58 Mon Sep 17 00:00:00 2001
From: Phil Hawkins <phil.a.hawkins@gmail.com>
Date: Mon, 15 Nov 2021 15:55:49 +1100
Subject: [PATCH 4/5] no softmax for training
---
deepsphere/models/spherical_unet/decoder.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/deepsphere/models/spherical_unet/decoder.py b/deepsphere/models/spherical_unet/decoder.py
index dae1d16..8f4c7a0 100644
--- a/deepsphere/models/spherical_unet/decoder.py
+++ b/deepsphere/models/spherical_unet/decoder.py
@@ -116,6 +116,8 @@ def forward(self, x_enc0, x_enc1, x_enc2, x_enc3, x_enc4):
x = self.dec_l3(x, x_enc3)
x = self.dec_l4(x, x_enc4)
x = self.dec_l5(x)
+
if not self.training:
x = self.softmax(x)
+
return x
From f23c531445b3ddf234c7e98cdadb010163051e6d Mon Sep 17 00:00:00 2001
From: Phil Hawkins <phil.a.hawkins@gmail.com>
Date: Tue, 16 Nov 2021 09:23:08 +1100
Subject: [PATCH 5/5] Revert "no softmax for training"
This reverts commit 35b110b6a4c394dbc71575cf39f8743956484c58.
---
deepsphere/models/spherical_unet/decoder.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/deepsphere/models/spherical_unet/decoder.py b/deepsphere/models/spherical_unet/decoder.py
index 8f4c7a0..dae1d16 100644
--- a/deepsphere/models/spherical_unet/decoder.py
+++ b/deepsphere/models/spherical_unet/decoder.py
@@ -116,8 +116,6 @@ def forward(self, x_enc0, x_enc1, x_enc2, x_enc3, x_enc4):
x = self.dec_l3(x, x_enc3)
x = self.dec_l4(x, x_enc4)
x = self.dec_l5(x)
-
if not self.training:
x = self.softmax(x)
-
return x