From 5bc3ac9c06b381315abb9786943e20491c6619f1 Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Sat, 20 Feb 2021 17:10:42 +0000 Subject: [PATCH] Disambiguated functions --- single_include/kompute/Kompute.hpp | 4 ++-- src/Shader.cpp | 6 +++--- src/include/kompute/Shader.hpp | 4 ++-- test/TestAsyncOperations.cpp | 8 ++++---- test/TestDestroy.cpp | 26 ++++++++++++------------- test/TestMultipleAlgoExecutions.cpp | 26 ++++++++++++------------- test/TestOpAlgoLoopsPassingData.cpp | 2 +- test/TestOpShadersFromStringAndFile.cpp | 2 +- test/TestSpecializationConstant.cpp | 2 +- 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/single_include/kompute/Kompute.hpp b/single_include/kompute/Kompute.hpp index 3ff857dc0..1c2c5f3ac 100755 --- a/single_include/kompute/Kompute.hpp +++ b/single_include/kompute/Kompute.hpp @@ -118,13 +118,13 @@ namespace kp { class Shader { public: - static std::vector compile( + static std::vector compile_sources( const std::vector& sources, const std::vector& files = {}, const std::string& entryPoint = "main", std::vector> definitions = {}); - static std::vector compile( + static std::vector compile_source( const std::string& source, const std::string& entryPoint = "main", std::vector> definitions = {}); diff --git a/src/Shader.cpp b/src/Shader.cpp index 2f9e9243c..467cc07f2 100644 --- a/src/Shader.cpp +++ b/src/Shader.cpp @@ -4,7 +4,7 @@ namespace kp { std::vector -Shader::compile(const std::vector& sources, +Shader::compile_sources(const std::vector& sources, const std::vector& files, const std::string& entryPoint, std::vector> definitions) { @@ -85,10 +85,10 @@ Shader::compile(const std::vector& sources, } std::vector -Shader::compile(const std::string& source, +Shader::compile_source(const std::string& source, const std::string& entryPoint, std::vector> definitions) { - return compile({source}); + return compile_sources({source}); } } diff --git a/src/include/kompute/Shader.hpp b/src/include/kompute/Shader.hpp index 9a97a892c..97158cf56 100644 --- a/src/include/kompute/Shader.hpp +++ b/src/include/kompute/Shader.hpp @@ -13,13 +13,13 @@ namespace kp { class Shader { public: - static std::vector compile( + static std::vector compile_sources( const std::vector& sources, const std::vector& files = {}, const std::string& entryPoint = "main", std::vector> definitions = {}); - static std::vector compile( + static std::vector compile_source( const std::string& source, const std::string& entryPoint = "main", std::vector> definitions = {}); diff --git a/test/TestAsyncOperations.cpp b/test/TestAsyncOperations.cpp index b74088e2a..b0deee37c 100644 --- a/test/TestAsyncOperations.cpp +++ b/test/TestAsyncOperations.cpp @@ -55,7 +55,7 @@ TEST(TestAsyncOperations, TestManagerParallelExecution) for (uint32_t i = 0; i < numParallel; i++) { mgr.evalOpDefault( - { inputsSyncB[i] }, kp::Shader::compile(shader)); + { inputsSyncB[i] }, kp::Shader::compile_source(shader)); } auto endSync = std::chrono::high_resolution_clock::now(); @@ -89,7 +89,7 @@ TEST(TestAsyncOperations, TestManagerParallelExecution) mgrAsync.evalOpAsync( { inputsAsyncB[i] }, "async" + std::to_string(i), - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); } for (uint32_t i = 0; i < numParallel; i++) { @@ -152,10 +152,10 @@ TEST(TestAsyncOperations, TestManagerAsyncExecution) mgr.rebuild({ tensorA, tensorB }); mgr.evalOpAsync( - { tensorA }, "asyncOne", kp::Shader::compile(shader)); + { tensorA }, "asyncOne", kp::Shader::compile_source(shader)); mgr.evalOpAsync( - { tensorB }, "asyncTwo", kp::Shader::compile(shader)); + { tensorB }, "asyncTwo", kp::Shader::compile_source(shader)); mgr.evalOpAwait("asyncOne"); mgr.evalOpAwait("asyncTwo"); diff --git a/test/TestDestroy.cpp b/test/TestDestroy.cpp index d2e81d0ee..43f6ef028 100644 --- a/test/TestDestroy.cpp +++ b/test/TestDestroy.cpp @@ -28,7 +28,7 @@ TEST(TestDestroy, TestDestroyTensorSingle) sq->begin(); sq->record( - { tensorA }, kp::Shader::compile(shader)); + { tensorA }, kp::Shader::compile_source(shader)); sq->end(); sq->eval(); @@ -71,7 +71,7 @@ TEST(TestDestroy, TestDestroyTensorVector) sq->begin(); sq->record( - { tensorA, tensorB }, kp::Shader::compile(shader)); + { tensorA, tensorB }, kp::Shader::compile_source(shader)); sq->end(); sq->eval(); @@ -136,7 +136,7 @@ TEST(TestDestroy, TestDestroySequenceSingle) sq->begin(); sq->record( - { tensorA }, kp::Shader::compile(shader)); + { tensorA }, kp::Shader::compile_source(shader)); sq->end(); sq->eval(); @@ -176,14 +176,14 @@ TEST(TestDestroy, TestDestroySequenceVector) sq1 = mgr.sequence("One"); sq1->begin(); sq1->record( - { tensorA }, kp::Shader::compile(shader)); + { tensorA }, kp::Shader::compile_source(shader)); sq1->end(); sq1->eval(); sq2 = mgr.sequence("Two"); sq2->begin(); sq2->record( - { tensorA }, kp::Shader::compile(shader)); + { tensorA }, kp::Shader::compile_source(shader)); sq2->end(); sq2->eval(); @@ -218,11 +218,11 @@ TEST(TestDestroy, TestDestroySequenceNameSingleInsideManager) mgr.evalOp( { tensorA }, "one", - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); mgr.evalOp( { tensorA }, "two", - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); mgr.evalOpDefault({ tensorA }); @@ -257,7 +257,7 @@ TEST(TestDestroy, TestDestroySequenceNameSingleOutsideManager) sq1 = mgr.sequence("One"); sq1->begin(); sq1->record( - { tensorA }, kp::Shader::compile(shader)); + { tensorA }, kp::Shader::compile_source(shader)); sq1->end(); sq1->eval(); @@ -291,11 +291,11 @@ TEST(TestDestroy, TestDestroySequenceNameVectorInsideManager) mgr.evalOp( { tensorA }, "one", - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); mgr.evalOp( { tensorA }, "two", - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); mgr.evalOpDefault({ tensorA }); @@ -325,11 +325,11 @@ TEST(TestDestroy, TestDestroySequenceNameVectorOutsideManager) mgr.evalOp( { tensorA }, "one", - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); mgr.evalOp( { tensorA }, "two", - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); mgr.evalOpDefault({ tensorA }); @@ -359,7 +359,7 @@ TEST(TestDestroy, TestDestroySequenceNameDefaultOutsideManager) mgr.evalOpDefault( { tensorA }, - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); mgr.evalOpDefault({ tensorA }); diff --git a/test/TestMultipleAlgoExecutions.cpp b/test/TestMultipleAlgoExecutions.cpp index 901780c15..d82091a84 100644 --- a/test/TestMultipleAlgoExecutions.cpp +++ b/test/TestMultipleAlgoExecutions.cpp @@ -28,11 +28,11 @@ TEST(TestMultipleAlgoExecutions, SingleSequenceRecord) sq->begin(); sq->record( - { tensorA }, kp::Shader::compile(shader)); + { tensorA }, kp::Shader::compile_source(shader)); sq->record( - { tensorA }, kp::Shader::compile(shader)); + { tensorA }, kp::Shader::compile_source(shader)); sq->record( - { tensorA }, kp::Shader::compile(shader)); + { tensorA }, kp::Shader::compile_source(shader)); sq->record({ tensorA }); @@ -73,19 +73,19 @@ TEST(TestMultipleAlgoExecutions, MultipleCmdBufRecords) // Then perform the computations sq->begin(); sq->record({ tensorA }, - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); sq->end(); sq->eval(); sq->begin(); sq->record({ tensorA }, - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); sq->end(); sq->eval(); sq->begin(); sq->record({ tensorA }, - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); sq->end(); sq->eval(); @@ -122,7 +122,7 @@ TEST(TestMultipleAlgoExecutions, MultipleSequences) sq->begin(); sq->record( - { tensorA }, kp::Shader::compile(shader)); + { tensorA }, kp::Shader::compile_source(shader)); sq->end(); sq->eval(); @@ -135,7 +135,7 @@ TEST(TestMultipleAlgoExecutions, MultipleSequences) sq->begin(); sq->record( - { tensorA }, kp::Shader::compile(shader)); + { tensorA }, kp::Shader::compile_source(shader)); sq->end(); sq->eval(); @@ -148,7 +148,7 @@ TEST(TestMultipleAlgoExecutions, MultipleSequences) sq->begin(); sq->record( - { tensorA }, kp::Shader::compile(shader)); + { tensorA }, kp::Shader::compile_source(shader)); sq->end(); sq->eval(); @@ -206,7 +206,7 @@ TEST(TestMultipleAlgoExecutions, SingleRecordMultipleEval) sq->begin(); sq->record( - { tensorA }, kp::Shader::compile(shader)); + { tensorA }, kp::Shader::compile_source(shader)); sq->end(); @@ -265,7 +265,7 @@ TEST(TestMultipleAlgoExecutions, ManagerEvalMultSourceStrOpCreate) mgr.evalOpDefault( { tensorInA, tensorInB, tensorOut }, - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); mgr.evalOpDefault({ tensorOut }); @@ -308,7 +308,7 @@ TEST(TestMultipleAlgoExecutions, ManagerEvalMultSourceStrMgrCreate) mgr.evalOpDefault( { tensorInA, tensorInB, tensorOut }, - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); mgr.evalOpDefault({ tensorOut }); @@ -340,7 +340,7 @@ TEST(TestMultipleAlgoExecutions, SequenceAlgoDestroyOutsideManagerScope) sq->begin(); sq->record( - { tensorA }, kp::Shader::compile(shader)); + { tensorA }, kp::Shader::compile_source(shader)); sq->end(); sq->eval(); diff --git a/test/TestOpAlgoLoopsPassingData.cpp b/test/TestOpAlgoLoopsPassingData.cpp index f2353b761..77a5fd8d4 100644 --- a/test/TestOpAlgoLoopsPassingData.cpp +++ b/test/TestOpAlgoLoopsPassingData.cpp @@ -53,7 +53,7 @@ TEST(TestProcessingIterations, IterateThroughMultipleSumAndCopies) sq->record( { tensorA, tensorB }, - kp::Shader::compile(shader)); + kp::Shader::compile_source(shader)); sq->record({ tensorB, tensorA }); sq->end(); diff --git a/test/TestOpShadersFromStringAndFile.cpp b/test/TestOpShadersFromStringAndFile.cpp index 4377e3b18..b33b2f98e 100644 --- a/test/TestOpShadersFromStringAndFile.cpp +++ b/test/TestOpShadersFromStringAndFile.cpp @@ -29,7 +29,7 @@ TEST(TestOpAlgoBase, ShaderRawDataFromConstructor) )"); mgr.evalOpDefault( - { tensorA, tensorB }, kp::Shader::compile(shader)); + { tensorA, tensorB }, kp::Shader::compile_source(shader)); mgr.evalOpDefault({ tensorA, tensorB }); diff --git a/test/TestSpecializationConstant.cpp b/test/TestSpecializationConstant.cpp index 6e2be2666..5a3066d07 100644 --- a/test/TestSpecializationConstant.cpp +++ b/test/TestSpecializationConstant.cpp @@ -35,7 +35,7 @@ TEST(TestSpecializationConstants, TestTwoConstants) sq->begin(); sq->record( { tensorA, tensorB }, - kp::Shader::compile(shader), + kp::Shader::compile_source(shader), kp::Workgroup(), spec); sq->end();