clean up

aten/TH/THGreedy.c

 #include <TH/TH.h>
 
-#define THGreedy_(NAME) TH_CONCAT_4(TH,Real,Greedy_,NAME)
+#define THGreedy_ TH_CONCAT_3(TH,Real,Greedy)
 #define DATA(TENSOR) TENSOR->storage->data + TENSOR->storageOffset
 
 #define TH_GREEDY_CLUSTER(cluster, row, col, deg, SELECT) { \
@@ -13,12 +13,10 @@
   int64_t rowValue, colValue, clusterValue, tmp; \
   while(rowIdx < THLongTensor_nElement(row)) { \
     rowValue = rowData[rowIdx]; \
-    printf("rowValue = %lli, ", rowValue); \
     if (clusterData[rowValue] < 0) { \
       colValue = rowValue; \
       SELECT \
       clusterValue = rowValue < colValue ? rowValue : colValue; \
-      printf("%lli", clusterValue); \
       clusterData[rowValue] = clusterValue; \
       clusterData[colValue] = clusterValue; \
     } \
@@ -26,8 +24,7 @@
   } \
 }
 
-void THGreedy_cluster(THLongTensor *cluster, THLongTensor *row, THLongTensor *col,
-                      THLongTensor *deg) {
+void THGreedy(THLongTensor *cluster, THLongTensor *row, THLongTensor *col, THLongTensor *deg) {
   TH_GREEDY_CLUSTER(cluster, row, col, deg,
     for (neighborIdx = rowIdx; neighborIdx < rowIdx + degData[rowValue]; neighborIdx++) {
       tmp = colData[neighborIdx];

aten/TH/THGreedy.h

-void THGreedy_cluster(THLongTensor *cluster,
-                      THLongTensor *row,
-                      THLongTensor *col,
-                      THLongTensor *deg);
+void THGreedy(THLongTensor *cluster, THLongTensor *row, THLongTensor *col, THLongTensor *deg);
 
-void THByteGreedy_cluster(THLongTensor *cluster,
-                          THLongTensor *row,
-                          THLongTensor *col,
-                          THLongTensor *deg,
-                          THByteTensor *weight);
-
-void THCharGreedy_cluster(THLongTensor *cluster,
-                          THLongTensor *row,
-                          THLongTensor *col,
-                          THLongTensor *deg,
-                          THCharTensor *weight);
-
-void THShortGreedy_cluster(THLongTensor *cluster,
-                           THLongTensor *row,
-                           THLongTensor *col,
-                           THLongTensor *deg,
-                           THShortTensor *weight);
-
-void THIntGreedy_cluster(THLongTensor *cluster,
-                         THLongTensor *row,
-                         THLongTensor *col,
-                         THLongTensor *deg,
-                         THIntTensor *weight);
-
-void THLongGreedy_cluster(THLongTensor *cluster,
-                          THLongTensor *row,
-                          THLongTensor *col,
-                          THLongTensor *deg,
-                          THLongTensor *weight);
-
-void THFloatGreedy_cluster(THLongTensor *cluster,
-                           THLongTensor *row,
-                           THLongTensor *col,
-                           THLongTensor *deg,
-                           THFloatTensor *weight);
-
-void THDoubleGreedy_cluster(THLongTensor *cluster,
-                            THLongTensor *row,
-                            THLongTensor *col,
-                            THLongTensor *deg,
-                            THDoubleTensor *weight);
+void THByteGreedy(THLongTensor *cluster, THLongTensor *row, THLongTensor *col,
+                  THLongTensor *deg, THByteTensor *weight);
+void THCharGreedy(THLongTensor *cluster, THLongTensor *row, THLongTensor *col,
+                  THLongTensor *deg, THCharTensor *weight);
+void THShortGreedy(THLongTensor *cluster, THLongTensor *row, THLongTensor *col,
+                   THLongTensor *deg, THShortTensor *weight);
+void THIntGreedy(THLongTensor *cluster, THLongTensor *row, THLongTensor *col,
+                 THLongTensor *deg, THIntTensor *weight);
+void THLongGreedy(THLongTensor *cluster, THLongTensor *row, THLongTensor *col,
+                  THLongTensor *deg, THLongTensor *weight);
+void THFloatGreedy(THLongTensor *cluster, THLongTensor *row, THLongTensor *col,
+                   THLongTensor *deg, THFloatTensor *weight);
+void THDoubleGreedy(THLongTensor *cluster, THLongTensor *row, THLongTensor *col,
+                    THLongTensor *deg, THDoubleTensor *weight);

aten/TH/THGrid.c

 #include <TH/TH.h>
 
-#define THGrid_(NAME) TH_CONCAT_4(TH,Real,Grid_,NAME)
+#define THGrid_ TH_CONCAT_3(TH,Real,Grid)
 #define DATA(TENSOR) TENSOR->storage->data + TENSOR->storageOffset
 
 #include "generic/THGrid.c"

aten/TH/THGrid.h

-void THByteGrid_cluster(THLongTensor *cluster,
-                        THByteTensor *pos,
-                        THByteTensor *size,
+void THByteGrid(THLongTensor *cluster, THByteTensor *pos, THByteTensor *size,
                 THLongTensor *count);
-
-void THCharGrid_cluster(THLongTensor *cluster,
-                        THCharTensor *pos,
-                        THCharTensor *size,
+void THCharGrid(THLongTensor *cluster, THCharTensor *pos, THCharTensor *size,
                 THLongTensor *count);
-
-void THShortGrid_cluster(THLongTensor *cluster,
-                         THShortTensor *pos,
-                         THShortTensor *size,
+void THShortGrid(THLongTensor *cluster, THShortTensor *pos, THShortTensor *size,
                  THLongTensor *count);
-
-void THIntGrid_cluster(THLongTensor *cluster,
-                       THIntTensor *pos,
-                       THIntTensor *size,
+void THIntGrid(THLongTensor *cluster, THIntTensor *pos, THIntTensor *size,
                THLongTensor *count);
-
-void THLongGrid_cluster(THLongTensor *cluster,
-                        THLongTensor *pos,
-                        THLongTensor *size,
+void THLongGrid(THLongTensor *cluster, THLongTensor *pos, THLongTensor *size,
                 THLongTensor *count);
-
-void THFloatGrid_cluster(THLongTensor *cluster,
-                         THFloatTensor *pos,
-                         THFloatTensor *size,
+void THFloatGrid(THLongTensor *cluster, THFloatTensor *pos, THFloatTensor *size,
                  THLongTensor *count);
-
-void THDoubleGrid_cluster(THLongTensor *cluster,
-                          THDoubleTensor *pos,
-                          THDoubleTensor *size,
+void THDoubleGrid(THLongTensor *cluster, THDoubleTensor *pos, THDoubleTensor *size,
                   THLongTensor *count);

aten/TH/generic/THGreedy.c

@@ -2,8 +2,8 @@
 #define TH_GENERIC_FILE "generic/THGreedy.c"
 #else
 
-void THGreedy_(cluster)(THLongTensor *cluster, THLongTensor *row, THLongTensor *col,
-                        THLongTensor *deg, THTensor *weight) {
+void THGreedy_(THLongTensor *cluster, THLongTensor *row, THLongTensor *col, THLongTensor *deg,
+               THTensor *weight) {
   real *weightData = DATA(weight);
   real maxWeight = 0, tmpWeight;
   TH_GREEDY_CLUSTER(cluster, row, col, deg,

aten/TH/generic/THGrid.c

@@ -2,7 +2,7 @@
 #define TH_GENERIC_FILE "generic/THGrid.c"
 #else
 
-void THGrid_(cluster)(THLongTensor *cluster, THTensor *pos, THTensor *size, THLongTensor *count) {
+void THGrid_(THLongTensor *cluster, THTensor *pos, THTensor *size, THLongTensor *count) {
   int64_t *clusterData = DATA(cluster);
   real *posData = DATA(pos);
   real *sizeData = DATA(size);

aten/THC/THCGreedy.cu

 #include "THCGreedy.h"
 
-void THCGreedy_cluster(THCState *state,
-                       THCudaLongTensor *cluster,
-                       THCudaLongTensor *row,
-                       THCudaLongTensor *col,
-                       THCudaLongTensor *deg) {
-  printf("THCGreedy_cluster drin");
+void THCGreedy(THCState *state, THCudaLongTensor *cluster, THCudaLongTensor *row,
+               THCudaLongTensor *col, THCudaLongTensor *deg) {
+  printf("THCGreedy drin");
   // Fill cluster with -1
   // assign color to clusters < 0 (return done)
   // Generate proposal vector with length of nodes (init?)

aten/THC/THCGreedy.h

@@ -3,13 +3,10 @@
 
 #include <THC/THC.h>
 
-#define THCGreedy_(NAME) TH_CONCAT_4(TH,CReal,Greedy_,NAME)
+#define THCGreedy_ TH_CONCAT_3(TH,CReal,Greedy)
 
-void THCGreedy_cluster(THCState *state,
-                       THCudaLongTensor *cluster,
-                       THCudaLongTensor *row,
-                       THCudaLongTensor *col,
-                       THCudaLongTensor *deg);
+void THCGreedy(THCState *state, THCudaLongTensor *cluster, THCudaLongTensor *row,
+               THCudaLongTensor *col, THCudaLongTensor *deg);
 
 #include "generic/THCGreedy.h"
 #include "THC/THCGenerateAllTypes.h"

aten/THC/THCGrid.cu

+#include "THCGrid.h"
+
+#include "generic/THCGrid.cu"
+#include "THC/THCGenerateAllTypes.h"

aten/THC/THCGrid.h

+#ifndef THC_GRID_INC
+#define THC_GRID_INC
+
+#include <THC/THC.h>
+
+#define THCGrid_ TH_CONCAT_3(TH,CReal,Grid)
+
+#include "generic/THCGrid.h"
+#include "THC/THCGenerateAllTypes.h"
+
+#endif  // THC_GRID_INC

aten/THC/generic/THCGreedy.cu

@@ -2,13 +2,9 @@
 #define THC_GENERIC_FILE "generic/THCGreedy.cu"
 #else
 
-void THCGreedy_(cluster)(THCState *state,
-                         THCudaLongTensor *cluster,
-                         THCudaLongTensor *row,
-                         THCudaLongTensor *col,
-                         THCudaLongTensor *deg,
-                         THCTensor *weight) {
-  printf("THCGreedy_cluster dynamic drin");
+void THCGreedy_(THCState *state, THCudaLongTensor *cluster, THCudaLongTensor *row,
+                THCudaLongTensor *col, THCudaLongTensor *deg, THCTensor *weight) {
+  printf("THCGreedy dynamic drin");
 }
 
 #endif  // THC_GENERIC_FILE

aten/THC/generic/THCGreedy.h

@@ -2,12 +2,7 @@
 #define THC_GENERIC_FILE "generic/THCGreedy.h"
 #else
 
-void THCGreedy_(cluster)(THCState *state,
-                         THCudaLongTensor *cluster,
-                         THCudaLongTensor *row,
-                         THCudaLongTensor *col,
-                         THCudaLongTensor *deg,
-                         THCTensor *weight);
+void THCGreedy_(THCState *state, THCudaLongTensor *cluster, THCudaLongTensor *row,
+                THCudaLongTensor *col, THCudaLongTensor *deg, THCTensor *weight);
 
 #endif  // THC_GENERIC_FILE
-

aten/THC/generic/THCGrid.cu

+#ifndef THC_GENERIC_FILE
+#define THC_GENERIC_FILE "generic/THCGid.cu"
+#else
+
+void THCGrid_(THCState *state, THCudaLongTensor *cluster, THCTensor *pos, THCTensor *size,
+              THCudaLongTensor *count) {
+  printf("THCGrid drin");
+}
+
+#endif  // THC_GENERIC_FILE

aten/THC/generic/THCGrid.h

+#ifndef THC_GENERIC_FILE
+#define THC_GENERIC_FILE "generic/THCGrid.h"
+#else
+
+void THCGrid_(THCState *state, THCudaLongTensor *cluster, THCTensor *pos, THCTensor *size,
+              THCudaLongTensor *count);
+
+#endif  // THC_GENERIC_FILE