From d7fe53eae6e5f9b37ec2c7e3a325bb634d1db5a1 Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Mon, 8 Feb 2021 21:42:02 +0000 Subject: [PATCH] Updated tests to align with manager parameters update --- test/TestLogisticRegression.cpp | 2 -- test/TestManager.cpp | 14 -------------- test/TestMultipleAlgoExecutions.cpp | 17 +++++------------ test/TestOpAlgoLoopsPassingData.cpp | 2 +- test/TestOpShadersFromStringAndFile.cpp | 8 -------- test/TestOpTensorCopy.cpp | 12 +++--------- test/TestOpTensorSync.cpp | 4 ++-- test/TestTensor.cpp | 1 - 8 files changed, 11 insertions(+), 49 deletions(-) diff --git a/test/TestLogisticRegression.cpp b/test/TestLogisticRegression.cpp index e25b14161..a2b69505d 100644 --- a/test/TestLogisticRegression.cpp +++ b/test/TestLogisticRegression.cpp @@ -33,7 +33,6 @@ TEST(TestLogisticRegressionAlgorithm, TestMainLogisticRegression) kp::Manager mgr; mgr.rebuildTensors(params); - mgr.evalOpDefault(params); std::shared_ptr sq = mgr.createManagedSequence(); @@ -119,7 +118,6 @@ TEST(TestLogisticRegressionAlgorithm, TestMainLogisticRegressionManualCopy) kp::Manager mgr; mgr.rebuildTensors(params); - mgr.evalOpDefault(params); std::shared_ptr sq = mgr.createManagedSequence(); diff --git a/test/TestManager.cpp b/test/TestManager.cpp index d822a13d3..2bd7fc473 100644 --- a/test/TestManager.cpp +++ b/test/TestManager.cpp @@ -17,9 +17,6 @@ TEST(TestManager, EndToEndOpMultFlow) mgr.rebuildTensors({ tensorOutput }); - mgr.evalOpDefault( - { tensorLHS, tensorRHS, tensorOutput }); - mgr.evalOpDefault({ tensorLHS, tensorRHS, tensorOutput }); mgr.evalOpDefault({ tensorOutput }); @@ -46,10 +43,6 @@ TEST(TestManager, OpMultSequenceFlow) sq->begin(); - sq->record({ tensorLHS }); - sq->record({ tensorRHS }); - sq->record({ tensorOutput }); - sq->record({ tensorLHS, tensorRHS, tensorOutput }); sq->record({ tensorOutput }); @@ -106,9 +99,6 @@ TEST(TestManager, TestMultipleTensorsAtOnce) sq->begin(); - sq->record( - { tensorLHS, tensorRHS, tensorOutput }); - sq->record({ tensorLHS, tensorRHS, tensorOutput }); sq->record({ tensorOutput }); @@ -127,10 +117,6 @@ TEST(TestManager, TestCreateInitTensor) std::shared_ptr tensorA = mgr.buildTensor({ 0, 1, 2 }); std::shared_ptr tensorB = mgr.buildTensor({ 0, 0, 0 }); - mgr.rebuildTensors({ tensorA, tensorB }); - - mgr.evalOpDefault({ tensorA, tensorB }); - mgr.evalOpDefault({ tensorA, tensorB }); mgr.evalOpDefault({ tensorB }); diff --git a/test/TestMultipleAlgoExecutions.cpp b/test/TestMultipleAlgoExecutions.cpp index c98ba178b..208f1f9c8 100644 --- a/test/TestMultipleAlgoExecutions.cpp +++ b/test/TestMultipleAlgoExecutions.cpp @@ -27,8 +27,6 @@ TEST(TestMultipleAlgoExecutions, SingleSequenceRecord) { sq->begin(); - sq->record({ tensorA }); - sq->record( { tensorA }, std::vector(shader.begin(), shader.end())); sq->record( @@ -60,7 +58,7 @@ TEST(TestMultipleAlgoExecutions, MultipleCmdBufRecords) pa[index] = pa[index] + 1; })"); - mgr.rebuildTensors({ tensorA }); + mgr.rebuildTensors({ tensorA }, false); std::shared_ptr sqTensor = mgr.createManagedSequence(); @@ -123,8 +121,6 @@ TEST(TestMultipleAlgoExecutions, MultipleSequences) sq->begin(); - sq->record({ tensorA }); - sq->record( { tensorA }, std::vector(shader.begin(), shader.end())); @@ -189,7 +185,7 @@ TEST(TestMultipleAlgoExecutions, SingleRecordMultipleEval) pa[index] = pa[index] + 1; })"); - mgr.rebuildTensors({ tensorA }); + mgr.rebuildTensors({ tensorA }, false); { std::shared_ptr sq = @@ -248,9 +244,6 @@ TEST(TestMultipleAlgoExecutions, ManagerEvalMultSourceStrOpCreate) mgr.rebuildTensors({ tensorInA, tensorInB, tensorOut }); - mgr.evalOpDefault( - { tensorInA, tensorInB, tensorOut }); - std::string shader(R"( // The version to use #version 450 @@ -284,9 +277,9 @@ TEST(TestMultipleAlgoExecutions, ManagerEvalMultSourceStrMgrCreate) kp::Manager mgr; - auto tensorInA = mgr.buildTensor({ 2.0, 4.0, 6.0 }); - auto tensorInB = mgr.buildTensor({ 0.0, 1.0, 2.0 }); - auto tensorOut = mgr.buildTensor({ 0.0, 0.0, 0.0 }); + auto tensorInA = mgr.buildTensor({ 2.0, 4.0, 6.0 }, kp::Tensor::TensorTypes::eDevice, false); + auto tensorInB = mgr.buildTensor({ 0.0, 1.0, 2.0 }, kp::Tensor::TensorTypes::eDevice, false); + auto tensorOut = mgr.buildTensor({ 0.0, 0.0, 0.0 }, kp::Tensor::TensorTypes::eDevice, false); std::string shader(R"( // The version to use diff --git a/test/TestOpAlgoLoopsPassingData.cpp b/test/TestOpAlgoLoopsPassingData.cpp index b04ef3832..63bab299d 100644 --- a/test/TestOpAlgoLoopsPassingData.cpp +++ b/test/TestOpAlgoLoopsPassingData.cpp @@ -30,7 +30,7 @@ TEST(TestProcessingIterations, IterateThroughMultipleSumAndCopies) } )"); - mgr.rebuildTensors({ tensorA, tensorB }); + mgr.rebuildTensors({ tensorA, tensorB }, false); { std::shared_ptr sq = diff --git a/test/TestOpShadersFromStringAndFile.cpp b/test/TestOpShadersFromStringAndFile.cpp index 7b0db3dea..7d73bd7ff 100644 --- a/test/TestOpShadersFromStringAndFile.cpp +++ b/test/TestOpShadersFromStringAndFile.cpp @@ -28,8 +28,6 @@ TEST(TestOpAlgoBase, ShaderRawDataFromConstructor) } )"); - mgr.evalOpDefault({ tensorA, tensorB }); - mgr.evalOpDefault( { tensorA, tensorB }, std::vector(shader.begin(), shader.end())); @@ -47,8 +45,6 @@ TEST(TestOpAlgoBase, ShaderCompiledDataFromConstructor) std::shared_ptr tensorB{ new kp::Tensor({ 0, 0, 0 }) }; mgr.rebuildTensors({ tensorA, tensorB }); - mgr.evalOpDefault({ tensorA, tensorB }); - mgr.evalOpDefault( { tensorA, tensorB }, std::vector( @@ -71,8 +67,6 @@ TEST(TestOpAlgoBase, ShaderRawDataFromFile) std::shared_ptr tensorB{ new kp::Tensor({ 0, 0, 0 }) }; mgr.rebuildTensors({ tensorA, tensorB }); - mgr.evalOpDefault({ tensorA, tensorB }); - mgr.evalOpDefault( { tensorA, tensorB }, "test/shaders/glsl/test_op_custom_shader.comp"); @@ -90,8 +84,6 @@ TEST(TestOpAlgoBase, ShaderCompiledDataFromFile) std::shared_ptr tensorB{ new kp::Tensor({ 0, 0, 0 }) }; mgr.rebuildTensors({ tensorA, tensorB }); - mgr.evalOpDefault({ tensorA, tensorB }); - mgr.evalOpDefault( { tensorA, tensorB }, "test/shaders/glsl/test_op_custom_shader.comp.spv"); diff --git a/test/TestOpTensorCopy.cpp b/test/TestOpTensorCopy.cpp index ae99bf172..ca4539d6b 100644 --- a/test/TestOpTensorCopy.cpp +++ b/test/TestOpTensorCopy.cpp @@ -16,8 +16,6 @@ TEST(TestOpTensorCopy, CopyDeviceToDeviceTensor) mgr.rebuildTensors({ tensorA, tensorB }); - mgr.evalOpDefault({ tensorA, tensorB }); - EXPECT_TRUE(tensorA->isInit()); EXPECT_TRUE(tensorB->isInit()); @@ -45,8 +43,6 @@ TEST(TestOpTensorCopy, CopyDeviceToDeviceTensorMulti) mgr.rebuildTensors({ tensorA, tensorB, tensorC }); - mgr.evalOpDefault({ tensorA, tensorB }); - EXPECT_TRUE(tensorA->isInit()); EXPECT_TRUE(tensorB->isInit()); EXPECT_TRUE(tensorC->isInit()); @@ -74,7 +70,7 @@ TEST(TestOpTensorCopy, CopyDeviceToHostTensor) std::shared_ptr tensorB{ new kp::Tensor( testVecB, kp::Tensor::TensorTypes::eHost) }; - mgr.rebuildTensors({ tensorA, tensorB }); + mgr.rebuildTensors({ tensorA, tensorB }, false); // Only calling sync on device type tensor mgr.evalOpDefault({ tensorA }); @@ -103,7 +99,7 @@ TEST(TestOpTensorCopy, CopyHostToDeviceTensor) testVecA, kp::Tensor::TensorTypes::eHost) }; std::shared_ptr tensorB{ new kp::Tensor(testVecB) }; - mgr.rebuildTensors({ tensorA, tensorB }); + mgr.rebuildTensors({ tensorA, tensorB }, false); // Only calling sync on device type tensor mgr.evalOpDefault({ tensorB }); @@ -135,8 +131,6 @@ TEST(TestOpTensorCopy, CopyHostToHostTensor) mgr.rebuildTensors({ tensorA, tensorB }); - // Not calling OpTensorSyncDevice - EXPECT_TRUE(tensorA->isInit()); EXPECT_TRUE(tensorB->isInit()); @@ -159,7 +153,7 @@ TEST(TestOpTensorCopy, SingleTensorShouldFail) std::shared_ptr tensorA{ new kp::Tensor( testVecA, kp::Tensor::TensorTypes::eHost) }; - mgr.rebuildTensors({ tensorA }); + mgr.rebuildTensors({ tensorA }, false); EXPECT_TRUE(tensorA->isInit()); diff --git a/test/TestOpTensorSync.cpp b/test/TestOpTensorSync.cpp index 3808941f3..9080194af 100644 --- a/test/TestOpTensorSync.cpp +++ b/test/TestOpTensorSync.cpp @@ -13,7 +13,7 @@ TEST(TestOpTensorSync, SyncToDeviceMemorySingleTensor) std::shared_ptr tensorA{ new kp::Tensor(testVecPreA) }; - mgr.rebuildTensors({ tensorA }); + mgr.rebuildTensors({ tensorA }, false); EXPECT_TRUE(tensorA->isInit()); @@ -37,7 +37,7 @@ TEST(TestOpTensorSync, SyncToDeviceMemoryMultiTensor) std::shared_ptr tensorB{ new kp::Tensor({ 0, 0, 0 }) }; std::shared_ptr tensorC{ new kp::Tensor({ 0, 0, 0 }) }; - mgr.rebuildTensors({ tensorA, tensorB, tensorC }); + mgr.rebuildTensors({ tensorA, tensorB, tensorC }, false); EXPECT_TRUE(tensorA->isInit()); EXPECT_TRUE(tensorB->isInit()); diff --git a/test/TestTensor.cpp b/test/TestTensor.cpp index 764b5fa91..7ceea1ba7 100644 --- a/test/TestTensor.cpp +++ b/test/TestTensor.cpp @@ -24,7 +24,6 @@ TEST(TestTensor, CopyFromHostData) kp::Manager mgr; mgr.rebuildTensors({ tensorA, tensorB }); - mgr.evalOpDefault({ tensorA, tensorB }); if (std::shared_ptr sq = mgr.getOrCreateManagedSequence("new")) {