Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phase out :mpi, part 1 #22820

Closed
wants to merge 4 commits into from
Closed

Phase out :mpi, part 1 #22820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e68e028
konoha: phase out :mpi
fxcoudert Jan 13, 2018
49ab21c
abyss: phase out :mpi
fxcoudert Jan 13, 2018
09f0060
bsponmpi: phase out :mpi
fxcoudert Jan 13, 2018
7cb3bba
boost-mpi: phase out :mpi
fxcoudert Jan 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Formula/abyss.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Abyss < Formula
homepage "http://www.bcgsc.ca/platform/bioinfo/software/abyss"
url "https://github.com/bcgsc/abyss/releases/download/2.0.2/abyss-2.0.2.tar.gz"
sha256 "d87b76edeac3a6fb48f24a1d63f243d8278a324c9a5eb29027b640f7089422df"
revision 2
revision 3

bottle do
cellar :any
Expand All @@ -20,12 +20,12 @@ class Abyss < Formula
depends_on "multimarkdown" => :build
end

needs :openmp

depends_on "boost" => :build
depends_on "google-sparsehash" => :build
depends_on "gcc"
depends_on :mpi => :cc
depends_on "open-mpi"

fails_with :clang # no OpenMP support

resource("testdata") do
url "http://www.bcgsc.ca/platform/bioinfo/software/abyss/releases/1.3.4/test-data.tar.gz"
Expand Down
3 changes: 2 additions & 1 deletion Formula/boost-mpi.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class BoostMpi < Formula
homepage "https://www.boost.org/"
url "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2"
sha256 "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"
revision 1
head "https://github.com/boostorg/boost.git"

bottle do
Expand All @@ -12,7 +13,7 @@ class BoostMpi < Formula
end

depends_on "boost"
depends_on :mpi => [:cc, :cxx]
depends_on "open-mpi"

needs :cxx11

Expand Down
4 changes: 2 additions & 2 deletions Formula/bsponmpi.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Bsponmpi < Formula
homepage "https://sourceforge.net/projects/bsponmpi/"
url "https://downloads.sourceforge.net/project/bsponmpi/bsponmpi/0.3/bsponmpi-0.3.tar.gz"
sha256 "bc90ca22155be9ff65aca4e964d8cd0bef5f0facef0a42bc1db8b9f822c92a90"
revision 1
revision 2

bottle do
sha256 "2d3c362d85b10c9a1bd1b4adc45ac2576abe0a86c15408d20c375bffd9e05494" => :high_sierra
Expand All @@ -12,7 +12,7 @@ class Bsponmpi < Formula
end

depends_on "scons" => :build
depends_on :mpi => [:cc, :cxx]
depends_on "open-mpi"

def install
# Don't install 'CVS' folders from tarball
Expand Down
17 changes: 5 additions & 12 deletions Formula/konoha.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Konoha < Formula
homepage "https://github.com/konoha-project/konoha3"
url "https://github.com/konoha-project/konoha3/archive/v0.1.tar.gz"
sha256 "e7d222808029515fe229b0ce1c4e84d0a35b59fce8603124a8df1aeba06114d3"
revision 2
revision 3

bottle do
sha256 "02bc662f7d21b3a4a0de5fe3ab0687ad686ca7dc67fe22374abd75a34a33f78b" => :high_sierra
Expand All @@ -17,25 +17,18 @@ class Konoha < Formula
depends_on "openssl"
end

option "with-test", "Verify the build with make test (May currently fail)"

deprecated_option "tests" => "with-test"

depends_on "cmake" => :build
depends_on :mpi => [:cc, :cxx]
depends_on "pcre"
depends_on "json-c"
depends_on "sqlite"
depends_on "mecab" if MacOS.version >= :mountain_lion
depends_on "python" if MacOS.version <= :snow_leopard # for python glue code
depends_on "open-mpi"
depends_on "pcre"
depends_on "python" if MacOS.version <= :snow_leopard
depends_on "sqlite"

def install
mkdir "build" do
system "cmake", "..", *std_cmake_args
system "make"
# `make test` currently fails. Reported upstream:
# https://github.com/konoha-project/konoha3/issues/438
system "make", "test" if build.with? "test"
system "make", "install"
end
end
Expand Down