From 1769c386aaad1e7e025bb5292bb556a227049b9f Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Fri, 22 Feb 2019 13:41:09 +0000
Subject: [PATCH] COB-4: Moved getOutputProcHosts and send_state to CoInterface
to avoid linking to CUDA
---
RTCP/Cobalt/CoInterface/src/CMakeLists.txt | 6 ++++++
.../{GPUProc => CoInterface}/src/getOutputProcHosts.cc | 0
.../src/getOutputProcHosts.log_prop | 0
RTCP/Cobalt/{GPUProc => CoInterface}/src/send_state.cc | 0
RTCP/Cobalt/GPUProc/src/CMakeLists.txt | 3 ---
5 files changed, 6 insertions(+), 3 deletions(-)
rename RTCP/Cobalt/{GPUProc => CoInterface}/src/getOutputProcHosts.cc (100%)
rename RTCP/Cobalt/{GPUProc => CoInterface}/src/getOutputProcHosts.log_prop (100%)
rename RTCP/Cobalt/{GPUProc => CoInterface}/src/send_state.cc (100%)
diff --git a/RTCP/Cobalt/CoInterface/src/CMakeLists.txt b/RTCP/Cobalt/CoInterface/src/CMakeLists.txt
index 0f92407c39f..4710684d96a 100644
--- a/RTCP/Cobalt/CoInterface/src/CMakeLists.txt
+++ b/RTCP/Cobalt/CoInterface/src/CMakeLists.txt
@@ -26,6 +26,12 @@ lofar_add_library(cointerface
)
lofar_add_bin_program(versioncointerface versioncointerface.cc)
+lofar_add_bin_program(send_state send_state.cc)
+lofar_add_bin_program(getOutputProcHosts getOutputProcHosts.cc)
lofar_add_sbin_program(cmpfloat cmpfloat.cc)
lofar_add_sbin_program(createFeedback createFeedback.cc)
+
+# install logprop files
+lofar_add_sysconf_files(
+ getOutputProcHosts.log_prop)
diff --git a/RTCP/Cobalt/GPUProc/src/getOutputProcHosts.cc b/RTCP/Cobalt/CoInterface/src/getOutputProcHosts.cc
similarity index 100%
rename from RTCP/Cobalt/GPUProc/src/getOutputProcHosts.cc
rename to RTCP/Cobalt/CoInterface/src/getOutputProcHosts.cc
diff --git a/RTCP/Cobalt/GPUProc/src/getOutputProcHosts.log_prop b/RTCP/Cobalt/CoInterface/src/getOutputProcHosts.log_prop
similarity index 100%
rename from RTCP/Cobalt/GPUProc/src/getOutputProcHosts.log_prop
rename to RTCP/Cobalt/CoInterface/src/getOutputProcHosts.log_prop
diff --git a/RTCP/Cobalt/GPUProc/src/send_state.cc b/RTCP/Cobalt/CoInterface/src/send_state.cc
similarity index 100%
rename from RTCP/Cobalt/GPUProc/src/send_state.cc
rename to RTCP/Cobalt/CoInterface/src/send_state.cc
diff --git a/RTCP/Cobalt/GPUProc/src/CMakeLists.txt b/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
index 1a6acfff336..64fbda0f28a 100644
--- a/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
@@ -77,7 +77,6 @@ if(USE_CUDA)
endif()
lofar_add_bin_program(rtcp rtcp.cc)
- lofar_add_bin_program(getOutputProcHosts getOutputProcHosts.cc)
endif()
if(USE_OPENCL)
@@ -121,7 +120,6 @@ if(USE_OPENCL)
endif()
lofar_add_bin_program(station_stream Station/station_stream.cc)
-lofar_add_bin_program(send_state send_state.cc)
lofar_add_bin_program(gpu_load gpu_load.cc)
# install scripts used to run an observation under bin
@@ -146,6 +144,5 @@ lofar_add_sbin_scripts(
# install logprop files
lofar_add_sysconf_files(
rtcp.log_prop
- getOutputProcHosts.log_prop
Station/station_stream.log_prop
scripts/watchlogs-multitail.conf)
--
GitLab