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

Add OptimizationSolver with support for QUBO problems. #50

Merged
merged 189 commits into from
Sep 28, 2022
Merged

Add OptimizationSolver with support for QUBO problems. #50

merged 189 commits into from
Sep 28, 2022

Conversation

GaboFGuerra
Copy link
Collaborator

Issue Number:

Objective of pull request:
Add generic OptimizationSolver able to handle OptimizationProblem instances with initial support for QUBO problems.

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)
  • Docs reviewed and added / updated if needed (for bug fixes / features)
  • PR conforms to Coding Conventions
  • PR applys BSD 3-clause or LGPL2.1+ Licenses to all code files
  • [] Lint (pyb) passes locally
  • [] Build tests (pyb -E unit) or (python -m unittest) passes locally

Pull request type

Please check your PR type:

  • Bugfix
  • Feature
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • Documentation changes
  • Other (please describe):

What is the current behavior?

What is the new behavior?

Does this introduce a breaking change?

  • Yes
  • No

Supplemental information

@GaboFGuerra
Mock of solver and process for SR.
607ed1a 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Add discrete constraints InPort to solver process.
bd53637 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Adapt QP problem class to new interface and add LP problem class.
ee2caf3 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Create builder for dynamical creation of OptimizationProblemProcess f…
0163c61 
…rom problem definition.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Update copyright year.
2cc537d 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Update solver to work with the OptimizationSolverProcess builder.
892294f 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Remove line that breaks linting.
d09f277 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Repair QP tests broken with last release.
45267c5 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Add dummy class for dynamically created process to start tests from g…
25533c0 
…reen.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Delete testing file to be replaced.
c2bef60 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Start solver tests with OptimizationSolver instantiation.
fa8255f 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Add test for creation of OptimizationSolverProcess.
4aea3c1 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Improve OptimizationSolverProcess constructor.
b49283d 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Create auxiliary function that creates Vars from tensor coefficients.
1f779d4 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Add feature for solver to run continuously when timeout is -1.
6bd900b 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Extract method in solver for creating solver process.
a052b28 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Reformat file.
51e0d2f 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Add test for macrostate reader process creation by solver model.
8f28a27 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Add missing attributes to solver.
48b3bd4 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Add method to solver for solver process model creation.
c50c24d 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Implement SolverModelBuilder class and methods.
8f52b0e 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Implement VariablesProcesses dataclass.
5bb2c6c 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Implement DiscreteVariablesProcess.
2acd9ba 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Implement ReadGate process.
24d6402 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Implement SolutionReadOut process.
8e1b184 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Add missing return in _vars_from_coefficients.
c62db2d 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Implement CostConvergenceChecker process.
3459e0f 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Implement ReadGatePyMoldel.
49cdcf5 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Correct imports.
d7051f8 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Implement SolutionReadoutPyModel.
b91034a 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
GaboFGuerra and others added 11 commits September 28, 2022 15:58
@GaboFGuerra
Remove test requiring Loihi2 access.
e2fac58
@GaboFGuerra
Solve linting issues
56a7a02 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Update with upstream.
65bea61 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Remove test requiring Loihi2 access.
cea3584 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Solve remaining merge issue.
5c38a18 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Solve more lint issues.
69e5d6c 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Solve linting issues.
41827c0 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Rmove trailing space.
bc913c2 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Update import statement.
cd82783 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Change backend for solution readout test.
5a5b4e7 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Make solver tests pass.
6e7c38b 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@mgkwill mgkwill changed the base branch from version_0.2.0 to main September 28, 2022 16:23
GaboFGuerra and others added 14 commits September 28, 2022 18:23
@GaboFGuerra
Remove support for Loihi for this release.
1a7f99f 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
Update deps, add inits to tests
b54ff65 
Signed-off-by: Marcus G K Williams <Marcus G K Williams 168222+mgkwill@users.noreply.github.com>
Fix tutorial by removing specific venv kernel
76a49d6 
Signed-off-by: Marcus G K Williams <Marcus G K Williams 168222+mgkwill@users.noreply.github.com>
Fix tutorial test
ec6454d 
Signed-off-by: Marcus G K Williams <Marcus G K Williams 168222+mgkwill@users.noreply.github.com>
@GaboFGuerra
Add class architecture to Readme.
c10aaf5 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Merge branch 'optimization_solver' of https://github.com/lava-nc/lava…
313a578 
…-optimization into optimization_solver
@GaboFGuerra
Update taxonomy diagram.
5f8514b
@GaboFGuerra
Update library architecture diagram.
4877a4d
@GaboFGuerra
Order images.
4a2af0d
@GaboFGuerra
Improve equation.
90fc238
@GaboFGuerra
Solve broken lasso tutorial.
f2adea3 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Merge branch 'optimization_solver' of https://github.com/lava-nc/lava…
c088b70 
…-optimization into optimization_solver
@GaboFGuerra
Solve lint issue.
71f9d87 
Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
@GaboFGuerra
Correct typos.
f2414dc
@mgkwill mgkwill merged commit d5a323e into main Sep 28, 2022
@mgkwill mgkwill deleted the optimization_solver branch September 28, 2022 22:10
mgkwill added a commit that referenced this pull request Sep 29, 2022
@GaboFGuerra @mgkwill @phstratmann
Add OptimizationSolver with support for QUBO problems. (#50)
201280a 
* Mock of solver and process for SR.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add discrete constraints InPort to solver process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Adapt QP problem class to new interface and add LP problem class.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Create builder for dynamical creation of OptimizationProblemProcess from problem definition.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Update copyright year.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Update solver to work with the OptimizationSolverProcess builder.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Remove line that breaks linting.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Repair QP tests broken with last release.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add dummy class for dynamically created process to start tests from green.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Delete testing file to be replaced.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Start solver tests with OptimizationSolver instantiation.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test for creation of OptimizationSolverProcess.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Improve OptimizationSolverProcess constructor.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Create auxiliary function that creates Vars from tensor coefficients.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add feature for solver to run continuously when timeout is -1.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Extract method in solver for creating solver process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Reformat file.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test for macrostate reader process creation by solver model.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add missing attributes to solver.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add method to solver for solver process model creation.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement SolverModelBuilder class and methods.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement VariablesProcesses dataclass.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement DiscreteVariablesProcess.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement ReadGate process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement SolutionReadOut process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add missing return in _vars_from_coefficients.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement CostConvergenceChecker process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement ReadGatePyMoldel.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Correct imports.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement SolutionReadoutPyModel.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add missing import.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement CostConvergenceCheckerModel.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement CostIntegrator process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement CostIntegratorModel.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement DiscreteVariablesModel.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement StochasticIntegrateAndFire process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement StochasticIntegrateAndFireModel.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Remove debugging print.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement unit tests for StochasticIntegrateAndFire model.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test for connections between macrostate reader processes.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test to check cost checker is connected to variables population.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test to check cost is represented by connection weights.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test to check cost diagonal is represented as biases.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test to check QUBO cost defines number of discrete variables in process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test to check the solver terminates when running continuously.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Delete debugging print.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test to check the shape of output solution is correct.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test for solving method in solver.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test for solving a second and larger problem.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Clean up, delete obsolete and temporary classes.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Remove obsolete data-class

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Move dataclasses to independent file.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Apply black to solve linting issues.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Adhere to the dependency inversion principle adding APIs to dataclasses.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Apply black.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Solve remaining linting issues.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Simplify code by delaying use of self.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Improve variables naming.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Improve solver to work with true cost function, solve works now.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Solve parameter naming bug.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Enable solution to map coloring.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add workloads test suite including new max-cut workload.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add set packing workload.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add set partitioning workload.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Improve printing messages for solving.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Squash commit bringing changes from private development.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Repair imports after refactoring.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Repair StochasticIntegrateAndFire tests.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Remove duplicated file

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Make OptimizationSolver tests pass after refactoring.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Bring PS's tutorial from the private repo.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Merge redundant files.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Enable SolutionReadout tests.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Make Loihi2 tests pass except for those requiring  workload solution.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Update pyproject.toml

* qubo tutorial and unit test

* Update ci-build.yml

* Remove redundant classes.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add handshaking between LMT and Host to request pause of execution.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Correct typo.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Mock of solver and process for SR.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add discrete constraints InPort to solver process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Adapt QP problem class to new interface and add LP problem class.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Create builder for dynamical creation of OptimizationProblemProcess from problem definition.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Update copyright year.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Update solver to work with the OptimizationSolverProcess builder.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Remove line that breaks linting.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add dummy class for dynamically created process to start tests from green.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Delete testing file to be replaced.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Start solver tests with OptimizationSolver instantiation.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test for creation of OptimizationSolverProcess.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Improve OptimizationSolverProcess constructor.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Create auxiliary function that creates Vars from tensor coefficients.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add feature for solver to run continuously when timeout is -1.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Extract method in solver for creating solver process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Reformat file.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test for macrostate reader process creation by solver model.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add missing attributes to solver.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add method to solver for solver process model creation.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement SolverModelBuilder class and methods.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement VariablesProcesses dataclass.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement DiscreteVariablesProcess.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement ReadGate process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement SolutionReadOut process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add missing return in _vars_from_coefficients.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement CostConvergenceChecker process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement ReadGatePyMoldel.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Correct imports.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement SolutionReadoutPyModel.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add missing import.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement CostConvergenceCheckerModel.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement CostIntegrator process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement CostIntegratorModel.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement DiscreteVariablesModel.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement StochasticIntegrateAndFire process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement StochasticIntegrateAndFireModel.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Remove debugging print.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Implement unit tests for StochasticIntegrateAndFire model.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test for connections between macrostate reader processes.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test to check cost checker is connected to variables population.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test to check cost is represented by connection weights.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test to check cost diagonal is represented as biases.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test to check QUBO cost defines number of discrete variables in process.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test to check the solver terminates when running continuously.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Delete debugging print.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test to check the shape of output solution is correct.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test for solving method in solver.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add test for solving a second and larger problem.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Clean up, delete obsolete and temporary classes.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Remove obsolete data-class

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Move dataclasses to independent file.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Apply black to solve linting issues.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Adhere to the dependency inversion principle adding APIs to dataclasses.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Apply black.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Solve remaining linting issues.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Simplify code by delaying use of self.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Improve variables naming.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Improve solver to work with true cost function, solve works now.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Solve parameter naming bug.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Enable solution to map coloring.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add workloads test suite including new max-cut workload.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add set packing workload.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add set partitioning workload.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Improve printing messages for solving.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Squash commit bringing changes from private development.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Repair imports after refactoring.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Repair StochasticIntegrateAndFire tests.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Remove duplicated file

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Make OptimizationSolver tests pass after refactoring.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Bring PS's tutorial from the private repo.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Merge redundant files.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Enable SolutionReadout tests.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Make Loihi2 tests pass except for those requiring  workload solution.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* qubo tutorial and unit test

* Remove redundant classes.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Add handshaking between LMT and Host to request pause of execution.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Correct typo.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Enable noise by default.

* Repair import path.

* Update test parameters.

* Remove test requiring Loihi2 access.

* Solve linting issues

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Remove test requiring Loihi2 access.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Solve remaining merge issue.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Solve more lint issues.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Solve linting issues.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Rmove trailing space.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Update import statement.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Change backend for solution readout test.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Make solver tests pass.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Remove support for Loihi for this release.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Update deps, add inits to tests

Signed-off-by: Marcus G K Williams <Marcus G K Williams 168222+mgkwill@users.noreply.github.com>

* Fix tutorial by removing specific venv kernel

Signed-off-by: Marcus G K Williams <Marcus G K Williams 168222+mgkwill@users.noreply.github.com>

* Fix tutorial test

Signed-off-by: Marcus G K Williams <Marcus G K Williams 168222+mgkwill@users.noreply.github.com>

* Add class architecture to Readme.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Update taxonomy diagram.

* Update library architecture diagram.

* Order images.

* Improve equation.

* Solve broken lasso tutorial.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Solve lint issue.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>

* Correct typos.

Signed-off-by: GaboFGuerra <gabriel.fonseca.guerra@intel.com>
Signed-off-by: Marcus G K Williams <Marcus G K Williams 168222+mgkwill@users.noreply.github.com>
Co-authored-by: Marcus G K Williams <168222+mgkwill@users.noreply.github.com>
Co-authored-by: Philipp Stratmann <Philipp.Stratmann@Intel.com>
Co-authored-by: Marcus G K Williams <Marcus G K Williams 168222+mgkwill@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mgkwill mgkwill mgkwill approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@GaboFGuerra @mgkwill @phstratmann