-
Notifications
You must be signed in to change notification settings - Fork 3.3k
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.
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
Update revbayes to v1.2.4 #52069
Merged
Update revbayes to v1.2.4 #52069
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
21c1bed
Update revbayes to v1.2.4
mencian 8baab1c
Update meta.yaml
mencian 2befab9
Update meta.yaml
mencian 5a8bcf1
Update build.sh
mencian 89ffdb6
Update build.sh
mencian b2d45fd
Update build.sh
mencian 8654bf5
Update build.sh
mencian 6203c9b
Merge branch 'master' into revbayes
mencian 6734f1a
skip building on linux-aarch64; builds successfully but goes over tim…
mencian File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,53 +1,50 @@ | ||
#!/usr/bin/env bash | ||
#!/bin/bash | ||
|
||
export INCLUDES="-I${PREFIX}/include" | ||
export LIBPATH="-L${PREFIX}/lib" | ||
export LDFLAGS="${LDFLAGS} -L${PREFIX}/lib" | ||
export CXXFLAGS="${CXXFLAGS} -O3 -I${PREFIX}/include" | ||
|
||
mkdir -p $PREFIX/bin | ||
cd projects/cmake | ||
|
||
if [ ! -d build ]; then | ||
mkdir build | ||
if [[ `uname` == "Darwin" ]]; then | ||
export CONFIG_ARGS="-DCMAKE_FIND_FRAMEWORK=NEVER -DCMAKE_FIND_APPBUNDLE=NEVER" | ||
else | ||
export CONFIG_ARGS="" | ||
fi | ||
|
||
./generate_version_number.sh | ||
mv GitVersion.cpp ../../src/revlanguage/utils/ | ||
|
||
# MPI version | ||
./regenerate.sh -mpi true | ||
|
||
cd build | ||
./build.sh -mpi true -help2yml true \ | ||
-DCMAKE_BUILD_TYPE=Release \ | ||
-DCMAKE_PREFIX_PATH="${PREFIX}" \ | ||
-DCMAKE_CXX_COMPILER="${CXX}" \ | ||
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ | ||
-boost_root "${PREFIX}" \ | ||
-j "${CPU_COUNT}" \ | ||
"${CONFIG_ARGS}" | ||
|
||
# If cmake finds a boost version compiled with cmake, it always links to it unless both | ||
# Boost_NO_SYSTEM_PATHS=ON and Boost_NO_BOOST_CMAKE=ON (probably a bug in cmake) | ||
cmake -DCMAKE_PREFIX_PATH=$PREFIX \ | ||
-DBOOST_ROOT=$PREFIX \ | ||
-DBoost_NO_SYSTEM_PATHS=ON \ | ||
-DBoost_NO_BOOST_CMAKE=ON \ | ||
. | ||
|
||
make | ||
|
||
cd .. | ||
mkdir -p $PREFIX/bin | ||
mv rb $PREFIX/bin/rb-mpi | ||
chmod 0755 rb-mpi rb-mpi-help2yml | ||
mv rb-mpi rb-mpi-help2yml $PREFIX/bin/rb-mpi | ||
|
||
|
||
# Non-mpi version | ||
rm -rf build | ||
mkdir build | ||
rm -rf build-mpi | ||
|
||
./regenerate.sh | ||
|
||
cd build | ||
|
||
# If cmake finds a boost version compiled with cmake, it always links to it unless both | ||
# Boost_NO_SYSTEM_PATHS=ON and Boost_NO_BOOST_CMAKE=ON (probably a bug in cmake) | ||
cmake -DCMAKE_PREFIX_PATH=$PREFIX \ | ||
-DBOOST_ROOT=$PREFIX \ | ||
-DBoost_NO_SYSTEM_PATHS=ON \ | ||
-DBoost_NO_BOOST_CMAKE=ON \ | ||
. | ||
./build.sh -mpi false -help2yml true \ | ||
-DCMAKE_BUILD_TYPE=Release \ | ||
-DCMAKE_PREFIX_PATH="${PREFIX}" \ | ||
-DCMAKE_CXX_COMPILER="${CXX}" \ | ||
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ | ||
-boost_root "${PREFIX}" \ | ||
-j "${CPU_COUNT}" \ | ||
"${CONFIG_ARGS}" | ||
|
||
make | ||
|
||
cd .. | ||
mkdir -p $PREFIX/bin | ||
mv rb $PREFIX/bin | ||
chmod 0755 rb rb-help2yml | ||
mv rb rb-help2yml $PREFIX/bin | ||
|
||
rm -rf build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,43 +1,58 @@ | ||
{% set version = "1.0.13" %} | ||
{% set name = "revbayes" %} | ||
{% set version = "1.2.4" %} | ||
|
||
package: | ||
name: revbayes | ||
name: {{ name }} | ||
version: {{ version }} | ||
|
||
build: | ||
number: 7 | ||
|
||
source: | ||
url: https://github.com/revbayes/revbayes.archive/archive/v{{ version }}.tar.gz | ||
sha256: e85e2e1fe182fe9f504900150d936a06d252a362c591b9d3d8272dd085aa85d9 | ||
url: https://github.com/revbayes/revbayes/archive/refs/tags/v{{ version }}.tar.gz | ||
sha256: 020aa32b32db5896b081e14613c754fbb5523f01fa64262f502a6b693db9058a | ||
|
||
build: | ||
number: 0 | ||
run_exports: | ||
- {{ pin_subpackage('revbayes', max_pin="x") }} | ||
|
||
requirements: | ||
build: | ||
- make | ||
- {{ compiler('c') }} | ||
- {{ compiler('cxx') }} | ||
- cmake >=2.6 | ||
- cmake | ||
host: | ||
- boost-cpp >=1.60 | ||
- boost-cpp >=1.71 | ||
- openmpi | ||
- llvm-openmp # [osx] | ||
- libgomp # [linux] | ||
run: | ||
- boost-cpp >=1.60 | ||
- boost-cpp >=1.71 | ||
- openmpi | ||
- llvm-openmp # [osx] | ||
- libgomp # [linux] | ||
|
||
test: | ||
commands: | ||
- rb -v | ||
- rb -h | ||
- rb-mpi -v | ||
- rb-mpi -h | ||
|
||
about: | ||
home: https://revbayes.github.io/ | ||
license: GPLv3 | ||
home: "https://revbayes.github.io" | ||
license: "GPL-3.0-or-later" | ||
license_family: GPL3 | ||
license_file: LICENSE | ||
summary: Bayesian phylogenetic inference using probabilistic graphical models and an interactive language. | ||
summary: "Bayesian Phylogenetic Inference Using Graphical Models and an Interactive Model-Specification Language." | ||
dev_url: "https://github.com/revbayes/revbayes" | ||
doc_url: "https://revbayes.github.io/tutorials" | ||
|
||
extra: | ||
container: | ||
# openmpi needs ssh/rsh | ||
extended-base: true | ||
extended-base: True | ||
identifiers: | ||
- biotools:revbayes | ||
- doi:10.1093/sysbio/syw021 | ||
- doi:10.1093/sysbio/syu039 | ||
additional-platforms: | ||
- linux-aarch64 | ||
- osx-arm64 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add error handling for directory navigation
While the platform-specific configuration is well-implemented, the
cd
command should include error handling to prevent silent failures.Apply this diff to add error handling:
📝 Committable suggestion
🧰 Tools
🪛 Shellcheck
[warning] 9-9: Use 'cd ... || exit' or 'cd ... || return' in case cd fails.
(SC2164)