Skip to content

Commit

Permalink
Merge branch 'main' into on-disck-format
Browse files Browse the repository at this point in the history
  • Loading branch information
termoshtt authored May 9, 2024
2 parents 7650a16 + 919b25b commit 1be385f
Show file tree
Hide file tree
Showing 13 changed files with 276 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ changelog:
- title: Protobuf update
labels:
- proto
- title: Python binding update
- title: Python SDK update
labels:
- python
- title: Rust binding update
- title: Rust SDK update
labels:
- rust
- title: Others
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Run tests
run: |
python -m pytest
python -m pytest -vv --doctest-modules
lint-python:
runs-on: ubuntu-latest
Expand All @@ -81,5 +81,4 @@ jobs:
- name: Lint
run: |
python -m mypy python/ommx
python -m pyright python/ommx
Binary file added BRIDGE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ This project manages several versions as follows:
- Schemas in `ommx.v1` will be compatible after [ommx.v1 schema release](https://github.com/Jij-Inc/ommx/milestone/3). Note that the schema can be changed incompatible way until this release.
- `v2` schema with namespace `ommx.v2` will start developing if we need to change the schema in incompatible way after `ommx.v1` release. Compatible changes will be made in `v1` schema also after its release. We never create namespaces like `ommx.v1_1`.

## Language specific bindings
This project consists of main protobuf schema and language specific bindings.
## Language specific SDK
This project consists of main protobuf schema and language specific SDK.
Their versions are managed independently, and adopts semantic versioning.

# License
Expand All @@ -38,3 +38,7 @@ at your option.

# Contribution
TBW

# Acknowledgement
![BRIDGE](./BRIDGE.png)
This work was performed for Council for Science, Technology and Innovation (CSTI), Cross-ministerial Strategic Innovation Promotion Program (SIP), “Promoting the application of advanced quantum technology platforms to social issues”(Funding agency : QST).
14 changes: 14 additions & 0 deletions proto/ommx/v1/instance.proto
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,18 @@ message Instance {
//
// TODO: Add semi-definite constraints to represent SDP
// repeated SemiDefiniteConstraint semi_definite_constraints = ?;

// The sense of this instance
enum Sense {
SENSE_UNSPECIFIED = 0;
SENSE_MINIMIZE = 1;
SENSE_MAXIMIZE = 2;
}

// The sense of this problem, i.e. minimize the objective or maximize it.
//
// Design decision note:
// - This is a required field. Most mathematical modeling tools allow for an empty sense and default to minimization. Alternatively, some tools do not create such a field and represent maximization problems by negating the objective function. This project prefers explicit descriptions over implicit ones to avoid such ambiguity and to make it unnecessary for developers to look up the reference for the treatment of omitted cases.
//
Sense sense = 5;
}
1 change: 1 addition & 0 deletions python/BRIDGE.png
166 changes: 166 additions & 0 deletions python/ommx/testing.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions python/ommx/v1/instance_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 39 additions & 1 deletion python/ommx/v1/instance_pb2.pyi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "ommx"
version = "0.1.0"
version = "0.2.0"
description = "Open Mathematical prograMming eXchange (OMMX)"
authors = [
{ name="Jij Inc.", email="info@j-ij.com" },
Expand All @@ -18,6 +18,7 @@ classifiers = [
"License :: OSI Approved :: MIT License",
]
dependencies = [
"numpy>=1.23.0, <2.0.0",
"protobuf>=5.26.1, <6.0.0",
]

Expand Down
2 changes: 1 addition & 1 deletion rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust/ommx/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ommx"
version = "0.1.0"
version = "0.2.0"
edition = "2021"
license = "MIT OR Apache-2.0"

Expand Down
Loading

0 comments on commit 1be385f

Please sign in to comment.