coin-or-tools · May 2, 2024 · May 2, 2024 · May 2, 2024 · May 2, 2024 · May 2, 2024
Showing with 126 additions and 57 deletions.

+2 −2 .github/workflows/publish.yml

+3 −3 .github/workflows/tests.yml

+65 −0 ampl-mp@3.1.0.rb

+12 −10 cbc.rb

+12 −7 cgl.rb

+10 −10 clp.rb

+6 −5 coinutils.rb

+6 −6 mumps-seq.rb

+4 −4 osi.rb

+6 −10 symphony.rb
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -20,7 +20,7 @@ jobs:
           HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{ github.token }}
           HOMEBREW_GITHUB_PACKAGES_USER: ${{ github.actor }}
           PULL_REQUEST: ${{ github.event.pull_request.number }}
-        run: brew pr-pull --debug --tap=$GITHUB_REPOSITORY $PULL_REQUEST
+        run: brew pr-pull --debug --tap="$GITHUB_REPOSITORY" "$PULL_REQUEST"
 
       - name: Push commits
         uses: Homebrew/actions/git-try-push@master
@@ -32,4 +32,4 @@ jobs:
         if: github.event.pull_request.head.repo.fork == false
         env:
           BRANCH: ${{ github.event.pull_request.head.ref }}
-        run: git push --delete origin $BRANCH
+        run: git push --delete origin "$BRANCH"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ jobs:
 
       - name: Cache Homebrew Bundler RubyGems
         id: cache
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.set-up-homebrew.outputs.gems-path }}
           key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }}
@@ -38,7 +38,7 @@ jobs:
 
       - name: Upload bottles as artifact
         if: always() && github.event_name == 'pull_request'
-        uses: actions/upload-artifact@main
+        uses: actions/upload-artifact@v4
         with:
-          name: bottles
+          name: bottles_${{ matrix.os }}
           path: '*.bottle.*'
diff --git a/ampl-mp@3.1.0.rb b/ampl-mp@3.1.0.rb
@@ -0,0 +1,65 @@
+class AmplMpAT310 < Formula
+  desc "Open-source library for mathematical programming"
+  homepage "https://ampl.com/"
+  url "https://github.com/ampl/mp/archive/refs/tags/3.1.0.tar.gz"
+  sha256 "587c1a88f4c8f57bef95b58a8586956145417c8039f59b1758365ccc5a309ae9"
+  license "MIT"
+
+  bottle do
+    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/ampl-mp@3.1.0-3.1.0"
+    sha256 cellar: :any,                 arm64_sonoma: "d448ee4945a4943bd730587813f9b7d5ea159ac5adbc3240e8488d4a855b9857"
+    sha256 cellar: :any,                 ventura:      "f7cef5bef73b70be543d0baad162b2b382d9a703b3baae082f49e255424797a5"
+    sha256 cellar: :any_skip_relocation, x86_64_linux: "e92408864d3721101f8cafe1e6afb29046ebd479b87137714692879090309aa4"
+  end
+
+  depends_on "cmake" => :build
+
+  resource "miniampl" do
+    url "https://github.com/dpo/miniampl/archive/refs/tags/v1.0.tar.gz"
+    sha256 "b836dbf1208426f4bd93d6d79d632c6f5619054279ac33453825e036a915c675"
+  end
+
+  # Removes Google Benchmark - as already done so upstream
+  # All it did was conflict with the google-benchmark formula
+  patch do
+    url "https://github.com/ampl/mp/commit/96e332bb8cb7ba925e3ac947d6df515496027eed.patch?full_index=1"
+    sha256 "1a4ef4cd1f4e8b959c20518f8f00994ef577e74e05824b2d1b241b1c3c1f84eb"
+  end
+
+  # Install missing header files, remove in > 3.1.0
+  # https://github.com/ampl/mp/issues/110
+  patch do
+    url "https://github.com/ampl/mp/commit/8183be3e486d38d281e0c5a02a1ea4239695035e.patch?full_index=1"
+    sha256 "6b37201f1d0d6dba591e7e1b81fb16d2694d118605c92c422dcdaaedb463c367"
+  end
+  # Backport fmt header update. Remove in the next release
+  # https://github.com/ampl/mp/issues/108
+
+  patch do
+    url "https://github.com/ampl/mp/commit/1f39801af085656e4bf72250356a3a70d5d98e73.patch?full_index=1"
+    sha256 "b0e0185f24caba54cb38b65a638ebda6eb4db3e8c74d71ca79f072b8337e8e2c"
+  end
+
+  def install
+    args = %W[
+      -DAMPL_LIBRARY_DIR=#{libexec}/bin
+      -DBUILD_SHARED_LIBS=ON
+      -DBUILD_TESTS=OFF
+      -DCMAKE_INSTALL_RPATH=#{rpath};#{rpath(source: libexec/"bin")}
+      -DCMAKE_DISABLE_FIND_PACKAGE_ODBC=TRUE
+    ]
+
+    system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
+    system "cmake", "--build", "build"
+    system "cmake", "--install", "build"
+  end
+
+  test do
+    resource("miniampl").stage do
+      testpath.install "src/miniampl.c", Dir["examples/wb.*"]
+    end
+    system ENV.cc, "miniampl.c", "-std=c99", "-I#{include}/asl", "-L#{lib}", "-lasl", "-lmp"
+    output = shell_output("./a.out wb showname=1 showgrad=1")
+    assert_match "Objective name: objective", output
+  end
+end
diff --git a/cbc.rb b/cbc.rb
@@ -1,29 +1,31 @@
 class Cbc < Formula
   desc "Mixed integer linear programming solver"
   homepage "https://github.com/coin-or/Cbc"
-  url "https://github.com/coin-or/Cbc/archive/refs/tags/releases/2.10.7.tar.gz"
-  sha256 "5aa5490e2bc39c3c03f3636c9bca459cb3f8f365e0280fd0c4759ce3119e5b19"
-  revision 1
+  url "https://github.com/coin-or/Cbc/archive/refs/tags/releases/2.10.12.tar.gz"
+  sha256 "9ed71e4b61668462fc3794c102e26b4bb01a047efbbbcbd69ae7bde1f04f46a8"
 
   head "https://github.com/coin-or/Cbc.git"
 
   bottle do
-    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/cbc-2.10.7_1"
-    sha256 cellar: :any,                 big_sur:      "f8c7534d87c16619c56ec9818808860ccd84514d109c07e6e054a6ddd0ef5cd3"
-    sha256 cellar: :any,                 catalina:     "d933de75143248e0e63563165f1665a061987024476e3e114ba465421ac489aa"
-    sha256 cellar: :any_skip_relocation, x86_64_linux: "a030470d18477baa62a2b5b083a537edc9518300e46261a2a0912da2e529ae72"
+    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/cbc-2.10.12"
+    sha256 cellar: :any_skip_relocation, x86_64_linux: "d4832af4b6870322b17589c1c9c7047690738cf0a0647927eb99ed496d21a894"
   end
 
   keg_only "conflicts with formula in core"
 
   depends_on "pkg-config" => :build
 
-  depends_on "ampl-mp"
+  depends_on "ampl-mp@3.1.0"
+  depends_on "bzip2"
   depends_on "coin-or-tools/coinor/cgl"
   depends_on "coin-or-tools/coinor/clp"
+  depends_on "coin-or-tools/coinor/coinutils"
   depends_on "coin-or-tools/coinor/glpk@448"
   depends_on "coin-or-tools/coinor/mumps-seq"
+  depends_on "coin-or-tools/coinor/osi"
   depends_on "gcc"
+  depends_on "openblas"
+  depends_on "zlib"
 
   def install
     args = ["--disable-debug",
@@ -39,8 +41,8 @@ def install
     args << "--with-glpk-lib=-L#{Formula["coin-or-tools/coinor/glpk@448"].opt_lib} -lglpk"
     args << "--with-glpk-incdir=#{Formula["coin-or-tools/coinor/glpk@448"].opt_include}"
 
-    args << "--with-asl-incdir=#{Formula["ampl-mp"].opt_include}/asl"
-    args << "--with-asl-lib=-L#{Formula["ampl-mp"].opt_lib} -lasl"
+    args << "--with-asl-incdir=#{Formula["ampl-mp@3.1.0"].opt_include}/asl"
+    args << "--with-asl-lib=-L#{Formula["ampl-mp@3.1.0"].opt_lib} -lasl"
 
     system "./configure", *args
 

diff --git a/cgl.rb b/cgl.rb
@@ -1,24 +1,29 @@
 class Cgl < Formula
   desc "Cut-generation library"
   homepage "https://github.com/coin-or/Cgl"
-  url "https://github.com/coin-or/Cgl/archive/refs/tags/releases/0.60.5.tar.gz"
-  sha256 "5a2e7ca380425b3d7279d0759c625a367d06ec8293698b59f82fae38ae5df64e"
-  revision 1
+  url "https://github.com/coin-or/Cgl/archive/refs/tags/releases/0.60.9.tar.gz"
+  sha256 "558421ccd6aa91d6922dd1baa04e37aa4c75ba0472118dc11779e5d6a19bfb38"
 
   head "https://github.com/coin-or/Cgl.git"
 
   bottle do
-    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/cgl-0.60.5_1"
-    sha256 cellar: :any,                 big_sur:      "cc216ff362787ae8eded9927aa5e42cd41359b8bbe0eda1772fe7deeb5486919"
-    sha256 cellar: :any,                 catalina:     "26c93fa9913d68a8adee0b3aea306ef0f592ee8a83fccb0616b3cf07e1359c4c"
-    sha256 cellar: :any_skip_relocation, x86_64_linux: "bf8626f34b7734320781b94ec047fce63e7ddcc3dc7ea7ae2141e3a44d3d247f"
+    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/cgl-0.60.9"
+    sha256 cellar: :any_skip_relocation, x86_64_linux: "a1b1789904d58aa065bb669e8daecfae9ba94e7b2499d7f4e97cec68bbf383ee"
   end
 
   keg_only "conflicts with formula in core"
 
   depends_on "pkg-config" => :build
 
+  depends_on "ampl-mp@3.1.0"
+  depends_on "bzip2"
   depends_on "coin-or-tools/coinor/clp"
+  depends_on "coin-or-tools/coinor/coinutils"
+  depends_on "coin-or-tools/coinor/glpk@448"
+  depends_on "coin-or-tools/coinor/mumps-seq"
+  depends_on "coin-or-tools/coinor/osi"
+  depends_on "openblas"
+  depends_on "zlib"
 
   def install
     args = ["--disable-debug",

diff --git a/clp.rb b/clp.rb
@@ -1,30 +1,30 @@
 class Clp < Formula
   desc "Linear programming solver"
   homepage "https://github.com/coin-or/Clp"
-  url "https://github.com/coin-or/Clp/archive/refs/tags/releases/1.17.7.tar.gz"
-  sha256 "c4c2c0e014220ce8b6294f3be0f3a595a37bef58a14bf9bac406016e9e73b0f5"
+  url "https://github.com/coin-or/Clp/archive/refs/tags/releases/1.17.10.tar.gz"
+  sha256 "0d79ece896cdaa4a3855c37f1c28e6c26285f74d45f635046ca0b6d68a509885"
 
   head "https://github.com/coin-or/Clp.git"
 
   bottle do
-    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/clp-1.17.7"
-    sha256 cellar: :any,                 big_sur:      "10c8837f4e1456327943c7742e9e5674548aa9676e4131aeb4abf34714cf78f6"
-    sha256 cellar: :any,                 catalina:     "809c3db66d9868f67d9b3b85fde06681315cef63337c48dbff0a1cca77a4d879"
-    sha256 cellar: :any_skip_relocation, x86_64_linux: "b23c8e42f8c654ebdf2db051c63bdac3fd418dcd6e1f504063e344983e38cbc2"
+    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/clp-1.17.10"
+    sha256 cellar: :any_skip_relocation, x86_64_linux: "1ba42aa59a5ba95256c5c21b8d17bd1f1889651212720e7987fb8eef2ba11de3"
   end
 
   keg_only "conflicts with formula in core"
 
   depends_on "pkg-config" => :build
 
-  depends_on "ampl-mp"
+  depends_on "ampl-mp@3.1.0"
+  depends_on "bzip2"
   depends_on "coin-or-tools/coinor/coinutils"
   depends_on "coin-or-tools/coinor/glpk@448"
   depends_on "coin-or-tools/coinor/mumps-seq"
   depends_on "coin-or-tools/coinor/osi"
   depends_on "gcc"
+  depends_on "openblas"
   depends_on "readline"
-  depends_on "openblas" => :recommended
+  depends_on "zlib"
   depends_on "suite-sparse" => :optional
 
   def install
@@ -49,8 +49,8 @@ def install
     args << "--with-glpk-lib=-L#{Formula["coin-or-tools/coinor/glpk@448"].opt_lib} -lglpk"
     args << "--with-glpk-incdir=#{Formula["coin-or-tools/coinor/glpk@448"].opt_include}"
 
-    args << "--with-asl-incdir=#{Formula["ampl-mp"].opt_include}/asl"
-    args << "--with-asl-lib=-L#{Formula["ampl-mp"].opt_lib} -lasl"
+    args << "--with-asl-incdir=#{Formula["ampl-mp@3.1.0"].opt_include}/asl"
+    args << "--with-asl-lib=-L#{Formula["ampl-mp@3.1.0"].opt_lib} -lasl"
 
     mumps_libs = %w[-ldmumps -lmumps_common -lpord -lmpiseq]
     mumps_libcmd = "-L#{Formula["coin-or-tools/coinor/mumps-seq"].opt_lib} " + mumps_libs.join(" ")

diff --git a/coinutils.rb b/coinutils.rb
@@ -1,14 +1,14 @@
 class Coinutils < Formula
   desc "Utilities used by other Coin-OR projects"
   homepage "https://github.com/coin-or/CoinUtils"
-  url "https://github.com/coin-or/CoinUtils/archive/refs/tags/releases/2.11.11.tar.gz"
-  sha256 "27da344479f38c82112d738501643dcb229e4ee96a5f87d4f406456bdc1b2cb4"
+  url "https://github.com/coin-or/CoinUtils/archive/refs/tags/releases/2.11.12.tar.gz"
+  sha256 "eef1785d78639b228ae2de26b334129fe6a7d399c4ac6f8fc5bb9054ba00de64"
 
   head "https://github.com/coin-or/CoinUtils.git"
 
   bottle do
-    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/coinutils-2.11.11"
-    sha256 cellar: :any_skip_relocation, x86_64_linux: "c5c9e6bafc97f3c541ea9838954f311d6bd7224aafa655e7d63b54672356f60c"
+    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/coinutils-2.11.12"
+    sha256 cellar: :any_skip_relocation, x86_64_linux: "b0039fd3edaa73a0c0dbee4ca2032c3c6d27d0cbab4a03739294dc80e3edb3ca"
   end
 
   keg_only "conflicts with formula in core"
@@ -22,7 +22,8 @@ class Coinutils < Formula
   depends_on "coin-or-tools/coinor/glpk@448"
   depends_on "doxygen"
   depends_on "gcc"
-  depends_on "openblas" => :recommended
+  depends_on "openblas"
+  depends_on "zlib"
 
   def install
     args = ["--disable-debug",

diff --git a/mumps-seq.rb b/mumps-seq.rb
@@ -4,13 +4,13 @@ class MumpsSeq < Formula
   url "https://graal.ens-lyon.fr/MUMPS/MUMPS_5.5.1.tar.gz"
   mirror "http://mumps.enseeiht.fr/MUMPS_5.5.1.tar.gz"
   sha256 "1abff294fa47ee4cfd50dfd5c595942b72ebfcedce08142a75a99ab35014fa15"
+  revision 1
 
   bottle do
-    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/mumps-seq-5.5.1"
-    sha256 cellar: :any,                 monterey:     "0c262d274ac247ea643f4744957d0faa58c2a52d277fc40579e3baa40a936c2d"
-    sha256 cellar: :any,                 big_sur:      "8f49ff5dbb6ff3122100ef553ef9a4d1121e45512a4b46265cc482f2d99df4d9"
-    sha256 cellar: :any,                 catalina:     "d2aae77254f8323864edc310cff09faa43368e88bb018b0b3d9c8100fb120587"
-    sha256 cellar: :any_skip_relocation, x86_64_linux: "f7e5be60d9eb35028e0e168046cec8a89a26d9e7c5bb051ab381aa0d6198dae5"
+    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/mumps-seq-5.5.1_1"
+    sha256 cellar: :any,                 arm64_sonoma: "a9f2c8660ad094f56d44bde66d9f6200a79354c521ebe8d2d14c1d21428d007a"
+    sha256 cellar: :any,                 ventura:      "37a08558c70b1458be6bcb41645bacd870aac2f00030b34f3fd33e4eeedf966f"
+    sha256 cellar: :any_skip_relocation, x86_64_linux: "b7cfca4980b2ff8deab1deb97f10f641724f1bad016a6950a7faaa159544cd81"
   end
 
   keg_only "conflicts with parallel builds of MUMPS"
@@ -61,7 +61,7 @@ def install
     # make shared lib
     so = OS.mac? ? "dylib" : "so"
     all_load = OS.mac? ? "-all_load" : "--whole-archive"
-    noall_load = OS.mac? ? "-noall_load" : "--no-whole-archive"
+    noall_load = OS.mac? ? "" : "--no-whole-archive"
     shopts = OS.mac? ? ["-undefined", "dynamic_lookup"] : []
     install_name = ->(libname) { OS.mac? ? ["-Wl,-install_name", "-Wl,#{lib}/#{libname}.#{so}"] : [] }
     cd "lib" do

diff --git a/osi.rb b/osi.rb
@@ -1,14 +1,14 @@
 class Osi < Formula
   desc "Abstract class to generic LP solver, derived classes for specific solvers"
   homepage "https://github.com/coin-or/Osi"
-  url "https://github.com/coin-or/Osi/archive/refs/tags/releases/0.108.10.tar.gz"
-  sha256 "614c2b329caf57c00326412266299fdfd93c5691492034fbb46990b5e71cc5a7"
+  url "https://github.com/coin-or/Osi/archive/refs/tags/releases/0.108.11.tar.gz"
+  sha256 "1063b6a057e80222e2ede3ef0c73c0c54697e0fee1d913e2bef530310c13a670"
 
   head "https://github.com/coin-or/Osi.git"
 
   bottle do
-    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/osi-0.108.10"
-    sha256 cellar: :any_skip_relocation, x86_64_linux: "b5b9cc1463d6ec5ecad3d811901f7786ac2fab12feb3aa630497cdc9faf0de81"
+    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/osi-0.108.11"
+    sha256 cellar: :any_skip_relocation, x86_64_linux: "01fed4631dee3e0d832d47f12b2fef5968c3d6f71ff286b5e867486b45baab39"
   end
 
   keg_only "conflicts with formula in core"

diff --git a/symphony.rb b/symphony.rb
@@ -1,24 +1,23 @@
 class Symphony < Formula
   desc "Framework for solving mixed integer linear programs"
   homepage "https://github.com/coin-or/SYMPHONY"
-  url "https://github.com/coin-or/SYMPHONY/archive/refs/tags/releases/5.6.18.tar.gz"
-  sha256 "f566e2986c6b4269a5a128cea13622d3d90b046b7a9151ebd89f27c495f183a0"
+  url "https://github.com/coin-or/SYMPHONY/archive/refs/tags/releases/5.7.2.tar.gz"
+  sha256 "0807187a907027590fb860454b20cfde29dd61a2ce21b8af6be2ece4327955da"
 
   head "https://github.com/coin-or/SYMPHONY"
 
   bottle do
-    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/symphony-5.6.18"
-    sha256 cellar: :any,                 big_sur:      "649af28bff2e2ef1e1736e0a8933bbdb809f2037826e9676aa26dcb653be296e"
-    sha256 cellar: :any,                 catalina:     "13cf723e769a58337b113e452981ea47027298a3d869e63e557774d4ebd6949c"
-    sha256 cellar: :any_skip_relocation, x86_64_linux: "eaf881a77a0e000107d05a3a8b53ac725ba3e6dbe921c88319eae7c8fbb061ce"
+    root_url "https://github.com/coin-or-tools/homebrew-coinor/releases/download/symphony-5.7.2"
+    sha256 cellar: :any_skip_relocation, x86_64_linux: "fa6c70528fb7e19fdcd7dc1696079348dbe7497bfb1b78894305f4c11940b6cd"
   end
 
   depends_on "pkg-config" => :build
 
   depends_on "coin-or-tools/coinor/cgl"
   depends_on "coin-or-tools/coinor/clp"
-  depends_on "coin-or-tools/coinor/dylp"
+  depends_on "coin-or-tools/coinor/coinutils"
   depends_on "coin-or-tools/coinor/glpk@448"
+  depends_on "coin-or-tools/coinor/osi"
   depends_on "gcc"
   depends_on "readline"
 
@@ -43,9 +42,6 @@ def install
     args << "--with-clp-lib=-L#{Formula["coin-or-tools/coinor/clp"].opt_lib} -lClp -lOsiClp"
     args << "--with-clp-incdir=#{Formula["coin-or-tools/coinor/clp"].opt_include}/clp/coin"
 
-    args << "--with-dylp-lib=-L#{Formula["coin-or-tools/coinor/dylp"].opt_lib} -lDylp"
-    args << "--with-dylp-incdir=#{Formula["coin-or-tools/coinor/dylp"].opt_include}/dylp/coin"
-
     args << "--with-glpk-lib=-L#{Formula["coin-or-tools/coinor/glpk@448"].opt_lib} -lglpk"
     args << "--with-glpk-incdir=#{Formula["coin-or-tools/coinor/glpk@448"].opt_include}"
     args << "--with-gmpl"