From fcc4e1761a38d7bd49c7f724155fb861d41bdedb Mon Sep 17 00:00:00 2001
From: Alexander van Amesfoort <amesfoort@astron.nl>
Date: Wed, 8 May 2013 12:46:17 +0000
Subject: [PATCH] Task #4433: move test cases and gpu sources into opencl/ or
cuda/
---
.gitattributes | 59 ++++-----
RTCP/Cobalt/GPUProc/src/CMakeLists.txt | 6 -
RTCP/Cobalt/GPUProc/src/cuda/CMakeLists.txt | 11 +-
.../Kernels => cuda}/DelayAndBandPass.cu | 0
.../{opencl/Kernels => cuda}/FIR_Filter.cu | 0
RTCP/Cobalt/GPUProc/src/opencl/CMakeLists.txt | 10 +-
.../GPUProc/src/opencl/Kernels/CMakeLists.txt | 7 -
RTCP/Cobalt/GPUProc/test/CMakeLists.txt | 25 +---
.../GPUProc/test/UnitTests/BeamFormerTest.cc | 29 ----
.../test/UnitTests/new_style_unittest.cc | 29 ----
RTCP/Cobalt/GPUProc/test/cuda/CMakeLists.txt | 10 +-
.../test/{ => cuda}/tDelayCompensation.cc | 0
.../Cobalt/GPUProc/test/opencl/CMakeLists.txt | 20 +++
.../test/{ => opencl}/RTCP_UnitTest.cc | 0
.../RTCP_UnitTest.parset.77_Stations | 0
.../RTCP_UnitTest.parset.AARTFAAC | 0
.../RTCP_UnitTest.parset.small-test | 0
.../test/{ => opencl}/RTCP_UnitTest.run | 0
.../test/{ => opencl}/RTCP_UnitTest.sh | 0
.../GPUProc/test/{ => opencl}/UnitTest.cc | 0
.../GPUProc/test/{ => opencl}/UnitTest.h | 0
.../GPUProc/test/{ => opencl}/cmpfloat.py | 0
.../GPUProc/test/{ => opencl}/tContext.cc | 0
.../GPUProc/test/{ => opencl}/tContext.run | 0
.../GPUProc/test/{ => opencl}/tContext.sh | 0
.../SB0.MS | Bin
.../SB1.MS | Bin
.../SB2.MS | Bin
.../SB3.MS | Bin
.../SB4.MS | Bin
.../tCorrelate_1sec_1st_5sb_noflagging.parset | 0
.../tCorrelate_1sec_1st_5sb_noflagging.run | 0
.../tCorrelate_1sec_1st_5sb_noflagging.sh | 2 +-
.../tCorrelate_3sec_1st_5sb.output/SB0.MS | Bin
.../tCorrelate_3sec_1st_5sb.output/SB1.MS | Bin
.../tCorrelate_3sec_1st_5sb.output/SB2.MS | Bin
.../tCorrelate_3sec_1st_5sb.output/SB3.MS | Bin
.../tCorrelate_3sec_1st_5sb.output/SB4.MS | Bin
.../tCorrelate_3sec_1st_5sb.parset | 0
.../{ => opencl}/tCorrelate_3sec_1st_5sb.run | 0
.../{ => opencl}/tCorrelate_3sec_1st_5sb.sh | 0
.../tCorrelate_3sec_2st_5sb.output/SB0.MS | Bin
.../tCorrelate_3sec_2st_5sb.output/SB1.MS | Bin
.../tCorrelate_3sec_2st_5sb.output/SB2.MS | Bin
.../tCorrelate_3sec_2st_5sb.output/SB3.MS | Bin
.../tCorrelate_3sec_2st_5sb.output/SB4.MS | Bin
.../tCorrelate_3sec_2st_5sb.parset | 0
.../{ => opencl}/tCorrelate_3sec_2st_5sb.run | 0
.../{ => opencl}/tCorrelate_3sec_2st_5sb.sh | 0
.../tCorrelatorWorkQueue.cc | 2 +-
.../test/{ => opencl}/tGPUPerformance.parset | 0
.../test/{ => opencl}/tGPUPerformance.run | 0
.../test/{ => opencl}/tGPUPerformance.sh | 0
.../test/{ => opencl}/tPerformanceCounter.cc | 0
.../test/{ => opencl}/tPerformanceCounter.run | 0
.../test/{ => opencl}/tPerformanceCounter.sh | 0
.../GPUProc/test/{ => opencl}/testFuncs.sh | 0
RTCP/Cobalt/GPUProc/test/t_complex.cc | 52 --------
RTCP/Cobalt/GPUProc/test/testParset.sh | 124 ------------------
59 files changed, 76 insertions(+), 310 deletions(-)
rename RTCP/Cobalt/GPUProc/src/{opencl/Kernels => cuda}/DelayAndBandPass.cu (100%)
rename RTCP/Cobalt/GPUProc/src/{opencl/Kernels => cuda}/FIR_Filter.cu (100%)
delete mode 100644 RTCP/Cobalt/GPUProc/src/opencl/Kernels/CMakeLists.txt
delete mode 100644 RTCP/Cobalt/GPUProc/test/UnitTests/BeamFormerTest.cc
delete mode 100644 RTCP/Cobalt/GPUProc/test/UnitTests/new_style_unittest.cc
rename RTCP/Cobalt/GPUProc/test/{ => cuda}/tDelayCompensation.cc (100%)
create mode 100644 RTCP/Cobalt/GPUProc/test/opencl/CMakeLists.txt
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/RTCP_UnitTest.cc (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/RTCP_UnitTest.parset.77_Stations (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/RTCP_UnitTest.parset.AARTFAAC (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/RTCP_UnitTest.parset.small-test (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/RTCP_UnitTest.run (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/RTCP_UnitTest.sh (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/UnitTest.cc (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/UnitTest.h (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/cmpfloat.py (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tContext.cc (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tContext.run (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tContext.sh (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_1sec_1st_5sb_noflagging.parset (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_1sec_1st_5sb_noflagging.run (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_1sec_1st_5sb_noflagging.sh (83%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_1st_5sb.output/SB0.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_1st_5sb.output/SB1.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_1st_5sb.output/SB2.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_1st_5sb.output/SB3.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_1st_5sb.output/SB4.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_1st_5sb.parset (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_1st_5sb.run (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_1st_5sb.sh (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_2st_5sb.output/SB0.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_2st_5sb.output/SB1.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_2st_5sb.output/SB2.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_2st_5sb.output/SB3.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_2st_5sb.output/SB4.MS (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_2st_5sb.parset (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_2st_5sb.run (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tCorrelate_3sec_2st_5sb.sh (100%)
rename RTCP/Cobalt/GPUProc/test/{UnitTests/WorkQueues => opencl}/tCorrelatorWorkQueue.cc (99%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tGPUPerformance.parset (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tGPUPerformance.run (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tGPUPerformance.sh (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tPerformanceCounter.cc (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tPerformanceCounter.run (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/tPerformanceCounter.sh (100%)
rename RTCP/Cobalt/GPUProc/test/{ => opencl}/testFuncs.sh (100%)
delete mode 100644 RTCP/Cobalt/GPUProc/test/t_complex.cc
delete mode 100755 RTCP/Cobalt/GPUProc/test/testParset.sh
diff --git a/.gitattributes b/.gitattributes
index 4a7007d8d51..70dd6b2c719 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3710,44 +3710,43 @@ RTCP/Cobalt/GPUProc/test/Kernels/FIR_FilterTest.run -text
RTCP/Cobalt/GPUProc/test/Kernels/FIR_FilterTest.sh -text
RTCP/Cobalt/GPUProc/test/Kernels/tDelayAndBandPass.run eol=lf
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/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/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.parset -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.run -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.sh -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB0.MS -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB1.MS -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB2.MS -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB3.MS -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB4.MS -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.parset -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.run -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.sh -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB0.MS -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB1.MS -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB2.MS -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB3.MS -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB4.MS -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.parset -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.run -text
-RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.sh -text
+RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.77_Stations -text
+RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.AARTFAAC -text
+RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.small-test -text
+RTCP/Cobalt/GPUProc/test/opencl/cmpfloat.py -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.parset -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.run -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.sh -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB0.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB1.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB2.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB3.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB4.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.parset -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.run -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.sh -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB0.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB1.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB2.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB3.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB4.MS -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.parset -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.run -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.sh -text
+RTCP/Cobalt/GPUProc/test/opencl/tCorrelatorWorkQueue.cc -text
RTCP/Cobalt/GPUProc/test/tSSH.run -text
RTCP/Cobalt/GPUProc/test/tSSH.sh -text
RTCP/Cobalt/GPUProc/test/tSSH.stdout -text
RTCP/Cobalt/GPUProc/test/tStorageProcesses.sh -text
RTCP/Cobalt/GPUProc/test/tStorageProcesses.stdout -text
-RTCP/Cobalt/GPUProc/test/testParset.sh -text
RTCP/Cobalt/InputProc/CMakeLists.txt -text
RTCP/Cobalt/InputProc/src/Buffer/Block.h -text
RTCP/Cobalt/InputProc/src/Buffer/BlockReader.h -text
diff --git a/RTCP/Cobalt/GPUProc/src/CMakeLists.txt b/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
index 85b4ea5df9a..c42e626fac5 100644
--- a/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
@@ -26,9 +26,6 @@ if(USE_CUDA)
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)
@@ -69,7 +66,4 @@ if(USE_OPENCL)
lofar_add_library(gpuproc_opencl ${_gpuproc_sources})
lofar_add_bin_program(rtcp_opencl rtcp.cc)
- install(FILES
- rtcp_opencl
- DESTINATION bin)
endif()
diff --git a/RTCP/Cobalt/GPUProc/src/cuda/CMakeLists.txt b/RTCP/Cobalt/GPUProc/src/cuda/CMakeLists.txt
index 21c62d0cc63..d58d35633bb 100644
--- a/RTCP/Cobalt/GPUProc/src/cuda/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/src/cuda/CMakeLists.txt
@@ -1,5 +1,8 @@
+# $Id$
install(FILES
- complex.h
- cuPrintf.cu
- cuPrintf.cuh
- DESTINATION share/gpu/kernels)
\ No newline at end of file
+ complex.h
+ cuPrintf.cu
+ cuPrintf.cuh
+ FIR_Filter.cu
+ DelayAndBandPass.cu
+ DESTINATION share/gpu/kernels)
diff --git a/RTCP/Cobalt/GPUProc/src/opencl/Kernels/DelayAndBandPass.cu b/RTCP/Cobalt/GPUProc/src/cuda/DelayAndBandPass.cu
similarity index 100%
rename from RTCP/Cobalt/GPUProc/src/opencl/Kernels/DelayAndBandPass.cu
rename to RTCP/Cobalt/GPUProc/src/cuda/DelayAndBandPass.cu
diff --git a/RTCP/Cobalt/GPUProc/src/opencl/Kernels/FIR_Filter.cu b/RTCP/Cobalt/GPUProc/src/cuda/FIR_Filter.cu
similarity index 100%
rename from RTCP/Cobalt/GPUProc/src/opencl/Kernels/FIR_Filter.cu
rename to RTCP/Cobalt/GPUProc/src/cuda/FIR_Filter.cu
diff --git a/RTCP/Cobalt/GPUProc/src/opencl/CMakeLists.txt b/RTCP/Cobalt/GPUProc/src/opencl/CMakeLists.txt
index 7fc94cf723e..3923ababad4 100644
--- a/RTCP/Cobalt/GPUProc/src/opencl/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/src/opencl/CMakeLists.txt
@@ -1,3 +1,11 @@
# $Id$
-add_subdirectory(Kernels)
+install(FILES
+ Correlator.cl
+ DelayAndBandPass.cl
+ #fft2.cl
+ FFT.cl
+ FIR.cl
+ math.cl
+ NewCorrelator.cl
+ DESTINATION share/gpu/kernels)
diff --git a/RTCP/Cobalt/GPUProc/src/opencl/Kernels/CMakeLists.txt b/RTCP/Cobalt/GPUProc/src/opencl/Kernels/CMakeLists.txt
deleted file mode 100644
index 2bc7a8f032d..00000000000
--- a/RTCP/Cobalt/GPUProc/src/opencl/Kernels/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Id$
-
-install(FILES
- FIR_Filter.cu
- DelayAndBandPass.cu
- DESTINATION share/gpu/kernels
-)
diff --git a/RTCP/Cobalt/GPUProc/test/CMakeLists.txt b/RTCP/Cobalt/GPUProc/test/CMakeLists.txt
index b9ce8dc5c16..2824fc0e907 100644
--- a/RTCP/Cobalt/GPUProc/test/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/test/CMakeLists.txt
@@ -6,36 +6,17 @@ include(LofarCTest)
# source files and headers in subdirectories include UnitTest.h
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-#lofar_add_test(t_complex t_complex.cc)
+# Jan David, is this a test case? If so, please rename + lofar_add_test().
+lofar_add_bin_program(DummyStorage DummyStorage.cc)
lofar_add_test(tBestEffortQueue tBestEffortQueue.cc)
-lofar_add_test(tGPUPerformance)
-
lofar_add_test(tSSH tSSH.cc)
-lofar_add_bin_program(DummyStorage DummyStorage.cc)
lofar_add_test(tStorageProcesses tStorageProcesses.cc)
-
if(USE_CUDA)
add_subdirectory(cuda)
- add_subdirectory(Kernels)
endif()
-# TODO: gradually move tests below out of USE_OPENCL when CUDA port is getting done
if(USE_OPENCL)
- lofar_add_test(tContext tContext.cc)
- lofar_add_test(tPerformanceCounter tPerformanceCounter.cc)
- lofar_add_test(tCorrelate_1sec_1st_5sb_noflagging)
- lofar_add_test(tCorrelate_3sec_1st_5sb)
- lofar_add_test(tCorrelate_3sec_2st_5sb)
- #lofar_add_test(tDelayCompensation tDelayCompensation.cc)
- #lofar_add_test(RTCP_UnitTest RTCP_UnitTest.cc UnitTest.cc)
-
- lofar_find_package(UnitTest++)
- if(UNITTEST++_FOUND)
- lofar_add_test(tCorrelatorWorkQueue
- UnitTests/WorkQueues/tCorrelatorWorkQueue.cc
- UnitTests/new_style_unittest.cc)
- endif()
+ add_subdirectory(opencl)
endif()
-
diff --git a/RTCP/Cobalt/GPUProc/test/UnitTests/BeamFormerTest.cc b/RTCP/Cobalt/GPUProc/test/UnitTests/BeamFormerTest.cc
deleted file mode 100644
index 0e56585bbe5..00000000000
--- a/RTCP/Cobalt/GPUProc/test/UnitTests/BeamFormerTest.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-//# BeamFormerTest.cc
-//# Copyright (C) 2013 ASTRON (Netherlands Institute for Radio Astronomy)
-//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
-//#
-//# This file is part of the LOFAR software suite.
-//# The LOFAR software suite is free software: you can redistribute it and/or
-//# modify it under the terms of the GNU General Public License as published
-//# by the Free Software Foundation, either version 3 of the License, or
-//# (at your option) any later version.
-//#
-//# The LOFAR software suite is distributed in the hope that it will be useful,
-//# but WITHOUT ANY WARRANTY; without even the implied warranty of
-//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//# GNU General Public License for more details.
-//#
-//# You should have received a copy of the GNU General Public License along
-//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
-//#
-//# $Id$
-
-#include <lofar_config.h>
-
-#include <UnitTest++.h>
-
-TEST(FailSpectacularly2)
-{
- CHECK(true);
-}
-
diff --git a/RTCP/Cobalt/GPUProc/test/UnitTests/new_style_unittest.cc b/RTCP/Cobalt/GPUProc/test/UnitTests/new_style_unittest.cc
deleted file mode 100644
index 8dc1ed53d9b..00000000000
--- a/RTCP/Cobalt/GPUProc/test/UnitTests/new_style_unittest.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-//# new_style_unittest.cc
-//# Copyright (C) 2013 ASTRON (Netherlands Institute for Radio Astronomy)
-//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
-//#
-//# This file is part of the LOFAR software suite.
-//# The LOFAR software suite is free software: you can redistribute it and/or
-//# modify it under the terms of the GNU General Public License as published
-//# by the Free Software Foundation, either version 3 of the License, or
-//# (at your option) any later version.
-//#
-//# The LOFAR software suite is distributed in the hope that it will be useful,
-//# but WITHOUT ANY WARRANTY; without even the implied warranty of
-//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//# GNU General Public License for more details.
-//#
-//# You should have received a copy of the GNU General Public License along
-//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
-//#
-//# $Id$
-
-#include <lofar_config.h>
-
-#include <UnitTest++.h>
-
-TEST(FailSpectacularly)
-{
- CHECK(true);
-}
-
diff --git a/RTCP/Cobalt/GPUProc/test/cuda/CMakeLists.txt b/RTCP/Cobalt/GPUProc/test/cuda/CMakeLists.txt
index ec8e98cc8c5..9409c09f33f 100644
--- a/RTCP/Cobalt/GPUProc/test/cuda/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/test/cuda/CMakeLists.txt
@@ -2,12 +2,14 @@
include(LofarCTest)
+lofar_add_test(tCudaRuntimeCompiler tCudaRuntimeCompiler.cc)
+lofar_add_test(tStreamReadBuffer tStreamReadBuffer.cc)
+
+
# To compile .cu files, invoke CUDA's nvcc, but respect the host C/C++ compiler (variants) selection.
set(COMPILER_BINDIR_OPT --compiler-bindir ${CMAKE_CXX_COMPILER})
-lofar_add_test(tCudaRuntimeCompiler tCudaRuntimeCompiler.cc)
-
+# tests built by nvcc
cuda_add_executable(t_cuda_complex t_cuda_complex.cu OPTIONS ${COMPILER_BINDIR_OPT})
add_test(t_cuda_complex ${CMAKE_CURRENT_SOURCE_DIR}/t_cuda_complex.sh)
-
-lofar_add_test(tStreamReadBuffer tStreamReadBuffer.cc)
+#lofar_add_test(tDelayCompensation tDelayCompensation.cc)
diff --git a/RTCP/Cobalt/GPUProc/test/tDelayCompensation.cc b/RTCP/Cobalt/GPUProc/test/cuda/tDelayCompensation.cc
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tDelayCompensation.cc
rename to RTCP/Cobalt/GPUProc/test/cuda/tDelayCompensation.cc
diff --git a/RTCP/Cobalt/GPUProc/test/opencl/CMakeLists.txt b/RTCP/Cobalt/GPUProc/test/opencl/CMakeLists.txt
new file mode 100644
index 00000000000..9543c234ecc
--- /dev/null
+++ b/RTCP/Cobalt/GPUProc/test/opencl/CMakeLists.txt
@@ -0,0 +1,20 @@
+# $Id$
+
+include(LofarCTest)
+
+# TODO: move generic tests to ../ when supported by our CUDA port
+
+lofar_add_test(tContext tContext.cc)
+lofar_add_test(tPerformanceCounter tPerformanceCounter.cc)
+#lofar_add_test(RTCP_UnitTest RTCP_UnitTest.cc UnitTest.cc)
+
+lofar_find_package(UnitTest++)
+if(UNITTEST++_FOUND)
+ lofar_add_test(tCorrelatorWorkQueue tCorrelatorWorkQueue.cc)
+endif()
+
+# tests that use testParset.sh
+lofar_add_test(tCorrelate_1sec_1st_5sb_noflagging)
+lofar_add_test(tCorrelate_3sec_1st_5sb)
+lofar_add_test(tCorrelate_3sec_2st_5sb)
+lofar_add_test(tGPUPerformance)
diff --git a/RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.cc b/RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.cc
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.cc
rename to RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.cc
diff --git a/RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.77_Stations b/RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.77_Stations
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.77_Stations
rename to RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.77_Stations
diff --git a/RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.AARTFAAC b/RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.AARTFAAC
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.AARTFAAC
rename to RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.AARTFAAC
diff --git a/RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.small-test b/RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.small-test
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.small-test
rename to RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.small-test
diff --git a/RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.run b/RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.run
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.run
rename to RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.run
diff --git a/RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.sh b/RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.sh
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.sh
rename to RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.sh
diff --git a/RTCP/Cobalt/GPUProc/test/UnitTest.cc b/RTCP/Cobalt/GPUProc/test/opencl/UnitTest.cc
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/UnitTest.cc
rename to RTCP/Cobalt/GPUProc/test/opencl/UnitTest.cc
diff --git a/RTCP/Cobalt/GPUProc/test/UnitTest.h b/RTCP/Cobalt/GPUProc/test/opencl/UnitTest.h
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/UnitTest.h
rename to RTCP/Cobalt/GPUProc/test/opencl/UnitTest.h
diff --git a/RTCP/Cobalt/GPUProc/test/cmpfloat.py b/RTCP/Cobalt/GPUProc/test/opencl/cmpfloat.py
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/cmpfloat.py
rename to RTCP/Cobalt/GPUProc/test/opencl/cmpfloat.py
diff --git a/RTCP/Cobalt/GPUProc/test/tContext.cc b/RTCP/Cobalt/GPUProc/test/opencl/tContext.cc
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tContext.cc
rename to RTCP/Cobalt/GPUProc/test/opencl/tContext.cc
diff --git a/RTCP/Cobalt/GPUProc/test/tContext.run b/RTCP/Cobalt/GPUProc/test/opencl/tContext.run
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tContext.run
rename to RTCP/Cobalt/GPUProc/test/opencl/tContext.run
diff --git a/RTCP/Cobalt/GPUProc/test/tContext.sh b/RTCP/Cobalt/GPUProc/test/opencl/tContext.sh
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tContext.sh
rename to RTCP/Cobalt/GPUProc/test/opencl/tContext.sh
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.parset b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.parset
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.parset
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.parset
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.run b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.run
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.run
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.run
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.sh b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.sh
similarity index 83%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.sh
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.sh
index 286085dd525..2b1ca711b25 100755
--- a/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.sh
+++ b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
TESTNAME=`basename "${0%%.sh}"`
./runctest.sh $TESTNAME > $TESTNAME.log 2>&1
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB0.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB0.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB0.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB0.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB1.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB1.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB1.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB1.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB2.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB2.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB2.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB2.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB3.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB3.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB3.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB3.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB4.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB4.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB4.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB4.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.parset b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.parset
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.parset
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.parset
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.run b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.run
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.run
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.run
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.sh b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.sh
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.sh
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.sh
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB0.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB0.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB0.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB0.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB1.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB1.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB1.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB1.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB2.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB2.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB2.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB2.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB3.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB3.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB3.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB3.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB4.MS b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB4.MS
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB4.MS
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB4.MS
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.parset b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.parset
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.parset
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.parset
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.run b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.run
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.run
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.run
diff --git a/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.sh b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.sh
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.sh
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.sh
diff --git a/RTCP/Cobalt/GPUProc/test/UnitTests/WorkQueues/tCorrelatorWorkQueue.cc b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelatorWorkQueue.cc
similarity index 99%
rename from RTCP/Cobalt/GPUProc/test/UnitTests/WorkQueues/tCorrelatorWorkQueue.cc
rename to RTCP/Cobalt/GPUProc/test/opencl/tCorrelatorWorkQueue.cc
index b1034b46fdc..02a3111674b 100644
--- a/RTCP/Cobalt/GPUProc/test/UnitTests/WorkQueues/tCorrelatorWorkQueue.cc
+++ b/RTCP/Cobalt/GPUProc/test/opencl/tCorrelatorWorkQueue.cc
@@ -25,7 +25,7 @@
#include <UnitTest++.h>
#include <iostream>
#include <CoInterface/Parset.h>
-#include "CoInterface/CorrelatedData.h"
+#include <CoInterface/CorrelatedData.h>
#include <CoInterface/SparseSet.h>
#include <CoInterface/MultiDimArray.h>
#include <complex>
diff --git a/RTCP/Cobalt/GPUProc/test/tGPUPerformance.parset b/RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.parset
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tGPUPerformance.parset
rename to RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.parset
diff --git a/RTCP/Cobalt/GPUProc/test/tGPUPerformance.run b/RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.run
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tGPUPerformance.run
rename to RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.run
diff --git a/RTCP/Cobalt/GPUProc/test/tGPUPerformance.sh b/RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.sh
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tGPUPerformance.sh
rename to RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.sh
diff --git a/RTCP/Cobalt/GPUProc/test/tPerformanceCounter.cc b/RTCP/Cobalt/GPUProc/test/opencl/tPerformanceCounter.cc
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tPerformanceCounter.cc
rename to RTCP/Cobalt/GPUProc/test/opencl/tPerformanceCounter.cc
diff --git a/RTCP/Cobalt/GPUProc/test/tPerformanceCounter.run b/RTCP/Cobalt/GPUProc/test/opencl/tPerformanceCounter.run
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tPerformanceCounter.run
rename to RTCP/Cobalt/GPUProc/test/opencl/tPerformanceCounter.run
diff --git a/RTCP/Cobalt/GPUProc/test/tPerformanceCounter.sh b/RTCP/Cobalt/GPUProc/test/opencl/tPerformanceCounter.sh
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/tPerformanceCounter.sh
rename to RTCP/Cobalt/GPUProc/test/opencl/tPerformanceCounter.sh
diff --git a/RTCP/Cobalt/GPUProc/test/testFuncs.sh b/RTCP/Cobalt/GPUProc/test/opencl/testFuncs.sh
similarity index 100%
rename from RTCP/Cobalt/GPUProc/test/testFuncs.sh
rename to RTCP/Cobalt/GPUProc/test/opencl/testFuncs.sh
diff --git a/RTCP/Cobalt/GPUProc/test/t_complex.cc b/RTCP/Cobalt/GPUProc/test/t_complex.cc
deleted file mode 100644
index a296d00ec60..00000000000
--- a/RTCP/Cobalt/GPUProc/test/t_complex.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-//# t_complex.cc
-//# Copyright (C) 2013 ASTRON (Netherlands Institute for Radio Astronomy)
-//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
-//#
-//# This file is part of the LOFAR software suite.
-//# The LOFAR software suite is free software: you can redistribute it and/or
-//# modify it under the terms of the GNU General Public License as published
-//# by the Free Software Foundation, either version 3 of the License, or
-//# (at your option) any later version.
-//#
-//# The LOFAR software suite is distributed in the hope that it will be useful,
-//# but WITHOUT ANY WARRANTY; without even the implied warranty of
-//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//# GNU General Public License for more details.
-//#
-//# You should have received a copy of the GNU General Public License along
-//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
-//#
-//# $Id$
-
-#include <lofar_config.h>
-
-#include <iostream>
-
-#if 1
-#include <GPUProc/complex.h>
-using namespace LOFAR::Cobalt;
-#else
-#include <complex>
-namespace gpu = std;
-#endif
-
-int main()
-{
- gpu::complex<float> cf(3.14f, 2.72f);
- cf *= 3;
- gpu::complex<double> cd(1.618, 0.577);
- cd *= 3;
- gpu::complex<long double> cl(1.41421356237L, 1.73205080757L);
- cl *= 3;
- std::cout << cf << std::endl;
- std::cout << cd << std::endl;
- std::cout << cl << std::endl;
- cd *= gpu::complex<double>(cf);
- cf *= gpu::complex<float>(cd);
- cl *= cd;
- cf *= cl;
- std::cout << cf << std::endl;
- std::cout << cd << std::endl;
- std::cout << cl << std::endl;
- return 0;
-}
diff --git a/RTCP/Cobalt/GPUProc/test/testParset.sh b/RTCP/Cobalt/GPUProc/test/testParset.sh
deleted file mode 100755
index 3441ce44d35..00000000000
--- a/RTCP/Cobalt/GPUProc/test/testParset.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-
-# Run a parset and compare the output to that in the reference_output directory.
-#
-# Syntax: testParset.sh parset [-r reference-output-directory] [-g minimal-gpu-efficiency]
-
-# Set defaults for options
-REFDIR=
-GPUEFFICIENCY=0
-
-# Parse options
-while getopts "r:g:" opt
-do
- case $opt in
- r)
- REFDIR=$OPTARG
- ;;
-
- g)
- GPUEFFICIENCY=$OPTARG
- ;;
-
- \?)
- echo "Invalid option: -$OPTARG" >&2
- exit 1
- ;;
-
- :)
- echo "Option needs argument: -$OPTARG" >&2
- exit 1
- ;;
- esac
-done
-
-PARSET=$1
-
-# Include some useful shell functions
-. $srcdir/testFuncs.sh
-
-BINDIR=`pwd`/../src
-
-# Some host info
-echo "Running as `whoami`"
-echo "Running on `hostname`"
-echo "Working directory is `pwd`"
-
-# Check for GPU
-haveGPU || exit 3
-
-# Check for input files
-if [ ! -e /var/scratch/mol/test_sets ]
-then
- echo "No input files found -- aborting test." >&2
- exit 3
-fi
-
-echo "Testing $PARSET"
-
-RUNDIR=`pwd`
-OUTDIR=`basename "${PARSET%.parset}.in_output"`
-
-function parse_logs
-{
- NORMAL=$1
- PROFILED=$2
-
- test -r $NORMAL || return 1
- test -r $PROFILED || return 1
-
- # obtain wall time
- WALLTIME=`<$NORMAL perl -ne 'if (/Wall seconds spent.*?([0-9.]+)$/) { print $1; }'`
- # obtain GPU cost
- GPUCOST=`<$PROFILED perl -ne 'if (/GPU seconds spent computing.*?([0-9.]+)$/) { print $1; }'`
-
- # log efficiency
- GPUUSAGE=`echo "scale=0;100*$GPUCOST/$WALLTIME" | bc -l`
- echo "Total processing time: $WALLTIME s"
- echo "GPU usage : $GPUUSAGE %"
-
- if [ "$GPUUSAGE" -lt $GPUEFFICIENCY ]
- then
- echo "ERROR: GPU usage < $GPUEFFICIENCY% -- considering test a failure." >&2
- return 1
- fi
-
- return 0
-}
-
-(
- # create output dir
- mkdir -p $OUTDIR &&
- cd $OUTDIR &&
-
- # enable debugging
- echo "Global 20" >> rtcp.debug &&
-
- # run correlator -- without profiling
- mpirun -H localhost -np 3 $BINDIR/rtcp $PARSET > performance_normal.txt 2>&1 &&
- # run correlator -- with profiling
- mpirun -H localhost -np 3 $BINDIR/rtcp -p $PARSET > performance_profiled.txt 2>&1 &&
-
- # compare output
- if [ "x" != "x$REFDIR" ]
- then
- # create script to accept output (ie. copy it to the source dir for check in)
- echo "#!/bin/bash
- cp `pwd`/*.MS $REFDIR" > accept_output
- chmod a+x accept_output
-
- for f in *.MS
- do
- ${srcdir}/cmpfloat.py $f $REFDIR/$f || exit 1
- done
- fi &&
-
- # check logs
- parse_logs performance_normal.txt performance_profiled.txt
-) || exit 1
-
-cd $RUNDIR
-
-# toss output
-rm -rf $OUTDIR
-
--
GitLab