Task #5395: Reverted commit r27942; it breaks tMPITransfer, which now gets...

Task #5395: Reverted commit r27942; it breaks tMPITransfer, which now gets killed by SIGALRM. Maybe the test needs fixing, though. I cannot judge.

.gitattributes

@@ -2099,7 +2099,6 @@ CMake/variants/variants.cbt008 -text
 CMake/variants/variants.cbt009 -text
 CMake/variants/variants.dop252 -text
 CMake/variants/variants.dop256 -text
-CMake/variants/variants.dop282 -text
 CMake/variants/variants.fs0 -text
 CMake/variants/variants.gpu01 -text
 CMake/variants/variants.gpu1 -text

CMake/variants/variants.dop282

-set(GNU_COMPILE_DEFINITIONS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS)
-set(ENV{CUDA_LIB_PATH} /usr/lib/nvidia-current)
-
-# NVidia does not support GCC 4.7 and up
-set(GNU_C         /usr/bin/gcc-4.6 )
-set(GNU_CXX       /usr/bin/g++-4.6 )
-set(GNU_Fortran   /usr/bin/gfortran-4.6)
-set(GNU_ASM       /usr/bin/gcc-4.6 )

LCS/Common/test/tSaxpy.cc

@@ -82,13 +82,13 @@ int main (int argc, const char* argv[])
   cout<< "float,float " << n << endl;
   saxpy<float,float> (n, 0);
   cout<< "__complex__ float,float " << n << endl;
-  saxpy<__complex__ float,float> (n, 0.+0.i);
+  saxpy<__complex__ float,float> (n, 0.);
   cout<< "std::complex<float>,float " << n << endl;
   saxpy<std::complex<float>,float> (n, std::complex<float>());
   cout<< "double,double " << n << endl;
   saxpy<double,double> (n, 0);
   cout<< "__complex__ double,double " << n << endl;
-  saxpy<__complex__ double,double> (n, 0.+0.i);
+  saxpy<__complex__ double,double> (n, 0.);
   cout<< "std::complex<double>,double " << n << endl;
   saxpy<std::complex<double>,double> (n, std::complex<double>());
   cout<< "std::complex<double>,std::complex<double> " << n << endl;

MAC/APL/CURTDBDaemons/test/tLoggingProcessor.cc

@@ -26,6 +26,7 @@
 //# Includes
 #include <Common/LofarLogger.h>
 #include <Common/lofar_string.h>
+#include <Common/SystemUtil.h>
 
 using namespace LOFAR;
 

RTCP/CNProc/src/InversePPF.h

@@ -68,6 +68,7 @@
 #include <Interface/Align.h>
 #include <Interface/AlignedStdAllocator.h>
 #include <vector>
+#include <boost/noncopyable.hpp>
 #include <FilterBank.h>
 #include <FIR.h>
 

RTCP/Cobalt/InputProc/src/CMakeLists.txt

@@ -22,6 +22,10 @@ set(_inputproc_sources
   Station/RSPPacketFactory.cc
 )
 
+message(STATUS "**** MPI_FOUND = ${MPI_FOUND}")
+message(STATUS "**** USE_MPI = ${USE_MPI}")
+message(STATUS "**** HAVE_MPI = ${HAVE_MPI}")
+
 if(MPI_FOUND)
   list(APPEND _inputproc_sources
     Transpose/MPISendStation.cc

RTCP/Cobalt/InputProc/src/OMPThread.h

@@ -71,9 +71,8 @@ namespace LOFAR
     void kill()
     {
       while (!stopped) {
-        // Interrupt blocking system calls (most notably, read()),
-        // possibly multiple in a row.
-        // Note that the thread will stick around until the end
+        // interrupt blocking system calls (most notably, read())
+        // note that the thread will stick around until the end
         // of pragma parallel, so the thread id is always valid
         // once it has been set.
         pthread_t oldid = id;
@@ -113,16 +112,8 @@ namespace LOFAR
 
     static void init()
     {
-      // We avoid cancellation exception for OpenMP threads.
-      // Allow signalling them ourselves to cancel blocking syscalls.
-      struct sigaction sa;
-      sa.sa_handler = sighandler;
-      ::sigemptyset(&sa.sa_mask);
-      sa.sa_flags = SA_RESTART;
-      int err = ::sigaction(SIGHUP, &sa, NULL);
-      if (err != 0) {
-        LOG_WARN("Failed to register a handler for SIGHUP: OpenMP threads may not terminate!");
-      }
+      signal(SIGHUP, sighandler);
+      siginterrupt(SIGHUP, 1);
     }
 
   private:

RTCP/Cobalt/InputProc/src/mpirun.sh.in

@@ -111,7 +111,8 @@ set_mvapich2_options()
   done
 }
 
-if [ "@HAVE_MPI@" = "TRUE" ]
+#if [ "@HAVE_MPI@" = "TRUE" ]
+if [ "@MPI_FOUND@" = "TRUE" ]
 then
   MPIEXEC=@MPIEXEC@
   MPIEXEC_PREFLAGS=@MPIEXEC_PREFLAGS@