diff --git a/.gitattributes b/.gitattributes index 5e4d9e45d588e4e2b10434c1166b34f36985506b..a6612558744b5951b463db81ae56ae91bbbfb5ee 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3724,32 +3724,32 @@ RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.AARTFAAC -text RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.small-test -text RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.run eol=lf RTCP/Cobalt/GPUProc/test/opencl/tContext.run eol=lf -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.parset -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.run eol=lf -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.sh eol=lf -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB0.MS -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB1.MS -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB2.MS -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB3.MS -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB4.MS -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.parset -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.run eol=lf -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.sh eol=lf -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB0.MS -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB1.MS -text -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB2.MS -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 eol=lf -RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.sh eol=lf -RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.run eol=lf RTCP/Cobalt/GPUProc/test/opencl/tPerformanceCounter.run eol=lf +RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.parset -text +RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.run eol=lf +RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.sh eol=lf +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB0.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB1.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB2.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB3.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB4.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.parset -text +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.run eol=lf +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.sh eol=lf +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB0.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB1.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB2.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB3.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB4.MS -text +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.parset -text +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.run eol=lf +RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.sh eol=lf +RTCP/Cobalt/GPUProc/test/tGPUPerformance.run eol=lf RTCP/Cobalt/GPUProc/test/tStorageProcesses.sh eol=lf RTCP/Cobalt/InputProc/test/tBlockReader.in_16bit -text RTCP/Cobalt/InputProc/test/tBlockReader.in_8bit -text diff --git a/RTCP/Cobalt/GPUProc/test/CMakeLists.txt b/RTCP/Cobalt/GPUProc/test/CMakeLists.txt index 73d711f37595a1a009054a99e862ae7e17711bff..7312dc6080608c32970bd248865646d90470abe3 100644 --- a/RTCP/Cobalt/GPUProc/test/CMakeLists.txt +++ b/RTCP/Cobalt/GPUProc/test/CMakeLists.txt @@ -13,6 +13,16 @@ lofar_add_test(tSSH tSSH.cc) lofar_add_executable(DummyStorage DummyStorage.cc) lofar_add_test(tStorageProcesses tStorageProcesses.cc DEPENDS DummyStorage) +if(UNITTEST++_FOUND) + lofar_add_test(tCorrelatorWorkQueue tCorrelatorWorkQueue.cc) +endif() + +# tests that use testParset.sh +lofar_add_test(tCorrelate_1sec_1st_5sb_noflagging DEPENDS rtcp) +lofar_add_test(tCorrelate_3sec_1st_5sb DEPENDS rtcp) +lofar_add_test(tCorrelate_3sec_2st_5sb DEPENDS rtcp) +#lofar_add_test(tGPUPerformance DEPENDS rtcp) # performance measurement and comparison are broken + if(USE_CUDA) add_subdirectory(cuda) endif() diff --git a/RTCP/Cobalt/GPUProc/test/opencl/cmpfloat.py b/RTCP/Cobalt/GPUProc/test/cmpfloat.py similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/cmpfloat.py rename to RTCP/Cobalt/GPUProc/test/cmpfloat.py diff --git a/RTCP/Cobalt/GPUProc/test/opencl/CMakeLists.txt b/RTCP/Cobalt/GPUProc/test/opencl/CMakeLists.txt index 6564170bf92c3b4b15d885f83c0704bb25f5482a..637873a393c58664db14da543f80a113f2ccca1a 100644 --- a/RTCP/Cobalt/GPUProc/test/opencl/CMakeLists.txt +++ b/RTCP/Cobalt/GPUProc/test/opencl/CMakeLists.txt @@ -2,19 +2,6 @@ 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 DEPENDS rtcp_opencl) -lofar_add_test(tCorrelate_3sec_1st_5sb DEPENDS rtcp_opencl) -lofar_add_test(tCorrelate_3sec_2st_5sb DEPENDS rtcp_opencl) -lofar_add_test(tGPUPerformance DEPENDS rtcp_opencl) diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.parset b/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.parset similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.parset rename to RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.parset diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.run b/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.run similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.run rename to RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.run diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.sh b/RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.sh similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.sh rename to RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.sh diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB0.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB0.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB0.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB0.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB1.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB1.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB1.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB1.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB2.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB2.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB2.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB2.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB3.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB3.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB3.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB3.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB4.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB4.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB4.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB4.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.parset b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.parset similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.parset rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.parset diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.run b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.run similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.run rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.run diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.sh b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.sh similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.sh rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.sh diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB0.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB0.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB0.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB0.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB1.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB1.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB1.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB1.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB2.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB2.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB2.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB2.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB3.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB3.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB3.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB3.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB4.MS b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB4.MS similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB4.MS rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB4.MS diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.parset b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.parset similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.parset rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.parset diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.run b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.run similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.run rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.run diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.sh b/RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.sh similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.sh rename to RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.sh diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tCorrelatorWorkQueue.cc b/RTCP/Cobalt/GPUProc/test/tCorrelatorWorkQueue.cc similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tCorrelatorWorkQueue.cc rename to RTCP/Cobalt/GPUProc/test/tCorrelatorWorkQueue.cc diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.parset b/RTCP/Cobalt/GPUProc/test/tGPUPerformance.parset similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.parset rename to RTCP/Cobalt/GPUProc/test/tGPUPerformance.parset diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.run b/RTCP/Cobalt/GPUProc/test/tGPUPerformance.run similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.run rename to RTCP/Cobalt/GPUProc/test/tGPUPerformance.run diff --git a/RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.sh b/RTCP/Cobalt/GPUProc/test/tGPUPerformance.sh similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.sh rename to RTCP/Cobalt/GPUProc/test/tGPUPerformance.sh diff --git a/RTCP/Cobalt/GPUProc/test/opencl/testFuncs.sh b/RTCP/Cobalt/GPUProc/test/testFuncs.sh similarity index 100% rename from RTCP/Cobalt/GPUProc/test/opencl/testFuncs.sh rename to RTCP/Cobalt/GPUProc/test/testFuncs.sh diff --git a/RTCP/Cobalt/GPUProc/test/opencl/testParset.sh b/RTCP/Cobalt/GPUProc/test/testParset.sh similarity index 91% rename from RTCP/Cobalt/GPUProc/test/opencl/testParset.sh rename to RTCP/Cobalt/GPUProc/test/testParset.sh index 767c3dace7c1d0316c388939a99a48dd96ae38bf..77f3427ffa5dfb5da8472809ed94dda961ddd4df 100755 --- a/RTCP/Cobalt/GPUProc/test/opencl/testParset.sh +++ b/RTCP/Cobalt/GPUProc/test/testParset.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x # Run a parset and compare the output to that in the reference_output directory. # @@ -37,7 +37,7 @@ PARSET=$1 # Include some useful shell functions . $srcdir/testFuncs.sh -BINDIR=`pwd`/../../src +BINDIR=`pwd`/../src # Some host info echo "Running as `whoami`" @@ -95,9 +95,9 @@ function parse_logs echo "Global 20" >> rtcp.debug && # run correlator -- without profiling - mpirun -H localhost -np 3 $BINDIR/rtcp_opencl $PARSET > performance_normal.txt 2>&1 && + mpirun -H localhost -np 3 $BINDIR/rtcp $PARSET > performance_normal.txt 2>&1 && # run correlator -- with profiling - mpirun -H localhost -np 3 $BINDIR/rtcp_opencl -p $PARSET > performance_profiled.txt 2>&1 && + mpirun -H localhost -np 3 $BINDIR/rtcp -p $PARSET > performance_profiled.txt 2>&1 && # compare output if [ "x" != "x$REFDIR" ]