conjugate cons cleanup

harshangrjn · Dec 3, 2024 · 9e24ca2 · 9e24ca2
1 parent 17f9d79
commit 9e24ca2
Show file tree

Hide file tree

Showing 73 changed files with 45 additions and 23 deletions.
diff --git a/.codecov.yml b/.codecov.yml
diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml
diff --git a/.github/workflows/TagBot.yml b/.github/workflows/TagBot.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
diff --git a/.gitignore b/.gitignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CITATION.bib b/CITATION.bib
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/Project.toml b/Project.toml
diff --git a/README.md b/README.md
diff --git a/docs/.gitignore b/docs/.gitignore
diff --git a/docs/Project.toml b/docs/Project.toml
diff --git a/docs/README.md b/docs/README.md
diff --git a/docs/make.jl b/docs/make.jl
diff --git a/docs/src/1_qubit_gates.md b/docs/src/1_qubit_gates.md
diff --git a/docs/src/2_qubit_gates.md b/docs/src/2_qubit_gates.md
diff --git a/docs/src/3_qubit_gates.md b/docs/src/3_qubit_gates.md
diff --git a/docs/src/assets/QCOpt_framework.png b/docs/src/assets/QCOpt_framework.png
diff --git a/docs/src/assets/QCOpt_framework_dark.png b/docs/src/assets/QCOpt_framework_dark.png
diff --git a/docs/src/assets/docs_header.png b/docs/src/assets/docs_header.png
diff --git a/docs/src/assets/docs_header_dark.png b/docs/src/assets/docs_header_dark.png
diff --git a/docs/src/assets/extra_styles.css b/docs/src/assets/extra_styles.css
diff --git a/docs/src/assets/logo-dark.png b/docs/src/assets/logo-dark.png
diff --git a/docs/src/assets/logo.png b/docs/src/assets/logo.png
diff --git a/docs/src/assets/logo_header_dark.png b/docs/src/assets/logo_header_dark.png
diff --git a/docs/src/assets/logo_header_light.png b/docs/src/assets/logo_header_light.png
diff --git a/docs/src/assets/themes/dark.scss b/docs/src/assets/themes/dark.scss
diff --git a/docs/src/assets/themes/darkdefs.scss b/docs/src/assets/themes/darkdefs.scss
diff --git a/docs/src/assets/themes/documenter-dark.css b/docs/src/assets/themes/documenter-dark.css
diff --git a/docs/src/assets/themes/documenter-light.css b/docs/src/assets/themes/documenter-light.css
diff --git a/docs/src/assets/themes/light.scss b/docs/src/assets/themes/light.scss
diff --git a/docs/src/assets/themes/lightdefs.scss b/docs/src/assets/themes/lightdefs.scss
diff --git a/docs/src/assets/themes/style.scss b/docs/src/assets/themes/style.scss
diff --git a/docs/src/assets/video_img_1.png b/docs/src/assets/video_img_1.png
diff --git a/docs/src/assets/video_img_2.png b/docs/src/assets/video_img_2.png
diff --git a/docs/src/function_references.md b/docs/src/function_references.md
diff --git a/docs/src/index.md b/docs/src/index.md
diff --git a/docs/src/multi_qubit_gates.md b/docs/src/multi_qubit_gates.md
diff --git a/docs/src/quickguide.md b/docs/src/quickguide.md
diff --git a/examples/2qubit_gates.jl b/examples/2qubit_gates.jl
diff --git a/examples/3qubit_gates.jl b/examples/3qubit_gates.jl
diff --git a/examples/4qubit_gates.jl b/examples/4qubit_gates.jl
diff --git a/examples/5qubit_gates.jl b/examples/5qubit_gates.jl
diff --git a/examples/Project.toml b/examples/Project.toml
diff --git a/examples/README.md b/examples/README.md
diff --git a/examples/decompose_all_gates.jl b/examples/decompose_all_gates.jl
diff --git a/examples/gates_sc21.jl b/examples/gates_sc21.jl
diff --git a/examples/optimizers.jl b/examples/optimizers.jl
diff --git a/examples/parametrized_gates.jl b/examples/parametrized_gates.jl
diff --git a/examples/results_sc21.jl b/examples/results_sc21.jl
diff --git a/examples/run_examples.jl b/examples/run_examples.jl
@@ -3,20 +3,20 @@ using LinearAlgebra
 
 using JuMP
 using Gurobi
-# using CPLEX
+using CPLEX
 # using HiGHS
 
 include("optimizers.jl")
 [include("$(i)qubit_gates.jl") for i in 2:5]
 include("parametrized_gates.jl")
 include("decompose_all_gates.jl")
 
-# decompose_gates = ["iSwap"]
+decompose_gates = ["magic"]
 
 #----------------------------------------------#
 #      Quantum Circuit Optimization model      #
 #----------------------------------------------#
-qcopt_optimizer = get_gurobi(solver_log = true)
+qcopt_optimizer = get_cplex(solver_log = true)
 
 result = Dict{String,Any}()
 times = zeros(length(decompose_gates), 1)

diff --git a/src/QuantumCircuitOpt.jl b/src/QuantumCircuitOpt.jl
diff --git a/src/chull.jl b/src/chull.jl
diff --git a/src/constraints.jl b/src/constraints.jl
@@ -560,31 +560,36 @@ function constraint_unitary_property(qcm::QuantumCircuitModel)
     return
 end
 
-function constraint_unitary_complex_conjugate(qcm::QuantumCircuitModel)
+function constraint_unitary_complex_conjugate(qcm::QuantumCircuitModel; 
+                                              quadratic_constraint = true,
+                                              num_gates_bnd = 50)
+
     max_depth  = qcm.data["maximum_depth"]
     z_bin_var  = qcm.variables[:z_bin_var]
     U_var  = qcm.variables[:U_var]
     gates_real = qcm.data["gates_real"]
 
     num_gates  = size(gates_real)[3]
 
-    if max_depth >= 3
+    if max_depth >= 2
         JuMP.@constraint(qcm.model, U_var[:, :, (max_depth-1)] .== 
                                     qcm.data["target_gate"] *
                                     sum(z_bin_var[i, (max_depth)] *  
                                     (gates_real[:,:,i]') for i=1:num_gates)
                         )
     end
 
-    if max_depth >= 4
-        # Quadratic constraint
+    # Quadratic constraint
+    if (max_depth >= 3) && (num_gates <= num_gates_bnd) && (quadratic_constraint)
+        Memento.info(_LOGGER, "Applying quadratic unitary complex-congugate constraints")
+
         JuMP.@constraint(qcm.model, U_var[:, :, (max_depth-2)] .== 
                                     qcm.data["target_gate"] *
                                     sum(z_bin_var[i, (max_depth)] *  
                                     (gates_real[:,:,i]') for i=1:num_gates) * 
                                     sum(z_bin_var[i, (max_depth-1)] *  
                                     (gates_real[:,:,i]') for i=1:num_gates)
-                        )
+    )
 
     end
 

diff --git a/src/data.jl b/src/data.jl
diff --git a/src/gates.jl b/src/gates.jl
diff --git a/src/log.jl b/src/log.jl
diff --git a/src/objective.jl b/src/objective.jl
diff --git a/src/qc_model.jl b/src/qc_model.jl
diff --git a/src/relaxations.jl b/src/relaxations.jl
diff --git a/src/solution.jl b/src/solution.jl
diff --git a/src/types.jl b/src/types.jl
diff --git a/src/utility.jl b/src/utility.jl
diff --git a/src/variables.jl b/src/variables.jl
@@ -144,28 +144,45 @@ function variable_gate_products_linearization(qcm::QuantumCircuitModel)
     return
 end
 
+# function variable_slack_for_feasibility(qcm::QuantumCircuitModel)
+#     n_r     = size(qcm.data["gates_real"])[1]
+#     n_c     = size(qcm.data["gates_real"])[2]
+#     max_depth   = qcm.data["maximum_depth"]
+#     U_var = qcm.variables[:U_var]
+
+#     qcm.variables[:slack_var] = JuMP.@variable(qcm.model, slack_var[1:n_r, 1:n_c])
+
+#     for i=1:n_r, j=1:n_c
+#         lb = JuMP.lower_bound(U_var[i,j,max_depth-1])
+#         ub = JuMP.upper_bound(U_var[i,j,max_depth-1])
+#         if QCO.is_zero(lb) && QCO.is_zero(ub)
+#             JuMP.set_lower_bound(slack_var[i,j], 0)
+#             JuMP.set_upper_bound(slack_var[i,j], 0)
+#         else 
+#             JuMP.set_lower_bound(slack_var[i,j], -1)
+#             JuMP.set_upper_bound(slack_var[i,j],  1)
+#         end
+#     end
+#     return
+# end   
+
 function variable_slack_for_feasibility(qcm::QuantumCircuitModel)
-    n_r     = size(qcm.data["gates_real"])[1]
-    n_c     = size(qcm.data["gates_real"])[2]
-    max_depth   = qcm.data["maximum_depth"]
+    n_r, n_c = size(qcm.data["gates_real"])[1:2]
+    max_depth = qcm.data["maximum_depth"]
     U_var = qcm.variables[:U_var]
-    
+
     qcm.variables[:slack_var] = JuMP.@variable(qcm.model, slack_var[1:n_r, 1:n_c])
 
-    for i=1:n_r, j=1:n_c
-        lb = JuMP.lower_bound(U_var[i,j,max_depth-1])
-        ub = JuMP.upper_bound(U_var[i,j,max_depth-1])
-        if QCO.is_zero(lb) && QCO.is_zero(ub)
-            JuMP.set_lower_bound(slack_var[i,j], 0)
-            JuMP.set_upper_bound(slack_var[i,j], 0)
-        else 
-            JuMP.set_lower_bound(slack_var[i,j], -1)
-            JuMP.set_upper_bound(slack_var[i,j],  1)
-        end
+    # Set bounds for slack variables
+    for i in 1:n_r, j in 1:n_c
+        lb, ub = JuMP.lower_bound(U_var[i, j, max_depth - 1]), JuMP.upper_bound(U_var[i, j, max_depth - 1])
+        bounds = (QCO.is_zero(lb) && QCO.is_zero(ub)) ? (0, 0) : (-1, 1)
+        JuMP.set_lower_bound(slack_var[i, j], bounds[1])
+        JuMP.set_upper_bound(slack_var[i, j], bounds[2])
     end
-    return
 end
 
+
 function variable_slack_var_outer_approximation(qcm::QuantumCircuitModel)
     n_r     = size(qcm.data["gates_real"])[1]
     n_c     = size(qcm.data["gates_real"])[2]

diff --git a/test/chull_tests.jl b/test/chull_tests.jl
diff --git a/test/data_tests.jl b/test/data_tests.jl
diff --git a/test/gates_tests.jl b/test/gates_tests.jl
diff --git a/test/qc_model_tests.jl b/test/qc_model_tests.jl
diff --git a/test/relaxations_tests.jl b/test/relaxations_tests.jl
diff --git a/test/runtests.jl b/test/runtests.jl
diff --git a/test/types_tests.jl b/test/types_tests.jl
diff --git a/test/utility_tests.jl b/test/utility_tests.jl