Skip to content

Commit

Permalink
[Clp] update to v1.17.9 and use LBT (#9088)
Browse files Browse the repository at this point in the history
* [Clp] update to v1.17.9 and use LBT

* Update build_tarballs.jl

* Update coin-or-common.jl
  • Loading branch information
odow authored Jul 17, 2024
1 parent e9b8732 commit 4b53a4c
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 17 deletions.
38 changes: 24 additions & 14 deletions C/Coin-OR/Clp/build_tarballs.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# In addition to coin-or-common.jl, we need to modify this file to trigger a
# rebuild.
#
# Last updated: 2022-10-26
# Last updated: 2024-07-17

include("../coin-or-common.jl")

Expand Down Expand Up @@ -35,6 +35,13 @@ if [[ ${target} == *aarch64* ]] || [[ ${target} == *arm* ]]; then
export CPPFLAGS="${CPPFLAGS} -D__arm__"
fi
# BLAS and LAPACK
if [[ "${target}" == *mingw* ]]; then
LBT="-lblastrampoline-5"
else
LBT="-lblastrampoline"
fi
../configure \
--prefix=$prefix \
--build=${MACHTYPE} \
Expand All @@ -45,12 +52,14 @@ fi
--disable-dependency-tracking \
--enable-shared \
lt_cv_deplibs_check_method=pass_all \
--with-blas="-lopenblas" \
--with-lapack="-lopenblas" \
--with-blas \
--with-blas-lib="-L${libdir} ${LBT}" \
--with-lapack \
--with-lapack-lib="-L${libdir} ${LBT}" \
--with-coinutils-lib="-lCoinUtils" \
--with-osi-lib="-lOsi -lCoinUtils" \
--with-mumps-lib="-L${libdir} -ldmumps -lzmumps -lcmumps -lsmumps -lmumps_common -lmpiseq -lpord -lmetis -lopenblas -lgfortran -lpthread" \
--with-mumps-incdir="${includedir}/mumps_seq" \
--with-osi-lib="-lCoinUtils -lOsi" \
--with-mumps-lib="-L${libdir} -ldmumps -lmpiseq" \
--with-mumps-incdir="${includedir}/libseq" \
--with-metis-lib="-L${libdir} -lmetis" \
--with-metis-incdir="${includedir}"
Expand All @@ -68,12 +77,12 @@ products = [

# Dependencies that must be installed before this package can be built
dependencies = [
Dependency("CoinUtils_jll", compat="$(CoinUtils_version)"),
Dependency("Osi_jll", compat="$(Osi_version)"),
Dependency("METIS_jll", compat="$(METIS_version)"),
Dependency("MUMPS_seq_jll", compat="$(MUMPS_seq_version)"),
Dependency("OpenBLAS32_jll", OpenBLAS32_version),
Dependency("CompilerSupportLibraries_jll"),
Dependency(PackageSpec(name="CoinUtils_jll", uuid="be027038-0da8-5614-b30d-e42594cb92df"), compat="=$(CoinUtils_version)"),
Dependency(PackageSpec(name="METIS_jll", uuid="d00139f3-1899-568f-a2f0-47f597d42d70"), compat="=$(METIS_version)"),
Dependency(PackageSpec(name="Osi_jll", uuid="7da25872-d9ce-5375-a4d3-7a845f58efdd"), compat="=$(Osi_version)"),
Dependency(PackageSpec(name="MUMPS_seq_jll", uuid="d7ed1dd3-d0ae-5e8e-bfb4-87a502085b8d"), compat="=$(MUMPS_seq_version_LBT)"),
Dependency(PackageSpec(name="libblastrampoline_jll", uuid="8e850b90-86db-534c-a0d3-1478176c7d93"), compat="5.4.0"),
Dependency(PackageSpec(name="CompilerSupportLibraries_jll", uuid="e66e0078-7015-5450-92f7-15fbd957f2ae"))
]

# Build the tarballs, and possibly a `build.jl` as well.
Expand All @@ -83,9 +92,10 @@ build_tarballs(
Clp_version,
sources,
script,
expand_gfortran_versions(platforms),
platforms,
products,
dependencies;
preferred_gcc_version = gcc_version,
julia_compat = Julia_compat_version,
preferred_llvm_version = llvm_version,
julia_compat = "1.9",
)
34 changes: 31 additions & 3 deletions C/Coin-OR/coin-or-common.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
# The C/Coin-OR directory contains a number of inter-related packages. Their
# dependency graph has the following topological order. Because we use strict
# equality compat bounds (relaxing to SemVer has caused compatibility issues in
# the past), when updating a package, you should also update all subsequent
# packages in the order.
#
# The order is:
#
# [CoinUtils_jll]
# [Osi_jll]
# [Clp_jll]
# [Cgl_jll]
# [Cbc_jll]
# [Bonmin_jll]
# [Couenne_jll]
# [SHOT_jll]
# [SYMPHONY_jll]
# [ALPS_jll]
# [BiCePS_jll]
# [CHIPPS_BLIS_jll]
# [MibS_jll]
#
# The other packages in C/Coin-OR that do not have dependencies are:
#
# [Ipopt_jll]
# [IpoptMKL_jll]
# [CDSP_jll]

using BinaryBuilder, Pkg

"""
Expand Down Expand Up @@ -39,8 +67,8 @@ Cbc_gitsha = "3c1d759619f38bbd5916380df292cfc1dafba7f5"
Cgl_version = offset_version(v"0.60.6", v"0.0.0")
Cgl_gitsha = "8952b9e737e434b730fab5967cd28180b43d7234"

Clp_version = offset_version(v"1.17.7", v"0.0.0")
Clp_gitsha = "1c2586a08d33ecc59ed67d319c29044802c0866b"
Clp_version = offset_version(v"1.17.9", v"0.0.0")
Clp_gitsha = "7b9daa62d4c2710a368a17385913ce59d8c67b68"

Osi_version = offset_version(v"0.108.10", v"0.0.0")
Osi_gitsha = "2997cda8e85ccc6712c4b05404e7aa70500e422f"
Expand Down Expand Up @@ -82,7 +110,7 @@ Julia_compat_version = "1.6"
ASL_version = v"0.1.3"
METIS_version = v"5.1.2"
MUMPS_seq_version = v"5.4.1"
MUMPS_seq_version_LBT = v"500.600.201"
MUMPS_seq_version_LBT = v"500.700.200"
SPRAL_version_LBT = v"2024.1.18"
OpenBLAS32_version = v"0.3.26"

Expand Down

0 comments on commit 4b53a4c

Please sign in to comment.