From 85d1f679b6c1b687f13ad08b636f06cbb7a50a6c Mon Sep 17 00:00:00 2001
From: Alexander van Amesfoort <amesfoort@astron.nl>
Date: Tue, 15 Apr 2014 21:55:18 +0000
Subject: [PATCH] Task #5632: move tManyPartTABOutput, tMultiPartTABOutput to
Cobalt/CobaltTest/. Patch mostly by Marcel.
---
.gitattributes | 22 +++++++++---------
CMake/LofarPackageList.cmake | 3 ++-
RTCP/Cobalt/CMakeLists.txt | 1 +
RTCP/Cobalt/CobaltTest/CMakeLists.txt | 17 ++++++++++++++
RTCP/Cobalt/CobaltTest/test/CMakeLists.txt | 17 ++++++++++++++
.../Cobalt/CobaltTest/test/setlofarroot.sh.in | 10 ++++++++
.../CobaltTest}/test/tManyPartTABOutput.cc | 0
...tManyPartTABOutput.in_SAP0-1sb-P001.raw.gz | Bin
...tManyPartTABOutput.in_SAP0-4sb-P000.raw.gz | Bin
...tManyPartTABOutput.in_SAP1-3sb-P002.raw.gz | Bin
...tManyPartTABOutput.in_SAP1-4sb-P000.raw.gz | Bin
...tManyPartTABOutput.in_SAP1-4sb-P001.raw.gz | Bin
.../test/tManyPartTABOutput.parset | 0
.../CobaltTest}/test/tManyPartTABOutput.run | 4 ++--
.../CobaltTest}/test/tManyPartTABOutput.sh | 0
.../CobaltTest}/test/tMultiPartTABOutput.cc | 0
.../test/tMultiPartTABOutput.in_P000.raw.gz | Bin
.../test/tMultiPartTABOutput.in_P001.raw.gz | Bin
.../test/tMultiPartTABOutput.parset | 0
.../CobaltTest}/test/tMultiPartTABOutput.run | 4 ++--
.../CobaltTest}/test/tMultiPartTABOutput.sh | 0
SubSystems/Online_Cobalt/CMakeLists.txt | 3 +--
SubSystems/Online_Cobalt/test/CMakeLists.txt | 17 --------------
23 files changed, 63 insertions(+), 35 deletions(-)
create mode 100644 RTCP/Cobalt/CobaltTest/CMakeLists.txt
create mode 100644 RTCP/Cobalt/CobaltTest/test/CMakeLists.txt
create mode 100644 RTCP/Cobalt/CobaltTest/test/setlofarroot.sh.in
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tManyPartTABOutput.cc (100%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tManyPartTABOutput.in_SAP0-1sb-P001.raw.gz (100%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tManyPartTABOutput.in_SAP0-4sb-P000.raw.gz (100%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tManyPartTABOutput.in_SAP1-3sb-P002.raw.gz (100%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tManyPartTABOutput.in_SAP1-4sb-P000.raw.gz (100%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tManyPartTABOutput.in_SAP1-4sb-P001.raw.gz (100%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tManyPartTABOutput.parset (100%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tManyPartTABOutput.run (97%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tManyPartTABOutput.sh (100%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tMultiPartTABOutput.cc (100%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tMultiPartTABOutput.in_P000.raw.gz (100%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tMultiPartTABOutput.in_P001.raw.gz (100%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tMultiPartTABOutput.parset (100%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tMultiPartTABOutput.run (94%)
rename {SubSystems/Online_Cobalt => RTCP/Cobalt/CobaltTest}/test/tMultiPartTABOutput.sh (100%)
diff --git a/.gitattributes b/.gitattributes
index 445464d32b3..3d45b8f259b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3923,6 +3923,17 @@ RTCP/Cobalt/CoInterface/test/tParset.sh eol=lf
RTCP/Cobalt/CoInterface/test/tRingCoordinates.py eol=lf
RTCP/Cobalt/CoInterface/test/tRingCoordinates.sh eol=lf
RTCP/Cobalt/CoInterface/test/tcmpfloat.sh eol=lf
+RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP0-1sb-P001.raw.gz -text svneol=unset#application/x-gzip
+RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP0-4sb-P000.raw.gz -text svneol=unset#application/x-gzip
+RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP1-3sb-P002.raw.gz -text svneol=unset#application/x-gzip
+RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP1-4sb-P000.raw.gz -text svneol=unset#application/x-gzip
+RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP1-4sb-P001.raw.gz -text svneol=unset#application/x-gzip
+RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.run eol=lf
+RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.sh eol=lf
+RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.in_P000.raw.gz -text svneol=unset#application/x-gzip
+RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.in_P001.raw.gz -text svneol=unset#application/x-gzip
+RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.run eol=lf
+RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.sh eol=lf
RTCP/Cobalt/GPUProc/doc/2ndtranspose.txt -text
RTCP/Cobalt/GPUProc/doc/BGP-Cobalt-procs.dia -text
RTCP/Cobalt/GPUProc/doc/BGP-Cobalt-procs.png -text svneol=unset#image/png
@@ -4521,17 +4532,6 @@ SubSystems/Online_Cobalt/test/MockOnlineControl.sh eol=lf
SubSystems/Online_Cobalt/test/tMACfeedback.in_parset -text
SubSystems/Online_Cobalt/test/tMACfeedback.run eol=lf
SubSystems/Online_Cobalt/test/tMACfeedback.sh eol=lf
-SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP0-1sb-P001.raw.gz -text svneol=unset#application/x-gzip
-SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP0-4sb-P000.raw.gz -text svneol=unset#application/x-gzip
-SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP1-3sb-P002.raw.gz -text svneol=unset#application/x-gzip
-SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP1-4sb-P000.raw.gz -text svneol=unset#application/x-gzip
-SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP1-4sb-P001.raw.gz -text svneol=unset#application/x-gzip
-SubSystems/Online_Cobalt/test/tManyPartTABOutput.run eol=lf
-SubSystems/Online_Cobalt/test/tManyPartTABOutput.sh eol=lf
-SubSystems/Online_Cobalt/test/tMultiPartTABOutput.in_P000.raw.gz -text svneol=unset#application/x-gzip
-SubSystems/Online_Cobalt/test/tMultiPartTABOutput.in_P001.raw.gz -text svneol=unset#application/x-gzip
-SubSystems/Online_Cobalt/test/tMultiPartTABOutput.run eol=lf
-SubSystems/Online_Cobalt/test/tMultiPartTABOutput.sh eol=lf
SubSystems/Online_Cobalt/test/tProductionParsets.in_parsets/CorrProc_173014.param -text
SubSystems/Online_Cobalt/test/tProductionParsets.in_parsets/CorrProc_196344-CygAf009-225SAPS.cleaned.param -text
SubSystems/Online_Cobalt/test/tProductionParsets.run eol=lf
diff --git a/CMake/LofarPackageList.cmake b/CMake/LofarPackageList.cmake
index 28c174ae880..f8f632a3ca7 100644
--- a/CMake/LofarPackageList.cmake
+++ b/CMake/LofarPackageList.cmake
@@ -1,7 +1,7 @@
# - Create for each LOFAR package a variable containing the absolute path to
# its source directory.
#
-# Generated by gen_LofarPackageList_cmake.sh at Sat Apr 5 21:14:41 CEST 2014
+# Generated by gen_LofarPackageList_cmake.sh at Tue Apr 15 20:51:38 UTC 2014
#
# ---- DO NOT EDIT ----
#
@@ -121,6 +121,7 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
set(GPUProc_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/GPUProc)
set(OpenCL_FFT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/OpenCL_FFT)
set(CoInterface_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/CoInterface)
+ set(CobaltTest_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/CobaltTest)
set(OTDB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB)
set(OTB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB)
set(OTDB_SQL_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB/sql)
diff --git a/RTCP/Cobalt/CMakeLists.txt b/RTCP/Cobalt/CMakeLists.txt
index a246a3a4835..790172a5d9d 100644
--- a/RTCP/Cobalt/CMakeLists.txt
+++ b/RTCP/Cobalt/CMakeLists.txt
@@ -5,3 +5,4 @@ lofar_add_package(OutputProc) # GPU cluster: Data Storage applications
lofar_add_package(GPUProc) # GPU computation applications
lofar_add_package(OpenCL_FFT) # Apple's FFT library for OpenCL
lofar_add_package(CoInterface) # CoInterface code between Cobalt packages
+lofar_add_package(CobaltTest) # Overall Cobalt tests
diff --git a/RTCP/Cobalt/CobaltTest/CMakeLists.txt b/RTCP/Cobalt/CobaltTest/CMakeLists.txt
new file mode 100644
index 00000000000..4fbdd85c0b4
--- /dev/null
+++ b/RTCP/Cobalt/CobaltTest/CMakeLists.txt
@@ -0,0 +1,17 @@
+# $Id$
+
+lofar_package(CobaltTest 1.0 DEPENDS GPUProc OutputProc)
+
+# Handle options USE_CUDA and USE_OPENCL.
+if(USE_CUDA AND NOT USE_OPENCL)
+# # We need at least CMake 2.8 for CUDA support
+# cmake_minimum_required(VERSION 2.8)
+
+# lofar_find_package(CUDA 4.1 REQUIRED)
+
+ add_definitions(-DUSE_CUDA)
+elseif(USE_OPENCL AND NOT USE_CUDA)
+ add_definitions(-DUSE_OPENCL)
+endif()
+
+add_subdirectory(test)
diff --git a/RTCP/Cobalt/CobaltTest/test/CMakeLists.txt b/RTCP/Cobalt/CobaltTest/test/CMakeLists.txt
new file mode 100644
index 00000000000..4b59819a98c
--- /dev/null
+++ b/RTCP/Cobalt/CobaltTest/test/CMakeLists.txt
@@ -0,0 +1,17 @@
+# $Id$
+
+include(LofarCTest)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/setlofarroot.sh.in
+ ${CMAKE_CURRENT_BINARY_DIR}/setlofarroot.sh @ONLY
+)
+
+# Create symbolic link to the outputProc executable used by the tests below.
+get_target_property(_loc outputProc LOCATION)
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
+ ${_loc}
+ ${CMAKE_CURRENT_BINARY_DIR}/outputProc)
+
+lofar_add_test(tMultiPartTABOutput tMultiPartTABOutput.cc)
+lofar_add_test(tManyPartTABOutput tManyPartTABOutput.cc)
diff --git a/RTCP/Cobalt/CobaltTest/test/setlofarroot.sh.in b/RTCP/Cobalt/CobaltTest/test/setlofarroot.sh.in
new file mode 100644
index 00000000000..2fc7be30509
--- /dev/null
+++ b/RTCP/Cobalt/CobaltTest/test/setlofarroot.sh.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Set LOFARROOT to GPUProc/ to make runtime GPU kernel compilation work
+# without an install tree.
+#
+# This file must be source'd, not executed!
+#
+# $Id$
+
+export LOFARROOT="@GPUProc_SOURCE_DIR@"
diff --git a/SubSystems/Online_Cobalt/test/tManyPartTABOutput.cc b/RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.cc
similarity index 100%
rename from SubSystems/Online_Cobalt/test/tManyPartTABOutput.cc
rename to RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.cc
diff --git a/SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP0-1sb-P001.raw.gz b/RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP0-1sb-P001.raw.gz
similarity index 100%
rename from SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP0-1sb-P001.raw.gz
rename to RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP0-1sb-P001.raw.gz
diff --git a/SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP0-4sb-P000.raw.gz b/RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP0-4sb-P000.raw.gz
similarity index 100%
rename from SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP0-4sb-P000.raw.gz
rename to RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP0-4sb-P000.raw.gz
diff --git a/SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP1-3sb-P002.raw.gz b/RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP1-3sb-P002.raw.gz
similarity index 100%
rename from SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP1-3sb-P002.raw.gz
rename to RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP1-3sb-P002.raw.gz
diff --git a/SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP1-4sb-P000.raw.gz b/RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP1-4sb-P000.raw.gz
similarity index 100%
rename from SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP1-4sb-P000.raw.gz
rename to RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP1-4sb-P000.raw.gz
diff --git a/SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP1-4sb-P001.raw.gz b/RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP1-4sb-P001.raw.gz
similarity index 100%
rename from SubSystems/Online_Cobalt/test/tManyPartTABOutput.in_SAP1-4sb-P001.raw.gz
rename to RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP1-4sb-P001.raw.gz
diff --git a/SubSystems/Online_Cobalt/test/tManyPartTABOutput.parset b/RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.parset
similarity index 100%
rename from SubSystems/Online_Cobalt/test/tManyPartTABOutput.parset
rename to RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.parset
diff --git a/SubSystems/Online_Cobalt/test/tManyPartTABOutput.run b/RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.run
similarity index 97%
rename from SubSystems/Online_Cobalt/test/tManyPartTABOutput.run
rename to RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.run
index e5f11560180..92d26e87f52 100755
--- a/SubSystems/Online_Cobalt/test/tManyPartTABOutput.run
+++ b/RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.run
@@ -1,6 +1,6 @@
#!/bin/bash
-. testFuncs.sh
+. setlofarroot.sh
# remove any output files from prev runs
rm -rf tManyPartTABOutput-data/
@@ -10,7 +10,7 @@ trap 'kill -9 $outPid' SIGTERM SIGINT SIGQUIT SIGHUP # don't linger on e.g. Ctr
obsID=123882
rank=0
-"$LOFARROOT/bin/outputProc" $obsID $rank &
+./outputProc $obsID $rank &
outPid=$!
./tManyPartTABOutput
diff --git a/SubSystems/Online_Cobalt/test/tManyPartTABOutput.sh b/RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.sh
similarity index 100%
rename from SubSystems/Online_Cobalt/test/tManyPartTABOutput.sh
rename to RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.sh
diff --git a/SubSystems/Online_Cobalt/test/tMultiPartTABOutput.cc b/RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.cc
similarity index 100%
rename from SubSystems/Online_Cobalt/test/tMultiPartTABOutput.cc
rename to RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.cc
diff --git a/SubSystems/Online_Cobalt/test/tMultiPartTABOutput.in_P000.raw.gz b/RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.in_P000.raw.gz
similarity index 100%
rename from SubSystems/Online_Cobalt/test/tMultiPartTABOutput.in_P000.raw.gz
rename to RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.in_P000.raw.gz
diff --git a/SubSystems/Online_Cobalt/test/tMultiPartTABOutput.in_P001.raw.gz b/RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.in_P001.raw.gz
similarity index 100%
rename from SubSystems/Online_Cobalt/test/tMultiPartTABOutput.in_P001.raw.gz
rename to RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.in_P001.raw.gz
diff --git a/SubSystems/Online_Cobalt/test/tMultiPartTABOutput.parset b/RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.parset
similarity index 100%
rename from SubSystems/Online_Cobalt/test/tMultiPartTABOutput.parset
rename to RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.parset
diff --git a/SubSystems/Online_Cobalt/test/tMultiPartTABOutput.run b/RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.run
similarity index 94%
rename from SubSystems/Online_Cobalt/test/tMultiPartTABOutput.run
rename to RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.run
index 93360f8002b..3bd7be2252a 100755
--- a/SubSystems/Online_Cobalt/test/tMultiPartTABOutput.run
+++ b/RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.run
@@ -1,6 +1,6 @@
#!/bin/bash
-. testFuncs.sh
+. setlofarroot.sh
# remove any output files from prev runs
rm -f tMultiPartTABOutput-L123881_SAP000_B000_P00?_bf.h5 tMultiPartTABOutput-L123881_SAP000_B000_P00?_bf.raw
@@ -10,7 +10,7 @@ trap 'kill -9 $outPid' SIGTERM SIGINT SIGQUIT SIGHUP # don't linger on e.g. Ctr
obsID=123881
rank=0
-"$LOFARROOT/bin/outputProc" $obsID $rank &
+./outputProc $obsID $rank &
outPid=$!
./tMultiPartTABOutput
diff --git a/SubSystems/Online_Cobalt/test/tMultiPartTABOutput.sh b/RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.sh
similarity index 100%
rename from SubSystems/Online_Cobalt/test/tMultiPartTABOutput.sh
rename to RTCP/Cobalt/CobaltTest/test/tMultiPartTABOutput.sh
diff --git a/SubSystems/Online_Cobalt/CMakeLists.txt b/SubSystems/Online_Cobalt/CMakeLists.txt
index c2d05b65774..d2447220e5d 100644
--- a/SubSystems/Online_Cobalt/CMakeLists.txt
+++ b/SubSystems/Online_Cobalt/CMakeLists.txt
@@ -3,7 +3,6 @@
# should cover everything that Online_OutputProc has (e.g. for tests on cbt009)
#
# APLCommon is needed for the `swlevel' script
-# GPUProc is in Cobalt, but is apparently needed to link test/tMultiPartTABOutput
-lofar_package(Online_Cobalt DEPENDS Cobalt GPUProc Online_OutputProc APLCommon)
+lofar_package(Online_Cobalt DEPENDS Cobalt Online_OutputProc APLCommon)
add_subdirectory(test)
diff --git a/SubSystems/Online_Cobalt/test/CMakeLists.txt b/SubSystems/Online_Cobalt/test/CMakeLists.txt
index e627789e2a1..5075071e24a 100644
--- a/SubSystems/Online_Cobalt/test/CMakeLists.txt
+++ b/SubSystems/Online_Cobalt/test/CMakeLists.txt
@@ -2,23 +2,6 @@
include(LofarCTest)
-if(USE_CUDA AND NOT USE_OPENCL)
- # We need at least CMake 2.8 for CUDA support
- cmake_minimum_required(VERSION 2.8)
-
- lofar_find_package(OpenMP REQUIRED)
- lofar_find_package(CUDA 4.1 REQUIRED)
- lofar_find_package(CUDADriver REQUIRED)
-
- add_definitions(-DUSE_CUDA)
- if(LOFAR_BUILD_VARIANT MATCHES "^DEBUG$")
- list(APPEND CUDA_NVCC_FLAGS -g -G)
- endif()
-
- lofar_add_test(tMultiPartTABOutput tMultiPartTABOutput.cc)
- lofar_add_test(tManyPartTABOutput tManyPartTABOutput.cc)
-endif()
-
foreach(_file testFuncs runtest)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/${_file}.sh.in
--
GitLab