From 552a6c051fee47c81e883cef0b295bae78499741 Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Sun, 1 Nov 2020 16:29:07 +0000 Subject: [PATCH] Updated tests without tempaltes on opalgobase classes --- test/TestAsyncOperations.cpp | 8 ++++---- test/TestLogisticRegression.cpp | 4 ++-- test/TestManager.cpp | 6 +++--- test/TestMultipleAlgoExecutions.cpp | 24 ++++++++++++------------ test/TestOpAlgoLoopsPassingData.cpp | 2 +- test/TestOpShadersFromStringAndFile.cpp | 8 ++++---- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/test/TestAsyncOperations.cpp b/test/TestAsyncOperations.cpp index 11bdee98f..43bccf99b 100644 --- a/test/TestAsyncOperations.cpp +++ b/test/TestAsyncOperations.cpp @@ -54,7 +54,7 @@ TEST(TestAsyncOperations, TestManagerParallelExecution) auto startSync = std::chrono::high_resolution_clock::now(); for (uint32_t i = 0; i < numParallel; i++) { - mgr.evalOpDefault>( + mgr.evalOpDefault( { inputsSyncB[i] }, std::vector(shader.begin(), shader.end())); } @@ -86,7 +86,7 @@ TEST(TestAsyncOperations, TestManagerParallelExecution) auto startAsync = std::chrono::high_resolution_clock::now(); for (uint32_t i = 0; i < numParallel; i++) { - mgrAsync.evalOpAsync>( + mgrAsync.evalOpAsync( { inputsAsyncB[i] }, "async" + std::to_string(i), std::vector(shader.begin(), shader.end())); @@ -151,10 +151,10 @@ TEST(TestAsyncOperations, TestManagerAsyncExecution) mgr.evalOpDefault({ tensorA, tensorB }); - mgr.evalOpAsync>( + mgr.evalOpAsync( { tensorA }, "asyncOne", std::vector(shader.begin(), shader.end())); - mgr.evalOpAsync>( + mgr.evalOpAsync( { tensorB }, "asyncTwo", std::vector(shader.begin(), shader.end())); mgr.evalOpAwait("asyncOne"); diff --git a/test/TestLogisticRegression.cpp b/test/TestLogisticRegression.cpp index fa8dc7b59..9822c08d1 100644 --- a/test/TestLogisticRegression.cpp +++ b/test/TestLogisticRegression.cpp @@ -46,7 +46,7 @@ TEST(TestLogisticRegressionAlgorithm, TestMainLogisticRegression) sq->record({ wIn, bIn }); - sq->record>( + sq->record( params, "test/shaders/glsl/test_logistic_regression.comp"); sq->record({ wOutI, wOutJ, bOut, lOut }); @@ -127,7 +127,7 @@ TEST(TestLogisticRegressionAlgorithm, TestMainLogisticRegressionManualCopy) // Record op algo base sq->begin(); - sq->record>( + sq->record( params, "test/shaders/glsl/test_logistic_regression.comp"); sq->record({ wOutI, wOutJ, bOut, lOut }); diff --git a/test/TestManager.cpp b/test/TestManager.cpp index 1550d8efb..0cb2a78fd 100644 --- a/test/TestManager.cpp +++ b/test/TestManager.cpp @@ -17,7 +17,7 @@ TEST(TestManager, EndToEndOpMultFlow) mgr.evalOpDefault({ tensorOutput }); - mgr.evalOpDefault>({ tensorLHS, tensorRHS, tensorOutput }); + mgr.evalOpDefault({ tensorLHS, tensorRHS, tensorOutput }); mgr.evalOpDefault({ tensorOutput }); @@ -44,7 +44,7 @@ TEST(TestManager, OpMultSequenceFlow) sq->record({ tensorRHS }); sq->record({ tensorOutput }); - sq->record>({ tensorLHS, tensorRHS, tensorOutput }); + sq->record({ tensorLHS, tensorRHS, tensorOutput }); sq->record({ tensorOutput }); @@ -100,7 +100,7 @@ TEST(TestManager, TestMultipleTensorsAtOnce) EXPECT_TRUE(tensorRHS->isInit()); EXPECT_TRUE(tensorOutput->isInit()); - sq->record>({ tensorLHS, tensorRHS, tensorOutput }); + sq->record({ tensorLHS, tensorRHS, tensorOutput }); sq->record({ tensorOutput }); diff --git a/test/TestMultipleAlgoExecutions.cpp b/test/TestMultipleAlgoExecutions.cpp index cdccd62fc..a0355416c 100644 --- a/test/TestMultipleAlgoExecutions.cpp +++ b/test/TestMultipleAlgoExecutions.cpp @@ -26,11 +26,11 @@ TEST(TestMultipleAlgoExecutions, SingleSequenceRecord) sq->record({ tensorA }); - sq->record>( + sq->record( { tensorA }, std::vector(shader.begin(), shader.end())); - sq->record>( + sq->record( { tensorA }, std::vector(shader.begin(), shader.end())); - sq->record>( + sq->record( { tensorA }, std::vector(shader.begin(), shader.end())); sq->record({ tensorA }); @@ -70,19 +70,19 @@ TEST(TestMultipleAlgoExecutions, MultipleCmdBufRecords) // Then perform the computations sq->begin(); - sq->record>( + sq->record( { tensorA }, std::vector(shader.begin(), shader.end())); sq->end(); sq->eval(); sq->begin(); - sq->record>( + sq->record( { tensorA }, std::vector(shader.begin(), shader.end())); sq->end(); sq->eval(); sq->begin(); - sq->record>( + sq->record( { tensorA }, std::vector(shader.begin(), shader.end())); sq->end(); sq->eval(); @@ -118,7 +118,7 @@ TEST(TestMultipleAlgoExecutions, MultipleSequences) sq->record({ tensorA }); - sq->record>( + sq->record( { tensorA }, std::vector(shader.begin(), shader.end())); sq->end(); @@ -130,7 +130,7 @@ TEST(TestMultipleAlgoExecutions, MultipleSequences) if (std::shared_ptr sq = sqWeakPtr2.lock()) { sq->begin(); - sq->record>( + sq->record( { tensorA }, std::vector(shader.begin(), shader.end())); sq->end(); @@ -142,7 +142,7 @@ TEST(TestMultipleAlgoExecutions, MultipleSequences) if (std::shared_ptr sq = sqWeakPtr3.lock()) { sq->begin(); - sq->record>( + sq->record( { tensorA }, std::vector(shader.begin(), shader.end())); sq->end(); @@ -195,7 +195,7 @@ TEST(TestMultipleAlgoExecutions, SingleRecordMultipleEval) if (std::shared_ptr sq = sqWeakPtr2.lock()) { sq->begin(); - sq->record>( + sq->record( { tensorA }, std::vector(shader.begin(), shader.end())); sq->end(); @@ -252,7 +252,7 @@ TEST(TestMultipleAlgoExecutions, ManagerEvalMultSourceStrOpCreate) } )"); - mgr.evalOpDefault>( + mgr.evalOpDefault( { tensorInA, tensorInB, tensorOut }, std::vector(shader.begin(), shader.end())); @@ -289,7 +289,7 @@ TEST(TestMultipleAlgoExecutions, ManagerEvalMultSourceStrMgrCreate) } )"); - mgr.evalOpDefault>( + mgr.evalOpDefault( { tensorInA, tensorInB, tensorOut }, std::vector(shader.begin(), shader.end())); diff --git a/test/TestOpAlgoLoopsPassingData.cpp b/test/TestOpAlgoLoopsPassingData.cpp index 2c47b0de3..9c592e356 100644 --- a/test/TestOpAlgoLoopsPassingData.cpp +++ b/test/TestOpAlgoLoopsPassingData.cpp @@ -49,7 +49,7 @@ TEST(TestProcessingIterations, IterateThroughMultipleSumAndCopies) if (std::shared_ptr sq = sqWeakPtr2.lock()) { sq->begin(); - sq->record>( + sq->record( { tensorA, tensorB }, std::vector(shader.begin(), shader.end())); diff --git a/test/TestOpShadersFromStringAndFile.cpp b/test/TestOpShadersFromStringAndFile.cpp index 58a361558..273421b26 100644 --- a/test/TestOpShadersFromStringAndFile.cpp +++ b/test/TestOpShadersFromStringAndFile.cpp @@ -28,7 +28,7 @@ TEST(TestOpAlgoBase, ShaderRawDataFromConstructor) } )"); - mgr.evalOpDefault>( + mgr.evalOpDefault( { tensorA, tensorB }, std::vector(shader.begin(), shader.end())); mgr.evalOpDefault({ tensorA, tensorB }); @@ -45,7 +45,7 @@ TEST(TestOpAlgoBase, ShaderCompiledDataFromConstructor) std::shared_ptr tensorB{ new kp::Tensor({ 0, 0, 0 }) }; mgr.evalOpDefault({ tensorA, tensorB }); - mgr.evalOpDefault>( + mgr.evalOpDefault( { tensorA, tensorB }, std::vector( kp::shader_data::test_shaders_glsl_test_op_custom_shader_comp_spv, @@ -67,7 +67,7 @@ TEST(TestOpAlgoBase, ShaderRawDataFromFile) std::shared_ptr tensorB{ new kp::Tensor({ 0, 0, 0 }) }; mgr.evalOpDefault({ tensorA, tensorB }); - mgr.evalOpDefault>( + mgr.evalOpDefault( { tensorA, tensorB }, "test/shaders/glsl/test_op_custom_shader.comp"); mgr.evalOpDefault({ tensorA, tensorB }); @@ -84,7 +84,7 @@ TEST(TestOpAlgoBase, ShaderCompiledDataFromFile) std::shared_ptr tensorB{ new kp::Tensor({ 0, 0, 0 }) }; mgr.evalOpDefault({ tensorA, tensorB }); - mgr.evalOpDefault>( + mgr.evalOpDefault( { tensorA, tensorB }, "test/shaders/glsl/test_op_custom_shader.comp.spv"); mgr.evalOpDefault({ tensorA, tensorB });