Merge pull request #201454 from Homebrew/bump-halide-19.0.0

halide 19.0.0
Homebrew · Dec 18, 2024 · a63a460 · a63a460
2 parents b5fb74c + 7ace12e
commit a63a460
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 43 deletions.
diff --git a/Formula/h/halide.rb b/Formula/h/halide.rb
@@ -1,10 +1,9 @@
 class Halide < Formula
   desc "Language for fast, portable data-parallel computation"
   homepage "https://halide-lang.org"
-  url "https://github.com/halide/Halide/archive/refs/tags/v18.0.0.tar.gz"
-  sha256 "1176b42a3e2374ab38555d9316c78e39b157044b5a8e765c748bf3afd2edb351"
+  url "https://github.com/halide/Halide/archive/refs/tags/v19.0.0.tar.gz"
+  sha256 "83bae1f0e24dc44d9d85014d5cd0474df2dd03975680894ce3fafd6e97dffee2"
   license "MIT"
-  revision 1
   head "https://github.com/halide/Halide.git", branch: "main"
 
   livecheck do
@@ -13,13 +12,12 @@ class Halide < Formula
   end
 
   bottle do
-    rebuild 3
-    sha256 cellar: :any,                 arm64_sequoia: "a47babd7741a825bbce356c14d356810c285ddbae7ee18dd0c3df827bf8347ba"
-    sha256 cellar: :any,                 arm64_sonoma:  "ca7b252871d4c067737db812d14b3467500e16158b2989086a9df041b5236390"
-    sha256 cellar: :any,                 arm64_ventura: "0d70fd91451260abc7c479759b93bee154123f1cdf5e0d8e725a6b6306bd8acb"
-    sha256 cellar: :any,                 sonoma:        "a2573bcd16dbb7de7025c788374881d8dfdaa313f67032eb9c97b065303b401a"
-    sha256 cellar: :any,                 ventura:       "73cb1225eecf3b0ef6d50e5599bec8f8592c256c3dcf4213df47582849ffcf7d"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:  "d53aacb6e8c1c2950cb98ff4dd9f634a9f1e0e95db56644816d8837776c79609"
+    sha256 cellar: :any,                 arm64_sequoia: "63e0a77f37e9db89b85ee69af56a4c48af67f4131acc439d103c834c973b696e"
+    sha256 cellar: :any,                 arm64_sonoma:  "95a7b448f9ed4e23d48603ae2a63b92e5d0cf4729ee5e3bda4128234d3861baa"
+    sha256 cellar: :any,                 arm64_ventura: "57bae5cff5b521cc42a80f786411acf9cadc049ab5f7100d71e429c8986be6f4"
+    sha256 cellar: :any,                 sonoma:        "51ffd96b6e358f9e53ad81f0d3e9987c72d2ba2c19f85563fcd334baf0f25cf0"
+    sha256 cellar: :any,                 ventura:       "53888029c3c797b57577bb390dbcc34a4fe909b6aac219c81be9f55555764d3d"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "2a0bf8651e7a1c027c38776e0df09d4117156145efbacbc0fbbf00e0806cea21"
   end
 
   depends_on "cmake" => :build
@@ -30,39 +28,29 @@ class Halide < Formula
   depends_on "lld"
   depends_on "llvm"
   depends_on "[email protected]"
+  depends_on "wabt"
 
-  # Check wabt version in `dependencies/wasm/CMakeLists.txt`.
-  # TODO: Ask upstream to support usage of a system-provided wabt.
-  # TODO: Do we really need a git checkout here?
-  resource "wabt" do
-    url "https://github.com/WebAssembly/wabt.git",
-        tag:      "1.0.33",
-        revision: "963f973469b45969ce198e0c86d3af316790a780"
+  on_macos do
+    depends_on "openssl@3"
   end
 
   def python3
     "python3.13"
   end
 
   def install
-    builddir = buildpath/"build"
-    (builddir/"_deps/wabt-src").install resource("wabt")
-
     site_packages = prefix/Language::Python.site_packages(python3)
     rpaths = [rpath, rpath(source: site_packages/"halide")]
     args = [
       "-DCMAKE_INSTALL_RPATH=#{rpaths.join(";")}",
-      "-DHalide_INSTALL_PYTHONDIR=#{site_packages}",
-      "-DHalide_SHARED_LLVM=ON",
-      "-DPYBIND11_USE_FETCHCONTENT=OFF",
-      "-DFLATBUFFERS_USE_FETCHCONTENT=OFF",
-      "-DFETCHCONTENT_SOURCE_DIR_WABT=#{builddir}/_deps/wabt-src",
-      "-DCMAKE_SHARED_LINKER_FLAGS=-llldCommon",
+      "-DHalide_INSTALL_PYTHONDIR=#{site_packages}/halide",
+      "-DHalide_LLVM_SHARED_LIBS=ON",
+      "-DHalide_USE_FETCHCONTENT=OFF",
+      "-DWITH_TESTS=NO",
     ]
-    odie "CMAKE_SHARED_LINKER_FLAGS can be removed from `args`" if build.bottle? && version > "18.0.0"
-    system "cmake", "-S", ".", "-B", builddir, *args, *std_cmake_args
-    system "cmake", "--build", builddir
-    system "cmake", "--install", builddir
+    system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
+    system "cmake", "--build", "build"
+    system "cmake", "--install", "build"
   end
 
   test do

diff --git a/Formula/w/wabt.rb b/Formula/w/wabt.rb
@@ -5,21 +5,20 @@ class Wabt < Formula
       tag:      "1.0.36",
       revision: "3e826ecde1adfba5f88d10d361131405637e65a3"
   license "Apache-2.0"
+  revision 1
 
   livecheck do
     url :stable
     strategy :github_latest
   end
 
   bottle do
-    sha256 cellar: :any,                 arm64_sequoia:  "6d9c47a7d54935eb10ec2dcf66c0c265e27f348cdf3e62b674debdbe2e3b6f71"
-    sha256 cellar: :any,                 arm64_sonoma:   "6237a1e991c6fd3ef13205d461352614079623eff66d4d3b789653b2f6ad62d0"
-    sha256 cellar: :any,                 arm64_ventura:  "e803c52ce80a02bb1f25f7ff14a84efc6aba0873e6d0349fbb3ceb525fdbebf2"
-    sha256 cellar: :any,                 arm64_monterey: "c7c06f7d146ed9921827c24b163619793d5ed37fae1ccd7119c04edaf4fc119c"
-    sha256 cellar: :any,                 sonoma:         "8e21afdc77664ee9790f575dc5e1e1b37432a04e78b60c99bd7964b35101e762"
-    sha256 cellar: :any,                 ventura:        "df218de107e9a4961f32db86ad0e3cb28120d02ef551f6e298e39549ca14e230"
-    sha256 cellar: :any,                 monterey:       "a3f76262eae5db4e8592817b256b27176a8fcf59f05d4a69b71cb617ed4d2c49"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "183381abe48031239a58680b7991463788a018a456403f5061b783fe01b307db"
+    sha256 cellar: :any,                 arm64_sequoia: "9c8c3383a667f9930bf6b7e92a5ecfada06d52dc973aaebfe74fad1c9cf413e9"
+    sha256 cellar: :any,                 arm64_sonoma:  "6623b6eda3ef06355df0aa5826f0048ed47363608df17fe4ce04b083723ba68a"
+    sha256 cellar: :any,                 arm64_ventura: "cacc4321f1793cf3de5ce0cd5c7e815bb304b9d685a5be0b42d08d8cb08d2969"
+    sha256 cellar: :any,                 sonoma:        "0177a246fb21ff547aa0df436f337ab1923e3d7e87ff521e8a9e27b2df9b66b4"
+    sha256 cellar: :any,                 ventura:       "a3a3ba1408a348483f6b710080ad55eb0a02d367fde5a457bb9164683472b21e"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "9db533eaf5d9e50fc16896ae6525eda7a3a0b0bbc512578b652d1ff0a79bde2e"
   end
 
   depends_on "cmake" => :build
@@ -28,11 +27,17 @@ class Wabt < Formula
   uses_from_macos "python" => :build
 
   def install
-    system "cmake", "-S", ".", "-B", "build",
-                    "-DBUILD_TESTS=OFF",
-                    "-WITH_WASI=ON",
-                    *std_cmake_args,
-                    "-DFETCHCONTENT_FULLY_DISCONNECTED=OFF" # FIXME: Find a way to build without this.
+    ENV.append_to_cflags "-fPIC" if OS.linux?
+
+    args = %w[
+      -DBUILD_TESTS=OFF
+      -DWITH_WASI=ON
+      -DFETCHCONTENT_FULLY_DISCONNECTED=OFF
+    ]
+
+    system "cmake", *args, *std_cmake_args
+
+    system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
     system "cmake", "--build", "build"
     system "cmake", "--install", "build"
   end