-
Notifications
You must be signed in to change notification settings - Fork 30
Add MatMul symbol #434
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.
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
Open
wbernoudy
wants to merge
10
commits into
dwavesystems:main
Choose a base branch
from
wbernoudy:feature/matmul-symbol
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add MatMul symbol #434
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
9306dac
Add MatMulNode
wbernoudy f8f092f
Use different ReshapeNode constructor to satisfy macos
wbernoudy ad064db
Fully support broadcasting for matmul
wbernoudy 3a75f3e
Fix std::max call for windows
wbernoudy d47f35a
Add missing includes
wbernoudy 0a80d2d
Add release notes and some clarifying comments
wbernoudy f037cf0
Make Array::shape_to_size public
wbernoudy ee16139
Use raw pointers/strides of predecessors in matmul
wbernoudy 13b61a8
Fix bug in matmul with leading subspace iteration
wbernoudy 142cdd1
Clarify Python `matmul` method
wbernoudy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
dwave/optimization/include/dwave-optimization/nodes/linear_algebra.hpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| // Copyright 2025 D-Wave Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <vector> | ||
|
|
||
| #include "dwave-optimization/array.hpp" | ||
| #include "dwave-optimization/graph.hpp" | ||
|
|
||
| namespace dwave::optimization { | ||
|
|
||
| class MatrixMultiplyNode : public ArrayOutputMixin<ArrayNode> { | ||
| public: | ||
| MatrixMultiplyNode(ArrayNode* x_ptr, ArrayNode* y_ptr); | ||
|
|
||
| /// @copydoc Array::buff() | ||
| double const* buff(const State& state) const override; | ||
|
|
||
| /// @copydoc Node::commit() | ||
| void commit(State& state) const override; | ||
|
|
||
| /// @copydoc Array::diff() | ||
| std::span<const Update> diff(const State& state) const override; | ||
|
|
||
| /// @copydoc Node::initialize_state() | ||
| void initialize_state(State& state) const override; | ||
|
|
||
| /// @copydoc Array::integral() | ||
| bool integral() const override; | ||
|
|
||
| /// @copydoc Array::max() | ||
| double max() const override; | ||
|
|
||
| /// @copydoc Array::min() | ||
| double min() const override; | ||
|
|
||
| /// @copydoc Node::propagate() | ||
| void propagate(State& state) const override; | ||
|
|
||
| /// @copydoc Node::revert() | ||
| void revert(State& state) const override; | ||
|
|
||
| /// @copydoc Array::shape() | ||
| using Array::shape; | ||
| std::span<const ssize_t> shape(const State& state) const override; | ||
|
|
||
| /// @copydoc Array::size() | ||
| using Array::size; | ||
| ssize_t size(const State& state) const override; | ||
|
|
||
| /// @copydoc Array::size_diff() | ||
| ssize_t size_diff(const State& state) const override; | ||
|
|
||
| /// @copydoc Array::size_info() | ||
| SizeInfo sizeinfo() const override; | ||
|
|
||
| private: | ||
| void matmul_(State& state, std::span<double> out, std::span<const ssize_t> out_shape) const; | ||
| void update_shape_(State& state) const; | ||
|
|
||
| const ArrayNode* x_ptr_; | ||
| const ArrayNode* y_ptr_; | ||
|
|
||
| const SizeInfo sizeinfo_; | ||
| const ValuesInfo values_info_; | ||
| }; | ||
|
|
||
| } // namespace dwave::optimization | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| # Copyright 2025 D-Wave | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| from dwave.optimization.libcpp.graph cimport ArrayNode | ||
|
|
||
|
|
||
| cdef extern from "dwave-optimization/nodes/linear_algebra.hpp" namespace "dwave::optimization" nogil: | ||
| cdef cppclass MatrixMultiplyNode(ArrayNode): | ||
| pass |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.