diff --git a/Dependencies.txt b/Dependencies.txt index 85bcc6682a..c9ebed0a22 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -9,7 +9,7 @@ Clp=1.17.10 Cgl=0.60.9 Cbc=2.10.12 GLPK=5.0 -HiGHS=v1.9.0 +HiGHS=v1.10.0 Scip=v922 # Python pybind11=v2.13.6 diff --git a/bazel/swig_python.bzl b/bazel/swig_python.bzl deleted file mode 100644 index 67067c6fee..0000000000 --- a/bazel/swig_python.bzl +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 2010-2025 Google LLC -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -""" Bazel rules for building swig files.""" - -def _py_wrap_cc_impl(ctx): - srcs = ctx.files.srcs - if len(srcs) != 1: - fail("Exactly one SWIG source file label must be specified.", "srcs") - module_name = ctx.attr.module_name - src = ctx.files.srcs[0] - inputs = set([src]) - inputs += ctx.files.i_includes - for dep in ctx.attr.deps: - inputs += dep.cc.transitive_headers - inputs += ctx.files._swiglib - inputs += ctx.files.toolchain_deps - swig_include_dirs = set(_get_repository_roots(ctx, inputs)) - swig_include_dirs += sorted([f.dirname for f in ctx.files._swiglib]) - args = [ - "-c++", - "-python", - "-module", - module_name, - "-o", - ctx.outputs.cc_out.path, - "-outdir", - ctx.outputs.py_out.dirname, - ] - args += ["-l" + f.path for f in ctx.files.i_includes] - args += ["-I" + i for i in swig_include_dirs] - args.append(src.path) - outputs = [ctx.outputs.cc_out, ctx.outputs.py_out] - ctx.actions.run( - executable = ctx.executable._swig, - arguments = args, - inputs = list(inputs), - outputs = outputs, - mnemonic = "PythonSwig", - progress_message = "SWIGing " + src.path, - ) - return [ - DefaultInfo(files = depset(outputs)), - ] - -_py_wrap_cc = rule( - attrs = { - "srcs": attr.label_list( - mandatory = True, - allow_files = True, - ), - "swig_includes": attr.label_list( - allow_files = True, - ), - "deps": attr.label_list( - allow_files = True, - providers = ["cc"], - ), - "toolchain_deps": attr.label_list( - allow_files = True, - ), - "module_name": attr.string(mandatory = True), - "py_module_name": attr.string(mandatory = True), - "_swig": attr.label( - default = Label("@swig//:swig"), - executable = True, - cfg = "exec", - ), - "_swiglib": attr.label( - default = Label("@swig//:templates"), - allow_files = True, - ), - }, - outputs = { - "cc_out": "%{module_name}.cc", - "py_out": "%{py_module_name}.py", - }, - implementation = _py_wrap_cc_impl, -) diff --git a/cmake/README.md b/cmake/README.md index 9d18ecbd56..a233fb8142 100644 --- a/cmake/README.md +++ b/cmake/README.md @@ -7,6 +7,7 @@ | amd64 MacOS | [![Status][amd64_macos_cpp_svg]][amd64_macos_cpp_link] | [![Status][amd64_macos_python_svg]][amd64_macos_python_link] | [![Status][amd64_macos_java_svg]][amd64_macos_java_link] | [![Status][amd64_macos_dotnet_svg]][amd64_macos_dotnet_link] | | amd64 Windows | [![Status][windows_cpp_svg]][windows_cpp_link] | [![Status][windows_python_svg]][windows_python_link] | [![Status][windows_java_svg]][windows_java_link] | [![Status][windows_dotnet_svg]][windows_dotnet_link] | + [linux_cpp_svg]: ./../../../actions/workflows/amd64_linux_cmake_cpp.yml/badge.svg?branch=main [linux_cpp_link]: ./../../../actions/workflows/amd64_linux_cmake_cpp.yml [linux_python_svg]: ./../../../actions/workflows/amd64_linux_cmake_python.yml/badge.svg?branch=main @@ -43,7 +44,8 @@ [windows_dotnet_svg]: ./../../../actions/workflows/amd64_windows_cmake_dotnet.yml/badge.svg?branch=main [windows_dotnet_link]: ./../../../actions/workflows/amd64_windows_cmake_dotnet.yml -Dockers \[AlmaLinux, Alpine, Archlinux, Debian, Fedora, OpenSuse, RockyLinux, Ubuntu\]x +Dockers: +\[AlmaLinux, Alpine, Archlinux, Debian, Fedora, OpenSuse, RockyLinux, Ubuntu\]x \[C++, Python, Java, .Net\]: [![Status][docker_svg]][docker_link] [docker_svg]: ./../../../actions/workflows/amd64_docker_cmake.yml/badge.svg?branch=main