From a79c10d717c433b80ee8502c4958c2cfda0ecbe4 Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Thu, 5 Dec 2024 13:57:41 +0100 Subject: [PATCH] bazel: remove scip override --- MODULE.bazel | 10 +- bazel/scip-v920.patch | 402 ------------------------------------------ 2 files changed, 1 insertion(+), 411 deletions(-) delete mode 100644 bazel/scip-v920.patch diff --git a/MODULE.bazel b/MODULE.bazel index f8a02d7a57..891031bd0a 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -36,7 +36,7 @@ bazel_dep(name = "rules_jvm_external", version = "6.4") bazel_dep(name = "rules_license", version = "1.0.0") bazel_dep(name = "rules_proto", version = "6.0.2") bazel_dep(name = "rules_python", version = "0.37.2") -bazel_dep(name = "scip", version = "9.2.0") +bazel_dep(name = "scip", version = "9.2.0.bcr.1") bazel_dep(name = "swig", version = "4.2.0") bazel_dep(name = "zlib", version = "1.3.1.bcr.3") @@ -48,14 +48,6 @@ git_override( remote = "https://github.com/pybind/pybind11_abseil.git", ) -git_override( - module_name = "scip", - commit = "74cea9222e98f7351dc4540f562a6dfa4c1d7595", - patch_strip = 1, - patches = ["//bazel:scip-v920.patch"], - remote = "https://github.com/scipopt/scip.git", -) - SUPPORTED_PYTHON_VERSIONS = [ "3.9", "3.10", diff --git a/bazel/scip-v920.patch b/bazel/scip-v920.patch deleted file mode 100644 index fc9964c44b..0000000000 --- a/bazel/scip-v920.patch +++ /dev/null @@ -1,402 +0,0 @@ -diff --git a/BUILD.bazel b/BUILD.bazel -new file mode 100644 -index 0000000000..36283fe63d ---- /dev/null -+++ b/BUILD.bazel -@@ -0,0 +1,139 @@ -+# Copyright 2010-2024 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. -+ -+exports_files( -+ ["src/lpi/lpi_glop.cpp"], -+) -+ -+config_setting( -+ name = "on_linux", -+ constraint_values = [ -+ "@platforms//os:linux", -+ ], -+) -+ -+config_setting( -+ name = "on_macos", -+ constraint_values = [ -+ "@platforms//os:macos", -+ ], -+) -+ -+config_setting( -+ name = "on_windows", -+ constraint_values = [ -+ "@platforms//os:windows", -+ ], -+) -+ -+PLATFORM_FLAGS = select({ -+ "on_linux": [ -+ "-Wunknown-pragmas", -+ "-fexceptions", -+ "-DSYM=bliss", -+ ], -+ "on_macos": [ -+ "-Wunknown-pragmas", -+ "-fexceptions", -+ "-DSYM=bliss", -+ ], -+ "on_windows": [ -+ "/DSYM=none", -+ "/DSCIP_NO_SIGACTION", -+ "/DSCIP_NO_STRTOK_R", -+ ], -+ "//conditions:default": [], -+}) -+ -+PLATFORM_DEPS = select({ -+ "on_linux": ["@bliss"], -+ "on_macos": ["@bliss"], -+ "on_windows": [], -+ "//conditions:default": [], -+}) -+ -+BLISS_FILE = select({ -+ "on_linux": ["src/symmetry/compute_symmetry_bliss.cpp"], -+ "on_macos": ["src/symmetry/compute_symmetry_bliss.cpp"], -+ "on_windows": ["src/symmetry/compute_symmetry_none.cpp"], -+ "//conditions:default": ["src/symmetry/compute_symmetry_none.cpp"], -+}) -+ -+BASE_SRCS = glob( -+ [ -+ "src/*/*.c", -+ ], -+ exclude = [ -+ "src/lpi/lpi_*.c", -+ "src/nauty/*", -+ "src/scip/exprinterpret_*.c", -+ "src/scip/nlpi_filtersqp.c", -+ "src/scip/nlpi_worhp.c", -+ "src/scip/*_xyz.c", -+ "src/scip/sorttpl.c", -+ "src/symmetry/compute_symmetry_*.cpp", -+ "src/symmetry/*nauty*", -+ "src/tpi/tpi_*.c", -+ ], -+) -+ -+BASE_HDRS = glob( -+ [ -+ "src/*/*.h", -+ "src/*/*.hpp", -+ "src/scip/githash.c", -+ "src/scip/sorttpl.c", -+ "src/scip/buildflags.c", -+ ], -+ exclude = [ "src/scip/*_xyz.h" ], -+) -+ -+BASE_COPTS = [ -+ "$(STACK_FRAME_UNLIMITED)", # src/scip/reader_cnf.c -+ "-DSCIP_IPOPT=\\\"NONE\\\"", -+ "-DSCIP_LPS=\\\"glop\\\"", -+ "-DSCIP_GITHASH=\\\"a740f0891e\\\"", -+] -+ -+ -+DEFINES = [ -+ # Scip optionally depends on scip/config.h and scip/scip_export.h -+ # that are generated by build system. -+ # -+ # We need every library and binary that depends on SCIP libraries to -+ # define this macro. That is why we use `defines' here instead of -+ # `copts' or `local_defines'. -+ "NO_CONFIG_HEADER", -+] -+ -+cc_library( -+ name = "scip", -+ srcs = BASE_SRCS + BLISS_FILE + [ -+ "src/scip/exprinterpret_none.c", -+ "src/tpi/tpi_tnycthrd.c", -+ ], -+ hdrs = BASE_HDRS, -+ copts = BASE_COPTS + [ -+ "-DTPI_TNY", # src/tpi/tpi_tnycthrd.h -+ "-DPARASCIP", -+ ] + PLATFORM_FLAGS, -+ defines = DEFINES, -+ features = ["-parse_headers"], -+ includes = [ -+ "src", -+ ], -+ visibility = ["//visibility:public"], -+ deps = [ -+ "@zlib", -+ ] + PLATFORM_DEPS, -+) -diff --git a/MODULE.bazel b/MODULE.bazel -new file mode 100644 -index 0000000000..b2a03c509f ---- /dev/null -+++ b/MODULE.bazel -@@ -0,0 +1,18 @@ -+module( -+ name = "scip", -+ version = "9.2.0.bcr.1", -+ compatibility_level = 1, -+) -+ -+bazel_dep( -+ name = "bliss", -+ version = "0.73", -+) -+bazel_dep( -+ name = "platforms", -+ version = "0.0.9", -+) -+bazel_dep( -+ name = "zlib", -+ version = "1.2.13", -+) -diff --git a/src/scip/buildflags.h b/src/scip/buildflags.h -new file mode 100644 -index 0000000000..c686abcd20 ---- /dev/null -+++ b/src/scip/buildflags.h -@@ -0,0 +1,59 @@ -+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -+/* */ -+/* This file is part of the program and library */ -+/* SCIP --- Solving Constraint Integer Programs */ -+/* */ -+/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */ -+/* */ -+/* 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. */ -+/* */ -+/* You should have received a copy of the Apache-2.0 license */ -+/* along with SCIP; see the file LICENSE. If not visit scipopt.org. */ -+/* */ -+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -+ -+/**@file buildflags.h -+ * @brief build flags methods -+ * @author Felipe Serrano -+ */ -+ -+/*---+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8----+----9----+----0----+----1----+----2*/ -+ -+#define SCIP_BUILDFLAGS \ -+ "ARCH=arm64\n " \ -+ "OSTYPE=Darwin-23.6.0\n " \ -+ "COMP=AppleClang 16.0.0.16000026\n " \ -+ "BUILD=Release\n " \ -+ "DEBUGSOL=OFF\n " \ -+ "EXPRINT=none\n " \ -+ "SYM=none\n " \ -+ "GMP=OFF\n " \ -+ "IPOPT=OFF\n " \ -+ "WORHP=OFF\n " \ -+ "LPS=glop\n " \ -+ "LPSCHECK=OFF\n " \ -+ "NOBLKBUFMEM=OFF\n " \ -+ "NOBLKMEM=OFF\n " \ -+ "NOBUFMEM=OFF\n " \ -+ "THREADSAFE=ON; " \ -+ "FORCE\n " \ -+ "READLINE=OFF\n " \ -+ "SANITIZE_ADDRESS=OFF\n " \ -+ "SANITIZE_MEMORY=OFF\n " \ -+ "SANITIZE_UNDEFINED=OFF\n " \ -+ "SANITIZE_THREAD=OFF\n " \ -+ "SHARED=OFF\n " \ -+ "VERSION=9.2.0.0\n " \ -+ "API_VERSION=115\n " \ -+ "ZIMPL=OFF\n " \ -+ "ZLIB=ON" -diff --git a/src/scip/config.h b/src/scip/config.h -new file mode 100644 -index 0000000000..718ffce3b0 ---- /dev/null -+++ b/src/scip/config.h -@@ -0,0 +1,31 @@ -+#ifndef __CONFIG_H__ -+#define __CONFIG_H__ -+ -+#define CMAKE_BUILD_TYPE "Release" -+#define SCIP_VERSION_MAJOR 9 -+#define SCIP_VERSION_MINOR 2 -+#define SCIP_VERSION_PATCH 0 -+#define SCIP_VERSION_SUB 0 -+#define SCIP_VERSION_API 115 -+/* #undef BMS_NOBLOCKMEM */ -+/* #undef SCIP_NOBUFFERMEM */ -+/* #undef WITH_DEBUG_SOLUTION */ -+/* #undef SCIP_NO_SIGACTION */ -+/* #undef SCIP_NO_STRTOK_R */ -+/* #undef TPI_NONE */ -+/* #undef TPI_OMP */ -+#define SCIP_THREADSAFE -+#define WITH_SCIPDEF -+/* #undef SCIP_WITH_LAPACK */ -+/* #undef SCIP_WITH_PAPILO */ -+#define SCIP_WITH_ZLIB -+/* #undef SCIP_WITH_READLINE */ -+/* #undef SCIP_WITH_GMP */ -+/* #undef SCIP_WITH_LPSCHECK */ -+/* #undef SCIP_WITH_ZIMPL */ -+/* #undef SCIP_WITH_AMPL */ -+#define SCIP_ROUNDING_FE -+/* #undef SCIP_ROUNDING_FP */ -+/* #undef SCIP_ROUNDING_MS */ -+ -+#endif -diff --git a/src/scip/githash.c b/src/scip/githash.c -new file mode 100644 -index 0000000000..8b13789179 ---- /dev/null -+++ b/src/scip/githash.c -@@ -0,0 +1 @@ -+ -diff --git a/src/scip/scip_export.h b/src/scip/scip_export.h -new file mode 100644 -index 0000000000..5fcb08e6b8 ---- /dev/null -+++ b/src/scip/scip_export.h -@@ -0,0 +1,24 @@ -+ -+#ifndef SCIP_EXPORT_H -+#define SCIP_EXPORT_H -+ -+#ifdef SCIP_STATIC_DEFINE -+# define SCIP_EXPORT -+# define SCIP_NO_EXPORT -+#else -+# ifndef SCIP_EXPORT -+# ifdef libscip_EXPORTS -+/* We are building this library */ -+# define SCIP_EXPORT -+# else -+/* We are using this library */ -+# define SCIP_EXPORT -+# endif -+# endif -+ -+# ifndef SCIP_NO_EXPORT -+# define SCIP_NO_EXPORT -+# endif -+#endif -+ -+#endif /* SCIP_EXPORT_H */ -diff --git a/BUILD.bazel b/BUILD.bazel -index 36283fe63d..7acd4b8709 100644 ---- a/BUILD.bazel -+++ b/BUILD.bazel -@@ -118,6 +118,28 @@ DEFINES = [ - - cc_library( - name = "scip", -+ srcs = BASE_SRCS + BLISS_FILE + [ -+ "src/scip/exprinterpret_none.c", -+ "src/tpi/tpi_none.c", -+ ], -+ hdrs = BASE_HDRS, -+ copts = BASE_COPTS + [ -+ "-DTPI_NONE", # src/tpi/tpi_none.h -+ "-DNPARASCIP", -+ ] + PLATFORM_FLAGS, -+ defines = DEFINES, -+ features = ["-parse_headers"], -+ includes = [ -+ "src", -+ ], -+ visibility = ["//visibility:public"], -+ deps = [ -+ "@zlib", -+ ] + PLATFORM_DEPS, -+) -+ -+cc_library( -+ name = "scip_parallel", - srcs = BASE_SRCS + BLISS_FILE + [ - "src/scip/exprinterpret_none.c", - "src/tpi/tpi_tnycthrd.c", -diff --git a/src/lpi/lpi_glop.cpp b/src/lpi/lpi_glop.cpp -index a90120188a..26fe768436 100644 ---- a/src/lpi/lpi_glop.cpp -+++ b/src/lpi/lpi_glop.cpp -@@ -51,7 +51,6 @@ - #include "ortools/util/time_limit.h" - - #include "ortools/base/logging.h" --#include "ortools/base/vlog_is_on.h" - - #include "lpi/lpi.h" - #include "scip/pub_message.h" -@@ -2942,12 +2941,12 @@ SCIP_RETCODE SCIPlpiSetIntpar( - SCIPdebugMessage("SCIPlpiSetIntpar: SCIP_LPPAR_LPINFO -> %d.\n", ival); - if ( ival == 0 ) - { -- (void) google::SetVLOGLevel("*", google::GLOG_INFO); -+ absl::SetFlag(&FLAGS_stderrthreshold, 2); - lpi->lp_info = false; - } - else - { -- (void) google::SetVLOGLevel("*", google::GLOG_ERROR); -+ absl::SetFlag(&FLAGS_stderrthreshold, 0); - lpi->lp_info = true; - } - break; -@@ -3190,7 +3189,7 @@ SCIP_RETCODE SCIPlpiReadLP( - - const std::string filespec(fname); - MPModelProto proto; -- if ( ! ReadFileToProto(filespec, &proto) ) -+ if ( ! ReadFileToProto(filespec, &proto).ok() ) - { - SCIPerrorMessage("Could not read <%s>\n", fname); - return SCIP_READERROR; -@@ -3214,7 +3213,7 @@ SCIP_RETCODE SCIPlpiWriteLP( - MPModelProto proto; - LinearProgramToMPModelProto(*lpi->linear_program, &proto); - const std::string filespec(fname); -- if ( ! WriteProtoToFile(filespec, proto, operations_research::ProtoWriteFormat::kProtoText, true) ) -+ if ( ! WriteProtoToFile(filespec, proto, operations_research::ProtoWriteFormat::kProtoText, true).ok() ) - { - SCIPerrorMessage("Could not write <%s>\n", fname); - return SCIP_READERROR; -diff --git a/src/symmetry/compute_symmetry_bliss.cpp b/src/symmetry/compute_symmetry_bliss.cpp -index 0ba5ea060e..426a6f90f3 100644 ---- a/src/symmetry/compute_symmetry_bliss.cpp -+++ b/src/symmetry/compute_symmetry_bliss.cpp -@@ -34,8 +34,9 @@ - #include "compute_symmetry.h" - - /* include bliss graph */ --#include --#include -+#define BLISS_VERSION "0.73" -+#include -+#include - - #include - #include