fixed tests

test/basis.json

@@ -4,23 +4,23 @@
     "pseudo": [0, 0.125, 0.25, 0.5, 0.75, 0.875, 1],
     "kernel_size": [5],
     "is_open_spline": [1],
-    "expected_basis": [[0, 1], [0.5, 0.5], [0, 1], [0, 1], [0, 1], [0.5, 0.5], [0, 1]],
-    "expected_index": [[1, 0], [1, 0], [2, 1], [3, 2], [4, 3], [4, 3], [0, 4]]
+    "expected_basis": [[1, 0], [0.5, 0.5], [1, 0], [1, 0], [1, 0], [0.5, 0.5], [1, 0]],
+    "expected_index": [[0, 1], [0, 1], [1, 2], [2, 3], [3, 4], [3, 4], [4, 0]]
   },
   {
     "degree": 1,
     "pseudo": [0, 0.125, 0.25, 0.5, 0.75, 0.875, 1],
     "kernel_size": [4],
     "is_open_spline": [0],
-    "expected_basis": [[0, 1], [0.5, 0.5], [0, 1], [0, 1], [0, 1], [0.5, 0.5], [0, 1]],
-    "expected_index": [[1, 0], [1, 0], [2, 1], [3, 2], [0, 3], [0, 3], [1, 0]]
+    "expected_basis": [[1, 0], [0.5, 0.5], [1, 0], [1, 0], [1, 0], [0.5, 0.5], [1, 0]],
+    "expected_index": [[0, 1], [0, 1], [1, 2], [2, 3], [3, 0], [3, 0], [0, 1]]
   },
   {
     "degree": 1,
     "pseudo": [[0.125, 0.5], [0.5, 0.5], [0.75, 0.125]],
     "kernel_size": [5, 5],
     "is_open_spline": [1, 1],
-    "expected_basis": [[0, 0, 0.5, 0.5], [0, 0, 0, 1], [0, 0.5, 0, 0.5]],
-    "expected_index": [[8, 3, 7, 2], [18, 13, 17, 12], [21, 16, 20, 15]]
+    "expected_basis": [[0.5, 0.5, 0, 0], [1, 0, 0, 0], [0.5, 0, 0.5, 0]],
+    "expected_index": [[2, 7, 3, 8], [12, 17, 13, 18], [15, 20, 16, 21]]
   }
 ]

torch_spline_conv/functions/utils.py

@@ -3,7 +3,7 @@ from torch.autograd import Function
 
 from .._ext import ffi
 
-implemented_degrees = {1: 'linear', 2: 'quadric', 3: 'cubic'}
+implemented_degrees = {1: 'linear', 2: 'quadratic', 3: 'cubic'}
 
 
 def get_func(name, tensor):

torch_spline_conv/src/cpu.h

 void spline_basis_linear_Float(THFloatTensor *basis, THLongTensor *weight_index, THFloatTensor *pseudo, THLongTensor *kernel_size, THByteTensor *is_open_spline, int K);
 void spline_basis_linear_Double(THDoubleTensor *basis, THLongTensor *weight_index, THDoubleTensor *pseudo, THLongTensor *kernel_size, THByteTensor *is_open_spline, int K);
+
+void spline_basis_quadratic_Float(THFloatTensor *basis, THLongTensor *weight_index, THFloatTensor *pseudo, THLongTensor *kernel_size, THByteTensor *is_open_spline, int K);
+void spline_basis_quadratic_Double(THDoubleTensor *basis, THLongTensor *weight_index, THDoubleTensor *pseudo, THLongTensor *kernel_size, THByteTensor *is_open_spline, int K);
+
+void spline_basis_cubic_Float(THFloatTensor *basis, THLongTensor *weight_index, THFloatTensor *pseudo, THLongTensor *kernel_size, THByteTensor *is_open_spline, int K);
+void spline_basis_cubic_Double(THDoubleTensor *basis, THLongTensor *weight_index, THDoubleTensor *pseudo, THLongTensor *kernel_size, THByteTensor *is_open_spline, int K);

torch_spline_conv/src/generic/cpu.c

@@ -29,7 +29,7 @@
 
 void spline_(basis_linear)(THTensor *basis, THLongTensor *weight_index, THTensor *pseudo, THLongTensor *kernel_size, THByteTensor *is_open_spline, int K) {
   SPLINE_BASIS(1, basis, weight_index, pseudo, kernel_size, is_open_spline, K,
-    value = (1 - k_mod) * value + k_mod * (1 - value);
+    value = (1 - k_mod) * (1 - value) + k_mod * value;
   )
 }