Add or-tools modules by Mizux · Pull Request #3832 · bazelbuild/bazel-central-registry

Mizux · 2025-02-19T09:18:30Z

Add google/or-tools v9.12
need the fix google/riegeli@0306789 (2024 September) only available in BCR version = "0.0.0-20241218-3385e3c" of riegeli.
note: none version of fuzztest use it...
git grep -A 1 "\bname = .*riegeli" | grep -v "$modules\/riegeli\|--$"

DevNote:

Gen patch between original or-tools v9.12 MODULE.bazel and custom MODULE.bazel:

pushd
cd modules/or-tools/9.12
meld patches/bazel.patch <$(diff -u ~/work/stable/MODULE.bazel MODULE.bazel)
popd

bazel run //tools:update_integrity or-tools
bazel run -- //tools:bcr_validation --check=or-tools@9.12

BCR use sha256sum encoded in base64 to make it boring to generate...

git archive --prefix=or-tools-9.12/ -o or-tools-9.12.tar.gz v9.12
sha256sum v9.12.tar.gz | cut -d' ' -f1 | xxd -r -p | base64

bazel-io · 2025-02-19T09:18:50Z

Hello @bazelbuild/bcr-maintainers, modules without existing maintainers (or-tools) have been updated in this PR.
Please review the changes. You can view a diff against the previous version in the "Generate module diff" check.

bazel-io · 2025-02-19T14:20:41Z

Hello @bazelbuild/bcr-maintainers, modules without existing maintainers (ortools) have been updated in this PR.
Please review the changes. You can view a diff against the previous version in the "Generate module diff" check.

Mizux · 2025-03-05T14:41:23Z

PTAL

hzeller · 2025-03-07T19:57:17Z

👍
Looks good. Using bazel_dep(name = "ortools", version = "9.12") with this pull request applied to the registry works for me.

Given that ortools is using a newer version of absl, it would probably be good to include a patch that inserts absl/log/vlog_is_on.h to all of the following
find . -name "*.cc" | xargs grep VLOG_IS_ON | awk -F: '{print $1}' | sort | uniq
... but it works for now and is probably more of a cleanup to implement upstream.

Mizux · 2025-03-10T07:42:25Z

👍 Looks good. Using bazel_dep(name = "ortools", version = "9.12") with this pull request applied to the registry works for me.

Given that ortools is using a newer version of absl, it would probably be good to include a patch that inserts absl/log/vlog_is_on.h to all of the following find . -name "*.cc" | xargs grep VLOG_IS_ON | awk -F: '{print $1}' | sort | uniq ... but it works for now and is probably more of a cleanup to implement upstream.

git grep -l VLOG_IS_ON ?

EDIT: even better, cli to find files using VLOG_IS_ON but not including log/vlog_is_on.h
git grep -l VLOG_IS_ON | xargs grep -L "log/vlog_is_on_log.h"
ps: with a | wc -l I got 40 -_-

hzeller · 2025-03-10T23:48:06Z

git grep -l VLOG_IS_ON ?

#TIL that there is git grep :)

hzeller

LGTM

hzeller · 2025-03-10T23:50:45Z

Not sure if my approval of a non-write-access person counts in any way, but I think this is a good first version to get into the BCR.

meteorcloudy · 2025-03-11T13:23:45Z

@Mizux @hzeller Do you want to wait a bit for a new protobuf release so that you can use or-tools as the module name?
protocolbuffers/protobuf@3576a1f

Or we just go with ortools?

Mizux · 2025-03-11T14:02:34Z

@Mizux @hzeller Do you want to wait a bit for a new protobuf release so that you can use or-tools as the module name? protocolbuffers/protobuf@3576a1f

Or we just go with ortools?

Discussing with @mering in off, I'll try to wait and revert this PR to or-tools naming (or building a duplicate/sibling for or-tools ?)
TLDR: longterm goal is to have or-tools package, if it take too much time to have a protobuf package version with a fix, then we may provide an ortools package in the mean time...

hzeller · 2025-03-11T17:34:07Z

I am happy to wait for it to be possible to have a proper name with a dash or-tools.

Require module maintainers' approval for newly pushed changes.

bazel-io · 2025-03-11T17:51:09Z

Hello @bazelbuild/bcr-maintainers, modules without existing maintainers (or-tools, ortools) have been updated in this PR.
Please review the changes. You can view a diff against the previous version in the "Generate module diff" check.

Mizux · 2025-03-11T18:00:03Z

Currently pushing "both" module (1 commit per module, have squashed previous commits), to check the CI
https://buildkite.com/bazel/bcr-presubmit/builds/11485

meteorcloudy · 2025-03-21T10:21:43Z

Please rebase your branch to get the latest protobuf version

meteorcloudy · 2025-03-21T10:37:12Z

Oh, looks like you still need to switch to use py_proto_library from protobuf:
https://github.com/google/or-tools/blob/9b77015d9d7162b560b9e772c06ff262d2780844/ortools/constraint_solver/BUILD.bazel#L21
https://github.com/protocolbuffers/protobuf/blob/main/bazel/py_proto_library.bzl

meteorcloudy · 2025-03-21T10:39:05Z

Or, upgrade rules_python to the latest version: bazel-contrib/rules_python@edfb4b3

Mizux · 2025-03-21T10:42:31Z

Oh, looks like you still need to switch to use py_proto_library from protobuf: https://github.com/google/or-tools/blob/9b77015d9d7162b560b9e772c06ff262d2780844/ortools/constraint_solver/BUILD.bazel#L21 https://github.com/protocolbuffers/protobuf/blob/main/bazel/py_proto_library.bzl

yes and no: here we try to package the release 9.12 (basically snapshot of October 2024)
while our v99bugfix branch (incoming v9.13) and main do have the patch and also target abseil 202501 and soon protobuf 30.1

i.e. I don't see the point to pass hours to backport bazel patch only required for BCR while it should work for 9.13 out of the box + 9.12 build (CMake and bazel) and local BCR seems to work too...

devNote:
From v9.12 tag:

%git grep "load.*py_proto_library"
ortools/algorithms/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")
ortools/bop/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")
ortools/constraint_solver/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")
ortools/glop/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")
ortools/gscip/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")
ortools/linear_solver/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")
ortools/math_opt/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")
ortools/math_opt/solvers/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")
ortools/pdlp/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")
ortools/sat/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")
ortools/scheduling/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")
ortools/service/v1/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")
ortools/service/v1/mathopt/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")
ortools/util/BUILD.bazel:load("@rules_python//python:proto.bzl", "py_proto_library")

From v99bugfix or main

%git grep "load.*py_proto_library"
ortools/bop/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
ortools/constraint_solver/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
ortools/glop/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
ortools/gscip/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
ortools/linear_solver/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
ortools/math_opt/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
ortools/math_opt/solvers/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
ortools/pdlp/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
ortools/sat/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
ortools/scheduling/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
ortools/service/v1/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
ortools/service/v1/mathopt/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
ortools/set_cover/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
ortools/util/BUILD.bazel:load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")

mering · 2025-03-21T11:10:57Z

Can you upgrade rules_python to 1.2.0? Then it should redirect to py_proto_library from Protobuf which in 30.1 contains the fix.

Mizux · 2025-03-21T13:20:43Z

Can you upgrade rules_python to 1.2.0? Then it should redirect to py_proto_library from Protobuf which in 30.1 contains the fix.

Yup the idea was to suppose rules_python was just an alias to Protobuf so using Protobuf v30.1 would fix the issue (until we migrate in the next release)...

seems now we have issue with riegeli upstream...

https://buildkite.com/bazel/bcr-presubmit/builds/11954

meteorcloudy · 2025-03-21T14:24:44Z

Upgrading riegeli might help (although it's not your direct dependency)

bazel_dep(name = "riegeli", version = "0.0.0-20241218-3385e3c")

Mizux · 2025-03-21T14:25:36Z

Upgrading riegeli might help (although it's not your direct dependency)
bazel_dep(name = "riegeli", version = "0.0.0-20241218-3385e3c")

Just found:
google/riegeli@0306789 (2024 September)

But the repo has zero release and tags... -_-

devNote: All fuzztest release borken 🙃

%git grep -A 1 "\bname = .*riegeli"
modules/distributed_point_functions/0.0.0/MODULE.bazel:    name = "riegeli",
modules/distributed_point_functions/0.0.0/MODULE.bazel-    version = "0.0.0-20240927-cdfb25a",
--
modules/fuzztest/20240813.0/MODULE.bazel:    name = "riegeli",
modules/fuzztest/20240813.0/MODULE.bazel-    version = "0.0.0-20240606-973b6f0",
--
modules/fuzztest/20240813.0/patches/update_module_bazel_version.patch:     name = "riegeli",
modules/fuzztest/20240813.0/patches/update_module_bazel_version.patch-     version = "0.0.0-20240606-973b6f0",
--
modules/fuzztest/20241028.0/MODULE.bazel:    name = "riegeli",
modules/fuzztest/20241028.0/MODULE.bazel-    version = "0.0.0-20240606-973b6f0",
--
modules/fuzztest/20250214.0/MODULE.bazel:    name = "riegeli",
modules/fuzztest/20250214.0/MODULE.bazel-    version = "0.0.0-20240606-973b6f0",
--

meteorcloudy · 2025-03-21T14:26:36Z

But the repo has zero release and tags... -_-

Yes, that's why we have to make up a version number in BCR

* Add v9.12 * use -c opt in presubmit to avoid build failure. note: BCR use sha256sum encoded in base64 to make it boring to generate... ```sh sha256sum v9.12.tar.gz | cut -d' ' -f1 | xxd -r -p | base64 ```

Should fix hyphen error... ref: https://github.com/protocolbuffers/protobuf/releases/tag/v3

see if it fix the build

need fix: google/riegeli@0306789 (2024 September) devNote: gen patch between v9.12 clone and custom MODULE.bazel ```sh pushd cd modules/or-tools/9.12 meld patches/bazel.patch <$(diff -u ~/work/stable/MODULE.bazel MODULE.bazel) popd bazel run //tools:update_integrity or-tools bazel run -- //tools:bcr_validation --check=or-tools@9.12 ```

bazel-io · 2025-03-21T15:00:40Z

Hello @bazelbuild/bcr-maintainers, modules without existing maintainers (or-tools) have been updated in this PR.
Please review the changes. You can view a diff against the previous version in the "Generate module diff" check.

Mizux · 2025-03-21T15:02:59Z

remove module ortools (only keep or-tools),
presubmit pass

=> Should be ready to merge !

meteorcloudy

Thanks!

issue found while submitting bazelbuild/bazel-central-registry#3832

* Add [google/or-tools v9.12](https://github.com/google/or-tools/releases/tag/v9.12) * need the fix google/riegeli@0306789 (2024 September) only available in BCR version = "0.0.0-20241218-3385e3c" of riegeli. note: none version of fuzztest use it... `git grep -A 1 "\bname = .*riegeli" | grep -v "$modules\/riegeli\|--$"` ## DevNote: Gen patch between original or-tools `v9.12` MODULE.bazel and custom MODULE.bazel: ```sh pushd cd modules/or-tools/9.12 meld patches/bazel.patch <$(diff -u ~/work/stable/MODULE.bazel MODULE.bazel) popd bazel run //tools:update_integrity or-tools bazel run -- //tools:bcr_validation --check=or-tools@9.12 ``` BCR use sha256sum encoded in base64 to make it boring to generate... ```sh git archive --prefix=or-tools-9.12/ -o or-tools-9.12.tar.gz v9.12 sha256sum v9.12.tar.gz | cut -d' ' -f1 | xxd -r -p | base64 ```

Mizux force-pushed the or-tools branch 2 times, most recently from b8b0bb8 to c1a2d4d Compare February 19, 2025 10:21

fmeum reviewed Feb 19, 2025

View reviewed changes

Comment thread modules/or-tools/9.12/MODULE.bazel

fmeum added the presubmit-auto-run Presubmit jobs will be triggered for new changes automatically without reviewer's approval label Feb 19, 2025

This was referenced Feb 19, 2025

Packaging request: Make available on Bazel Central Registry ? google/or-tools#4551

Closed

wanted: google/or-tools #3466

Closed

Mizux force-pushed the or-tools branch from 6d55c61 to 64e971e Compare February 19, 2025 14:24

Mizux changed the title ~~Add or-tools modules~~ Add ortools modules Feb 19, 2025

Mizux force-pushed the or-tools branch from 67b1275 to 4a0ec8f Compare February 19, 2025 20:22

Mizux mentioned this pull request Feb 20, 2025

ortools is not on the bazel central registry (yet?) or-tools/bazel_or-tools#2

Closed

This was referenced Feb 20, 2025

Migrate to bazel 8, start migrating to bazelmod google/heir#1445

Merged

Migrate remaining dependencies to Bazelmod google/heir#1446

Closed

hzeller previously approved these changes Mar 10, 2025

View reviewed changes

Mizux force-pushed the or-tools branch from 240da6f to 4a3f8ed Compare March 11, 2025 17:58

meteorcloudy changed the title ~~Add ortools modules~~ Add or-tools modules Mar 12, 2025

ericastor mentioned this pull request Mar 18, 2025

Migrate XLS to bzlmod google/xls#931

Open

Mizux force-pushed the or-tools branch from 4fefc05 to f85d249 Compare March 21, 2025 10:30

mering reviewed Mar 21, 2025

View reviewed changes

Comment thread modules/or-tools/9.12/MODULE.bazel Outdated

Mizux force-pushed the or-tools branch from f85d249 to 4bfd9dc Compare March 21, 2025 12:41

Mizux and others added 4 commits March 21, 2025 16:00

add module or-tools

ac304c2

* Add v9.12 * use -c opt in presubmit to avoid build failure. note: BCR use sha256sum encoded in base64 to make it boring to generate... ```sh sha256sum v9.12.tar.gz | cut -d' ' -f1 | xxd -r -p | base64 ```

or-tools: bump protobuf to v30.1

9ad882e

Should fix hyphen error... ref: https://github.com/protocolbuffers/protobuf/releases/tag/v3

or-tools: bump fuzztest

0165a9f

see if it fix the build

Mizux force-pushed the or-tools branch from ea65880 to 75955c3 Compare March 21, 2025 15:00

meteorcloudy approved these changes Mar 21, 2025

View reviewed changes

meteorcloudy merged commit a00a52c into bazelbuild:main Mar 21, 2025

Mizux added a commit to google/or-tools that referenced this pull request Mar 24, 2025

bazel: fix riegeli resolution

a690ea4

issue found while submitting bazelbuild/bazel-central-registry#3832

Conversation

Mizux commented Feb 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

DevNote:

Uh oh!

bazel-io commented Feb 19, 2025

Uh oh!

Uh oh!

bazel-io commented Feb 19, 2025

Uh oh!

Mizux commented Mar 5, 2025

Uh oh!

hzeller commented Mar 7, 2025

Uh oh!

Mizux commented Mar 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hzeller commented Mar 10, 2025

Uh oh!

hzeller left a comment

Choose a reason for hiding this comment

Uh oh!

hzeller commented Mar 10, 2025

Uh oh!

meteorcloudy commented Mar 11, 2025

Uh oh!

Mizux commented Mar 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hzeller commented Mar 11, 2025

Uh oh!

bazel-io commented Mar 11, 2025

Uh oh!

Mizux commented Mar 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

meteorcloudy commented Mar 21, 2025

Uh oh!

meteorcloudy commented Mar 21, 2025

Uh oh!

meteorcloudy commented Mar 21, 2025

Uh oh!

Mizux commented Mar 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mering commented Mar 21, 2025

Uh oh!

Uh oh!

Mizux commented Mar 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

meteorcloudy commented Mar 21, 2025

Uh oh!

Mizux commented Mar 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

meteorcloudy commented Mar 21, 2025

Uh oh!

bazel-io commented Mar 21, 2025

Uh oh!

Mizux commented Mar 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

meteorcloudy left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Mizux commented Feb 19, 2025 •

edited

Loading

Mizux commented Mar 10, 2025 •

edited

Loading

Mizux commented Mar 11, 2025 •

edited

Loading

Mizux commented Mar 11, 2025 •

edited

Loading

Mizux commented Mar 21, 2025 •

edited

Loading

Mizux commented Mar 21, 2025 •

edited

Loading

Mizux commented Mar 21, 2025 •

edited

Loading

Mizux commented Mar 21, 2025 •

edited

Loading