Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
ed71f2c
export from google3
Mizux May 13, 2025
b08e6c6
Merge remote-tracking branch 'origin/v99bugfix'
Mizux May 14, 2025
640aaeb
[CP-SAT] lots of bugfixes, improvement to primary variables heuristic…
lperron May 14, 2025
77e5e44
minor cleanup
lperron May 14, 2025
c30fefa
fixes
lperron May 14, 2025
709fe93
[CP-SAT] fix dtime reporting for lns
lperron May 14, 2025
9355534
algorithms: export from google3
Mizux May 16, 2025
88c57dd
rework ortools samples (#4590)
Mizux May 16, 2025
aac608e
rework ortools/routing samples (#4590)
Mizux May 16, 2025
b29f407
[CP-SAT] use precedences in completion time cuts; improve glue clause…
lperron May 16, 2025
af52d34
cleanup
Mizux May 16, 2025
92e3c1e
python: target typing-extensions >= 4.12
Mizux May 19, 2025
4177426
sat: update internal docs
Mizux May 19, 2025
2433654
fix indent
Mizux May 19, 2025
327263e
replace some const string by string_view
Mizux May 19, 2025
1cd3c86
update internal doc
Mizux May 19, 2025
04d55fc
bazel: use eigen 3.4.0.bcr.3
Mizux May 19, 2025
45d24e2
add gurobi 12.0.2
lperron May 20, 2025
d65609d
cmake: disable shortest_paths_test (timeout)
Mizux May 20, 2025
cf96d6b
bump go protobuf to 1.36.5
lperron May 20, 2025
1e06338
Merge branch 'main' of github.com:google/or-tools
lperron May 20, 2025
6dc6888
fix #4654
lperron May 21, 2025
f8549c6
cmake: use GLPK 5.0.1 (#4656)
Mizux May 21, 2025
ed1b05d
bazel: update deps
Mizux May 20, 2025
cfefe41
cmake: bump dependencies
Mizux May 21, 2025
f9e9b55
cmake: fixup abseil-cpp bump
Mizux May 21, 2025
965c619
deps: add missing absl::random_internal_entropy_pool
Mizux May 22, 2025
cf373ae
bazel: bump GLPK to 5.0.bcr.4 (#4656)
Mizux May 22, 2025
7518c71
bazel: cleanup BUILD.bazel
Mizux May 26, 2025
548497b
base: export from google3
Mizux May 26, 2025
17b8187
scheduling: export from google3
Mizux May 26, 2025
2bcdb10
math_opt: Fix elemental python on windows
Mizux May 26, 2025
0bf24b2
tools/release: remove Python 3.8 support
Mizux May 26, 2025
75d5d21
tools/docker: remove python 3.8 support
Mizux May 26, 2025
6390cc1
cmake: Fix host tools build when using a toolchain
Mizux May 27, 2025
4e2d73a
python: bump last remaining 3.8 to 3.9
Mizux May 27, 2025
46a97de
Use Fractional everywhere
lperron May 27, 2025
d055bae
[CP-SAT] work on precedences; improve scheduling cuts
lperron May 27, 2025
de3d0b4
inprove code
lperron May 27, 2025
9371f32
Merge branch 'main' of github.com:google/or-tools
lperron May 27, 2025
947a211
bazel: cleanup cc_binary load
Mizux May 27, 2025
77e8bb8
lp_data: Fix compilation (#4662)
Mizux May 27, 2025
f13223c
Merge remote-tracking branch 'origin/v99bugfix' into mizux/dev
Mizux May 28, 2025
5b1da71
make: Fix archive_cpp target
Mizux Jun 2, 2025
92b92f4
cmake: log Python executable path at configure
Mizux Jun 2, 2025
9b18eff
make: fix archive_python target
Mizux Jun 2, 2025
ac26215
tools/docker: Add Fedora-42
Mizux Jun 2, 2025
b223ef8
tools/docker: target and fix dotnet 8.0 support
Mizux Jun 2, 2025
2b792c0
MPSolver-XPRESS: Remove superfluous calls to XPRSloadlp and XPRScreat…
pet-mit Jun 2, 2025
98a3e8e
[CP-SAT] reindent samples; fix #4666
lperron Jun 2, 2025
8f43bdb
add iterators to sorted_interval_list
lperron Jun 2, 2025
67529ab
small fix
lperron Jun 2, 2025
8d2d46f
reindent
lperron Jun 2, 2025
3bbd02a
Merge branch 'main' of github.com:google/or-tools
lperron Jun 2, 2025
29fabd9
[CP-SAT] stronger no_overlap_2d variation
lperron Jun 2, 2025
b56ec14
Merge pull request #4667 from rte-france/xpress/better_performance
lperron Jun 2, 2025
55fbc3d
fix
lperron Jun 2, 2025
8c9033f
make: Fix test_dotnet and test_java targets
Mizux Jun 2, 2025
c2777d5
java: update private key used by release scripts
Mizux Jun 2, 2025
8be2627
ci/tools: Simplify alpine .Net 8.0 SDK install
Mizux Jun 2, 2025
22be413
dotnet: get rid of last remaining .Net 6.0
Mizux Jun 2, 2025
c22621b
dotnet: Remove EOL .Net Core 3.1 in release artifacts
Mizux Jun 2, 2025
a90d9d9
pdlp: Fix test when using pytest 8.4.0
Mizux Jun 3, 2025
f500358
tools/docker: fix images
Mizux Jun 3, 2025
285be22
linear_solver: reapply xpress_interface fix (#4382)
Mizux Jun 3, 2025
26b2071
cmake: format fix
Mizux Jun 4, 2025
1b9c659
improve xpress
lperron Jun 4, 2025
53ed645
Merge remote-tracking branch 'origin/v99bugfix' into mizux/dev
Mizux Jun 5, 2025
115261b
bazel: regenerate notebook_requirements.txt
Mizux Jun 5, 2025
b448993
fix
lperron Jun 5, 2025
6e95195
Merge remote-tracking branch 'origin/v99bugfix'
Mizux Jun 5, 2025
c9a3da1
cmake: HiGHS v1.11.0 (#4670)
galabovaa Jun 6, 2025
212665f
bazel: update HiGHS to v1.11.0
galabovaa Jun 6, 2025
91d20f0
HiGHS cleanup
Mizux Jun 6, 2025
7c96ded
new minizinc challenge entry
lperron Jun 10, 2025
64fcba4
[CP-SAT] work on precedences; fix bug in scheduling cuts
lperron Jun 10, 2025
d3617d5
proper fix
lperron Jun 11, 2025
9956831
cmake: Fix README.md
Mizux Jun 11, 2025
8b82db1
Update README.md
Mizux Jun 11, 2025
f8f4651
cmake: Add support for custom protoc executable via OR_TOOLS_PROTOC_E…
clementperon Jun 10, 2025
e25617b
reindent; span
lperron Jun 11, 2025
9ca57ad
[CP-SAT] more precedence handling; minor python improvements
lperron Jun 11, 2025
ef630e7
Merge branch 'main' of github.com:google/or-tools
lperron Jun 11, 2025
afbb563
make: Enable HiGHS support by default
Mizux Jun 11, 2025
4d9ef15
tools/release: Detect /Users path in libortools.dylib (#4674)
Mizux Jun 11, 2025
c1f2d74
dependencies: Fix MACOSX_RPATH usage (#4674)
Mizux Jun 11, 2025
c229e9f
[CP-SAT] improve python layer for += and -= operators
lperron Jun 12, 2025
d1c3c7f
[CP-SAT] more work on precedences
lperron Jun 12, 2025
6270850
bump minizinc challenge tag
lperron Jun 12, 2025
43c874a
fix
lperron Jun 12, 2025
7d58c11
improve python exprs
lperron Jun 12, 2025
b1d5100
improve python exprs
lperron Jun 12, 2025
4953c79
[CP-SAT] more work on precedences
lperron Jun 12, 2025
8abc6da
cleanup python expression code for cp-sat and model-builder
lperron Jun 13, 2025
8ff5dbe
[CP-SAT] split intervals in disjoint sets for scheduling cuts
lperron Jun 13, 2025
63b9ecd
[CP-SAT] tweak and improve code
lperron Jun 13, 2025
8a2a537
cmake: format samples
Mizux Jun 16, 2025
dd9029a
tools/release: Workaround for macos x86_64 python build failure
Mizux Jun 16, 2025
9831cdb
tools/release: add python build log
Mizux Jun 16, 2025
2524635
Fix bz2.dll install path for windows-cpp archive
flomnes Jun 16, 2025
35ee27b
graph: export from google3
Mizux Jun 16, 2025
79b86cc
constraint_solver: export from google3
Mizux Jun 16, 2025
7b67f85
cleanup and formatting
Mizux Jun 16, 2025
3467396
dependencies: bump Protobuf from v31.0 to v31.1
Mizux Jun 17, 2025
ac0fe62
gscip cleanup; linear_solver samples reident
lperron Jun 17, 2025
20f14fa
misc doc change
lperron Jun 17, 2025
1c81bd8
more gscip cleaning
lperron Jun 17, 2025
e3d4f34
[CP-SAT] more work on precedences; and no_overlap_2d
lperron Jun 17, 2025
e76ecdf
minor cleaning
lperron Jun 17, 2025
8049f03
Merge branch 'main' of github.com:google/or-tools
lperron Jun 17, 2025
e995b1a
remove model_builder support for xpress as it is not implemented; mov…
lperron Jun 17, 2025
966a597
graph: fix iterator compatibility since C++17
clementperon Jun 18, 2025
c4b01c1
reorganize gurobi and xpress side loading
lperron Jun 18, 2025
b61ec98
reorganize gurobi and xpress side loading
lperron Jun 18, 2025
91e14de
ortools: utils: keep compatibility with protobuf < 26
clementperon Jun 18, 2025
fa616a6
Merge pull request #4696 from clementperon/fix_compilation_cpp17
lperron Jun 18, 2025
c4fd63c
Merge pull request #4697 from clementperon/fix_compat_protobuf
lperron Jun 18, 2025
f1e9538
cmake: Fix cmake_minimum_required to 3.24 (#4692)
Mizux Jun 18, 2025
3365d16
routing: export from google3
Mizux Jun 16, 2025
3434ae4
tools/release: fixup
Mizux Jun 18, 2025
9888ce3
polish third_party_solvers; speed up cp-sat on no_ovrlap_2d
lperron Jun 19, 2025
6ceb6d4
tools/release: more cleanup
Mizux Jun 19, 2025
7a42226
:wq
lperron Jun 19, 2025
c14e54c
[CP-SAT] print a solution after a SIGTERM; improve precedences
lperron Jun 20, 2025
6d8c32c
fix
lperron Jun 20, 2025
6c973a4
graph: fix iterator compilation in C++20
Mizux Jun 18, 2025
73bfae5
Fix dockerfile ENV usage
Mizux Jun 23, 2025
333f8c1
ci: Use the default installed maven in windows_cmake_java job
Mizux Jun 23, 2025
189bd79
Format py files to adopt internal style
gchatelet Jun 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 0 additions & 4 deletions .github/workflows/amd64_windows_cmake_java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ jobs:
with:
distribution: ${{matrix.java.distrib}}
java-version: ${{matrix.java.version}}
- name: Update maven
run: |
choco upgrade maven
echo "C:\ProgramData\chocolatey\lib\maven\apache-maven-3.9.9\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Check java
run: |
java -version
Expand Down
2 changes: 1 addition & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

load("@bazel_gazelle//:def.bzl", "gazelle")
load("@gazelle//:def.bzl", "gazelle")
load("@rules_license//rules:license.bzl", "license")

# Expose license for external usage through bazel.
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# limitations under the License.

# This file is just an orchestration
cmake_minimum_required(VERSION 3.20)
cmake_minimum_required(VERSION 3.24)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

# Enable output of compile commands during generation.
Expand Down
12 changes: 6 additions & 6 deletions Dependencies.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
ZLIB=1.3.1
abseil-cpp=20250127.1
Protobuf=v30.2
abseil-cpp=20250512.0
Protobuf=v31.1
Eigen=3.4.0
Re2=2024-04-01
Re2=2024-07-02
CoinUtils=2.11.12
Osi=0.108.11
Clp=1.17.10
Cgl=0.60.9
Cbc=2.10.12
GLPK=5.0
HiGHS=v1.9.0
HiGHS=v1.11.0
Scip=v922
# Python
pybind11=v2.13.6
pybind11_abseil=v202402.0
pybind11_protobuf=84653a591aea5df482dc2bde42c19efafbd53a57
# Testing
googletest=v1.16.0
benchmark=v1.9.1
googletest=v1.17.0
benchmark=v1.9.2
30 changes: 15 additions & 15 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@ module(
)

# see https://registry.bazel.build/
bazel_dep(name = "abseil-cpp", version = "20250127.1")
bazel_dep(name = "abseil-cpp", version = "20250512.0")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "bzip2", version = "1.0.8.bcr.2")
bazel_dep(name = "contrib_rules_jvm", version = "0.28.0")
bazel_dep(name = "eigen", version = "4.0.0-20241125.bcr.1")
bazel_dep(name = "fuzztest", version = "20250214.0", repo_name = "com_google_fuzztest")
bazel_dep(name = "eigen", version = "3.4.0.bcr.3")
bazel_dep(name = "fuzztest", version = "20250214.0")
bazel_dep(name = "riegeli", version = "0.0.0-20241218-3385e3c") # otherwise fuzztest use a borken version
bazel_dep(name = "gazelle", version = "0.42.0", repo_name = "bazel_gazelle")
bazel_dep(name = "glpk", version = "5.0.bcr.3")
bazel_dep(name = "google_benchmark", version = "1.9.1", repo_name = "com_google_benchmark")
bazel_dep(name = "googletest", version = "1.16.0", repo_name = "com_google_googletest")
bazel_dep(name = "highs", version = "1.10.0")
bazel_dep(name = "gazelle", version = "0.43.0")
bazel_dep(name = "glpk", version = "5.0.bcr.4")
bazel_dep(name = "google_benchmark", version = "1.9.2")
bazel_dep(name = "googletest", version = "1.17.0")
bazel_dep(name = "highs", version = "1.11.0")
bazel_dep(name = "platforms", version = "0.0.11")
bazel_dep(name = "protobuf", version = "30.2", repo_name = "com_google_protobuf")
bazel_dep(name = "protobuf", version = "31.1")
bazel_dep(name = "pybind11_abseil", version = "202402.0")
bazel_dep(name = "pybind11_bazel", version = "2.13.6")
bazel_dep(name = "pybind11_protobuf", version = "0.0.0-20240524-1d7a729")
bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_google_re2")
bazel_dep(name = "re2", version = "2024-07-02.bcr.1")
bazel_dep(name = "rules_cc", version = "0.1.1")
bazel_dep(name = "rules_go", version = "0.53.0", repo_name = "io_bazel_rules_go")
bazel_dep(name = "rules_go", version = "0.53.0")
bazel_dep(name = "rules_java", version = "8.11.0")
bazel_dep(name = "rules_jvm_external", version = "6.7")
bazel_dep(name = "rules_license", version = "1.0.0")
Expand Down Expand Up @@ -131,10 +131,10 @@ maven.install(
)
use_repo(maven, "maven")

go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
go_sdk.download(version = "1.22.4")

go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
go_deps.module(
path = "github.com/golang/glog",
sum = "h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY=",
Expand All @@ -152,8 +152,8 @@ go_deps.module(
)
go_deps.module(
path = "google.golang.org/protobuf",
sum = "h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=",
version = "v1.34.2",
sum = "h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=",
version = "v1.36.5",
)
go_deps.module(
path = "golang.org/x/xerrors",
Expand Down
20 changes: 10 additions & 10 deletions bazel/notebook_requirements.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# OR-Tools code dependencies
absl-py==2.1.0
immutabledict==3.0.0
absl-py==2.2.2
immutabledict==4.2.1
numpy==2.2.0
protobuf==6.30.2
requests==2.32.3
protobuf==6.31.1
requests==2.32.4
scipy==1.14.1
typing-extensions==4.13.1

Expand All @@ -21,10 +21,10 @@ svgwrite==1.4.3
plotly==5.15.0

# Notebook
jupyterlab==4.4.1
notebook==7.4.1
jupyter-server==2.15.0
tornado==6.4.2
Pygments==2.15.0
jsonschema==4.19.0
jupyterlab==4.4.3
notebook==7.4.2
jupyter-server==2.16.0
tornado==6.5.0
Pygments==2.19.1
jsonschema==4.23.0
jinja2==3.1.6
Loading
Loading