From e9ccb8e73bd4aeb688fb2a62d7f4918607d74ad6 Mon Sep 17 00:00:00 2001 From: Thibaut Cuvelier Date: Thu, 19 Dec 2024 22:36:15 +0100 Subject: [PATCH 1/7] Update Project.toml to the latest binaries --- ortools/julia/ORToolsGenerated.jl/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ortools/julia/ORToolsGenerated.jl/Project.toml b/ortools/julia/ORToolsGenerated.jl/Project.toml index 949d0df169..b43e65d4b4 100644 --- a/ortools/julia/ORToolsGenerated.jl/Project.toml +++ b/ortools/julia/ORToolsGenerated.jl/Project.toml @@ -6,7 +6,7 @@ version = "0.0.1" ORTools_jll = "717719f8-c30c-5086-8f3c-70cd6a1e3a46" [compat] -ORTools_jll = "9.7.0+2" +ORTools_jll = "9.11.0" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" From c8c5047aa530a5444a08426b3cc2f3cc13869a8b Mon Sep 17 00:00:00 2001 From: Thibaut Cuvelier Date: Fri, 20 Dec 2024 17:00:02 +0100 Subject: [PATCH 2/7] Update Project.toml to reflect the package's name. Also, add the Julia version in the dependencies to match the JLL. --- ortools/julia/ORToolsGenerated.jl/Project.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ortools/julia/ORToolsGenerated.jl/Project.toml b/ortools/julia/ORToolsGenerated.jl/Project.toml index b43e65d4b4..fbf10db30e 100644 --- a/ortools/julia/ORToolsGenerated.jl/Project.toml +++ b/ortools/julia/ORToolsGenerated.jl/Project.toml @@ -1,4 +1,4 @@ -name = "ORTools" +name = "ORToolsGenerated" uuid = "6b269722-41d3-11ee-be56-0242ac120002" version = "0.0.1" @@ -7,6 +7,7 @@ ORTools_jll = "717719f8-c30c-5086-8f3c-70cd6a1e3a46" [compat] ORTools_jll = "9.11.0" +julia = "1.9" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" From 337ef962f50e474339d23bef8c5421f5037efee4 Mon Sep 17 00:00:00 2001 From: Thibaut Cuvelier Date: Fri, 20 Dec 2024 17:23:57 +0100 Subject: [PATCH 3/7] Update Project.toml to include ProtoBuf.jl dependency The generator requires 1.0.15+. --- ortools/julia/ORToolsGenerated.jl/Project.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ortools/julia/ORToolsGenerated.jl/Project.toml b/ortools/julia/ORToolsGenerated.jl/Project.toml index fbf10db30e..7e5b6d4e3e 100644 --- a/ortools/julia/ORToolsGenerated.jl/Project.toml +++ b/ortools/julia/ORToolsGenerated.jl/Project.toml @@ -4,9 +4,11 @@ version = "0.0.1" [deps] ORTools_jll = "717719f8-c30c-5086-8f3c-70cd6a1e3a46" +ProtoBuf = "3349acd9-ac6a-5e09-bcdb-63829b23a429" [compat] ORTools_jll = "9.11.0" +ProtoBuf = "1.0.15" julia = "1.9" [extras] From df55695423778e1f57263340d407207e13594810 Mon Sep 17 00:00:00 2001 From: Thibaut Cuvelier Date: Fri, 20 Dec 2024 17:31:23 +0100 Subject: [PATCH 4/7] Update operations_research.jl: typo in generated code; to investigate later on. --- .../src/genproto/operations_research/operations_research.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ortools/julia/ORToolsGenerated.jl/src/genproto/operations_research/operations_research.jl b/ortools/julia/ORToolsGenerated.jl/src/genproto/operations_research/operations_research.jl index f37f1760d5..63379fb744 100644 --- a/ortools/julia/ORToolsGenerated.jl/src/genproto/operations_research/operations_research.jl +++ b/ortools/julia/ORToolsGenerated.jl/src/genproto/operations_research/operations_research.jl @@ -19,7 +19,7 @@ include("scheduling/scheduling.jl") include("glop/glop.jl") include("bop/bop.jl") include("packing/packing.jl") -include("ortools/pdlp/pdlp.jl") +include("pdlp/pdlp.jl") include("math_opt/math_opt.jl") end # module operations_research From ccd5969ea33ee257b0419d8d08988f7eacf60d4c Mon Sep 17 00:00:00 2001 From: Thibaut Cuvelier Date: Fri, 20 Dec 2024 17:31:49 +0100 Subject: [PATCH 5/7] Update google.jl: typo in generated code; very strange! --- ortools/julia/ORToolsGenerated.jl/src/genproto/google/google.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ortools/julia/ORToolsGenerated.jl/src/genproto/google/google.jl b/ortools/julia/ORToolsGenerated.jl/src/genproto/google/google.jl index 31fc82b542..25bf6b5d48 100644 --- a/ortools/julia/ORToolsGenerated.jl/src/genproto/google/google.jl +++ b/ortools/julia/ORToolsGenerated.jl/src/genproto/google/google.jl @@ -1,5 +1,5 @@ module google -include("google/protobuf/protobuf.jl") +include("protobuf/protobuf.jl") end # module google From 82914bc4f9490722acdce4e82adac0f8e11ff967 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 23:45:54 +0000 Subject: [PATCH 6/7] build(deps): bump jinja2 from 3.1.3 to 3.1.5 in /bazel in the pip group Bumps the pip group in /bazel with 1 update: [jinja2](https://github.com/pallets/jinja). Updates `jinja2` from 3.1.3 to 3.1.5 - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/3.1.3...3.1.5) --- updated-dependencies: - dependency-name: jinja2 dependency-type: indirect dependency-group: pip ... Signed-off-by: dependabot[bot] --- bazel/notebook_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/notebook_requirements.txt b/bazel/notebook_requirements.txt index ce03f7210e..40a635be75 100644 --- a/bazel/notebook_requirements.txt +++ b/bazel/notebook_requirements.txt @@ -85,7 +85,7 @@ isoduration==20.11.0 # via jsonschema jedi==0.19.0 # via ipython -jinja2==3.1.3 +jinja2==3.1.5 # via # jupyter-server # jupyterlab From f99e8e981e13035bb7ef074776525ad275182ef6 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Tue, 7 Jan 2025 15:12:50 +0100 Subject: [PATCH 7/7] cmake: math_opt add core/c_api --- ortools/math_opt/core/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ortools/math_opt/core/CMakeLists.txt b/ortools/math_opt/core/CMakeLists.txt index 3516545a40..f6e0f9d201 100644 --- a/ortools/math_opt/core/CMakeLists.txt +++ b/ortools/math_opt/core/CMakeLists.txt @@ -12,6 +12,7 @@ # limitations under the License. file(GLOB _SRCS "*.h" "*.cc") +list(APPEND _SRCS "${CMAKE_CURRENT_SOURCE_DIR}/c_api/solver.cc") list(FILTER _SRCS EXCLUDE REGEX "/[^/]*_test\\.cc$") set(NAME ${PROJECT_NAME}_math_opt_core)