From c156e5685066324d3607121566944effc200741d Mon Sep 17 00:00:00 2001 From: Dan Fortunato Date: Wed, 14 Feb 2024 02:02:10 -0500 Subject: [PATCH 01/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 19bb7e3..c2db3e0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Flatironinstitute Ccm +# Homebrew formulae from Flatiron Institute's CCM ## How do I install these formulae? From ce361efa8346f8e1ae6c1cc27a30b7771ebcbe79 Mon Sep 17 00:00:00 2001 From: Dan Fortunato Date: Wed, 14 Feb 2024 00:15:45 -0500 Subject: [PATCH 02/10] Add fmm3d formula Closes #1. Signed-off-by: Dan Fortunato --- Formula/fmm3d.rb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Formula/fmm3d.rb diff --git a/Formula/fmm3d.rb b/Formula/fmm3d.rb new file mode 100644 index 0000000..ab7ee90 --- /dev/null +++ b/Formula/fmm3d.rb @@ -0,0 +1,27 @@ +class Fmm3d < Formula + desc "Fast multipole methods in three dimensions" + homepage "https://fmm3d.readthedocs.io" + url "https://github.com/flatironinstitute/FMM3D/archive/refs/tags/v1.0.2.tar.gz" + sha256 "e29a1ebe485d2431d4e330334b2853bc91b957afde6e24c2991099b28bd2b97c" + license "Apache-2.0" + + depends_on "gcc" + + def install + ln_s "make.inc.macosx.gnu", "make.inc" if OS.mac? + + # Don't use -march=native when building a bottle + inreplace "makefile", "-march=native", "-march=#{Hardware.oldest_cpu}" if build.bottle? + + # Build libraries + system "make", "lib" + + # Install libraries + lib.install "lib/libfmm3d.so" + lib.install "lib-static/libfmm3d.a" + end + + test do + system "true" + end +end From 8b63a5ee0f942e02257be798d418d02f7991455e Mon Sep 17 00:00:00 2001 From: Dan Fortunato Date: Wed, 14 Feb 2024 21:24:59 +0000 Subject: [PATCH 03/10] fmm3d: add 1.0.2 bottle. --- Formula/fmm3d.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Formula/fmm3d.rb b/Formula/fmm3d.rb index ab7ee90..58f8a75 100644 --- a/Formula/fmm3d.rb +++ b/Formula/fmm3d.rb @@ -5,6 +5,12 @@ class Fmm3d < Formula sha256 "e29a1ebe485d2431d4e330334b2853bc91b957afde6e24c2991099b28bd2b97c" license "Apache-2.0" + bottle do + root_url "https://ghcr.io/v2/flatironinstitute/ccm" + sha256 cellar: :any, ventura: "b656b343a56284d8a24d07850515ab99a45a6acd03ae0b0de4867d1fd745fd4b" + sha256 cellar: :any_skip_relocation, x86_64_linux: "43b26f7877439572dccf5a17dc9c0b65e209552c281f2be31c021537b030dd75" + end + depends_on "gcc" def install From 21d4c804ea5533e639ac25d036253ba7b14ef15b Mon Sep 17 00:00:00 2001 From: Dan Fortunato Date: Wed, 14 Feb 2024 16:49:58 -0500 Subject: [PATCH 04/10] Add mwrap formula Closes #2. Signed-off-by: Dan Fortunato --- Formula/mwrap.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Formula/mwrap.rb diff --git a/Formula/mwrap.rb b/Formula/mwrap.rb new file mode 100644 index 0000000..3fa5b54 --- /dev/null +++ b/Formula/mwrap.rb @@ -0,0 +1,22 @@ +class Mwrap < Formula + desc "MATLAB MEX gateway generator" + homepage "https://github.com/zgimbutas/mwrap" + url "https://github.com/zgimbutas/mwrap/archive/refs/tags/v1.1.1.tar.gz" + sha256 "7c007a2c833d956d4805f12922920c8c8f9a47dc3f483ba0ffffca5aa130daed" + license "MIT" + head "https://github.com/zgimbutas/mwrap.git", branch: "master" + + uses_from_macos "bison" => :build + uses_from_macos "flex" => :build + + def install + system "make", "bin" + bin.install "mwrap" + man1.install "doc/mwrap.1" + share.install "mwrap.pdf" + end + + test do + system "#{bin}/mwrap" + end +end From 2333b1467734a1b5ea96c88f85c2db6aeb703f41 Mon Sep 17 00:00:00 2001 From: Dan Fortunato Date: Wed, 14 Feb 2024 21:54:46 +0000 Subject: [PATCH 05/10] mwrap: add 1.1.1 bottle. --- Formula/mwrap.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Formula/mwrap.rb b/Formula/mwrap.rb index 3fa5b54..2544e95 100644 --- a/Formula/mwrap.rb +++ b/Formula/mwrap.rb @@ -6,6 +6,12 @@ class Mwrap < Formula license "MIT" head "https://github.com/zgimbutas/mwrap.git", branch: "master" + bottle do + root_url "https://ghcr.io/v2/flatironinstitute/ccm" + sha256 cellar: :any_skip_relocation, ventura: "22113a7b460fad9d128608ae736c3ddb94c737c4256a1d2193b019caf0121b1c" + sha256 cellar: :any_skip_relocation, x86_64_linux: "80aeb61d13865f89cc047106d422ca9bfb562a93ed69094e45ebd7569bc9f37a" + end + uses_from_macos "bison" => :build uses_from_macos "flex" => :build From 8926f20fdb32e313ab4d3f68a801aa0bc441fc58 Mon Sep 17 00:00:00 2001 From: Dan Fortunato Date: Wed, 14 Feb 2024 22:00:06 -0500 Subject: [PATCH 06/10] Add SCTL formula Closes #3. Signed-off-by: Dan Fortunato --- Formula/sctl.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Formula/sctl.rb diff --git a/Formula/sctl.rb b/Formula/sctl.rb new file mode 100644 index 0000000..6fc6e81 --- /dev/null +++ b/Formula/sctl.rb @@ -0,0 +1,17 @@ +class Sctl < Formula + desc "Scientific Computing Template Library" + homepage "https://github.com/dmalhotra/SCTL" + url "https://github.com/dmalhotra/SCTL/archive/refs/tags/1.0.0.tar.gz" + sha256 "ee1c73802449d187eeeea034f9084a54b91c32ac149e4de7a7c5259e536b9826" + license "Apache-2.0" + head "https://github.com/dmalhotra/SCTL.git", branch: "master" + + def install + include.install "include/sctl" + include.install "include/sctl.hpp" + end + + test do + system "true" + end +end From cd516f399642846613f5d10fc7cce99978d0601a Mon Sep 17 00:00:00 2001 From: Dan Fortunato Date: Thu, 15 Feb 2024 03:06:05 +0000 Subject: [PATCH 07/10] sctl: add 1.0.0 bottle. --- Formula/sctl.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Formula/sctl.rb b/Formula/sctl.rb index 6fc6e81..a045fea 100644 --- a/Formula/sctl.rb +++ b/Formula/sctl.rb @@ -6,6 +6,12 @@ class Sctl < Formula license "Apache-2.0" head "https://github.com/dmalhotra/SCTL.git", branch: "master" + bottle do + root_url "https://ghcr.io/v2/flatironinstitute/ccm" + sha256 cellar: :any_skip_relocation, ventura: "c1c119b41dd3415da9f99f74fb8e27e3e223ef902f0aa7c9130077bd0cd0dc41" + sha256 cellar: :any_skip_relocation, x86_64_linux: "abd0a8ddad6048889faf14f66e74bca423eb3f53df90760f4a4a1574daa158ac" + end + def install include.install "include/sctl" include.install "include/sctl.hpp" From 25a700112d9877d87a9212dab13f13a2e0a370bd Mon Sep 17 00:00:00 2001 From: Dan Fortunato Date: Wed, 14 Feb 2024 22:53:13 -0500 Subject: [PATCH 08/10] Add HEAD option to fmm3d formula --- Formula/fmm3d.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/fmm3d.rb b/Formula/fmm3d.rb index 58f8a75..25b42e7 100644 --- a/Formula/fmm3d.rb +++ b/Formula/fmm3d.rb @@ -4,6 +4,7 @@ class Fmm3d < Formula url "https://github.com/flatironinstitute/FMM3D/archive/refs/tags/v1.0.2.tar.gz" sha256 "e29a1ebe485d2431d4e330334b2853bc91b957afde6e24c2991099b28bd2b97c" license "Apache-2.0" + head "https://github.com/flatironinstitute/FMM3D.git", branch: "master" bottle do root_url "https://ghcr.io/v2/flatironinstitute/ccm" From ce295344246b38dd3ed0b68ce6e2cf9e6992f79e Mon Sep 17 00:00:00 2001 From: Dan Fortunato Date: Wed, 14 Feb 2024 22:53:44 -0500 Subject: [PATCH 09/10] Clean up SCTL formula --- Formula/sctl.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Formula/sctl.rb b/Formula/sctl.rb index a045fea..4f004d6 100644 --- a/Formula/sctl.rb +++ b/Formula/sctl.rb @@ -13,8 +13,7 @@ class Sctl < Formula end def install - include.install "include/sctl" - include.install "include/sctl.hpp" + include.install Dir["include/*"] end test do From 3ba899347830eb649ad155ae8429f0a6602a932a Mon Sep 17 00:00:00 2001 From: Dan Fortunato Date: Thu, 15 Feb 2024 14:27:55 -0500 Subject: [PATCH 10/10] Add M1 runner --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0721209..c60cc39 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ jobs: test-bot: strategy: matrix: - os: [ubuntu-22.04, macos-13] + os: [ubuntu-22.04, macos-13, flyci-macos-large-latest-m1] runs-on: ${{ matrix.os }} steps: - name: Set up Homebrew