From 0c2ee14150b0856cada56ce4579fef5f43ac8e46 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 15 Mar 2019 13:12:06 +0000
Subject: [PATCH] COB-60: removed USE_OPENCL and USE_CUDA definitions. Default
and only gpu implementation for cobalt is now cuda only
---
CMake/variants/variants.cbt001 | 1 -
CMake/variants/variants.dop256 | 2 -
CMake/variants/variants.dragnet | 1 -
CMake/variants/variants.lofar-documentation | 2 -
RTCP/Cobalt/CobaltTest/CMakeLists.txt | 2 -
RTCP/Cobalt/GPUProc/CMakeLists.txt | 1 -
RTCP/Cobalt/GPUProc/doc/rtcp-usage.txt | 3 +-
.../GPUProc/src/Kernels/Filter_FFT_Kernel.h | 41 -------------------
RTCP/Cobalt/GPUProc/test/t_gpu_utils.cc | 24 -----------
9 files changed, 1 insertion(+), 76 deletions(-)
delete mode 100644 RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.h
diff --git a/CMake/variants/variants.cbt001 b/CMake/variants/variants.cbt001
index 7104bf68462..5f1cbe8df0e 100644
--- a/CMake/variants/variants.cbt001
+++ b/CMake/variants/variants.cbt001
@@ -7,7 +7,6 @@
option(USE_LOG4CPLUS "Use Log4Cplus" ON)
option(USE_MPI "Use MPI" ON)
-option(USE_CUDA "Use CUDA" ON)
#set(CASACORE_ROOT_DIR /opt/casacore)
set(CASACORE_ROOT_DIR /localhome/lofar/casacore-1.7.0)
diff --git a/CMake/variants/variants.dop256 b/CMake/variants/variants.dop256
index 25eca45b00d..5bb784e615d 100644
--- a/CMake/variants/variants.dop256
+++ b/CMake/variants/variants.dop256
@@ -3,8 +3,6 @@
# $Id$
option(USE_MPI "Use MPI" 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(CLANG_COMPILE_DEFINITIONS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS)
diff --git a/CMake/variants/variants.dragnet b/CMake/variants/variants.dragnet
index 982b7236fd9..00e49bd874e 100644
--- a/CMake/variants/variants.dragnet
+++ b/CMake/variants/variants.dragnet
@@ -3,7 +3,6 @@
# $Id$
option(USE_MPI "Use MPI" ON)
-option(USE_CUDA "Use CUDA" 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/
diff --git a/CMake/variants/variants.lofar-documentation b/CMake/variants/variants.lofar-documentation
index b8bd7aca1f4..1fc21d13704 100644
--- a/CMake/variants/variants.lofar-documentation
+++ b/CMake/variants/variants.lofar-documentation
@@ -1,7 +1,5 @@
-option(USE_CUDA "Use CUDA" ON)
option(USE_MPI "Use MPI" ON)
option(USE_OPENMP "Use OPENMP" ON)
-option(USE_OPENCL "Don't use OPENCL" OFF)
set(WINCC_ROOT_DIR /opt/WinCC_OA/3.14)
diff --git a/RTCP/Cobalt/CobaltTest/CMakeLists.txt b/RTCP/Cobalt/CobaltTest/CMakeLists.txt
index 514f4cb87fc..116e3fd326d 100644
--- a/RTCP/Cobalt/CobaltTest/CMakeLists.txt
+++ b/RTCP/Cobalt/CobaltTest/CMakeLists.txt
@@ -2,6 +2,4 @@
lofar_package(CobaltTest 1.0 DEPENDS GPUProc OutputProc)
-add_definitions(-DUSE_CUDA)
-
add_subdirectory(test)
diff --git a/RTCP/Cobalt/GPUProc/CMakeLists.txt b/RTCP/Cobalt/GPUProc/CMakeLists.txt
index 9db80cbd69f..950d51463f5 100644
--- a/RTCP/Cobalt/GPUProc/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/CMakeLists.txt
@@ -15,7 +15,6 @@ set(CUDA_PROPAGATE_HOST_FLAGS OFF)
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()
diff --git a/RTCP/Cobalt/GPUProc/doc/rtcp-usage.txt b/RTCP/Cobalt/GPUProc/doc/rtcp-usage.txt
index d684e51b5e9..df558eab198 100644
--- a/RTCP/Cobalt/GPUProc/doc/rtcp-usage.txt
+++ b/RTCP/Cobalt/GPUProc/doc/rtcp-usage.txt
@@ -18,8 +18,7 @@ To build and install Cobalt:
# configure Cobalt
mkdir -p $ROOT/build/gnu_opt
cd $ROOT/build/gnu_opt
- cmake $ROOT/LOFAR -DBUILD_PACKAGES=Cobalt \
- -DUSE_CUDA=ON -DUSE_OPENMP=ON -DUSE_MPI=ON
+ cmake $ROOT/LOFAR -DBUILD_PACKAGES=Cobalt -DUSE_OPENMP=ON -DUSE_MPI=ON
# build and install into $ROOT/build/gnu_opt/installed/
# Note: you can choose another install directory by setting the *CMake*
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.h
deleted file mode 100644
index aeab1577995..00000000000
--- a/RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//# Filter_FFT_Kernel.h
-//#
-//# 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$
-
-// \file
-// Include the right GPU API include with our options.
-
-#ifndef LOFAR_GPUPROC_FILTER_FFT_KERNEL_H
-#define LOFAR_GPUPROC_FILTER_FFT_KERNEL_H
-
-#if defined (USE_CUDA) && defined (USE_OPENCL)
-# error "Either CUDA or OpenCL must be enabled, not both"
-#endif
-
-#if defined (USE_CUDA)
-# include <GPUProc/cuda/Kernels/Filter_FFT_Kernel.h>
-#elif defined (USE_OPENCL)
-# include <GPUProc/opencl/Kernels/Filter_FFT_Kernel.h>
-#else
-# error "Either CUDA or OpenCL must be enabled, not neither"
-#endif
-
-#endif
-
diff --git a/RTCP/Cobalt/GPUProc/test/t_gpu_utils.cc b/RTCP/Cobalt/GPUProc/test/t_gpu_utils.cc
index bbda75dda26..228e99fcc47 100644
--- a/RTCP/Cobalt/GPUProc/test/t_gpu_utils.cc
+++ b/RTCP/Cobalt/GPUProc/test/t_gpu_utils.cc
@@ -21,8 +21,6 @@
#include <lofar_config.h>
-#ifdef USE_CUDA
-
#include <cstdio> // for remove()
#include <cstdlib> // for getenv()
#include <cassert>
@@ -37,13 +35,7 @@
using namespace std;
using namespace LOFAR::Cobalt;
-#ifdef USE_CUDA
const char* srcFile("t_gpu_utils.cu");
-#elif USE_OPENCL
-const char* srcFile("t_gpu_utils.cl");
-#else
-#error "Either USE_CUDA or USE_OPENCL must be defined"
-#endif
struct CreateFixture
{
@@ -57,11 +49,8 @@ struct CreateFixture
ofs << "#if defined FOO && FOO != 42\n"
<< "#error FOO != 42\n"
<< "#endif\n"
-#ifdef USE_CUDA
<< "__global__ void dummy(void) {}\n"
-#elif USE_OPENCL
<< "__kernel void dummy(__global void) {}\n"
-#endif
<< endl;
}
~CreateFixture() {
@@ -179,16 +168,3 @@ int main()
return 0;
}
}
-
-#else
-
-#include <iostream>
-
-int main()
-{
- std::cout << "The GPU wrapper classes are not yet available for OpenCL.\n"
- << "Test skipped." << std::endl;
- return 0;
-}
-
-#endif
--
GitLab