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

[QUBO] Minor improvements #283

Merged
merged 40 commits into from
Mar 1, 2024
Merged

[QUBO] Minor improvements #283

merged 40 commits into from
Mar 1, 2024

Conversation

phstratmann
Copy link
Contributor

@phstratmann phstratmann commented Jan 11, 2024 •
edited
Loading

Objective of pull request:
This PR enables readout of the QUBO solution via spikeIO. This is required to scale to multi-chip systems.
Please note that this PR adds a fully new QUBOSolver class with corresponding Process and Model. It thus does not change the OptimizationSolver class.
For review, I would suggest to start with the QUBOSolver class, and then look into QUBOSolverProcess and QUBOSolverModel.
Has a corresponding PR in lava-on-loihi.

New features/advantages of this PR:

  • No eCPU involved. Thus, fast, efficient, scalable.
  • QUBO solver has a flattened, clear hierarchy. Full cleanup of technical debt.

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 (flakeheaven lint src/lava tests/) and (bandit -r src/lava/.) pass locally
  • Build tests (pytest) passes locally

Pull request type

  • Feature
  • Refactoring (no functional changes, no api changes)

phstratmann and others added 26 commits November 30, 2023 17:52
@phstratmann
starting SolutionReceiver
814abc9
@phstratmann
transferring unit test from spikeIO
313881a
@phstratmann
spikeIO working via LMT
597e9d5
@phstratmann
starting unittest for SolutionReadout
3b70b6d
@AlessandroPierro
Remove NxToPy adapters from SolutionReadout
2646faf
@AlessandroPierro
Implement SolutionReceiver with a single port
02def67
@AlessandroPierro
Incremental update to spikeio readout
20e2675
@phstratmann
revising CostIntegrator
e80b96e
@phstratmann
ensure that run_async also stops if no solution found
341e778
@phstratmann
passing unit tests for new CostIntegrator
f34707d
@phstratmann
nebm_sa: first revision, untested
3808fc2
@phstratmann
spikeIO running in unit test, but no msgs arriving yet
add481c
@phstratmann
Merge remote-tracking branch 'optimization_origin/qubo_readout' into …
8b7e118 
…qubo_readout
@phstratmann
spikeIO msgs arriving
e840f92
@phstratmann
unit tests passing for SolutionReceiver and SolutionReadout, Spiker32…
c946c7d 
…bit now supports signed
@phstratmann
revised nebm_sa, old unit tests pass
8bcfbe9
@AlessandroPierro
Add synapses NEBM -> SpikeIntegrators
6dc1607
@phstratmann
Merge branch 'main' into qubo_readout
8a13b22
@phstratmann
SolutionReadout functional and tested
2784092
@phstratmann
Renamend SolutionReadout
d17e085
@AlessandroPierro @phstratmann
Bug fix in SolutionReadout
e35212d 
Co-authored-by: Philipp Stratmann <phstratmann@users.noreply.github.com>
@phstratmann
refractor
0216983
@phstratmann
refractor
40617b8
@phstratmann
lintin
a34329f
@phstratmann
input validation and docstrings
53ab268
@phstratmann
added timeout in SolutionReceiver
87f14e1
@phstratmann phstratmann changed the title [QUBO] Readout via spikeIO [QUBO] Readout via spikeIO for multi-chip support Jan 23, 2024
@phstratmann phstratmann self-assigned this Jan 23, 2024
@phstratmann phstratmann mentioned this pull request Jan 23, 2024
Merged
@AlessandroPierro AlessandroPierro removed the 0-needs-review Has to be reviewed. label Feb 6, 2024
GaboFGuerra
GaboFGuerra reviewed Feb 7, 2024
View reviewed changes
Copy link
Collaborator

@GaboFGuerra GaboFGuerra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you agree on another chat to move the flagged files to lava-loihi, I'll add the proper review of these there alongside the rest of the code. Feel free to merge once these files are removed here and added there.

src/lava/lib/optimization/solvers/qubo/cost_integrator/process.py Outdated Show resolved Hide resolved
src/lava/lib/optimization/solvers/qubo/simulated_annealing/process.py Outdated Show resolved Hide resolved
src/lava/lib/optimization/solvers/qubo/solution_readout/models.py Outdated Show resolved Hide resolved
src/lava/lib/optimization/solvers/qubo/solution_readout/process.py Outdated Show resolved Hide resolved
AlessandroPierro and others added 4 commits February 8, 2024 08:12
@AlessandroPierro @phstratmann
Draft re-initialization of QUBOSolver
4052cda 
Co-authored-by: Philipp Stratmann <phstratmann@users.noreply.github.com>
@AlessandroPierro @phstratmann
Enables re-initialization of QUBOSolver
08c5641 
Co-authored-by: Philipp Stratmann <phstratmann@users.noreply.github.com>
@AlessandroPierro
Add printing to SolutionReadout
1327f4e
@phstratmann
renamed best_state
1fcf242
@phstratmann phstratmann reopened this Feb 29, 2024
@phstratmann phstratmann changed the title [QUBO] Readout via spikeIO for multi-chip support [QUBO] Minor improvements Feb 29, 2024
GaboFGuerra
GaboFGuerra approved these changes Feb 29, 2024
View reviewed changes
Copy link
Collaborator

@GaboFGuerra GaboFGuerra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well done!

@phstratmann phstratmann merged commit ce2c270 into main Mar 1, 2024
4 checks passed
@phstratmann phstratmann deleted the qubo_readout branch March 1, 2024 09:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GaboFGuerra GaboFGuerra GaboFGuerra approved these changes

@tim-shea tim-shea Awaiting requested review from tim-shea

@srrisbud srrisbud Awaiting requested review from srrisbud

Assignees

@phstratmann phstratmann

Labels
1-feature New feature or request 2-important/urgent
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@phstratmann @GaboFGuerra @AlessandroPierro