fixes

torch_cluster/src/generic/grid_cpu.c

@@ -2,7 +2,7 @@
 #define TH_GENERIC_FILE "generic/grid_cpu.c"
 #else
 
-void grid_cluster(int C, THLongTensor *output, THTensor *position, THTensor *size, THLongTensor *count) {
+void cluster_(grid)(int C, THLongTensor *output, THTensor *position, THTensor *size, THLongTensor *count) {
   real *size_data = size->storage->data + size->storageOffset;
   int64_t *count_data = count->storage->data + count->storageOffset;
   int64_t D, d, i, c, tmp;

torch_cluster/src/generic/serial_cpu.c

+#ifndef TH_GENERIC_FILE
+#define TH_GENERIC_FILE "generic/serial_cpu.c"
+#else
+
+void cluster_(serial)(THLongTensor *output, THLongTensor *row, THLongTensor *col,  THTensor *weight, THLongTensor *degree) {
+}
+
+#endif
+

torch_cluster/src/grid_cpu.c

 #include <TH/TH.h>
 
-#define grid_cluster TH_CONCAT_2(grid_cluster_, Real)
+#define cluster_(NAME) TH_CONCAT_4(cluster_, NAME, _, Real)
 
 #include "generic/grid_cpu.c"
 #include "THGenerateAllTypes.h"

torch_cluster/src/grid_cpu.h

-void grid_cluster_Float (int C, THLongTensor *output, THFloatTensor  *position,  THFloatTensor *size, THLongTensor *count);
-void grid_cluster_Double(int C, THLongTensor *output, THDoubleTensor *position, THDoubleTensor *size, THLongTensor *count);
-void grid_cluster_Byte  (int C, THLongTensor *output, THByteTensor   *position,   THByteTensor *size, THLongTensor *count);
-void grid_cluster_Char  (int C, THLongTensor *output, THCharTensor   *position,   THCharTensor *size, THLongTensor *count);
-void grid_cluster_Short (int C, THLongTensor *output, THShortTensor  *position,  THShortTensor *size, THLongTensor *count);
-void grid_cluster_Int   (int C, THLongTensor *output, THIntTensor    *position,    THIntTensor *size, THLongTensor *count);
-void grid_cluster_Long  (int C, THLongTensor *output, THLongTensor   *position,   THLongTensor *size, THLongTensor *count);
+void cluster_grid_Float (int C, THLongTensor *output, THFloatTensor  *position,  THFloatTensor *size, THLongTensor *count);
+void cluster_grid_Double(int C, THLongTensor *output, THDoubleTensor *position, THDoubleTensor *size, THLongTensor *count);
+void cluster_grid_Byte  (int C, THLongTensor *output, THByteTensor   *position,   THByteTensor *size, THLongTensor *count);
+void cluster_grid_Char  (int C, THLongTensor *output, THCharTensor   *position,   THCharTensor *size, THLongTensor *count);
+void cluster_grid_Short (int C, THLongTensor *output, THShortTensor  *position,  THShortTensor *size, THLongTensor *count);
+void cluster_grid_Int   (int C, THLongTensor *output, THIntTensor    *position,    THIntTensor *size, THLongTensor *count);
+void cluster_grid_Long  (int C, THLongTensor *output, THLongTensor   *position,   THLongTensor *size, THLongTensor *count);

torch_cluster/src/serial_cpu.c

 #include <TH/TH.h>
 
-void serial_cluster(THLongTensor *output, THLongTensor *row, THLongTensor *col, THLongTensor *degree) {
+#define cluster_(NAME) TH_CONCAT_4(cluster_, NAME, _, Real)
+
+void cluster_serial(THLongTensor *output, THLongTensor *row, THLongTensor *col, THLongTensor *degree) {
   int64_t *output_data = output->storage->data + output->storageOffset;
   int64_t *row_data = row->storage->data + row->storageOffset;
   int64_t *col_data = col->storage->data + col->storageOffset;
@@ -38,4 +40,5 @@ void serial_cluster(THLongTensor *output, THLongTensor *row, THLongTensor *col,
   }
 }
 
-
+#include "generic/serial_cpu.c"
+#include "THGenerateAllTypes.h"

torch_cluster/src/serial_cpu.h

-void serial_cluster(THLongTensor *output, THLongTensor *row, THLongTensor *col, THLongTensor *degree);
+void cluster_serial(THLongTensor *output, THLongTensor *row, THLongTensor *col, THLongTensor *degree);
 
-void serial_cluster_Float (THLongTensor *output, THLongTensor *row, THLongTensor *col,  THFloatTensor *weight, THLongTensor *degree);
-void serial_cluster_Double(THLongTensor *output, THLongTensor *row, THLongTensor *col, THDoubleTensor *weight, THLongTensor *degree);
-void serial_cluster_Byte  (THLongTensor *output, THLongTensor *row, THLongTensor *col,   THByteTensor *weight, THLongTensor *degree);
-void serial_cluster_Char  (THLongTensor *output, THLongTensor *row, THLongTensor *col,   THCharTensor *weight, THLongTensor *degree);
-void serial_cluster_Short (THLongTensor *output, THLongTensor *row, THLongTensor *col,  THShortTensor *weight, THLongTensor *degree);
-void serial_cluster_Int   (THLongTensor *output, THLongTensor *row, THLongTensor *col,    THIntTensor *weight, THLongTensor *degree);
-void serial_cluster_Long  (THLongTensor *output, THLongTensor *row, THLongTensor *col,   THLongTensor *weight, THLongTensor *degree);
+void cluster_serial_Float (THLongTensor *output, THLongTensor *row, THLongTensor *col,  THFloatTensor *weight, THLongTensor *degree);
+void cluster_serial_Double(THLongTensor *output, THLongTensor *row, THLongTensor *col, THDoubleTensor *weight, THLongTensor *degree);
+void cluster_serial_Byte  (THLongTensor *output, THLongTensor *row, THLongTensor *col,   THByteTensor *weight, THLongTensor *degree);
+void cluster_serial_Char  (THLongTensor *output, THLongTensor *row, THLongTensor *col,   THCharTensor *weight, THLongTensor *degree);
+void cluster_serial_Short (THLongTensor *output, THLongTensor *row, THLongTensor *col,  THShortTensor *weight, THLongTensor *degree);
+void cluster_serial_Int   (THLongTensor *output, THLongTensor *row, THLongTensor *col,    THIntTensor *weight, THLongTensor *degree);
+void cluster_serial_Long  (THLongTensor *output, THLongTensor *row, THLongTensor *col,   THLongTensor *weight, THLongTensor *degree);