Skip to content
Snippets Groups Projects
Commit fcc4e176 authored by Alexander van Amesfoort's avatar Alexander van Amesfoort
Browse files

Task #4433: move test cases and gpu sources into opencl/ or cuda/

parent b71e6364
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 74 additions and 132 deletions
.gitattributes
+ 29
− 30
View file @ fcc4e176
...@@ -3710,44 +3710,43 @@ RTCP/Cobalt/GPUProc/test/Kernels/FIR_FilterTest.run -text ...@@ -3710,44 +3710,43 @@ RTCP/Cobalt/GPUProc/test/Kernels/FIR_FilterTest.run -text
RTCP/Cobalt/GPUProc/test/Kernels/FIR_FilterTest.sh -text RTCP/Cobalt/GPUProc/test/Kernels/FIR_FilterTest.sh -text
RTCP/Cobalt/GPUProc/test/Kernels/tDelayAndBandPass.run eol=lf RTCP/Cobalt/GPUProc/test/Kernels/tDelayAndBandPass.run eol=lf
RTCP/Cobalt/GPUProc/test/Kernels/tDelayAndBandPass.sh eol=lf RTCP/Cobalt/GPUProc/test/Kernels/tDelayAndBandPass.sh eol=lf
RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.77_Stations -text
RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.AARTFAAC -text
RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.small-test -text
RTCP/Cobalt/GPUProc/test/UnitTests/WorkQueues/tCorrelatorWorkQueue.cc -text
RTCP/Cobalt/GPUProc/test/cmpfloat.py -text
RTCP/Cobalt/GPUProc/test/cuda/tCudaRuntimeCompiler.run eol=lf RTCP/Cobalt/GPUProc/test/cuda/tCudaRuntimeCompiler.run eol=lf
RTCP/Cobalt/GPUProc/test/cuda/tCudaRuntimeCompiler.sh eol=lf RTCP/Cobalt/GPUProc/test/cuda/tCudaRuntimeCompiler.sh eol=lf
RTCP/Cobalt/GPUProc/test/cuda/t_cuda_complex.cu -text RTCP/Cobalt/GPUProc/test/cuda/t_cuda_complex.cu -text
RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS -text RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.77_Stations -text
RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS -text RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.AARTFAAC -text
RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS -text RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.small-test -text
RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS -text RTCP/Cobalt/GPUProc/test/opencl/cmpfloat.py -text
RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS -text
RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.parset -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS -text
RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.run -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS -text
RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.sh -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB0.MS -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB1.MS -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.parset -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB2.MS -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.run -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB3.MS -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.sh -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB4.MS -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB0.MS -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.parset -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB1.MS -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.run -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB2.MS -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.sh -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB3.MS -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB0.MS -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB4.MS -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB1.MS -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.parset -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB2.MS -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.run -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB3.MS -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.sh -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB4.MS -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB0.MS -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.parset -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB1.MS -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.run -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB2.MS -text
RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.sh -text RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB3.MS -text
RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB4.MS -text
RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.parset -text
RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.run -text
RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.sh -text
RTCP/Cobalt/GPUProc/test/opencl/tCorrelatorWorkQueue.cc -text
RTCP/Cobalt/GPUProc/test/tSSH.run -text RTCP/Cobalt/GPUProc/test/tSSH.run -text
RTCP/Cobalt/GPUProc/test/tSSH.sh -text RTCP/Cobalt/GPUProc/test/tSSH.sh -text
RTCP/Cobalt/GPUProc/test/tSSH.stdout -text RTCP/Cobalt/GPUProc/test/tSSH.stdout -text
RTCP/Cobalt/GPUProc/test/tStorageProcesses.sh -text RTCP/Cobalt/GPUProc/test/tStorageProcesses.sh -text
RTCP/Cobalt/GPUProc/test/tStorageProcesses.stdout -text RTCP/Cobalt/GPUProc/test/tStorageProcesses.stdout -text
RTCP/Cobalt/GPUProc/test/testParset.sh -text
RTCP/Cobalt/InputProc/CMakeLists.txt -text RTCP/Cobalt/InputProc/CMakeLists.txt -text
RTCP/Cobalt/InputProc/src/Buffer/Block.h -text RTCP/Cobalt/InputProc/src/Buffer/Block.h -text
RTCP/Cobalt/InputProc/src/Buffer/BlockReader.h -text RTCP/Cobalt/InputProc/src/Buffer/BlockReader.h -text
......
RTCP/Cobalt/GPUProc/src/CMakeLists.txt
+ 0
− 6
View file @ fcc4e176
...@@ -26,9 +26,6 @@ if(USE_CUDA) ...@@ -26,9 +26,6 @@ if(USE_CUDA)
lofar_add_library(gpuproc ${_gpuproc_sources}) lofar_add_library(gpuproc ${_gpuproc_sources})
# Compiling rtcp.cc doesn't work yet for CUDA # Compiling rtcp.cc doesn't work yet for CUDA
#lofar_add_bin_program(rtcp rtcp.cc) #lofar_add_bin_program(rtcp rtcp.cc)
#install(FILES
# rtcp
# DESTINATION bin)
endif() endif()
if(USE_OPENCL) if(USE_OPENCL)
...@@ -69,7 +66,4 @@ if(USE_OPENCL) ...@@ -69,7 +66,4 @@ if(USE_OPENCL)
lofar_add_library(gpuproc_opencl ${_gpuproc_sources}) lofar_add_library(gpuproc_opencl ${_gpuproc_sources})
lofar_add_bin_program(rtcp_opencl rtcp.cc) lofar_add_bin_program(rtcp_opencl rtcp.cc)
install(FILES
rtcp_opencl
DESTINATION bin)
endif() endif()
RTCP/Cobalt/GPUProc/src/cuda/CMakeLists.txt
+ 7
− 4
View file @ fcc4e176
# $Id$
install(FILES install(FILES
complex.h complex.h
cuPrintf.cu cuPrintf.cu
cuPrintf.cuh cuPrintf.cuh
FIR_Filter.cu
DelayAndBandPass.cu
DESTINATION share/gpu/kernels) DESTINATION share/gpu/kernels)
RTCP/Cobalt/GPUProc/src/opencl/CMakeLists.txt
+ 9
− 1
View file @ fcc4e176
# $Id$ # $Id$
add_subdirectory(Kernels) install(FILES
Correlator.cl
DelayAndBandPass.cl
#fft2.cl
FFT.cl
FIR.cl
math.cl
NewCorrelator.cl
DESTINATION share/gpu/kernels)
RTCP/Cobalt/GPUProc/src/opencl/Kernels/CMakeLists.txt deleted 100644 → 0
+ 0
− 7
View file @ b71e6364
# $Id$
install(FILES
FIR_Filter.cu
DelayAndBandPass.cu
DESTINATION share/gpu/kernels
)
RTCP/Cobalt/GPUProc/test/CMakeLists.txt
+ 3
− 22
View file @ fcc4e176
...@@ -6,36 +6,17 @@ include(LofarCTest) ...@@ -6,36 +6,17 @@ include(LofarCTest)
# source files and headers in subdirectories include UnitTest.h # source files and headers in subdirectories include UnitTest.h
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
#lofar_add_test(t_complex t_complex.cc) # Jan David, is this a test case? If so, please rename + lofar_add_test().
lofar_add_bin_program(DummyStorage DummyStorage.cc)
lofar_add_test(tBestEffortQueue tBestEffortQueue.cc) lofar_add_test(tBestEffortQueue tBestEffortQueue.cc)
lofar_add_test(tGPUPerformance)
lofar_add_test(tSSH tSSH.cc) lofar_add_test(tSSH tSSH.cc)
lofar_add_bin_program(DummyStorage DummyStorage.cc)
lofar_add_test(tStorageProcesses tStorageProcesses.cc) lofar_add_test(tStorageProcesses tStorageProcesses.cc)
if(USE_CUDA) if(USE_CUDA)
add_subdirectory(cuda) add_subdirectory(cuda)
add_subdirectory(Kernels)
endif() endif()
# TODO: gradually move tests below out of USE_OPENCL when CUDA port is getting done
if(USE_OPENCL) if(USE_OPENCL)
lofar_add_test(tContext tContext.cc) add_subdirectory(opencl)
lofar_add_test(tPerformanceCounter tPerformanceCounter.cc)
lofar_add_test(tCorrelate_1sec_1st_5sb_noflagging)
lofar_add_test(tCorrelate_3sec_1st_5sb)
lofar_add_test(tCorrelate_3sec_2st_5sb)
#lofar_add_test(tDelayCompensation tDelayCompensation.cc)
#lofar_add_test(RTCP_UnitTest RTCP_UnitTest.cc UnitTest.cc)
lofar_find_package(UnitTest++)
if(UNITTEST++_FOUND)
lofar_add_test(tCorrelatorWorkQueue
UnitTests/WorkQueues/tCorrelatorWorkQueue.cc
UnitTests/new_style_unittest.cc)
endif()
endif() endif()
RTCP/Cobalt/GPUProc/test/UnitTests/BeamFormerTest.cc deleted 100644 → 0
+ 0
− 29
View file @ b71e6364
//# BeamFormerTest.cc
//# 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$
#include <lofar_config.h>
#include <UnitTest++.h>
TEST(FailSpectacularly2)
{
CHECK(true);
}
RTCP/Cobalt/GPUProc/test/UnitTests/new_style_unittest.cc deleted 100644 → 0
+ 0
− 29
View file @ b71e6364
//# new_style_unittest.cc
//# 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$
#include <lofar_config.h>
#include <UnitTest++.h>
TEST(FailSpectacularly)
{
CHECK(true);
}
RTCP/Cobalt/GPUProc/test/cuda/CMakeLists.txt
+ 6
− 4
View file @ fcc4e176
...@@ -2,12 +2,14 @@ ...@@ -2,12 +2,14 @@
include(LofarCTest) include(LofarCTest)
lofar_add_test(tCudaRuntimeCompiler tCudaRuntimeCompiler.cc)
lofar_add_test(tStreamReadBuffer tStreamReadBuffer.cc)
# To compile .cu files, invoke CUDA's nvcc, but respect the host C/C++ compiler (variants) selection. # To compile .cu files, invoke CUDA's nvcc, but respect the host C/C++ compiler (variants) selection.
set(COMPILER_BINDIR_OPT --compiler-bindir ${CMAKE_CXX_COMPILER}) set(COMPILER_BINDIR_OPT --compiler-bindir ${CMAKE_CXX_COMPILER})
lofar_add_test(tCudaRuntimeCompiler tCudaRuntimeCompiler.cc) # tests built by nvcc
cuda_add_executable(t_cuda_complex t_cuda_complex.cu OPTIONS ${COMPILER_BINDIR_OPT}) cuda_add_executable(t_cuda_complex t_cuda_complex.cu OPTIONS ${COMPILER_BINDIR_OPT})
add_test(t_cuda_complex ${CMAKE_CURRENT_SOURCE_DIR}/t_cuda_complex.sh) add_test(t_cuda_complex ${CMAKE_CURRENT_SOURCE_DIR}/t_cuda_complex.sh)
#lofar_add_test(tDelayCompensation tDelayCompensation.cc)
lofar_add_test(tStreamReadBuffer tStreamReadBuffer.cc)
RTCP/Cobalt/GPUProc/test/opencl/CMakeLists.txt 0 → 100644
+ 20
− 0
View file @ fcc4e176
# $Id$
include(LofarCTest)
# TODO: move generic tests to ../ when supported by our CUDA port
lofar_add_test(tContext tContext.cc)
lofar_add_test(tPerformanceCounter tPerformanceCounter.cc)
#lofar_add_test(RTCP_UnitTest RTCP_UnitTest.cc UnitTest.cc)
lofar_find_package(UnitTest++)
if(UNITTEST++_FOUND)
lofar_add_test(tCorrelatorWorkQueue tCorrelatorWorkQueue.cc)
endif()
# tests that use testParset.sh
lofar_add_test(tCorrelate_1sec_1st_5sb_noflagging)
lofar_add_test(tCorrelate_3sec_1st_5sb)
lofar_add_test(tCorrelate_3sec_2st_5sb)
lofar_add_test(tGPUPerformance)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment