Task #4433: Reverted my commits (r24836:24839) because they wrecked Alexander's changes

.gitattributes

@@ -3700,6 +3700,7 @@ RTCP/Cobalt/CoInterface/test/tParset.parset_obs99275 -text
 RTCP/Cobalt/CoInterface/test/tParset.sh -text
 RTCP/Cobalt/GPUProc/CMakeLists.txt -text
 RTCP/Cobalt/GPUProc/src/CMakeLists.txt -text
+RTCP/Cobalt/GPUProc/src/backward/CL/cl.hpp -text
 RTCP/Cobalt/GPUProc/test/CMakeLists.txt -text
 RTCP/Cobalt/GPUProc/test/DummyStorage.debug -text
 RTCP/Cobalt/GPUProc/test/Kernels/FIR_FilterTest.parset.77_Stations -text
@@ -3712,11 +3713,11 @@ RTCP/Cobalt/GPUProc/test/Kernels/tDelayAndBandPass.sh eol=lf
 RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.77_Stations -text
 RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.AARTFAAC -text
 RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.small-test -text
+RTCP/Cobalt/GPUProc/test/UnitTests/WorkQueues/tCorrelatorWorkQueue.cc -text
 RTCP/Cobalt/GPUProc/test/cmpfloat.py -text
 RTCP/Cobalt/GPUProc/test/cuda/tCudaRuntimeCompiler.run eol=lf
 RTCP/Cobalt/GPUProc/test/cuda/tCudaRuntimeCompiler.sh eol=lf
 RTCP/Cobalt/GPUProc/test/cuda/t_cuda_complex.cu -text
-RTCP/Cobalt/GPUProc/test/opencl/UnitTests/WorkQueues/tCorrelatorWorkQueue.cc -text
 RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS -text
 RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS -text
 RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS -text

RTCP/Cobalt/GPUProc/src/CMakeLists.txt

@@ -14,19 +14,29 @@ set(_gpuproc_sources
   global_defines.cc
   Storage/SSH.cc
   Storage/StorageProcess.cc
-  Storage/StorageProcesses.cc)
+  Storage/StorageProcesses.cc
+)
 
 if(USE_CUDA)
   list(APPEND _gpuproc_sources 
     cuda/gpu_wrapper.cc
     cuda/CudaRuntimeCompiler.cc
   )
+
+  lofar_add_library(gpuproc ${_gpuproc_sources})
+  # Compiling rtcp.cc doesn't work yet for CUDA
+  #lofar_add_bin_program(rtcp rtcp.cc)
+  #install(FILES
+  #  rtcp
+  #  DESTINATION bin)
 endif()
 
 if(USE_OPENCL)
   list(APPEND _gpuproc_sources 
+    #opencl/gpu_wrapper.cc
     opencl/createProgram.cc
-    opencl/gpu_wrapper.cc
+    opencl/OpenCL_Support.cc
+    opencl/PerformanceCounter.cc
     opencl/Kernels/Kernel.cc
     opencl/Kernels/BeamFormerKernel.cc
     opencl/Kernels/BeamFormerTransposeKernel.cc
@@ -42,18 +52,24 @@ if(USE_OPENCL)
     opencl/Kernels/FIR_FilterKernel.cc
     opencl/Kernels/IncoherentStokesKernel.cc
     opencl/Kernels/IntToFloatKernel.cc
-    opencl/OpenCL_Support.cc
-    opencl/PerformanceCounter.cc
+    #opencl/Kernels/UHEP_BeamFormerKernel.cc
+    #opencl/Kernels/UHEP_InvFFT_Kernel.cc
+    #opencl/Kernels/UHEP_InvFIR_Kernel.cc
+    #opencl/Kernels/UHEP_TransposeKernel.cc
+    #opencl/Kernels/UHEP_TriggerKernel.cc
     opencl/Pipelines/Pipeline.cc
     opencl/Pipelines/BeamFormerPipeline.cc
     opencl/Pipelines/CorrelatorPipeline.cc
+    #opencl/Pipelines/UHEP_Pipeline.cc
+    opencl/WorkQueues/WorkQueue.cc
     opencl/WorkQueues/BeamFormerWorkQueue.cc
     opencl/WorkQueues/CorrelatorWorkQueue.cc
-    opencl/WorkQueues/WorkQueue.cc)
-endif()
-
-lofar_add_library(gpuproc ${_gpuproc_sources})
+    #opencl/WorkQueues/UHEP_WorkQueue.cc
+  )
 
-if(USE_OPENCL)
-  lofar_add_bin_program(rtcp rtcp.cc)
+  lofar_add_library(gpuproc_opencl ${_gpuproc_sources})
+  lofar_add_bin_program(rtcp_opencl rtcp.cc)
+  install(FILES
+    rtcp_opencl
+    DESTINATION bin)
 endif()

RTCP/Cobalt/GPUProc/src/opencl/Kernels/BeamFormerKernel.h

@@ -18,13 +18,13 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_BEAM_FORMER_KERNEL_H
-#define LOFAR_GPUPROC_BEAM_FORMER_KERNEL_H
+#ifndef LOFAR_GPUPROC_OPENCL_BEAM_FORMER_KERNEL_H
+#define LOFAR_GPUPROC_OPENCL_BEAM_FORMER_KERNEL_H
 
 #include <CoInterface/Parset.h>
 
-#include <GPUProc/Kernel.h>
-#include <GPUProc/opencl-incl.h>
+#include "Kernel.h"
+#include <GPUProc/gpu_incl.h>
 
 namespace LOFAR
 {

RTCP/Cobalt/GPUProc/src/opencl/Kernels/BeamFormerTransposeKernel.h

@@ -18,13 +18,13 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_BEAM_FORMER_TRANSPOSE_KERNEL_H
-#define LOFAR_GPUPROC_BEAM_FORMER_TRANSPOSE_KERNEL_H
+#ifndef LOFAR_GPUPROC_OPENCL_BEAM_FORMER_TRANSPOSE_KERNEL_H
+#define LOFAR_GPUPROC_OPENCL_BEAM_FORMER_TRANSPOSE_KERNEL_H
 
 #include <CoInterface/Parset.h>
 
-#include <GPUProc/Kernel.h>
-#include <GPUProc/opencl-incl.h>
+#include "Kernel.h"
+#include <GPUProc/gpu_incl.h>
 
 namespace LOFAR
 {

RTCP/Cobalt/GPUProc/src/opencl/Kernels/CMakeLists.txt

+# $Id$
+
 install(FILES
   FIR_Filter.cu
-		DESTINATION share/gpu/kernels)
+  DelayAndBandPass.cu
\ No newline at end of file
+  DESTINATION share/gpu/kernels
+)

RTCP/Cobalt/GPUProc/src/opencl/Kernels/CoherentStokesKernel.h

@@ -18,13 +18,13 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_COHERENT_STOKES_KERNEL_H
-#define LOFAR_GPUPROC_COHERENT_STOKES_KERNEL_H
+#ifndef LOFAR_GPUPROC_OPENCL_COHERENT_STOKES_KERNEL_H
+#define LOFAR_GPUPROC_OPENCL_COHERENT_STOKES_KERNEL_H
 
 #include <CoInterface/Parset.h>
 
-#include <GPUProc/Kernel.h>
-#include <GPUProc/opencl-incl.h>
+#include "Kernel.h"
+#include <GPUProc/gpu_incl.h>
 
 namespace LOFAR
 {

RTCP/Cobalt/GPUProc/src/opencl/Kernels/CorrelatorKernel.h

@@ -18,14 +18,14 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_CORRELATOR_KERNEL_H
-#define LOFAR_GPUPROC_CORRELATOR_KERNEL_H
+#ifndef LOFAR_GPUPROC_OPENCL_CORRELATOR_KERNEL_H
+#define LOFAR_GPUPROC_OPENCL_CORRELATOR_KERNEL_H
 
 #include <CoInterface/Parset.h>
 
-#include <GPUProc/Kernel.h>
+#include "Kernel.h"
 #include <GPUProc/global_defines.h>
-#include <GPUProc/opencl-incl.h>
+#include <GPUProc/gpu_incl.h>
 
 namespace LOFAR
 {

RTCP/Cobalt/GPUProc/src/opencl/Kernels/DedispersionBackwardFFTkernel.h

@@ -18,8 +18,8 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_DEDISPERSION_BACKWARD_FFTKERNEL_H
-#define LOFAR_GPUPROC_DEDISPERSION_BACKWARD_FFTKERNEL_H
+#ifndef LOFAR_GPUPROC_OPENCL_DEDISPERSION_BACKWARD_FFTKERNEL_H
+#define LOFAR_GPUPROC_OPENCL_DEDISPERSION_BACKWARD_FFTKERNEL_H
 
 #include <CoInterface/Parset.h>
 

RTCP/Cobalt/GPUProc/src/opencl/Kernels/DedispersionChirpKernel.h

@@ -18,13 +18,13 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_DEDISPERSION_CHIRP_KERNEL_H
-#define LOFAR_GPUPROC_DEDISPERSION_CHIRP_KERNEL_H
+#ifndef LOFAR_GPUPROC_OPENCL_DEDISPERSION_CHIRP_KERNEL_H
+#define LOFAR_GPUPROC_OPENCL_DEDISPERSION_CHIRP_KERNEL_H
 
 #include <CoInterface/Parset.h>
 
-#include <GPUProc/Kernel.h>
-#include <GPUProc/opencl-incl.h>
+#include "Kernel.h"
+#include <GPUProc/gpu_incl.h>
 #include <GPUProc/PerformanceCounter.h>
 
 namespace LOFAR

RTCP/Cobalt/GPUProc/src/opencl/Kernels/DedispersionForwardFFTkernel.h

@@ -18,8 +18,8 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_DEDISPERSION_FORWARD_FFTKERNEL_H
-#define LOFAR_GPUPROC_DEDISPERSION_FORWARD_FFTKERNEL_H
+#ifndef LOFAR_GPUPROC_OPENCL_DEDISPERSION_FORWARD_FFTKERNEL_H
+#define LOFAR_GPUPROC_OPENCL_DEDISPERSION_FORWARD_FFTKERNEL_H
 
 #include <CoInterface/Parset.h>
 

RTCP/Cobalt/GPUProc/src/opencl/Kernels/DelayAndBandPassKernel.h

@@ -18,13 +18,13 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_DELAY_AND_BAND_PASS_KERNEL_H
-#define LOFAR_GPUPROC_DELAY_AND_BAND_PASS_KERNEL_H
+#ifndef LOFAR_GPUPROC_OPENCL_DELAY_AND_BAND_PASS_KERNEL_H
+#define LOFAR_GPUPROC_OPENCL_DELAY_AND_BAND_PASS_KERNEL_H
 
 #include <CoInterface/Parset.h>
 
-#include <GPUProc/Kernel.h>
-#include <GPUProc/opencl-incl.h>
+#include "Kernel.h"
+#include <GPUProc/gpu_incl.h>
 #include <GPUProc/PerformanceCounter.h>
 
 namespace LOFAR

RTCP/Cobalt/GPUProc/src/opencl/Kernels/FFT_Kernel.h

@@ -18,12 +18,12 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_FFT_KERNEL_H
-#define LOFAR_GPUPROC_FFT_KERNEL_H
+#ifndef LOFAR_GPUPROC_OPENCL_FFT_KERNEL_H
+#define LOFAR_GPUPROC_OPENCL_FFT_KERNEL_H
 
 #include <CoInterface/Parset.h>
 
-#include <GPUProc/opencl-incl.h>
+#include <GPUProc/gpu_incl.h>
 #include <GPUProc/PerformanceCounter.h>
 #include "FFT_Plan.h"
 

RTCP/Cobalt/GPUProc/src/opencl/Kernels/FFT_Plan.h

@@ -18,12 +18,12 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_FFT_PLAN_H
-#define LOFAR_GPUPROC_FFT_PLAN_H
+#ifndef LOFAR_GPUPROC_OPENCL_FFT_PLAN_H
+#define LOFAR_GPUPROC_OPENCL_FFT_PLAN_H
 
 #include <CoInterface/Parset.h>
 
-#include <GPUProc/opencl-incl.h>
+#include <GPUProc/gpu_incl.h>
 #include <GPUProc/OpenCL_Support.h>
 #include <OpenCL_FFT/clFFT.h>
 

RTCP/Cobalt/GPUProc/src/opencl/Kernels/FIR_FilterKernel.h

@@ -18,13 +18,13 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_FIR_FILTER_KERNEL_H
-#define LOFAR_GPUPROC_FIR_FILTER_KERNEL_H
+#ifndef LOFAR_GPUPROC_OPENCL_FIR_FILTER_KERNEL_H
+#define LOFAR_GPUPROC_OPENCL_FIR_FILTER_KERNEL_H
 
 #include <CoInterface/Parset.h>
 
-#include <GPUProc/Kernel.h>
-#include <GPUProc/opencl-incl.h>
+#include "Kernel.h"
+#include <GPUProc/gpu_incl.h>
 
 namespace LOFAR
 {

RTCP/Cobalt/GPUProc/src/opencl/Kernels/Filter_FFT_Kernel.h

@@ -18,13 +18,13 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_FILTER_FFT_KERNEL_H
-#define LOFAR_GPUPROC_FILTER_FFT_KERNEL_H
+#ifndef LOFAR_GPUPROC_OPENCL_FILTER_FFT_KERNEL_H
+#define LOFAR_GPUPROC_OPENCL_FILTER_FFT_KERNEL_H
 
 #include <CoInterface/Parset.h>
 
 #include "FFT_Kernel.h"
-#include <GPUProc/opencl-incl.h>
+#include <GPUProc/gpu_incl.h>
 
 namespace LOFAR
 {

RTCP/Cobalt/GPUProc/src/opencl/Kernels/IncoherentStokesKernel.h

@@ -18,13 +18,13 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_INCOHERENT_STOKES_KERNEL_H
-#define LOFAR_GPUPROC_INCOHERENT_STOKES_KERNEL_H
+#ifndef LOFAR_GPUPROC_OPENCL_INCOHERENT_STOKES_KERNEL_H
+#define LOFAR_GPUPROC_OPENCL_INCOHERENT_STOKES_KERNEL_H
 
 #include <CoInterface/Parset.h>
 
-#include <GPUProc/Kernel.h>
-#include <GPUProc/opencl-incl.h>
+#include "Kernel.h"
+#include <GPUProc/gpu_incl.h>
 
 namespace LOFAR
 {

RTCP/Cobalt/GPUProc/src/opencl/Kernels/IntToFloatKernel.h

@@ -18,13 +18,13 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_GPUPROC_INT_TO_FLOAT_KERNEL_H
-#define LOFAR_GPUPROC_INT_TO_FLOAT_KERNEL_H
+#ifndef LOFAR_GPUPROC_OPENCL_INT_TO_FLOAT_KERNEL_H
+#define LOFAR_GPUPROC_OPENCL_INT_TO_FLOAT_KERNEL_H
 
 #include <CoInterface/Parset.h>
 
-#include <GPUProc/Kernel.h>
-#include <GPUProc/opencl-incl.h>
+#include "Kernel.h"
+#include <GPUProc/gpu_incl.h>
 
 namespace LOFAR
 {