diff --git a/examples/android/android-simple/app/src/main/cpp/KomputeModelML.cpp b/examples/android/android-simple/app/src/main/cpp/KomputeModelML.cpp index e930ddff..b0b7d4df 100644 --- a/examples/android/android-simple/app/src/main/cpp/KomputeModelML.cpp +++ b/examples/android/android-simple/app/src/main/cpp/KomputeModelML.cpp @@ -48,13 +48,13 @@ KomputeModelML::train(std::vector yData, std::shared_ptr algorithm = mgr.algorithm( params, shader, kp::Workgroup({ 5 }), std::vector({ 5.0 })); - mgr.sequence()->eval(params); + mgr.sequence()->eval(params); std::shared_ptr sq = mgr.sequence() - ->record({ wIn, bIn }) + ->record({ wIn, bIn }) ->record(algorithm) - ->record({ wOutI, wOutJ, bOut, lOut }); + ->record({ wOutI, wOutJ, bOut, lOut }); // Iterate across all expected iterations for (size_t i = 0; i < ITERATIONS; i++) { diff --git a/examples/array_multiplication/src/main.cpp b/examples/array_multiplication/src/main.cpp index 825bad7d..96c8267b 100644 --- a/examples/array_multiplication/src/main.cpp +++ b/examples/array_multiplication/src/main.cpp @@ -27,9 +27,9 @@ main() std::shared_ptr algo = mgr.algorithm(params, shader); mgr.sequence() - ->record(params) + ->record(params) ->record(algo) - ->record(params) + ->record(params) ->eval(); // prints "Output { 0 4 12 }" diff --git a/examples/logistic_regression/src/main.cpp b/examples/logistic_regression/src/main.cpp index 0648de08..2d76eed8 100644 --- a/examples/logistic_regression/src/main.cpp +++ b/examples/logistic_regression/src/main.cpp @@ -32,7 +32,7 @@ main() wIn, wOutI, wOutJ, bIn, bOut, lOut }; - mgr.sequence()->eval(params); + mgr.sequence()->eval(params); std::vector spirv2{ 0x1, 0x2 }; @@ -44,9 +44,9 @@ main() std::shared_ptr sq = mgr.sequence() - ->record({ wIn, bIn }) + ->record({ wIn, bIn }) ->record(algorithm) - ->record({ wOutI, wOutJ, bOut, lOut }); + ->record({ wOutI, wOutJ, bOut, lOut }); // Iterate across all expected iterations for (size_t i = 0; i < ITERATIONS; i++) { diff --git a/examples/neural_network_vgg7/run_vgg7.py b/examples/neural_network_vgg7/run_vgg7.py index f5d88e84..67435d69 100644 --- a/examples/neural_network_vgg7/run_vgg7.py +++ b/examples/neural_network_vgg7/run_vgg7.py @@ -85,7 +85,7 @@ if i == 0: # For first layer, the input isn't on-device yet things_to_sync_to_device.append(tensor_in) - last_seq.eval_async(kp.OpTensorSyncDevice(things_to_sync_to_device)) + last_seq.eval_async(kp.OpSyncDevice(things_to_sync_to_device)) last_seq.eval_await() # Prepare @@ -101,7 +101,7 @@ # DEBUG: # We want to see the output, copy it to local last_seq = kpm.sequence() - last_seq.eval_async(kp.OpTensorSyncLocal([tensor_out])) + last_seq.eval_async(kp.OpSyncLocal([tensor_out])) last_seq.eval_await() tensor_out.data().astype(">( m, "OpBase", DOC(kp, OpBase)); - py::class_>( - m, "OpTensorSyncDevice", DOC(kp, OpTensorSyncDevice)) + std::shared_ptr>( + m, "OpSyncDevice", DOC(kp, OpSyncDevice)) .def(py::init>&>(), - DOC(kp, OpTensorSyncDevice, OpTensorSyncDevice)); + DOC(kp, OpSyncDevice, OpSyncDevice)); - py::class_>( - m, "OpTensorSyncLocal", DOC(kp, OpTensorSyncLocal)) + std::shared_ptr>( + m, "OpSyncLocal", DOC(kp, OpSyncLocal)) .def(py::init>&>(), - DOC(kp, OpTensorSyncLocal, OpTensorSyncLocal)); + DOC(kp, OpSyncLocal, OpSyncLocal)); - py::class_>( - m, "OpTensorCopy", DOC(kp, OpTensorCopy)) + py::class_>( + m, "OpCopy", DOC(kp, OpCopy)) .def(py::init>&>(), - DOC(kp, OpTensorCopy, OpTensorCopy)); - py::class_>( - m, "OpImageSyncDevice", DOC(kp, OpImageSyncDevice)) - .def(py::init>&>(), - DOC(kp, OpImageSyncDevice, OpImageSyncDevice)); - - py::class_>( - m, "OpImageSyncLocal", DOC(kp, OpImageSyncLocal)) - .def(py::init>&>(), - DOC(kp, OpImageSyncLocal, OpImageSyncLocal)); - - py::class_>( - m, "OpImageCopy", DOC(kp, OpImageCopy)) - .def(py::init>&>(), - DOC(kp, OpImageCopy, OpImageCopy)); + DOC(kp, OpCopy, OpCopy)); py::class_