bazel: remove dead code
This commit is contained in:
@@ -15,18 +15,10 @@ load("@rules_python//python:pip.bzl", "compile_pip_requirements")
|
||||
|
||||
exports_files([
|
||||
"archive_helper.bzl",
|
||||
"bliss-0.73.patch",
|
||||
"bliss.BUILD.bazel",
|
||||
"glpk.BUILD.bazel",
|
||||
"notebook_requirements.in",
|
||||
"notebook_requirements.txt",
|
||||
"ortools_requirements.in",
|
||||
"ortools_requirements.txt",
|
||||
"pcre2.BUILD.bazel",
|
||||
"scip-v900.patch",
|
||||
"scip.BUILD.bazel",
|
||||
"swig.BUILD.bazel",
|
||||
"swig.patch",
|
||||
])
|
||||
|
||||
compile_pip_requirements(
|
||||
|
||||
@@ -1,147 +0,0 @@
|
||||
diff -u bliss-0.73.orig/graph.cc bliss-0.73/graph.cc
|
||||
--- bliss-0.73.orig/graph.cc 2015-09-01 09:23:10.000000000 +0200
|
||||
+++ bliss-0.73/graph.cc 2020-07-03 10:11:29.480649776 +0200
|
||||
@@ -67,6 +67,9 @@
|
||||
|
||||
report_hook = 0;
|
||||
report_user_param = 0;
|
||||
+
|
||||
+ limit_search_nodes = 0;
|
||||
+ limit_generators = 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -609,13 +612,7 @@
|
||||
|
||||
|
||||
|
||||
-
|
||||
-typedef struct {
|
||||
- unsigned int splitting_element;
|
||||
- unsigned int certificate_index;
|
||||
- unsigned int subcertificate_length;
|
||||
- UintSeqHash eqref_hash;
|
||||
-} PathInfo;
|
||||
+// struct PathInfo moved to graph.hh by Thomas Rehn, 2011-07-12
|
||||
|
||||
|
||||
void
|
||||
@@ -745,7 +742,7 @@
|
||||
initialize_certificate();
|
||||
|
||||
std::vector<TreeNode> search_stack;
|
||||
- std::vector<PathInfo> first_path_info;
|
||||
+ // first_path_info moved to graph.hh by Thomas Rehn, 2011-07-12
|
||||
std::vector<PathInfo> best_path_info;
|
||||
|
||||
search_stack.clear();
|
||||
@@ -1054,6 +1051,8 @@
|
||||
const unsigned int child_level = current_level+1;
|
||||
/* Update some statistics */
|
||||
stats.nof_nodes++;
|
||||
+ if (limit_search_nodes && stats.nof_nodes >= limit_search_nodes)
|
||||
+ break;
|
||||
if(search_stack.size() > stats.max_level)
|
||||
stats.max_level = search_stack.size();
|
||||
|
||||
@@ -1642,6 +1641,8 @@
|
||||
best_path_automorphism);
|
||||
/* Update statistics */
|
||||
stats.nof_generators++;
|
||||
+ if (limit_generators && stats.nof_generators >= limit_generators)
|
||||
+ break;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1733,6 +1734,8 @@
|
||||
|
||||
/* Update statistics */
|
||||
stats.nof_generators++;
|
||||
+ if (limit_generators && stats.nof_generators >= limit_generators)
|
||||
+ break;
|
||||
continue;
|
||||
|
||||
} /* while(!search_stack.empty()) */
|
||||
@@ -5452,7 +5455,7 @@
|
||||
component.clear();
|
||||
component_elements = 0;
|
||||
sh_return = 0;
|
||||
- unsigned int sh_first = 0;
|
||||
+ unsigned int sh_first = 1 << 31;
|
||||
unsigned int sh_size = 0;
|
||||
unsigned int sh_nuconn = 0;
|
||||
|
||||
Seulement dans bliss-0.73: graph.cc.orig
|
||||
diff -u bliss-0.73.orig/graph.hh bliss-0.73/graph.hh
|
||||
--- bliss-0.73.orig/graph.hh 2015-09-01 09:23:10.000000000 +0200
|
||||
+++ bliss-0.73/graph.hh 2020-07-03 10:11:29.484649847 +0200
|
||||
@@ -20,6 +20,9 @@
|
||||
along with bliss. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
+/** This is a patched version of bliss by Thomas Rehn extended by method AbstractGraph::set_search_limits() */
|
||||
+#define BLISS_PATCH_PRESENT
|
||||
+
|
||||
/**
|
||||
* \namespace bliss
|
||||
* The namespace bliss contains all the classes and functions of the bliss
|
||||
@@ -111,6 +114,14 @@
|
||||
|
||||
|
||||
|
||||
+/** moved here from graph.cc by Thomas Rehn, 2011-07-12 */
|
||||
+typedef struct {
|
||||
+ unsigned int splitting_element;
|
||||
+ unsigned int certificate_index;
|
||||
+ unsigned int subcertificate_length;
|
||||
+ UintSeqHash eqref_hash;
|
||||
+} PathInfo;
|
||||
+
|
||||
|
||||
|
||||
|
||||
@@ -284,7 +295,20 @@
|
||||
opt_use_long_prune = active;
|
||||
}
|
||||
|
||||
+ /// information vector about first path
|
||||
+ /** added by Thomas Rehn, 2011-07-12 */
|
||||
+ std::vector<PathInfo> get_first_path_info() { return first_path_info; }
|
||||
|
||||
+ /// limits number of search nodes and generators during the backtrack search
|
||||
+ /** added by Thomas Rehn, 2012-01-12
|
||||
+ *
|
||||
+ * \param searchNodeLimit if non-zero, limits the number of search nodes in search tree
|
||||
+ * \param generatorLimit if non-zero, limits the maximal number of automorphism group generators to be found
|
||||
+ */
|
||||
+ void set_search_limits(const unsigned int searchNodeLimit, const unsigned int generatorLimit) {
|
||||
+ limit_search_nodes = searchNodeLimit;
|
||||
+ limit_generators = generatorLimit;
|
||||
+ }
|
||||
|
||||
protected:
|
||||
/** \internal
|
||||
@@ -519,6 +543,11 @@
|
||||
|
||||
|
||||
|
||||
+ /** added by Thomas Rehn, 2011-07-12 */
|
||||
+ std::vector<PathInfo> first_path_info;
|
||||
+
|
||||
+ unsigned int limit_search_nodes;
|
||||
+ unsigned int limit_generators;
|
||||
};
|
||||
|
||||
|
||||
diff -u bliss-0.73.orig/Makefile bliss-0.73/Makefile
|
||||
--- bliss-0.73.orig/Makefile 2015-09-01 09:23:10.000000000 +0200
|
||||
+++ bliss-0.73/Makefile 2020-07-03 10:11:29.484649847 +0200
|
||||
@@ -5,7 +5,7 @@
|
||||
CFLAGS += --pedantic
|
||||
CFLAGS += -O9
|
||||
#CFLAGS += -DBLISS_DEBUG
|
||||
-CFLAGS += -fPIC
|
||||
+CFLAGS += -fPIC -fvisibility=hidden -fvisibility-inlines-hidden
|
||||
|
||||
SRCS = defs.cc graph.cc partition.cc orbit.cc uintseqhash.cc heap.cc
|
||||
SRCS += timer.cc utils.cc bliss_C.cc
|
||||
@@ -1,43 +0,0 @@
|
||||
# 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.
|
||||
|
||||
cc_library(
|
||||
name = "libbliss",
|
||||
srcs = [
|
||||
"bliss-0.73/bliss_C.cc",
|
||||
"bliss-0.73/defs.cc",
|
||||
"bliss-0.73/graph.cc",
|
||||
"bliss-0.73/heap.cc",
|
||||
"bliss-0.73/orbit.cc",
|
||||
"bliss-0.73/partition.cc",
|
||||
"bliss-0.73/timer.cc",
|
||||
"bliss-0.73/uintseqhash.cc",
|
||||
"bliss-0.73/utils.cc",
|
||||
],
|
||||
hdrs = [
|
||||
"bliss-0.73/bignum.hh",
|
||||
"bliss-0.73/bliss_C.h",
|
||||
"bliss-0.73/defs.hh",
|
||||
"bliss-0.73/graph.hh",
|
||||
"bliss-0.73/heap.hh",
|
||||
"bliss-0.73/kqueue.hh",
|
||||
"bliss-0.73/kstack.hh",
|
||||
"bliss-0.73/orbit.hh",
|
||||
"bliss-0.73/partition.hh",
|
||||
"bliss-0.73/timer.hh",
|
||||
"bliss-0.73/uintseqhash.hh",
|
||||
"bliss-0.73/utils.hh",
|
||||
],
|
||||
includes = ["."],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
@@ -1,51 +0,0 @@
|
||||
# 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.
|
||||
|
||||
cc_library(
|
||||
name = "glpk",
|
||||
srcs = glob(
|
||||
[
|
||||
"src/*.c",
|
||||
"src/*/*.c",
|
||||
"src/*.h",
|
||||
"src/*/*.h",
|
||||
],
|
||||
exclude = [
|
||||
"src/proxy/main.c",
|
||||
"src/zlib/*",
|
||||
],
|
||||
),
|
||||
hdrs = [
|
||||
"src/glpk.h",
|
||||
],
|
||||
copts = [
|
||||
"-w",
|
||||
"-Iexternal/glpk/src",
|
||||
"-Iexternal/glpk/src/amd",
|
||||
"-Iexternal/glpk/src/api",
|
||||
"-Iexternal/glpk/src/bflib",
|
||||
"-Iexternal/glpk/src/colamd",
|
||||
"-Iexternal/glpk/src/draft",
|
||||
"-Iexternal/glpk/src/env",
|
||||
"-Iexternal/glpk/src/intopt",
|
||||
"-Iexternal/glpk/src/minisat",
|
||||
"-Iexternal/glpk/src/misc",
|
||||
"-Iexternal/glpk/src/mpl",
|
||||
"-Iexternal/glpk/src/npp",
|
||||
"-Iexternal/glpk/src/proxy",
|
||||
"-Iexternal/glpk/src/simplex",
|
||||
],
|
||||
deps = ["@zlib"],
|
||||
includes = ["src"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
@@ -1,85 +0,0 @@
|
||||
# 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.
|
||||
|
||||
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
|
||||
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
|
||||
|
||||
copy_file(
|
||||
name = "config_h_generic",
|
||||
src = "src/config.h.generic",
|
||||
out = "src/config.h",
|
||||
)
|
||||
|
||||
copy_file(
|
||||
name = "pcre2_h_generic",
|
||||
src = "src/pcre2.h.generic",
|
||||
out = "src/pcre2.h",
|
||||
)
|
||||
|
||||
copy_file(
|
||||
name = "pcre2_chartables_c",
|
||||
src = "src/pcre2_chartables.c.dist",
|
||||
out = "src/pcre2_chartables.c",
|
||||
)
|
||||
|
||||
cc_library(
|
||||
name = "pcre2",
|
||||
srcs = [
|
||||
"src/pcre2_auto_possess.c",
|
||||
"src/pcre2_compile.c",
|
||||
"src/pcre2_config.c",
|
||||
"src/pcre2_context.c",
|
||||
"src/pcre2_convert.c",
|
||||
"src/pcre2_dfa_match.c",
|
||||
"src/pcre2_error.c",
|
||||
"src/pcre2_extuni.c",
|
||||
"src/pcre2_find_bracket.c",
|
||||
"src/pcre2_maketables.c",
|
||||
"src/pcre2_match.c",
|
||||
"src/pcre2_match_data.c",
|
||||
"src/pcre2_newline.c",
|
||||
"src/pcre2_ord2utf.c",
|
||||
"src/pcre2_pattern_info.c",
|
||||
"src/pcre2_script_run.c",
|
||||
"src/pcre2_serialize.c",
|
||||
"src/pcre2_string_utils.c",
|
||||
"src/pcre2_study.c",
|
||||
"src/pcre2_substitute.c",
|
||||
"src/pcre2_substring.c",
|
||||
"src/pcre2_tables.c",
|
||||
"src/pcre2_ucd.c",
|
||||
"src/pcre2_ucptables.c",
|
||||
"src/pcre2_valid_utf.c",
|
||||
"src/pcre2_xclass.c",
|
||||
":pcre2_chartables_c",
|
||||
],
|
||||
hdrs = glob(["src/*.h"]) + [
|
||||
":config_h_generic",
|
||||
":pcre2_h_generic",
|
||||
],
|
||||
defines = [
|
||||
"HAVE_CONFIG_H",
|
||||
"PCRE2_CODE_UNIT_WIDTH=8",
|
||||
"PCRE2_STATIC",
|
||||
],
|
||||
includes = ["src"],
|
||||
strip_include_prefix = "src",
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
cc_binary(
|
||||
name = "pcre2demo",
|
||||
srcs = ["src/pcre2demo.c"],
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [":pcre2"],
|
||||
)
|
||||
@@ -1,225 +0,0 @@
|
||||
diff --git a/src/lpi/lpi_glop.cpp b/src/lpi/lpi_glop.cpp
|
||||
index a90120188a..664cb4d097 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/scip/config.h b/src/scip/config.h
|
||||
new file mode 100644
|
||||
index 0000000000..871fde8e55
|
||||
--- /dev/null
|
||||
+++ b/src/scip/config.h
|
||||
@@ -0,0 +1,32 @@
|
||||
+#ifndef __CONFIG_H__
|
||||
+#define __CONFIG_H__
|
||||
+
|
||||
+#define CMAKE_BUILD_TYPE "Release"
|
||||
+#define SCIP_VERSION_MAJOR 9
|
||||
+#define SCIP_VERSION_MINOR 0
|
||||
+#define SCIP_VERSION_PATCH 0
|
||||
+#define SCIP_VERSION_SUB 0
|
||||
+#define SCIP_VERSION_API 114
|
||||
+/* #undef BMS_NOBLOCKMEM */
|
||||
+/* #undef SCIP_NOBUFFERMEM */
|
||||
+/* #undef WITH_DEBUG_SOLUTION */
|
||||
+/* #undef SCIP_NO_SIGACTION */
|
||||
+/* #undef SCIP_NO_STRTOK_R */
|
||||
+/* #undef TPI_NONE */
|
||||
+#define TPI_NONE
|
||||
+/* #undef TPI_OMP */
|
||||
+#define SCIP_THREADSAFE
|
||||
+#define WITH_SCIPDEF
|
||||
+/* #undef SCIP_WITH_LAPACK */
|
||||
+/* #undef SCIP_WITH_PAPILO */
|
||||
+/* #undef 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..4b1dfc587f
|
||||
--- /dev/null
|
||||
+++ b/src/scip/githash.c
|
||||
@@ -0,0 +1 @@
|
||||
+#define SCIP_GITHASH "7205bedd94"
|
||||
diff --git a/src/scip/scip_export.h b/src/scip/scip_export.h
|
||||
new file mode 100644
|
||||
index 0000000000..8bf2aaefa5
|
||||
--- /dev/null
|
||||
+++ b/src/scip/scip_export.h
|
||||
@@ -0,0 +1,42 @@
|
||||
+
|
||||
+#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
|
||||
+
|
||||
+#ifndef SCIP_DEPRECATED
|
||||
+# define SCIP_DEPRECATED __attribute__ ((__deprecated__))
|
||||
+#endif
|
||||
+
|
||||
+#ifndef SCIP_DEPRECATED_EXPORT
|
||||
+# define SCIP_DEPRECATED_EXPORT SCIP_EXPORT SCIP_DEPRECATED
|
||||
+#endif
|
||||
+
|
||||
+#ifndef SCIP_DEPRECATED_NO_EXPORT
|
||||
+# define SCIP_DEPRECATED_NO_EXPORT SCIP_NO_EXPORT SCIP_DEPRECATED
|
||||
+#endif
|
||||
+
|
||||
+#if 0 /* DEFINE_NO_DEPRECATED */
|
||||
+# ifndef SCIP_NO_DEPRECATED
|
||||
+# define SCIP_NO_DEPRECATED
|
||||
+# endif
|
||||
+#endif
|
||||
+
|
||||
+#endif /* SCIP_EXPORT_H */
|
||||
diff --git a/src/scip/scipbuildflag.c b/src/scip/scipbuildflag.c
|
||||
new file mode 100644
|
||||
index 0000000000..2af785150e
|
||||
--- /dev/null
|
||||
+++ b/src/scip/scipbuildflag.c
|
||||
@@ -0,0 +1,65 @@
|
||||
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||
+/* */
|
||||
+/* 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 scipbuildflags.c
|
||||
+ * @brief build flags methods
|
||||
+ * @author Felipe Serrano
|
||||
+ */
|
||||
+
|
||||
+/*---+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8----+----9----+----0----+----1----+----2*/
|
||||
+
|
||||
+#include "scip/scipbuildflags.h"
|
||||
+
|
||||
+/** returns the flags that were used to build SCIP */
|
||||
+const char* SCIPgetBuildFlags(
|
||||
+ void
|
||||
+ )
|
||||
+{
|
||||
+ return " ARCH=x86_64\n\
|
||||
+ OSTYPE=Linux-6.7.5-arch1-1\n\
|
||||
+ COMP=GNU 13.2.1\n\
|
||||
+ BUILD=Release\n\
|
||||
+ DEBUGSOL=OFF\n\
|
||||
+ EXPRINT=none\n\
|
||||
+ SYM=none\n\
|
||||
+ GMP=OFF\n\
|
||||
+ IPOPT=OFF\n\
|
||||
+ WORHP=OFF\n\
|
||||
+ LPS=none\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.0.0.0\n\
|
||||
+ API_VERSION=114\n\
|
||||
+ ZIMPL=OFF\n\
|
||||
+ ZLIB=ON";
|
||||
+}
|
||||
diff --git a/src/symmetry/compute_symmetry_bliss.cpp b/src/symmetry/compute_symmetry_bliss.cpp
|
||||
index 0ba5ea060e..10570448a0 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 <bliss/defs.hh>
|
||||
-#include <bliss/graph.hh>
|
||||
+#define BLISS_VERSION "0.73"
|
||||
+#include <bliss-0.73/defs.hh>
|
||||
+#include <bliss-0.73/graph.hh>
|
||||
|
||||
#include <string.h>
|
||||
#include <vector>
|
||||
@@ -1,124 +0,0 @@
|
||||
# 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",
|
||||
],
|
||||
"on_macos": [
|
||||
"-Wunknown-pragmas",
|
||||
"-fexceptions",
|
||||
],
|
||||
"on_windows": [
|
||||
"/DSYM=none",
|
||||
"/DSCIP_NO_SIGACTION",
|
||||
"/DSCIP_NO_STRTOK_R",
|
||||
],
|
||||
"//conditions:default": [],
|
||||
})
|
||||
|
||||
PLATFORM_DEPS = select({
|
||||
"on_linux": ["@bliss//:libbliss"],
|
||||
"on_macos": ["@bliss//:libbliss"],
|
||||
"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"],
|
||||
})
|
||||
|
||||
cc_library(
|
||||
name = "scip",
|
||||
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/scipbuildflags.c",
|
||||
"src/scip/sorttpl.c",
|
||||
"src/symmetry/compute_symmetry_*.cpp",
|
||||
"src/symmetry/*nauty*",
|
||||
"src/tpi/tpi_*.c",
|
||||
],
|
||||
) + BLISS_FILE + [
|
||||
"src/scip/exprinterpret_none.c",
|
||||
#"src/tpi/tpi_tnycthrd.c",
|
||||
"src/tpi/tpi_none.c",
|
||||
],
|
||||
hdrs = glob(
|
||||
[
|
||||
"src/*/*.h",
|
||||
"src/*/*.hpp",
|
||||
"src/scip/githash.c",
|
||||
"src/scip/sorttpl.c",
|
||||
],
|
||||
exclude =
|
||||
[
|
||||
#"src/scip/prop_symmetry.h",
|
||||
"src/scip/*_xyz.h",
|
||||
],
|
||||
),
|
||||
copts = [
|
||||
"$(STACK_FRAME_UNLIMITED)", # src/scip/reader_cnf.c
|
||||
#"-DTPI_TNY", # src/tpi/type_tpi_tnycthrd.h
|
||||
"-DTPI_NONE", # src/tpi/type_tpi_none.h
|
||||
"-Isrc",
|
||||
"-Isrc/scip",
|
||||
] + PLATFORM_FLAGS,
|
||||
defines = [],
|
||||
features = ["-parse_headers"],
|
||||
includes = [
|
||||
"src",
|
||||
],
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
#"@cppad:cppad_includes",
|
||||
"@zlib//:zlib",
|
||||
] + PLATFORM_DEPS,
|
||||
)
|
||||
@@ -1,161 +0,0 @@
|
||||
# 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.
|
||||
|
||||
licenses(["restricted"]) # GPLv3
|
||||
|
||||
exports_files(["LICENSE"])
|
||||
|
||||
config_setting(
|
||||
name = "on_windows",
|
||||
constraint_values = ["@platforms//os:windows"],
|
||||
)
|
||||
|
||||
cc_binary(
|
||||
name = "swig",
|
||||
srcs = [
|
||||
"Source/Include/swigconfig.h",
|
||||
"Source/DOH/dohint.h",
|
||||
"Source/DOH/doh.h",
|
||||
"Source/Swig/swigfile.h",
|
||||
"Source/Swig/swigtree.h",
|
||||
"Source/Swig/swig.h",
|
||||
"Source/Swig/swigparm.h",
|
||||
"Source/Swig/swigwrap.h",
|
||||
"Source/Swig/swigscan.h",
|
||||
"Source/Swig/swigopt.h",
|
||||
"Source/Include/swigwarn.h",
|
||||
"Source/CParse/parser.h",
|
||||
"Source/CParse/cparse.h",
|
||||
"Source/Doxygen/doxycommands.h",
|
||||
"Source/Doxygen/doxyentity.h",
|
||||
"Source/Doxygen/javadoc.h",
|
||||
"Source/Doxygen/doxytranslator.h",
|
||||
"Source/Doxygen/doxyparser.h",
|
||||
"Source/Doxygen/pydoc.h",
|
||||
"Source/Modules/swigmod.h",
|
||||
"Source/Preprocessor/preprocessor.h",
|
||||
"Source/DOH/list.c",
|
||||
"Source/DOH/memory.c",
|
||||
"Source/DOH/base.c",
|
||||
"Source/DOH/string.c",
|
||||
"Source/DOH/hash.c",
|
||||
"Source/DOH/fio.c",
|
||||
"Source/DOH/void.c",
|
||||
"Source/DOH/file.c",
|
||||
"Source/Swig/scanner.c",
|
||||
"Source/Swig/fragment.c",
|
||||
"Source/Swig/typesys.c",
|
||||
"Source/Swig/naming.c",
|
||||
"Source/Swig/parms.c",
|
||||
"Source/Swig/deprecate.c",
|
||||
"Source/Swig/extend.c",
|
||||
"Source/Swig/typemap.c",
|
||||
"Source/Swig/error.c",
|
||||
"Source/Swig/wrapfunc.c",
|
||||
"Source/Swig/symbol.c",
|
||||
"Source/Swig/stype.c",
|
||||
"Source/Swig/cwrap.c",
|
||||
"Source/Swig/include.c",
|
||||
"Source/Swig/typeobj.c",
|
||||
"Source/Swig/misc.c",
|
||||
"Source/Swig/getopt.c",
|
||||
"Source/Swig/tree.c",
|
||||
"Source/CParse/templ.c",
|
||||
"Source/CParse/util.c",
|
||||
"Source/CParse/cscanner.c",
|
||||
"Source/CParse/parser.c",
|
||||
"Source/Preprocessor/cpp.c",
|
||||
"Source/Preprocessor/expr.c",
|
||||
"Source/Doxygen/doxytranslator.cxx",
|
||||
"Source/Doxygen/javadoc.cxx",
|
||||
"Source/Doxygen/doxyparser.cxx",
|
||||
"Source/Doxygen/doxyentity.cxx",
|
||||
"Source/Doxygen/pydoc.cxx",
|
||||
"Source/Modules/nested.cxx",
|
||||
"Source/Modules/python.cxx",
|
||||
"Source/Modules/ruby.cxx",
|
||||
"Source/Modules/main.cxx",
|
||||
"Source/Modules/lang.cxx",
|
||||
"Source/Modules/lua.cxx",
|
||||
"Source/Modules/mzscheme.cxx",
|
||||
"Source/Modules/tcl8.cxx",
|
||||
"Source/Modules/xml.cxx",
|
||||
"Source/Modules/javascript.cxx",
|
||||
"Source/Modules/directors.cxx",
|
||||
"Source/Modules/allocate.cxx",
|
||||
"Source/Modules/interface.cxx",
|
||||
"Source/Modules/java.cxx",
|
||||
"Source/Modules/emit.cxx",
|
||||
"Source/Modules/swigmain.cxx",
|
||||
"Source/Modules/go.cxx",
|
||||
"Source/Modules/csharp.cxx",
|
||||
"Source/Modules/d.cxx",
|
||||
"Source/Modules/typepass.cxx",
|
||||
"Source/Modules/contract.cxx",
|
||||
"Source/Modules/ocaml.cxx",
|
||||
"Source/Modules/overload.cxx",
|
||||
"Source/Modules/perl5.cxx",
|
||||
"Source/Modules/r.cxx",
|
||||
"Source/Modules/octave.cxx",
|
||||
"Source/Modules/utils.cxx",
|
||||
"Source/Modules/guile.cxx",
|
||||
"Source/Modules/scilab.cxx",
|
||||
"Source/Modules/php.cxx",
|
||||
],
|
||||
copts = ["$(STACK_FRAME_UNLIMITED)"] + select({
|
||||
"on_windows": [],
|
||||
"//conditions:default": [
|
||||
"-Wno-parentheses",
|
||||
"-Wno-unused-variable",
|
||||
"-fexceptions",
|
||||
],
|
||||
}),
|
||||
includes = [
|
||||
"Source/CParse",
|
||||
"Source/DOH",
|
||||
"Source/Doxygen",
|
||||
"Source/Include",
|
||||
"Source/Modules",
|
||||
"Source/Preprocessor",
|
||||
"Source/Swig",
|
||||
],
|
||||
output_licenses = ["unencumbered"],
|
||||
visibility = ["//visibility:public"],
|
||||
deps = ["@pcre2//:pcre2"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "lib_java",
|
||||
srcs = glob([
|
||||
'Lib/*',
|
||||
'Lib/java/*',
|
||||
'Lib/std/*',
|
||||
'Lib/typemaps/*'
|
||||
]),
|
||||
licenses = ["notice"], # simple notice license for Lib/
|
||||
path = "Lib",
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "lib_python",
|
||||
srcs = glob([
|
||||
'Lib/*',
|
||||
'Lib/python/*',
|
||||
'Lib/std/*',
|
||||
'Lib/typemaps/*'
|
||||
]),
|
||||
licenses = ["notice"], # simple notice license for Lib/
|
||||
path = "Lib",
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
13124
bazel/swig.patch
13124
bazel/swig.patch
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user