Consolidate GPU Kernel launches

Compute.h

@@ -185,9 +185,6 @@ class ListCompute : public Compute{
   void enableCpu() {bUseCpu = 1;}
 
 #ifdef CUDA
-#ifdef GPU_LOCAL_TREE_WALK
-  void sendLocalTreeWalkTriggerToGpu(State *state, TreePiece *tp, int activeRung, int startBucket, int endBucket);
-#endif //GPU_LOCAL_TREE_WALK
   void sendNodeInteractionsToGpu(DoubleWalkState *state, TreePiece *tp);
   void sendPartInteractionsToGpu(DoubleWalkState *state, TreePiece *tp);
 #endif

CudaFunctions.h

@@ -4,8 +4,8 @@
 #ifdef CUDA
 #include "hapi.h"
 #include "HostCUDA.h"
-void TreePieceDataTransferBasic(CudaRequest *data, CudaDevPtr *ptr);
-void TreePieceDataTransferBasicCleanup(CudaDevPtr *ptr);
+void DataTransferBasic(CudaRequest *data, CudaDevPtr *ptr, const char* functionTag);
+void DataTransferBasicCleanup(CudaDevPtr *ptr, cudaStream_t stream, const char* functionTag);
 
 #ifdef GPU_LOCAL_TREE_WALK
 __global__ void gpuLocalTreeWalk(
@@ -36,7 +36,6 @@ __global__ void nodeGravityComputation(
 
 __global__ void ZeroVars(VariablePartData *particleVars, int nVars);
 
-#ifdef CUDA_2D_TB_KERNEL
 __global__ void particleGravityComputation(
                 CompactPartData *targetCores,
                 VariablePartData *targetVars,
@@ -46,18 +45,6 @@ __global__ void particleGravityComputation(
 		int *bucketStarts,
 		int *bucketSizes,
 		cudatype fperiod);
-#else
-__global__ void particleGravityComputation(
-                CompactPartData *targetCores,
-                VariablePartData *targetVars,
-                CompactPartData *sourceCores,
-                ILPart *ils,
-                int *ilmarks,
-		int *bucketStarts,
-		int *bucketSizes,
-		cudatype fperiod);
-#endif
-
 #endif
 
 #endif