always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bazel: use scip TPI_NONE

Browse Source 
TPI_TNY won't work in JAVA wrapper
This commit is contained in:
Corentin Le Molgat
2024-03-25 17:19:45 +01:00
parent 7bd7a29e51
commit 8f85d85be8
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bazel/scip-v900.patch
View File

@@ -64,7 +64,7 @@ index 0000000000..871fde8e55
+/* #undef SCIP_NO_SIGACTION */
+/* #undef SCIP_NO_STRTOK_R */
+/* #undef TPI_NONE */
+#define TPI_TNY
+#define TPI_NONE
+/* #undef TPI_OMP */
+#define SCIP_THREADSAFE
+#define WITH_SCIPDEF

6
bazel/scip.BUILD.bazel
View File

@@ -88,7 +88,8 @@ cc_library(
],
) + BLISS_FILE + [
"src/scip/exprinterpret_none.c",
"src/tpi/tpi_tnycthrd.c",
#"src/tpi/tpi_tnycthrd.c",
"src/tpi/tpi_none.c",
],
hdrs = glob(
[
@@ -104,7 +105,8 @@ cc_library(
]),
copts = [
"$(STACK_FRAME_UNLIMITED)", # src/scip/reader_cnf.c
"-DTPI_TNY", # src/tpi/type_tpi_tnycthrd.h
#"-DTPI_TNY", # src/tpi/type_tpi_tnycthrd.h
"-DTPI_NONE", # src/tpi/type_tpi_none.h
"-Isrc",
"-Isrc/scip",
] + PLATFORM_FLAGS,