Move assignCUDAStreams() call inside of buildTree()

N-BodyShop · Dec 9, 2024 · 05f65e2 · 05f65e2
1 parent bbbcb65
commit 05f65e2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/ParallelGravity.ci b/ParallelGravity.ci
@@ -546,11 +546,7 @@ const CkCallback& cb);
     entry void collectStatistics(const CkCallback &cb);
 
     // jetley
-#ifdef CUDA
-<<<<<<< HEAD
     entry void calculateNumActiveGasParticles(int bAll, int iActiveRung, const CkCallback& cb);
-=======
->>>>>>> 7dec4c5b (CUDA streams assigned to TreePieces after tree build)
     entry void assignCUDAStream(intptr_t stream);
     entry void continueStartRemoteChunk(int chunk, intptr_t d_remoteMoments, intptr_t d_remoteParts);
     entry void fillGPUBuffer(intptr_t bufLocalParts,

diff --git a/ParallelGravity.cpp b/ParallelGravity.cpp
@@ -2104,10 +2104,6 @@ void Main::advanceBigStep(int iStep) {
     dMProxy.clearRegisteredPieces(CkCallbackResumeThread());
     buildTree(activeRung);
 
-#ifdef CUDA
-    dMProxy.assignCUDAStreams(CkCallbackResumeThread());
-#endif
-
     CkCallback cbGravity(CkCallback::resumeThread);
 
 #ifdef COOLING_MOLECULARH