syncing up work on parameterized gates

quantum/gate/compilers/scaffold/ScaffoldCompiler.cpp

@@ -149,6 +149,35 @@ void ScaffoldCompiler::modifySource() {
 		kernelSource.erase(idx, s.size());
 	}
 
+	std::cout << "KERNELSRC: \n" << kernelSource << "\n";
+	std::regex gates("\\s+*\\w+\\(.*");
+	it = std::sregex_iterator(kernelSource.begin(), kernelSource.end(),
+			gates);
+	counter = 0;
+	for (auto it = std::sregex_iterator(kernelSource.begin(), kernelSource.end(),
+			gates); it != std::sregex_iterator(); ++it) {
+		std::cout << "GateLine? " << (*it).str() << "\n";
+		auto gateLine = (*it).str();
+		auto firstParen = gateLine.find_first_of('(');
+		auto secondParen = gateLine.find_first_of(')', firstParen);
+		auto functionArguments = gateLine.substr(firstParen+1, (secondParen-firstParen)-1);
+		auto args = gateLine.substr(firstParen+1, (secondParen-firstParen)-1);
+		std::cout << "Args for this gate are " << args << "\n";
+		std::vector<std::string> splitArgs;
+		boost::split(splitArgs, args, boost::is_any_of(","));
+		std::vector<std::string> params;
+		for (auto a : splitArgs) {
+			boost::trim(a);
+			if (!boost::contains(a, qbitVarName)) {
+				// This is a gate parameter... What do we do with it?
+				params.push_back(a);
+			}
+		}
+
+		gateIdToParameterMap.insert(std::make_pair(counter, params));
+
+	}
+
 	// Get the kernel name
 	std::regex functionName("((\\w+)\\s*\\()\\s*");
 	auto begin = std::sregex_iterator(kernelSource.begin(), kernelSource.end(),
@@ -198,6 +227,24 @@ std::shared_ptr<IR> ScaffoldCompiler::compile() {
 	// Get the Qasm as a Graph...
 	auto circuitGraph = QasmToGraph::getCircuitGraph(qasm);
 
+	int counter = 0;
+	for (int i = 0; i < circuitGraph.order(); i++) {
+		auto props = circuitGraph.getVertexProperties(i);
+		auto gateName = std::get<0>(props);
+		if (gateName != "InitialState" && gateName != "FinalState") {
+			auto possibleParams = std::get<5>(props);
+			if (!possibleParams.empty()) {
+				// This is a parameterized gate
+				for (int j = 0; j < possibleParams.size(); j++) {
+					possibleParams[j] = gateIdToParameterMap[counter][j];
+					std::cout << "Setting " << gateName << " param names to " << gateIdToParameterMap[counter][j] << "\n";
+				}
+			}
+			counter++;
+		}
+	}
+
+
 	// HERE we have main circuit graph, before conditional
 	// if branches... So then for each conditional code statement,
 	// get its circuit graph and add it to the main graph after
@@ -220,6 +267,7 @@ std::shared_ptr<IR> ScaffoldCompiler::compile() {
 				conditionalCodeSegmentActingQubits);
 	}
 
+
 	// Create a GraphIR instance from that graph
 	auto graphIR = std::make_shared<ScaffoldGraphIR>(circuitGraph);
 

quantum/gate/compilers/scaffold/ScaffoldCompiler.hpp

@@ -92,6 +92,8 @@ protected:
 	 */
 	std::vector<int> conditionalCodeSegmentActingQubits;
 
+	std::map<int, std::vector<std::string>> gateIdToParameterMap;
+
 };
 
 }

quantum/gate/utils/QasmToGraph.hpp

@@ -139,14 +139,18 @@ public:
 					// FIXME Need to differentiate between qubits and parameters here
 					// First we need the qubit register variable name
 
-
-					std::vector<std::string> splitComma;
+					int counter = 0;
+					std::vector<std::string> splitComma, props;
 					boost::split(splitComma, gateCommand[1], boost::is_any_of(","));
 					for (auto segment : splitComma) {
 						if (boost::contains(segment, qubitVarName)) {
 							actingQubits.push_back(qubitVarNameToId[segment]);
 						} else {
+							std::cout << "Adding param " << g << ", " << segment << "\n";
 							// This is not a qubit, it must be a parameter for gate
+							props.push_back("PARAM_" + std::to_string(counter));
+							std::get<5>(node.properties) = props;
+							counter++;
 						}
 					}
 				}

quantum/gate/utils/QuantumCircuit.hpp

@@ -58,6 +58,7 @@ public:
 		// by default all circuit nodes
 		// are enabled and
 		std::get<4>(properties) = true;
+
 	}
 };