Remove separate Stream class abstraction

Author: mconcas

Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/Stream.h

@@ -17,8 +17,6 @@
 #include "ITStracking/TimeFrame.h"
 
 #include "ITStrackingGPU/ClusterLinesGPU.h"
-// #include "ITStrackingGPU/Array.h"
-// #include "ITStrackingGPU/Vector.h"
 #include "ITStrackingGPU/Stream.h"
 
 #include <gsl/gsl>

Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/TimeFrameChunk.h

@@ -17,7 +17,6 @@
 #include "ITStracking/Configuration.h"
 
 #include "ITStrackingGPU/ClusterLinesGPU.h"
-#include "ITStrackingGPU/Stream.h"
 #include "ITStrackingGPU/Utils.h"
 
 #include <gsl/gsl>
@@ -28,6 +27,7 @@ namespace its
 {
 namespace gpu
 {
+class Stream;
 
 class DefaultGPUAllocator : public ExternalAllocator
 {
@@ -87,7 +87,7 @@ class TimeFrameGPU : public TimeFrame
   template <Task task>
   Stream& getStream(const size_t stream)
   {
-    return mGpuStreams[stream];
+    return *mGpuStreams[stream];
   }
   void wipe(const int);
 
@@ -199,7 +199,7 @@ class TimeFrameGPU : public TimeFrame
   const TrackingFrameInfo** mTrackingFrameInfoDeviceArray;
 
   // State
-  std::vector<Stream> mGpuStreams;
+  std::vector<Stream*> mGpuStreams;
   size_t mAvailMemGB;
   bool mFirstInit = true;
 

Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/TimeFrameGPU.h

@@ -17,7 +17,6 @@
 #define ITSTRACKINGGPU_UTILS_H_
 
 #include "GPUCommonDef.h"
-#include "Stream.h"
 
 namespace o2
 {

Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/Utils.h

@@ -17,7 +17,6 @@ message(STATUS "Building ITS CUDA tracker")
 # add_compile_definitions(ITS_MEASURE_GPU_TIME)
 o2_add_library(ITStrackingCUDA
                SOURCES ClusterLinesGPU.cu
-                       Stream.cu
                        TrackerTraitsGPU.cxx
                        TimeFrameGPU.cu
                        TracerGPU.cu

Detectors/ITSMFT/ITS/tracking/GPU/cuda/CMakeLists.txt

@@ -15,7 +15,6 @@ if(HIP_ENABLED)
   o2_add_hipified_library(ITStrackingHIP
                  SOURCES ../cuda/ClusterLinesGPU.cu
                          ../cuda/TimeFrameGPU.cu
-                         ../cuda/Stream.cu
                          ../cuda/TrackerTraitsGPU.cxx
                          ../cuda/TracerGPU.cu
                          ../cuda/TrackingKernels.cu

Detectors/ITSMFT/ITS/tracking/GPU/cuda/Stream.cu

@@ -26,19 +26,4 @@
   do {                 \
   } while (0)
 #endif
-
-#if defined(__CUDACC__) || defined(__HIPCC__)
-#ifdef __CUDACC__
-typedef cudaStream_t GPUStream;
-#else // __HIPCC__
-#ifndef GPUCA_GPUCODE_DEVICE
-#include <hip/hip_runtime.h>
-#endif
-typedef hipStream_t GPUStream;
-#endif
-#else
-typedef struct __dummyStream {
-} GPUStream;
-#endif
-
 #endif