Merge remote-tracking branch 'origin/rh/cumulative-iqhe' into rh/cumu…

…lative-iqhe
google · Oct 20, 2024 · e304e4a · e304e4a
2 parents 278f4b5 + 3d153d3
commit e304e4a
Show file tree

Hide file tree

Showing 193 changed files with 7,636 additions and 4,172 deletions.
diff --git a/.github/workflows/amd64_linux_bazel.yml b/.github/workflows/amd64_linux_bazel.yml
@@ -9,10 +9,10 @@ jobs:
     strategy:
       matrix:
         python: [
-          {version: '3.9'},
           {version: '3.10'},
           {version: '3.11'},
           {version: '3.12'},
+          {version: '3.13'},
         ]
       fail-fast: false
     name: Linux • Bazel • Python-${{ matrix.python.version }}

diff --git a/.github/workflows/amd64_linux_cmake_python.yml b/.github/workflows/amd64_linux_cmake_python.yml
@@ -18,6 +18,7 @@ jobs:
           {version: "3.10"},
           {version: "3.11"},
           {version: "3.12"},
+          {version: "3.13"},
         ]
       fail-fast: false
     name: Linux • ${{ matrix.cmake.generator }} • Python-${{ matrix.python.version }}

diff --git a/.github/workflows/amd64_macos_bazel.yml b/.github/workflows/amd64_macos_bazel.yml
@@ -9,10 +9,10 @@ jobs:
     strategy:
       matrix:
         python: [
-          {version: '3.9'},
           {version: '3.10'},
           {version: '3.11'},
           {version: '3.12'},
+          {version: '3.13'},
         ]
       fail-fast: false
     name: MacOS • Bazel • Python-${{ matrix.python.version }}

diff --git a/.github/workflows/amd64_macos_cmake_python.yml b/.github/workflows/amd64_macos_cmake_python.yml
@@ -16,7 +16,8 @@ jobs:
           {version: "3.9"},
           {version: "3.10"},
           {version: "3.11"},
-          {version: "3.12"}
+          {version: "3.12"},
+          {version: "3.13"},
         ]
       fail-fast: false
     name: MacOS • ${{ matrix.cmake.generator }} • Python-${{ matrix.python.version }}

diff --git a/.github/workflows/amd64_windows_bazel.yml b/.github/workflows/amd64_windows_bazel.yml
@@ -10,10 +10,10 @@ jobs:
       matrix:
         runner: [windows-2022]
         python: [
-          {version: '3.9'},
           {version: '3.10'},
           {version: '3.11'},
           {version: '3.12'},
+          {version: '3.13'},
         ]
       fail-fast: false # Don't cancel all jobs if one fails.
     name: ${{ matrix.runner }} • Bazel • Python-${{ matrix.python.version }}

diff --git a/.github/workflows/amd64_windows_cmake_cpp.yml b/.github/workflows/amd64_windows_cmake_cpp.yml
@@ -27,7 +27,7 @@ jobs:
         run: >
           cmake -S. -Bbuild
           -G "${{ matrix.cmake.generator }}"
-          -DCMAKE_BUILD_TYPE=${{ matrix.cmake.config }}
+          -DCMAKE_CONFIGURATION_TYPES=${{ matrix.cmake.config }}
           -DBUILD_DEPS=ON
           -DCMAKE_INSTALL_PREFIX=install
       - name: Build

diff --git a/.github/workflows/amd64_windows_cmake_python.yml b/.github/workflows/amd64_windows_cmake_python.yml
@@ -16,6 +16,7 @@ jobs:
           {version: "3.10", dir: Python310},
           {version: "3.11", dir: Python311},
           {version: "3.12", dir: Python312},
+          {version: "3.13", dir: Python313},
         ]
       fail-fast: false
     name: Windows • ${{ matrix.cmake.generator }} • Python-${{ matrix.python.version }}

diff --git a/.github/workflows/arm64_macos_bazel.yml b/.github/workflows/arm64_macos_bazel.yml
@@ -9,10 +9,10 @@ jobs:
     strategy:
       matrix:
         python: [
-          {version: '3.9'},
           {version: '3.10'},
           {version: '3.11'},
           {version: '3.12'},
+          {version: '3.13'},
         ]
       fail-fast: false
     name: MacOS • Bazel • Python-${{ matrix.python.version }}

diff --git a/.github/workflows/arm64_macos_cmake_cpp.yml b/.github/workflows/arm64_macos_cmake_cpp.yml
@@ -14,7 +14,7 @@ jobs:
         ]
       fail-fast: false
     name: MacOS • ${{ matrix.cmake.generator }} • C++
-    runs-on: macos-latest # macos arm64 based runner
+    runs-on: macos-latest # macos M1 based runner
     steps:
       - uses: actions/checkout@v4
       - name: Check cmake

diff --git a/.github/workflows/arm64_macos_cmake_python.yml b/.github/workflows/arm64_macos_cmake_python.yml
@@ -16,7 +16,8 @@ jobs:
           {version: "3.9"},
           {version: "3.10"},
           {version: "3.11"},
-          {version: "3.12"}
+          {version: "3.12"},
+          {version: "3.13"},
         ]
       fail-fast: false
     name: MacOS • ${{ matrix.cmake.generator }} • Python-${{ matrix.python.version }}

diff --git a/.gitignore b/.gitignore
@@ -79,6 +79,8 @@ cache/
 **/.vscode/*
 .DS_Store
 **/.vs/*
+/.helix
+/compile_commands.json
 
 ortools/linear_solver/lpi_glop.cc
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,6 +15,9 @@
 cmake_minimum_required(VERSION 3.20)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
+# Enable output of compile commands during generation.
+option(CMAKE_EXPORT_COMPILE_COMMANDS "Export compile command" ON)
+
 include(utils)
 set_version(VERSION)
 
@@ -234,6 +237,12 @@ if(USE_COINOR)
   CMAKE_DEPENDENT_OPTION(BUILD_Cbc "Build the Cbc dependency Library" OFF
     "NOT BUILD_DEPS" ON)
   message(STATUS "Build Cbc: ${BUILD_Cbc}")
+else()
+  set(BUILD_CoinUtils OFF)
+  set(BUILD_Osi OFF)
+  set(BUILD_Clp OFF)
+  set(BUILD_Cgl OFF)
+  set(BUILD_Cbc OFF)
 endif()
 
 ## GLOP
@@ -250,6 +259,8 @@ if(USE_GLPK)
   CMAKE_DEPENDENT_OPTION(BUILD_GLPK "Build the GLPK dependency Library" OFF
     "NOT BUILD_DEPS" ON)
   message(STATUS "Build GLPK: ${BUILD_GLPK}")
+else()
+  set(BUILD_GLPK OFF)
 endif()
 
 ## GUROBI
@@ -265,6 +276,8 @@ if(USE_HIGHS)
   CMAKE_DEPENDENT_OPTION(BUILD_HIGHS "Build the HiGHS dependency Library" OFF
     "NOT BUILD_DEPS" ON)
   message(STATUS "Build HiGHS: ${BUILD_HIGHS}")
+else()
+  set(BUILD_HIGHS OFF)
 endif()
 
 ## PDLP
@@ -274,6 +287,8 @@ if(USE_PDLP)
   CMAKE_DEPENDENT_OPTION(BUILD_PDLP "Build the PDLP dependency Library" ON
     "NOT BUILD_DEPS" ON)
   message(STATUS "Build PDLP: ${BUILD_PDLP}")
+else()
+  set(BUILD_PDLP OFF)
 endif()
 
 ## SCIP
@@ -284,6 +299,8 @@ if(USE_SCIP)
   CMAKE_DEPENDENT_OPTION(BUILD_SCIP "Build the SCIP dependency Library" OFF
     "NOT BUILD_DEPS" ON)
   message(STATUS "Build SCIP: ${BUILD_SCIP}")
+else()
+  set(BUILD_SCIP OFF)
 endif()
 
 # Optional third party solvers (disabled by default)

diff --git a/WORKSPACE b/WORKSPACE
@@ -110,13 +110,13 @@ load("@rules_python//python:repositories.bzl", "py_repositories")
 py_repositories()
 
 load("@rules_python//python:repositories.bzl", "python_register_toolchains")
-DEFAULT_PYTHON = "3.12"
+DEFAULT_PYTHON = "3.11"
 python_register_toolchains(
-    name = "python3_12",
+    name = "python3_11",
     python_version = DEFAULT_PYTHON,
     ignore_root_user_error=True,
 )
-load("@python3_12//:defs.bzl", "interpreter")
+load("@python3_11//:defs.bzl", "interpreter")
 
 # Create a central external repo, @pip_deps, that contains Bazel targets for all the
 # third-party packages specified in the bazel/requirements.txt file.

diff --git a/bazel/notebook_requirements.in b/bazel/notebook_requirements.in
@@ -1,19 +1,19 @@
 # OR-Tools code dependencies
-absl-py==2.0.0
+absl-py==2.1.0
 immutabledict==3.0.0
-numpy==1.26.4
-protobuf==5.27.3
+numpy==2.1.1
+protobuf==5.27.5
 requests==2.32.0
-scipy==1.11.3
+scipy==1.14.1
 
 # OR-Tools build dependencies
 mypy==1.6.1
 mypy-protobuf==3.5.0
 virtualenv==20.24.6
-black==24.3.0
+black==24.8.0
 
 # Example dependencies
-pandas==2.1.2
+pandas==2.2.3
 
 # Visualization dependencies
 svgwrite==1.4.3
@@ -26,3 +26,4 @@ jupyter-server==2.14.2
 tornado==6.4.1
 Pygments==2.15.0
 jsonschema==4.19.0
+jinja2==3.1.4
diff --git a/bazel/notebook_requirements.txt b/bazel/notebook_requirements.txt
@@ -1,10 +1,10 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    bazel run //bazel:notebook_requirements.update
 #
-absl-py==2.0.0
+absl-py==2.1.0
     # via -r bazel/notebook_requirements.in
 anyio==4.0.0
     # via
@@ -30,7 +30,7 @@ backcall==0.2.0
     # via ipython
 beautifulsoup4==4.12.2
     # via nbconvert
-black==24.3.0
+black==24.8.0
     # via -r bazel/notebook_requirements.in
 bleach==6.0.0
     # via nbconvert
@@ -85,8 +85,9 @@ isoduration==20.11.0
     # via jsonschema
 jedi==0.19.0
     # via ipython
-jinja2==3.1.3
+jinja2==3.1.4
     # via
+    #   -r bazel/notebook_requirements.in
     #   jupyter-server
     #   jupyterlab
     #   jupyterlab-server
@@ -176,7 +177,7 @@ notebook-shim==0.2.3
     # via
     #   jupyterlab
     #   notebook
-numpy==1.26.4
+numpy==2.1.1
     # via
     #   -r bazel/notebook_requirements.in
     #   pandas
@@ -192,7 +193,7 @@ packaging==23.1
     #   jupyterlab-server
     #   nbconvert
     #   plotly
-pandas==2.1.2
+pandas==2.2.3
     # via -r bazel/notebook_requirements.in
 pandocfilters==1.5.0
     # via nbconvert
@@ -215,7 +216,7 @@ prometheus-client==0.17.1
     # via jupyter-server
 prompt-toolkit==3.0.39
     # via ipython
-protobuf==5.27.3
+protobuf==5.27.5
     # via
     #   -r bazel/notebook_requirements.in
     #   mypy-protobuf
@@ -271,7 +272,7 @@ rpds-py==0.10.2
     # via
     #   jsonschema
     #   referencing
-scipy==1.11.3
+scipy==1.14.1
     # via -r bazel/notebook_requirements.in
 send2trash==1.8.2
     # via jupyter-server

diff --git a/bazel/ortools_requirements.in b/bazel/ortools_requirements.in
@@ -1,17 +1,17 @@
 # OR-Tools code dependencies
-absl-py==2.0.0
+absl-py==2.1.0
 immutabledict==3.0.0
-numpy==1.26.4
-protobuf==5.27.3
-requests==2.32.0
-scipy==1.11.3
+numpy==2.1.1
+protobuf==5.27.5
+requests==2.32.3
+scipy==1.14.1
 
 # OR-Tools build dependencies
 mypy==1.6.1
 mypy-protobuf==3.5.0
 virtualenv==20.24.6
-black==24.3.0
+black==24.8.0
 
 # Example dependencies
-pandas==2.1.2
+pandas==2.2.3
 svgwrite==1.4.3
diff --git a/bazel/ortools_requirements.txt b/bazel/ortools_requirements.txt
@@ -6,7 +6,7 @@
 #
 absl-py==2.0.0
     # via -r bazel/ortools_requirements.in
-black==24.3.0
+black==24.8.0
     # via -r bazel/ortools_requirements.in
 certifi==2024.7.4
     # via requests
@@ -30,14 +30,14 @@ mypy-extensions==1.0.0
     #   mypy
 mypy-protobuf==3.5.0
     # via -r bazel/ortools_requirements.in
-numpy==1.26.4
+numpy==2.1.0
     # via
     #   -r bazel/ortools_requirements.in
     #   pandas
     #   scipy
 packaging==23.1
     # via black
-pandas==2.1.2
+pandas==2.2.3
     # via -r bazel/ortools_requirements.in
 pathspec==0.11.1
     # via black
@@ -53,9 +53,9 @@ python-dateutil==2.8.2
     # via pandas
 pytz==2022.7.1
     # via pandas
-requests==2.32.0
+requests==2.32.3
     # via -r bazel/ortools_requirements.in
-scipy==1.11.3
+scipy==1.14.1
     # via -r bazel/ortools_requirements.in
 six==1.16.0
     # via python-dateutil

diff --git a/cmake/Makefile b/cmake/Makefile
@@ -632,7 +632,7 @@ TOOLCHAIN_STAGES := env devel toolchain build test
 define toolchain-stage-target =
 #$$(info STAGE: $1)
 #$$(info Create targets: toolchain_$1 $(addprefix toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS))).)
-targets_toolchain_$1 = $(addprefix toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS)))
+targets_toolchain_$1 := $(addprefix toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS)))
 .PHONY: toolchain_$1 $$(targets_toolchain_$1)
 toolchain_$1: $$(targets_toolchain_$1)
 $$(targets_toolchain_$1): toolchain_%_$1: docker/toolchain/Dockerfile
@@ -645,7 +645,7 @@ $$(targets_toolchain_$1): toolchain_%_$1: docker/toolchain/Dockerfile
  ..
 
 #$$(info Create targets: save_toolchain_$1 $(addprefix save_toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS))) (debug).)
-save_targets_toolchain_$1 = $(addprefix save_toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS)))
+save_targets_toolchain_$1 := $(addprefix save_toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS)))
 .PHONY: save_toolchain_$1 $$(save_targets_toolchain_$1)
 save_toolchain_$1: $$(save_targets_toolchain_$1)
 $$(save_targets_toolchain_$1): save_toolchain_%_$1: cache/%/docker_$1.tar
@@ -727,7 +727,7 @@ VAGRANT_VMS := \
 define make-vagrant-target =
 #$$(info VMS: $1)
 #$$(info Create target: $1_<LANG>.)
-$1_targets = $(addprefix $1_, $(LANGUAGES))
+$1_targets := $(addprefix $1_, $(LANGUAGES))
 .PHONY: $1 $$($1_targets)
 $1: $$($1_targets)
 $$($1_targets): $1_%: vagrant/$1/%/Vagrantfile
@@ -736,14 +736,14 @@ $$($1_targets): $1_%: vagrant/$1/%/Vagrantfile
 	cd vagrant/$1/$$* && vagrant up
 
 #$$(info Create targets: sh_$1_<lang> vagrant machine (debug).)
-sh_$1_targets = $(addprefix sh_$1_, $(LANGUAGES))
+sh_$1_targets := $(addprefix sh_$1_, $(LANGUAGES))
 .PHONY: $$(sh_$1_targets)
 $$(sh_$1_targets): sh_$1_%:
 	cd vagrant/$1/$$* && vagrant up
 	cd vagrant/$1/$$* && vagrant ssh
 
 #$$(info Create targets: clean_$1)
-clean_$1_targets = $(addprefix clean_$1_, $(LANGUAGES))
+clean_$1_targets := $(addprefix clean_$1_, $(LANGUAGES))
 .PHONY: clean_$1 $(clean_$1_targets)
 clean_$1: $$(clean_$1_targets)
 $$(clean_$1_targets): clean_$1_%: