Merge branch 'aluo-x-master' into master

deepsphere · Mar 18, 2021 · 849016d · 849016d
2 parents ebef266 + 1571a8b
commit 849016d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ conda create --name deepsphere python=3.7
 
 source activate deepsphere
 
-pip install git+https://github.com/Droxef/pygsp.git@6b216395beae25bf062d13fbf9abc251eeb5bbff#egg=PyGSP
+pip install git+https://github.com/epfl-lts2/pygsp.git@39a0665f637191152605911cf209fc16a36e5ae9#egg=PyGSP
 
 conda install pytorch=1.3.1 torchvision=0.4.2 cudatoolkit=10.0 -c pytorch
 

diff --git a/deepsphere/layers/samplings/healpix_pool_unpool.py b/deepsphere/layers/samplings/healpix_pool_unpool.py
@@ -44,7 +44,7 @@ def forward(self, x):
         if self.return_indices:
             x, indices = F.max_pool1d(x, self.kernel_size)
         else:
-            x = F.max_pool1d(x)
+            x = F.max_pool1d(x, self.kernel_size)
         x = x.permute(0, 2, 1)
 
         if self.return_indices:

diff --git a/deepsphere/utils/laplacian_funcs.py b/deepsphere/utils/laplacian_funcs.py
@@ -99,8 +99,8 @@ def get_healpix_laplacians(nodes, depth, laplacian_type):
     laps = []
     for i in range(depth):
         pixel_num = nodes
-        resolution = int(healpix_resolution_calculator(pixel_num)/2**i)
-        G = SphereHealpix(nside=resolution, n_neighbors=None)
+        subdivisions = int(healpix_resolution_calculator(pixel_num)/2**i)
+        G = SphereHealpix(subdivisions)
         G.compute_laplacian(laplacian_type)
         laplacian = prepare_laplacian(G.L)
         laps.append(laplacian)