diff --git a/include/glow/Runtime/RuntimeTypes.h b/include/glow/Runtime/RuntimeTypes.h index fbf23c5d0d..d65976a1e1 100644 --- a/include/glow/Runtime/RuntimeTypes.h +++ b/include/glow/Runtime/RuntimeTypes.h @@ -31,7 +31,7 @@ using RunIdentifierTy = size_t; /// Enum to communicate results when communicating with device at initialization /// and runtime. -enum ResultCode { Ready, Executed, Failed, Cancelled }; +enum class ResultCode { Ready, Executed, Failed, Cancelled }; /// Data structure that contains device constraint information for each device. /// Used to communicate memory constraints and later costs to the Partitioner. diff --git a/lib/Backends/CPU/CPUDeviceManager.cpp b/lib/Backends/CPU/CPUDeviceManager.cpp index cc5e2f8b8c..a3f63a29e2 100644 --- a/lib/Backends/CPU/CPUDeviceManager.cpp +++ b/lib/Backends/CPU/CPUDeviceManager.cpp @@ -36,7 +36,7 @@ void CPUDeviceManager::addNetworkImpl(const Module *module, if (modIt != modules_.end()) { // Already have a module with this ID. // TODO: should we replace it? - readyCB(module, Failed); + readyCB(module, ResultCode::Failed); return; } @@ -46,7 +46,7 @@ void CPUDeviceManager::addNetworkImpl(const Module *module, size_t moduleSize = 200 * 1024 * 1024; if (usedMemoryBytes + moduleSize > maxMemoryBytes) { - readyCB(module, Failed); + readyCB(module, ResultCode::Failed); return; } @@ -60,7 +60,7 @@ void CPUDeviceManager::addNetworkImpl(const Module *module, usedMemoryBytes += moduleSize; // Fire the ready CB. - readyCB(module, Ready); + readyCB(module, ResultCode::Ready); } void CPUDeviceManager::evictNetworkImpl(const Module *module) { @@ -85,7 +85,7 @@ void CPUDeviceManager::runFunctionImpl(RunIdentifierTy id, std::string function, ResultCBTy resultCB) { auto funcIt = functions_.find(function); if (funcIt == functions_.end()) { - resultCB(id, Failed, std::move(ctx)); + resultCB(id, ResultCode::Failed, std::move(ctx)); return; } @@ -99,5 +99,5 @@ void CPUDeviceManager::runFunctionImpl(RunIdentifierTy id, std::string function, func->tearDownRuns(); // Fire the resultCB. - resultCB(id, Executed, std::move(ctx)); + resultCB(id, ResultCode::Executed, std::move(ctx)); } diff --git a/tests/unittests/CPUDeviceManagerTest.cpp b/tests/unittests/CPUDeviceManagerTest.cpp index 7343c92d3a..3e264778ad 100644 --- a/tests/unittests/CPUDeviceManagerTest.cpp +++ b/tests/unittests/CPUDeviceManagerTest.cpp @@ -113,7 +113,8 @@ TEST(CPUDeviceManagerTest, Basic) { cpuCoreDevice.addNetwork(module.get(), std::move(functions), [&promise](const Module *module, ResultCode result) { - callbackHelper(promise, module, result, Ready); + callbackHelper(promise, module, result, + ResultCode::Ready); }); future.wait_for(2s); @@ -134,7 +135,7 @@ TEST(CPUDeviceManagerTest, Basic) { [&runPromise](RunIdentifierTy, ResultCode result, std::unique_ptr ctx_) { callbackHelper(runPromise, std::move(ctx_), - result, Executed); + result, ResultCode::Executed); }); runFuture.wait_for(2s); @@ -155,7 +156,8 @@ TEST(CPUDeviceManagerTest, MultiRun) { std::tie(promise, future) = getFutureHelper(); cpuCoreDevice.addNetwork(module.get(), std::move(functions), [&promise](const Module *module, ResultCode result) { - callbackHelper(promise, module, result, Ready); + callbackHelper(promise, module, result, + ResultCode::Ready); }); future.wait_for(2s); EXPECT_EQ(future.get(), module.get()); @@ -185,14 +187,14 @@ TEST(CPUDeviceManagerTest, MultiRun) { [&runP1](RunIdentifierTy, ResultCode result, std::unique_ptr ctx_) { callbackHelper(runP1, std::move(ctx_), result, - Executed); + ResultCode::Executed); }); cpuCoreDevice.runFunction("main", std::move(ctx2), [&runP2](RunIdentifierTy, ResultCode result, std::unique_ptr ctx_) { callbackHelper(runP2, std::move(ctx_), result, - Executed); + ResultCode::Executed); }); ctx1 = runF1.get(); @@ -225,7 +227,8 @@ TEST(CPUDeviceManagerTest, MultiFunction) { std::tie(promise, future) = getFutureHelper(); cpuCoreDevice.addNetwork(module.get(), std::move(functions), [&promise](const Module *module, ResultCode result) { - callbackHelper(promise, module, result, Ready); + callbackHelper(promise, module, result, + ResultCode::Ready); }); future.wait_for(2s); EXPECT_EQ(future.get(), module.get()); @@ -245,14 +248,14 @@ TEST(CPUDeviceManagerTest, MultiFunction) { [&runP1](RunIdentifierTy, ResultCode result, std::unique_ptr ctx_) { callbackHelper(runP1, std::move(ctx_), result, - Executed); + ResultCode::Executed); }); cpuCoreDevice.runFunction("func2", std::move(ctx2), [&runP2](RunIdentifierTy, ResultCode result, std::unique_ptr ctx_) { callbackHelper(runP2, std::move(ctx_), result, - Executed); + ResultCode::Executed); }); ctx1 = runF1.get(); @@ -276,7 +279,8 @@ TEST(CPUDeviceManagerTest, MultiModule) { std::tie(promise, future) = getFutureHelper(); cpuCoreDevice.addNetwork(module1.get(), std::move(functions1), [&promise](const Module *module, ResultCode result) { - callbackHelper(promise, module, result, Ready); + callbackHelper(promise, module, result, + ResultCode::Ready); }); future.wait_for(2s); EXPECT_EQ(future.get(), module1.get()); @@ -284,7 +288,8 @@ TEST(CPUDeviceManagerTest, MultiModule) { std::tie(promise, future) = getFutureHelper(); cpuCoreDevice.addNetwork(module2.get(), std::move(functions2), [&promise](const Module *module, ResultCode result) { - callbackHelper(promise, module, result, Ready); + callbackHelper(promise, module, result, + ResultCode::Ready); }); future.wait_for(2s); EXPECT_EQ(future.get(), module2.get()); @@ -309,14 +314,14 @@ TEST(CPUDeviceManagerTest, MultiModule) { [&runP1](RunIdentifierTy, ResultCode result, std::unique_ptr ctx_) { callbackHelper(runP1, std::move(ctx_), result, - Executed); + ResultCode::Executed); }); cpuCoreDevice.runFunction("func2", std::move(ctx2), [&runP2](RunIdentifierTy, ResultCode result, std::unique_ptr ctx_) { callbackHelper(runP2, std::move(ctx_), result, - Executed); + ResultCode::Executed); }); ctx1 = runF1.get(); @@ -340,11 +345,11 @@ TEST(CPUDeviceManagerTest, AvailableMemory) { auto module = makeBasicModule(); std::tie(promise, future) = getFutureHelper(); - cpuCoreDevice.addNetwork(module.get(), - compileFunctions(module.get(), backing), - [&promise](const Module *module, ResultCode result) { - callbackHelper(promise, module, result, Ready); - }); + cpuCoreDevice.addNetwork( + module.get(), compileFunctions(module.get(), backing), + [&promise](const Module *module, ResultCode result) { + callbackHelper(promise, module, result, ResultCode::Ready); + }); future.wait_for(2s); EXPECT_EQ(future.get(), module.get()); @@ -357,11 +362,11 @@ TEST(CPUDeviceManagerTest, AvailableMemory) { // Let's try again. auto module2 = makeBasicModule(); std::tie(promise, future) = getFutureHelper(); - cpuCoreDevice.addNetwork(module2.get(), - compileFunctions(module2.get(), backing), - [&promise](const Module *module, ResultCode result) { - callbackHelper(promise, module, result, Ready); - }); + cpuCoreDevice.addNetwork( + module2.get(), compileFunctions(module2.get(), backing), + [&promise](const Module *module, ResultCode result) { + callbackHelper(promise, module, result, ResultCode::Ready); + }); future.wait_for(2s); auto *resultModule = future.get(); @@ -377,11 +382,11 @@ TEST(CPUDeviceManagerTest, AvailableMemory) { // And try again, this time with available space. std::tie(promise, future) = getFutureHelper(); - cpuCoreDevice.addNetwork(module2.get(), - compileFunctions(module2.get(), backing), - [&promise](const Module *module, ResultCode result) { - callbackHelper(promise, module, result, Ready); - }); + cpuCoreDevice.addNetwork( + module2.get(), compileFunctions(module2.get(), backing), + [&promise](const Module *module, ResultCode result) { + callbackHelper(promise, module, result, ResultCode::Ready); + }); future.wait_for(2s); EXPECT_EQ(future.get(), module2.get());