Skip to content
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

Jump to bottom

Two stage solution of VRPs using QUBO #203

Open
wants to merge 53 commits into
base: main
Choose a base branch
from
Open

Two stage solution of VRPs using QUBO #203

wants to merge 53 commits into from

Conversation

srrisbud
Copy link
Contributor

@srrisbud srrisbud commented Apr 6, 2023

Issue Number: #192

Objective of pull request: To enable solving VRPs using the QUBO solver in lava-optimization library

Pull request checklist

Your PR fulfills the following requirements:

  • Issue created that explains the change and why it's needed
  • Tests are part of the PR (for bug fixes / features)
  • PR conforms to Coding Conventions
  • Lint (pyb) passes locally
  • Build tests (pyb -E unit) or (python -m unittest) passes locally

Pull request type

Please check your PR type:

  • Feature

What is the new behavior?

  • VRPSolver can solve VRPs using 2-stage QUBO strategy (clustering + TSPs)

Does this introduce a breaking change?

  • No

srrisbud and others added 30 commits April 6, 2023 14:48
@srrisbud
Prelim commit
645c890 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
NEBM+SCIF merger: first pass
ae13aa5 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Prelim commit
cd6c3ba 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
NEBM+SCIF merger: second pass
bad70a1 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Post code-review: removed debug from NEBM, added docstrings, reinst…
ce8d87d 
…ated `best_solution` in read_gate

Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
First VRP app commit; incomplete, needs tests
69b53aa 
Signed-off-by: Risbud, Sumedh <[email protected]>
@ashishrao7 @srrisbud
Adding helper functions to generate Q matrices
110c66c 
for a) clustering b) tsp.
TODO: Add Typing code
@srrisbud
Second VRP app commit; functional with VRPy. Includes tests.
5458d71 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Second VRP app commit; solver complete, needs correct Q matrices
72b9c96 
Signed-off-by: Risbud, Sumedh <[email protected]>
@ashishrao7 @srrisbud
Changes to clustering matrix complete.
989a005 
Made changes to TSP API only.
Further work needed on TSP logic
@ashishrao7 @srrisbud
New tsp matrix generator with tests
c8a68b1
@ashishrao7 @srrisbud
Changed formulation of distance in TSP.
fd7ee83 
Encoding is now accurate
@ashishrao7 @srrisbud
Added proper clustering Q matrix generator
f74b1e0 
(with test)
@srrisbud
VRP Solver: Almost there
20a39ac 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
NEBM+SCIF merger: first pass
331171f 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Prelim commit
5112bd8 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
NEBM+SCIF merger: second pass
ca2da0f 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Post code-review: removed debug from NEBM, added docstrings, reinst…
6b7c840 
…ated `best_solution` in read_gate

Signed-off-by: Risbud, Sumedh <[email protected]>
@ashishrao7 @srrisbud
Adding helper functions to generate Q matrices
b4c6268 
for a) clustering b) tsp.
TODO: Add Typing code
@srrisbud
Resolved conflicts
e81862b
@srrisbud
Prelim commit
9d05227 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
NEBM+SCIF merger: first pass
51b107d 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Prelim commit
c5bcd3e 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
NEBM+SCIF merger: second pass
8169e43 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Post code-review: removed debug from NEBM, added docstrings, reinst…
b927fa3 
…ated `best_solution` in read_gate

Signed-off-by: Risbud, Sumedh <[email protected]>
@ashishrao7 @srrisbud
Changes to clustering matrix complete.
8208e97 
Made changes to TSP API only.
Further work needed on TSP logic
@ashishrao7 @srrisbud
New tsp matrix generator with tests
b72b7ce
@ashishrao7 @srrisbud
Changed formulation of distance in TSP.
9f358f3 
Encoding is now accurate
@srrisbud
VRPSolver first milestone: successfully solves VRPs
3cb087c 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
SCIF CPU backend model minor change to remove state_hist and pass t…
ec7f72e 
…ests

Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud srrisbud self-assigned this Apr 6, 2023
@srrisbud srrisbud added the 1-feature New feature or request label Apr 6, 2023
@srrisbud srrisbud requested a review from awintel April 6, 2023 23:40
@srrisbud srrisbud force-pushed the vrpsolver branch 3 times, most recently from e010fc1 to 3b402a5 Compare April 7, 2023 23:41
srrisbud and others added 20 commits May 4, 2023 16:04
@srrisbud
Sparsification attempt lava-nc#1: DistProxy with sign inversion and m…
5309540 
…ax cut-off

Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Merge branch 'main' into vrp_sparsification
a4ebc9c
@srrisbud
Intermediate check point commit for scenario sweep
164b0a9 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Profiling and sparsification related improvements to VRPSolver and VR…
78df169 
…PConfig

Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Script to sweep various scenarios for performance modelling of VRPSolver
c57a653 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Merge branch 'main' into vrpsolver
cee82c0
@srrisbud
Profiling and sparsification related improvements to VRPSolver and VR…
89758be 
…PConfig

Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Fixed the way to check if VRPy is installed
dea31fb 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Code clean-up refactoring in LCA module
513d6eb 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Merge branch 'lava-nc:main' into main
5ca5fc6
@srrisbud
Merge branch 'main' into vrp_sparsification
91e5997
@srrisbud
Merge branch 'lava-nc:main' into main
7cb6706
@srrisbud
Merge branch 'main' into vrp_sparsification
767cd3b
@srrisbud
Merge branch 'lava-nc:main' into main
8e1acf9
@srrisbud
Merge branch 'main' into vrp_sparsification
e7ac28b
@srrisbud
Corrected TSP Q matrix name
5ec5a46 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Added edge-pruning based sparsification
4e9f4aa 
Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Tests and scripts for quantification of the effect of dist-mat sparsi…
f92a034 
…ty on solution quality

Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Sparsification attempt lava-nc#1: DistProxy with sign inversion and m…
7e658e3 
…ax cut-off

Signed-off-by: Risbud, Sumedh <[email protected]>
@srrisbud
Merge branch 'vrp_sparsification' into vrpsolver
7c73e18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mathisrichter mathisrichter Awaiting requested review from mathisrichter

@ashishrao7 ashishrao7 Awaiting requested review from ashishrao7

@PhilippPlank PhilippPlank Awaiting requested review from PhilippPlank

@gkarray gkarray Awaiting requested review from gkarray

@AlessandroPierro AlessandroPierro Awaiting requested review from AlessandroPierro

@GaboFGuerra GaboFGuerra Awaiting requested review from GaboFGuerra

@phstratmann phstratmann Awaiting requested review from phstratmann

@awintel awintel Awaiting requested review from awintel

At least 1 approving review is required to merge this pull request.

Assignees

@srrisbud srrisbud

Labels
1-feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@srrisbud @ashishrao7