Skip to content

Added support for local pipeline development #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 10, 2024
Merged

Added support for local pipeline development #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3782039
Added support for local pipeline development
AndreiCod Dec 10, 2024
33fa155
Changed device pass pipeline for remote execution
AndreiCod Dec 10, 2024
ce6ed52
Fixed pipeline logic for development
AndreiCod Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 37 additions & 29 deletions runtime/cudaq/platform/default/rest/helpers/equal1/Equal1ServerHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
******************************************************************************/
#include "common/Logger.h"
#include "common/MeasureCounts.h"
#include "common/ServerHelper.h"
#include "common/RestClient.h"
#include "common/ServerHelper.h"

#include "cudaq/utils/cudaq_utils.h"

Expand All @@ -26,17 +26,18 @@
namespace cudaq {

class Equal1ServerHelper : public ServerHelper {
static constexpr const llvm::StringLiteral DEFAULT_URL = "http://localhost:62444";
static constexpr const llvm::StringLiteral DEFAULT_URL =
"http://localhost:62444";

public:

const std::string name() const override {return "equal1";}
const std::string name() const override { return "equal1"; }

void initialize(BackendConfig config) override;

RestHeaders getHeaders() override;

ServerJobPayload createJob(std::vector<KernelExecution> &circuitNodes) override;
ServerJobPayload
createJob(std::vector<KernelExecution> &circuitNodes) override;

std::string extractJobId(ServerMessage &postResponse) override;

Expand All @@ -46,12 +47,13 @@ class Equal1ServerHelper : public ServerHelper {

bool jobIsDone(ServerMessage &getJobResponse) override;

cudaq::sample_result processResults(ServerMessage &postJobResponse, std::string &jobId) override;
cudaq::sample_result processResults(ServerMessage &postJobResponse,
std::string &jobId) override;

void updatePassPipeline(const std::filesystem::path &platformPath,
std::string &passPipeline) override;
private:
std::string &passPipeline) override;

private:
std::string equal1ServerURL;
std::string machine;
std::string optimizationLevel;
Expand All @@ -61,21 +63,23 @@ class Equal1ServerHelper : public ServerHelper {
RestClient client;

inline std::optional<std::string> getEnv(llvm::StringRef envVar) const {
const char* val = std::getenv(envVar.data());
if(!val)
const char *val = std::getenv(envVar.data());
if (!val)
return std::nullopt;
return std::string(val);
}

inline std::string getConfig(const std::string& envVarName, const std::string& configName, const std::string& defaultValue) {
if(envVarName.data()) {
inline std::string getConfig(const std::string &envVarName,
const std::string &configName,
const std::string &defaultValue) {
if (envVarName.data()) {
auto env = getEnv(envVarName);
if(env.has_value())
if (env.has_value())
return env.value();
}

auto iter = backendConfig.find(configName);
if(iter != backendConfig.end())
if (iter != backendConfig.end())
return iter->second;

return defaultValue;
Expand All @@ -84,11 +88,10 @@ class Equal1ServerHelper : public ServerHelper {
std::string queryPassPipeline();
};


std::string Equal1ServerHelper::queryPassPipeline() {
auto headers = getHeaders();
auto deviceProperties = client.get(equal1ServerURL, "devices/" + machine,
headers);
auto deviceProperties =
client.get(equal1ServerURL, "devices/" + machine, headers);

return deviceProperties["passPipeline"].get<std::string>();
}
Expand All @@ -100,7 +103,7 @@ void Equal1ServerHelper::initialize(BackendConfig config) {

equal1ServerURL = getConfig("EQUAL1_SERVER_URL", "url", DEFAULT_URL.str());

if(!equal1ServerURL.ends_with("/"))
if (!equal1ServerURL.ends_with("/"))
equal1ServerURL += "/";

machine = getConfig("EQUAL1_TARGET_MACHINE", "machine", "beta2");
Expand All @@ -109,7 +112,10 @@ void Equal1ServerHelper::initialize(BackendConfig config) {

parseConfigForCommonParams(config);

devicePassPipeline = queryPassPipeline();
if (config.count("emulate") && config["emulate"] == "true")
devicePassPipeline = "func.func(const-prop-complex),canonicalize,cse";
else
devicePassPipeline = queryPassPipeline();

return;
}
Expand All @@ -127,13 +133,14 @@ RestHeaders Equal1ServerHelper::getHeaders() {
return headers;
}

ServerJobPayload Equal1ServerHelper::createJob(std::vector<KernelExecution> &circuitNodes) {
ServerJobPayload
Equal1ServerHelper::createJob(std::vector<KernelExecution> &circuitNodes) {
cudaq::debug("{}ServerHelper::createJob", name());

assert(circuitNodes.size() == 1 && "Currently only supporting one message");

std::vector<ServerMessage> messages;
for(const auto& code : circuitNodes) {
for (const auto &code : circuitNodes) {
ServerMessage m;
m["target"] = name();
m["machine"] = machine;
Expand All @@ -151,13 +158,12 @@ ServerJobPayload Equal1ServerHelper::createJob(std::vector<KernelExecution> &cir
std::string Equal1ServerHelper::extractJobId(ServerMessage &postResponse) {
cudaq::debug("{}ServerHelper::extractJobId", name());

std::string jobToken =
postResponse["jobId"]
.get<std::string>();
std::string jobToken = postResponse["jobId"].get<std::string>();
return jobToken;
}

std::string Equal1ServerHelper::constructGetJobPath(ServerMessage &postResponse) {
std::string
Equal1ServerHelper::constructGetJobPath(ServerMessage &postResponse) {
cudaq::debug("{}ServerHelper::extractJobId", name());
return equal1ServerURL + "jobs/" + extractJobId(postResponse);
}
Expand All @@ -169,7 +175,7 @@ std::string Equal1ServerHelper::constructGetJobPath(std::string &jobId) {

bool Equal1ServerHelper::jobIsDone(ServerMessage &getJobResponse) {
auto status = getJobResponse["status"]
.get<std::string>(); // All job get and post responses at an
.get<std::string>(); // All job get and post responses at an
// array of [resdata, httpstatuscode]
if (status == "error") {
std::string msg = getJobResponse["message"].get<std::string>();
Expand All @@ -180,8 +186,9 @@ bool Equal1ServerHelper::jobIsDone(ServerMessage &getJobResponse) {
return status == "done";
}


cudaq::sample_result Equal1ServerHelper::processResults(ServerMessage &getJobResponse, std::string &jobId) {
cudaq::sample_result
Equal1ServerHelper::processResults(ServerMessage &getJobResponse,
std::string &jobId) {
cudaq::info("postJobResponse: {}", name());

auto result = getJobResponse["results"].get<std::vector<std::size_t>>();
Expand All @@ -190,7 +197,8 @@ cudaq::sample_result Equal1ServerHelper::processResults(ServerMessage &getJobRes
return sample;
};

void Equal1ServerHelper::updatePassPipeline(const std::filesystem::path&, std::string &passPipeline) {
void Equal1ServerHelper::updatePassPipeline(const std::filesystem::path &,
std::string &passPipeline) {
passPipeline += "," + devicePassPipeline;
return;
}
Expand Down
Loading