Update WORKSPACE file

fontanf · Aug 20, 2023 · 34cd650 · 34cd650
1 parent db13327
commit 34cd650
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 39 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -57,7 +57,7 @@ local_repository(
 git_repository(
     name = "columngenerationsolver",
     remote = "https://github.com/fontanf/columngenerationsolver.git",
-    commit = "7f8701fd56d642fb5939560e82de48e0816a879e",
+    commit = "8e79ac66ba7c9e24f75f27822f59cb2c0555f35d",
 )
 
 local_repository(
@@ -77,76 +77,93 @@ local_repository(
 )
 
 http_archive(
-    name = "coinor_linux",
-    urls = ["https://github.com/coin-or/Cbc/releases/download/releases%2F2.10.10/Cbc-releases.2.10.10-x86_64-ubuntu20-gcc940-static.tar.gz"],
-    sha256 = "872c78bfcdd1566f134d2f7757b76b2a2479a5b1ade065cdd1d4b303ed6f8006",
+    name = "osi_linux",
+    urls = ["https://github.com/coin-or/Osi/releases/download/releases%2F0.108.8/Osi-releases.0.108.8-x86_64-ubuntu20-gcc940-static.tar.gz"],
+    sha256 = "bd5a5bf1e6b6a28d13d41ab1554becd9f3992afe775785e51a88c9405cf2853e",
     build_file_content = """
 cc_library(
     name = "osi",
     hdrs = glob(["include/coin/Osi*.h*"], exclude_directories = 0),
     strip_include_prefix = "include/coin/",
+    srcs = ["lib/libOsi.a", "lib/libOsiCommonTests.a"],
     visibility = ["//visibility:public"],
 )
-cc_library(
-    name = "coinutils",
-    hdrs = glob(["include/coin/Coin*.h*"], exclude_directories = 0),
-    strip_include_prefix = "include/coin/",
-    srcs = ["lib/libCoinUtils.a"],
-    linkopts = ["-llapack", "-lblas", "-lbz2", "-lz"],
-    visibility = ["//visibility:public"],
-)
-cc_library(
-    name = "clp",
-    hdrs = glob(["include/coin/Clp*.h*"], exclude_directories = 0),
-    strip_include_prefix = "include/coin",
-    srcs = ["lib/libClp.a"],
-    deps = [":coinutils", ":osi"],
-    visibility = ["//visibility:public"],
+""",
 )
+
+http_archive(
+    name = "osi_windows",
+    urls = ["https://github.com/coin-or/Osi/releases/download/releases%2F0.108.8/Osi-releases.0.108.8-w64-msvc16-md.zip"],
+    sha256 = "a61fc462cb598139d205cd2323522581a01900575d0d6bccf660b6c7e1b0b71c",
+    build_file_content = """
 cc_library(
-    name = "cbc",
-    hdrs = glob(["include/coin/Cbc*.h*"], exclude_directories = 0),
-    strip_include_prefix = "include/coin",
-    srcs = ["lib/libCbc.a", "lib/libOsiCbc.a"],
-    deps = [":coinutils", ":osi", ":clp"],
+    name = "osi",
+    hdrs = glob(["include/coin/Osi*.h*"], exclude_directories = 0),
+    strip_include_prefix = "include/coin/",
     visibility = ["//visibility:public"],
+    srcs = ["lib/libOsi.lib", "lib/libOsiCommonTests.lib"],
 )
 """,
 )
 
 http_archive(
-    name = "coinor_windows",
-    urls = ["https://github.com/coin-or/Cbc/releases/download/releases%2F2.10.10/Cbc-releases.2.10.10-w64-msvc16-md.zip"],
-    sha256 = "94a951904eb80c2f351785fc9340216e88970a716634bc1ccd8b4fc5024af37c",
+    name = "coinutils_linux",
+    urls = ["https://github.com/coin-or/CoinUtils/releases/download/releases%2F2.11.9/CoinUtils-releases.2.11.9-x86_64-ubuntu20-gcc940-static.tar.gz"],
+    sha256 = "872c78bfcdd1566f134d2f7757b76b2a2479a5b1ade065cdd1d4b303ed6f8006",
     build_file_content = """
 cc_library(
-    name = "osi",
-    hdrs = glob(["include/coin/Osi*.h*"], exclude_directories = 0),
+    name = "coinutils",
+    hdrs = glob(["include/coin/Coin*.h*"], exclude_directories = 0),
     strip_include_prefix = "include/coin/",
+    srcs = ["lib/libCoinUtils.a"],
+    linkopts = ["-llapack", "-lblas", "-lbz2", "-lz"],
     visibility = ["//visibility:public"],
-    srcs = ["lib/libOsi.lib", "lib/libOsiCommonTests.lib"],
 )
+""",
+)
+
+http_archive(
+    name = "coinutils_windows",
+    urls = ["https://github.com/coin-or/CoinUtils/releases/download/releases%2F2.11.9/CoinUtils-releases.2.11.9-w64-msvc16-md.zip"],
+    sha256 = "2bc64f0afd80113571697e949b2663e9047272decf90d5f62e452c2628d33ca6",
+    build_file_content = """
 cc_library(
     name = "coinutils",
     hdrs = glob(["include/coin/Coin*.h*"], exclude_directories = 0),
     strip_include_prefix = "include/coin/",
     srcs = ["lib/libCoinUtils.lib"],
     visibility = ["//visibility:public"],
 )
+""",
+)
+
+http_archive(
+    name = "clp_linux",
+    urls = ["https://github.com/coin-or/Clp/releases/download/releases%2F1.17.8/Clp-releases.1.17.8-x86_64-ubuntu20-gcc940-static.tar.gz"],
+    sha256 = "d569b04d19c25876e55d2557a1d9739df8eb50ec8ca11a98ad387fd8b90212c9",
+    build_file_content = """
 cc_library(
     name = "clp",
-    hdrs = glob(["include/coin/Clp*.h*"], exclude_directories = 0),
+    hdrs = glob(["include/coin/*Clp*.h*"], exclude_directories = 0),
     strip_include_prefix = "include/coin",
-    srcs = ["lib/libClp.lib", "lib/libOsiClp.lib"],
-    deps = [":coinutils", ":osi"],
+    srcs = ["lib/libClp.a", "lib/libOsiClp.a"],
+    deps = ["@osi_linux//:osi", "@coinutils_linux//:coinutils"],
     visibility = ["//visibility:public"],
 )
+""",
+)
+
+http_archive(
+    name = "clp_windows",
+    urls = ["https://github.com/coin-or/Clp/releases/download/releases%2F1.17.8/Clp-releases.1.17.8-w64-msvc16-md.zip"],
+    sha256 = "e37c834aea5c31dfd8620b7d2432cb31fc16ecb0c6ffb398e8f07c9c82dd5028",
+    build_file_content = """
 cc_library(
-    name = "cbc",
-    hdrs = glob(["include/coin/Cbc*.h*"], exclude_directories = 0),
+    name = "clp",
+    hdrs = glob(["include/coin/*Clp*.h*"], exclude_directories = 0),
     strip_include_prefix = "include/coin",
-    srcs = ["lib/libCbc.lib", "lib/libOsiCbc.lib", "lib/libCgl.lib"],
-    deps = [":coinutils", ":osi", ":clp"],
+    srcs = ["lib/libClp.lib", "lib/libOsiClp.lib"],
+    deps = ["@osi_windows//:osi", "@coinutils_windows//:coinutils"],
     visibility = ["//visibility:public"],
 )
 """,

diff --git a/packingsolver/variables.bzl b/packingsolver/variables.bzl
@@ -6,10 +6,10 @@ CLP_COPTS = select({
             "//packingsolver:clp_build": ["-DCLP_FOUND"],
             "//conditions:default": []})
 CLP_DEP = select({
-            "//packingsolver:clp_windows": ["@coinor_windows//:clp"],
+            "//packingsolver:clp_windows": ["@clp_windows//:clp"],
             "//conditions:default": []
         }) + select({
-            "//packingsolver:clp_linux": ["@coinor_linux//:clp"],
+            "//packingsolver:clp_linux": ["@clp_linux//:clp"],
             "//conditions:default": []})
 
 CPLEX_COPTS = select({