thek0tyara/llama-cpp-turboquant
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Updated tests to align with manager parameters update

Browse source
This commit is contained in:
Alejandro Saucedo 2021-02-08 21:42:02 +00:00
parent aa25f980d6
commit d7fe53eae6
8 changed files with 11 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/TestLogisticRegression.cpp
View file

@ -33,7 +33,6 @@ TEST(TestLogisticRegressionAlgorithm, TestMainLogisticRegression)
kp::Manager mgr;
mgr.rebuildTensors(params);
mgr.evalOpDefault<kp::OpTensorSyncDevice>(params);
std::shared_ptr<kp::Sequence> sq = mgr.createManagedSequence();
@ -119,7 +118,6 @@ TEST(TestLogisticRegressionAlgorithm, TestMainLogisticRegressionManualCopy)
kp::Manager mgr;
mgr.rebuildTensors(params);
mgr.evalOpDefault<kp::OpTensorSyncDevice>(params);
std::shared_ptr<kp::Sequence> sq = mgr.createManagedSequence();

14
test/TestManager.cpp
View file

@ -17,9 +17,6 @@ TEST(TestManager, EndToEndOpMultFlow)
mgr.rebuildTensors({ tensorOutput });
mgr.evalOpDefault<kp::OpTensorSyncDevice>(
{ tensorLHS, tensorRHS, tensorOutput });
mgr.evalOpDefault<kp::OpMult>({ tensorLHS, tensorRHS, tensorOutput });
mgr.evalOpDefault<kp::OpTensorSyncLocal>({ tensorOutput });
@ -46,10 +43,6 @@ TEST(TestManager, OpMultSequenceFlow)
sq->begin();
sq->record<kp::OpTensorSyncDevice>({ tensorLHS });
sq->record<kp::OpTensorSyncDevice>({ tensorRHS });
sq->record<kp::OpTensorSyncDevice>({ tensorOutput });
sq->record<kp::OpMult>({ tensorLHS, tensorRHS, tensorOutput });
sq->record<kp::OpTensorSyncLocal>({ tensorOutput });
@ -106,9 +99,6 @@ TEST(TestManager, TestMultipleTensorsAtOnce)
sq->begin();
sq->record<kp::OpTensorSyncDevice>(
{ tensorLHS, tensorRHS, tensorOutput });
sq->record<kp::OpMult>({ tensorLHS, tensorRHS, tensorOutput });
sq->record<kp::OpTensorSyncLocal>({ tensorOutput });
@ -127,10 +117,6 @@ TEST(TestManager, TestCreateInitTensor)
std::shared_ptr<kp::Tensor> tensorA = mgr.buildTensor({ 0, 1, 2 });
std::shared_ptr<kp::Tensor> tensorB = mgr.buildTensor({ 0, 0, 0 });
mgr.rebuildTensors({ tensorA, tensorB });
mgr.evalOpDefault<kp::OpTensorSyncDevice>({ tensorA, tensorB });
mgr.evalOpDefault<kp::OpTensorCopy>({ tensorA, tensorB });
mgr.evalOpDefault<kp::OpTensorSyncLocal>({ tensorB });

17
test/TestMultipleAlgoExecutions.cpp
View file

@ -27,8 +27,6 @@ TEST(TestMultipleAlgoExecutions, SingleSequenceRecord)
{
sq->begin();
sq->record<kp::OpTensorSyncDevice>({ tensorA });
sq->record<kp::OpAlgoBase>(
{ tensorA }, std::vector<char>(shader.begin(), shader.end()));
sq->record<kp::OpAlgoBase>(
@ -60,7 +58,7 @@ TEST(TestMultipleAlgoExecutions, MultipleCmdBufRecords)
pa[index] = pa[index] + 1;
})");
mgr.rebuildTensors({ tensorA });
mgr.rebuildTensors({ tensorA }, false);
std::shared_ptr<kp::Sequence> sqTensor = mgr.createManagedSequence();
@ -123,8 +121,6 @@ TEST(TestMultipleAlgoExecutions, MultipleSequences)
sq->begin();
sq->record<kp::OpTensorSyncDevice>({ tensorA });
sq->record<kp::OpAlgoBase>(
{ tensorA }, std::vector<char>(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<kp::Sequence> sq =
@ -248,9 +244,6 @@ TEST(TestMultipleAlgoExecutions, ManagerEvalMultSourceStrOpCreate)
mgr.rebuildTensors({ tensorInA, tensorInB, tensorOut });
mgr.evalOpDefault<kp::OpTensorSyncDevice>(
{ 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

2
test/TestOpAlgoLoopsPassingData.cpp
View file

@ -30,7 +30,7 @@ TEST(TestProcessingIterations, IterateThroughMultipleSumAndCopies)
}
)");
mgr.rebuildTensors({ tensorA, tensorB });
mgr.rebuildTensors({ tensorA, tensorB }, false);
{
std::shared_ptr<kp::Sequence> sq =

8
test/TestOpShadersFromStringAndFile.cpp
View file

@ -28,8 +28,6 @@ TEST(TestOpAlgoBase, ShaderRawDataFromConstructor)
}
)");
mgr.evalOpDefault<kp::OpTensorSyncDevice>({ tensorA, tensorB });
mgr.evalOpDefault<kp::OpAlgoBase>(
{ tensorA, tensorB }, std::vector<char>(shader.begin(), shader.end()));
@ -47,8 +45,6 @@ TEST(TestOpAlgoBase, ShaderCompiledDataFromConstructor)
std::shared_ptr<kp::Tensor> tensorB{ new kp::Tensor({ 0, 0, 0 }) };
mgr.rebuildTensors({ tensorA, tensorB });
mgr.evalOpDefault<kp::OpTensorSyncDevice>({ tensorA, tensorB });
mgr.evalOpDefault<kp::OpAlgoBase>(
{ tensorA, tensorB },
std::vector<char>(
@ -71,8 +67,6 @@ TEST(TestOpAlgoBase, ShaderRawDataFromFile)
std::shared_ptr<kp::Tensor> tensorB{ new kp::Tensor({ 0, 0, 0 }) };
mgr.rebuildTensors({ tensorA, tensorB });
mgr.evalOpDefault<kp::OpTensorSyncDevice>({ tensorA, tensorB });
mgr.evalOpDefault<kp::OpAlgoBase>(
{ tensorA, tensorB }, "test/shaders/glsl/test_op_custom_shader.comp");
@ -90,8 +84,6 @@ TEST(TestOpAlgoBase, ShaderCompiledDataFromFile)
std::shared_ptr<kp::Tensor> tensorB{ new kp::Tensor({ 0, 0, 0 }) };
mgr.rebuildTensors({ tensorA, tensorB });
mgr.evalOpDefault<kp::OpTensorSyncDevice>({ tensorA, tensorB });
mgr.evalOpDefault<kp::OpAlgoBase>(
{ tensorA, tensorB }, "test/shaders/glsl/test_op_custom_shader.comp.spv");

12
test/TestOpTensorCopy.cpp
View file

@ -16,8 +16,6 @@ TEST(TestOpTensorCopy, CopyDeviceToDeviceTensor)
mgr.rebuildTensors({ tensorA, tensorB });
mgr.evalOpDefault<kp::OpTensorSyncDevice>({ tensorA, tensorB });
EXPECT_TRUE(tensorA->isInit());
EXPECT_TRUE(tensorB->isInit());
@ -45,8 +43,6 @@ TEST(TestOpTensorCopy, CopyDeviceToDeviceTensorMulti)
mgr.rebuildTensors({ tensorA, tensorB, tensorC });
mgr.evalOpDefault<kp::OpTensorSyncDevice>({ tensorA, tensorB });
EXPECT_TRUE(tensorA->isInit());
EXPECT_TRUE(tensorB->isInit());
EXPECT_TRUE(tensorC->isInit());
@ -74,7 +70,7 @@ TEST(TestOpTensorCopy, CopyDeviceToHostTensor)
std::shared_ptr<kp::Tensor> 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<kp::OpTensorSyncDevice>({ tensorA });
@ -103,7 +99,7 @@ TEST(TestOpTensorCopy, CopyHostToDeviceTensor)
testVecA, kp::Tensor::TensorTypes::eHost) };
std::shared_ptr<kp::Tensor> tensorB{ new kp::Tensor(testVecB) };
mgr.rebuildTensors({ tensorA, tensorB });
mgr.rebuildTensors({ tensorA, tensorB }, false);
// Only calling sync on device type tensor
mgr.evalOpDefault<kp::OpTensorSyncDevice>({ 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<kp::Tensor> tensorA{ new kp::Tensor(
testVecA, kp::Tensor::TensorTypes::eHost) };
mgr.rebuildTensors({ tensorA });
mgr.rebuildTensors({ tensorA }, false);
EXPECT_TRUE(tensorA->isInit());

4
test/TestOpTensorSync.cpp
View file

@ -13,7 +13,7 @@ TEST(TestOpTensorSync, SyncToDeviceMemorySingleTensor)
std::shared_ptr<kp::Tensor> 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<kp::Tensor> tensorB{ new kp::Tensor({ 0, 0, 0 }) };
std::shared_ptr<kp::Tensor> 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());

1
test/TestTensor.cpp
View file

@ -24,7 +24,6 @@ TEST(TestTensor, CopyFromHostData)
kp::Manager mgr;
mgr.rebuildTensors({ tensorA, tensorB });
mgr.evalOpDefault<kp::OpTensorSyncDevice>({ tensorA, tensorB });
if (std::shared_ptr<kp::Sequence> sq =
mgr.getOrCreateManagedSequence("new")) {