From 0d833992114819a529beb63bab5e281ff6a2877d Mon Sep 17 00:00:00 2001
From: Alexander van Amesfoort <amesfoort@astron.nl>
Date: Mon, 20 Jul 2015 14:51:58 +0000
Subject: [PATCH] Task #8161: tDelayAndBandPassKernel2: remove confusing and
unused parset keys referring to test data in custom location
---
CMake/variants/variants.dop256 | 22 +++++++++++--------
INSTALL | 11 +++++++++-
.../tDelayAndBandPassKernel2.in_parset | 4 ----
3 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/CMake/variants/variants.dop256 b/CMake/variants/variants.dop256
index ad19f807b61..f9873a647ee 100644
--- a/CMake/variants/variants.dop256
+++ b/CMake/variants/variants.dop256
@@ -6,23 +6,27 @@ option(USE_MPI "Use MPI" ON)
option(USE_OPENMP "Use OpenMP" ON)
option(USE_CUDA "Use CUDA" ON)
#option(USE_OPENCL "Use OpenCL" OFF)
-#set(GNU_COMPILE_DEFINITIONS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS)
+#set(GNU_COMPILE_DEFINITIONS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS)
+#set(CLANG_COMPILE_DEFINITIONS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS)
-# RHEL/CentOS 7 has log4cxx in the repo
-option(USE_LOG4CPLUS "Use log4cplus" OFF)
-option(USE_LOG4CXX "Use log4cxx" ON)
+# Default search path for LOFAR deps (see CMake/variants/variants): /opt/lofar/external:/usr/local
+# The dirs thereunder must be lower case, e.g. unittest++/ or dal/
-# /opt/lofar/external and /usr/local are searched by default for LOFAR dependencies (see CMake/variants/variants)
+# For the RPMs to make it work under CentOS 7, see https://support.astron.nl/lofar_issuetracker/issues/8161
-# RHEL/CentOS 7: no pkgs, so blitz/blitz-devel installed from two CentOS 6 rpm pkgs.
-# Includes end up in /usr/include, but an arch specific one under /usr/lib64/blitz/include.
+# RHEL/CentOS 7 has log4cxx in the repo, but LOFAR log4cxx is dodgy, so install log4cplus from CentOS 6 rpm pkgs.
+#option(USE_LOG4CPLUS "Use log4cplus" OFF)
+#option(USE_LOG4CXX "Use log4cxx" ON)
+
+# RHEL/CentOS 7: blitz/blitz-devel N/A, so installed from two CentOS 6 rpm pkgs. (Idem for UnitTest++, but from Fedora 22 pkgs)
+# blitz includes end up in /usr/include, but an arch specific one under /usr/lib64/blitz/include.
# Set the latter as INCLUDE_DIR, since /usr/include is already in the std search path.
set(BLITZ_INCLUDE_DIR /usr/lib64/blitz/include CACHE PATH "blitz include path")
# RHEL/CentOS 7 has openmpi in /usr/lib64/openmpi and mpich in /usr/lib64/mpich
-set(MPI_ROOT_DIR /usr/lib64/openmpi)
+set(MPI_ROOT_DIR /usr/lib64/openmpi)
-# By default and on RHEL/CentOS 7, the GCC linker does not opt out overlinking by default.
+# By default and on RHEL/CentOS 7, the GCC linker does not opt out overlinking.
# Make it so. It removes some ghost deps, but still leaves mysterious lib deps in place...
set(GNU_EXE_LINKER_FLAGS "-Wl,--as-needed")
set(GNU_SHARED_LINKER_FLAGS "-Wl,--as-needed")
diff --git a/INSTALL b/INSTALL
index fddfa3ac545..78bb67dafc5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -14,11 +14,19 @@ Supported Systems
Install from Ubuntu Packages
----------------------------
-To install the easy way for a specific Ubuntu version, see:
+To install LOFAR Offline processing tools the easy way for a specific Ubuntu version, see:
https://launchpad.net/~radio-astro/+archive/ubuntu/main
+Install using Docker Scripts
+----------------------------
+
+To create a Docker container with Ubuntu or CentOS and LOFAR Offline processing tools, see:
+
+ https://github.com/ygrange/lofar-profiling
+
+
Dependencies for Manual Build from Source
-----------------------------------------
@@ -49,6 +57,7 @@ For CentOS/Fedora (likely incomplete list, but goes a long way):
The blitz and blitz-devel pkgs are available on some distros, but not on e.g. CentOS 7.
If indeed required for your build, but not in your repo, take the two RPMs from CentOS 6.
+ Idem for log4cplus (LOFAR log4cxx is dodgy).
Similar for unittest++ and unitest++-devel (both optional), but take two RPMs from Fedora 22.
If you have LOFAR Redmine access, see: https://support.astron.nl/lofar_issuetracker/issues/8161
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/tDelayAndBandPassKernel2.in_parset b/RTCP/Cobalt/GPUProc/test/Kernels/tDelayAndBandPassKernel2.in_parset
index 39711300f8b..ab9807b229f 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/tDelayAndBandPassKernel2.in_parset
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/tDelayAndBandPassKernel2.in_parset
@@ -117,10 +117,6 @@ Observation.strategy = default
Observation.subbandList = [24..28]
Observation.subbandWidth = 195.3125
Observation.topologyID =
-PIC.Core.RS106HBA.clockCorrectionTime = 0
-PIC.Core.RS106HBA.phaseCenter = [3829205.598,469142.533,5062181.002]
-PIC.Core.RS106HBA.position = [3829205.598,469142.533,5062181.002]
-PIC.Core.RS106HBA.RSP.ports = [file:/localhome/lofar/test_sets/3sec/rs106.udp]
_DPname = LOFAR_ObsSW_TempObs0024
_parsetPrefix = CorrAppl.CorrProc.
_processName = CorrProc
--
GitLab