Skip to content

Mix finder update #19

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

Merged
merged 70 commits into from
Apr 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
f6ce95a
Fix the window compilation issue
thomaskf Mar 4, 2025
2252f7f
Merge pull request #2 from thomaskf/master
bqminh Mar 4, 2025
ce3de9d
Change binary file to iqtree3
bqminh Mar 4, 2025
805b910
mAIC should not be computed for -S option
thomaskf Mar 6, 2025
13558c3
if performing mcmc dating and run ModelFinder, force IQ-TREE to re-lo…
trongnhanuit Mar 6, 2025
074cfd3
Copy the traversal_starting_node information for a new copy of IQTREE
thomaskf Mar 7, 2025
52b4ca2
Fixed the issue for using predefined protein frequency under the --mo…
thomaskf Mar 7, 2025
770852f
Update the workflow so that the compiled IQ-TREE file under MacOS wil…
thomaskf Mar 7, 2025
ff92786
Update the codes to remove the warnings during the compilation
thomaskf Mar 7, 2025
3a56dee
add the option --fundi-epsilon to set the epsilon value for funDi model
thomaskf Mar 7, 2025
663216c
Revert "Fixed the issue for using predefined protein frequency under …
thomaskf Mar 7, 2025
42d98ae
Revert "Copy the traversal_starting_node information for a new copy o…
thomaskf Mar 7, 2025
bf1f85b
Merge pull request #3 from thomaskf/master
bqminh Mar 7, 2025
f3f49ba
Support --model-join for mixture model with predefined frequencies
thomaskf Mar 8, 2025
41d33a6
Allow syntax +CMIX for codon mixture, e.g., GY+CMIX3 is equivalent to…
bqminh Mar 10, 2025
b945d99
add files for ModelCodonMixture
bqminh Mar 10, 2025
1566ccf
allow setting lower and upper bound for omega with < and > syntax
bqminh Mar 10, 2025
2f04083
link kappa in codon mixture
bqminh Mar 10, 2025
f46815c
Change binary file to iqtree3
bqminh Mar 4, 2025
808c87a
Merge branch 'master' into minh
bqminh Mar 10, 2025
bb1c104
Update ci.yaml for iqtree3 instead of iqtree2
thomaskf Mar 11, 2025
987cb1f
Merge pull request #4 from thomaskf/master
bqminh Mar 11, 2025
ee08f76
Fixed the wall-clock time issue
thomaskf Mar 12, 2025
0c317c8
Update the codes to fix the timing issue.
thomaskf Mar 12, 2025
e3d3132
Update again for fixing the timing issue.
thomaskf Mar 12, 2025
3a1ef2f
Merge branch 'master' into Ryo
thomaskf Mar 12, 2025
edb41f5
fix parsing --model-joint string
bqminh Mar 14, 2025
56fbd9e
Merge branch 'master' into Ryo
thomaskf Mar 14, 2025
b518586
Merge pull request #5 from thomaskf/Ryo
bqminh Mar 14, 2025
a7458e5
Optimize FunDi rho from initial 0.5 and new options to set initial rh…
bqminh Mar 20, 2025
3375a10
Merge branch 'master' into minh
bqminh Mar 20, 2025
191021a
return proper value of variables changed for codon-mixture
bqminh Mar 20, 2025
30fc76a
Accept stop codons as missing data instead of printing errors
bqminh Mar 21, 2025
dcbae48
link to the latest version of CMAPLE
trongnhanuit Mar 28, 2025
223cbb9
first integration of SPRTA into IQ-TREE
trongnhanuit Mar 28, 2025
0f97176
Add alrt and sprta options to the help message
trongnhanuit Mar 28, 2025
968686f
change --zero-branch-supp to --sprta-zero-branch; change --out-alter-…
trongnhanuit Mar 28, 2025
696916b
change .nexus to .nex
trongnhanuit Mar 28, 2025
8d11402
remove help messages in usage() function, only keep those in usage_iq…
trongnhanuit Mar 28, 2025
1a07004
enforce using CMAPLE search algorithm when computing SPRTA
trongnhanuit Mar 28, 2025
4e22f8f
if SPRTA was computed, don't allow changing tree topology later
trongnhanuit Mar 28, 2025
6501328
Update copyright message
bqminh Apr 3, 2025
750008e
Update references to ask users to cite
bqminh Apr 3, 2025
9b18dd4
update cmake file
thomaskf Apr 3, 2025
b03cc7e
update cmake file again
thomaskf Apr 3, 2025
15b750d
update the workflow
thomaskf Apr 3, 2025
c99aa2e
update the workflow for windows
thomaskf Apr 3, 2025
135036f
update the workflow to make package
thomaskf Apr 3, 2025
3a14ac4
pull the latest cmaple to avoid redundant linkings
trongnhanuit Apr 3, 2025
16844d1
update the workflow to make package for all platforms
thomaskf Apr 3, 2025
6d43fd9
update the workflow from Mac Universal
thomaskf Apr 3, 2025
5d86c87
pull the latest CMAPLE to avoid adding duplicate libraries: '-lomp'
trongnhanuit Apr 3, 2025
2eaabf7
Update the script to make the Mac Universal
thomaskf Apr 3, 2025
5878046
Merge pull request #7 from thomaskf/master
bqminh Apr 3, 2025
90e806b
disable the workflow for the Mac Universal
thomaskf Apr 3, 2025
4f64753
change example command from iqtree2 to iqtree3
bqminh Apr 3, 2025
cda8b22
Merge pull request #8 from trongnhanuit/nhan
bqminh Apr 3, 2025
d9cb737
update the workflow for the Mac Universal
thomaskf Apr 3, 2025
ae04fad
change to version v3.0.0
bqminh Apr 3, 2025
377af62
update the workflow for the Mac Universal
thomaskf Apr 3, 2025
32ad273
compile windows with static option
thomaskf Apr 3, 2025
b64c63d
Merge pull request #9 from thomaskf/master
bqminh Apr 3, 2025
4be5fcc
add badge for iqtree3 in README
bqminh Apr 4, 2025
9ba4cd3
Naser-Khdour et al. (2024) -> Naser-Khdour et al. (2019)
Apr 4, 2025
8f3534a
Merge pull request #10 from HS6986/typo/HS6986/Naser-Khdour2019
bqminh Apr 4, 2025
8873228
Fix bug for binary data with ASC with flag when storing G_matrix.
piyumalanthony Apr 10, 2025
0b6025c
Update the code according to 433 pull request.
thomaskf Apr 10, 2025
0f84a1d
Fix bug in commandlines for yule-hardening tree generation.
piyumalanthony Apr 10, 2025
d20db5a
Merge branch 'bugfix' of https://github.com/thomaskf/iqtree3 into bugfix
thomaskf Apr 10, 2025
13b6892
Allow to fix the parameters for RHAS when using mixture finder. Also …
thomaskf Apr 16, 2025
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
70 changes: 45 additions & 25 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,19 @@ jobs:
run: |
mkdir build
cd build
cmake .. -DIQTREE_FLAGS=static -DCMAKE_C_COMPILER=$(which gcc-${{ matrix.gcc-version }}) -DCMAKE_CXX_COMPILER=$(which g++-${{ matrix.gcc-version }})
cmake .. -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DIQTREE_FLAGS=static -DCMAKE_C_COMPILER=$(which gcc-${{ matrix.gcc-version }}) -DCMAKE_CXX_COMPILER=$(which g++-${{ matrix.gcc-version }})
make -j
file iqtree2 | grep x86-64
make package
file iqtree3 | grep x86-64
file iqtree*.tar.gz | grep gzip

- name: Upload Built Binary
# Only upload for one of the gcc & cmake tests
if: ${{ matrix.upload }}
uses: actions/upload-artifact@v4
with:
name: Linux x86-64
path: build/iqtree2
path: build/iqtree*.tar.gz
if-no-files-found: error

build-linux-aarch64:
Expand All @@ -83,13 +85,15 @@ jobs:
cd build
cmake .. -DIQTREE_FLAGS=static
make -j
file iqtree2 | grep aarch64
make package
file iqtree3 | grep aarch64
file iqtree*.tar.gz | grep gzip

- name: Upload Built Binary
uses: actions/upload-artifact@v4
with:
name: Linux AArch64
path: build/iqtree2
path: build/iqtree*.tar.gz
if-no-files-found: error

build-macos-x86_64:
Expand All @@ -110,18 +114,19 @@ jobs:
set -x
mkdir build
cd build
export LDFLAGS="-L/usr/local/opt/libomp/lib"
export CPPFLAGS="-I/usr/local/opt/libomp/include"
export CXXFLAGS="-I/usr/local/opt/libomp/include"
cmake .. -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
gmake -j
file iqtree2 | grep x86_64
make -j
make package
file iqtree3 | grep x86_64
file iqtree*.zip | grep Zip

- name: Upload Built Binary
uses: actions/upload-artifact@v4
with:
name: Mac x86-64
path: build/iqtree2
path: build/iqtree*.zip
if-no-files-found: error

build-macos-arm:
Expand All @@ -142,18 +147,19 @@ jobs:
set -x
mkdir build
cd build
export LDFLAGS="-L/opt/homebrew/opt/libomp/lib"
export CPPFLAGS="-I/opt/homebrew/opt/libomp/include"
export CXXFLAGS="-I/opt/homebrew/opt/libomp/include"
cmake .. -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
gmake -j
file iqtree2 | grep arm64
make -j
make package
file iqtree3 | grep arm64
file iqtree*.zip | grep Zip

- name: Upload Built Binary
uses: actions/upload-artifact@v4
with:
name: Mac Arm
path: build/iqtree2
path: build/iqtree*.zip
if-no-files-found: error

compile-mac-universal:
Expand All @@ -164,22 +170,33 @@ jobs:
- build-macos-arm

steps:
- name: Download Artifacts
- name: Checkout
uses: actions/checkout@v4

- name: Download Mac x86-64 Artifact
uses: actions/download-artifact@v4
with:
pattern: Mac *

name: Mac x86-64
path: x86

- name: Download Mac Arm Artifact
uses: actions/download-artifact@v4
with:
name: Mac Arm
path: arm

- name: Combine Artifacts
run: lipo -create -output iqtree2 "Mac x86-64/iqtree2" "Mac Arm/iqtree2"

- name: Check Architectures
run: lipo -archs iqtree2

run: |
chmod +x test_scripts/make_universal.sh
file1=$(ls x86/iqtree*.zip)
file2=$(ls arm/iqtree*.zip)
test_scripts/make_universal.sh "$file1" "$file2"

- name: Upload Built Binary
uses: actions/upload-artifact@v4
with:
name: Mac Universal
path: iqtree2
path: iqtree*.zip
if-no-files-found: error

build-windows-x86-64:
Expand Down Expand Up @@ -221,20 +238,23 @@ jobs:
-DCMAKE_MAKE_PROGRAM=mingw32-make ^
-DBoost_INCLUDE_DIR=${{steps.install-boost.outputs.BOOST_ROOT}}/include ^
-DBoost_LIBRARY_DIRS=${{steps.install-boost.outputs.BOOST_ROOT}}/lib ^
-DIQTREE_FLAGS="cpp14" ..
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 ^
-DIQTREE_FLAGS="static cpp14" ..
make -j
make package
env:
BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}

- name: Check File Arch
shell: bash
run: |
cd build
file iqtree2.exe | grep x86-64
file iqtree3.exe | grep x86-64
file iqtree*.zip

- name: Upload Built Binary
uses: actions/upload-artifact@v4
with:
name: Windows x86-64
path: build/iqtree2.exe
path: build/iqtree*.zip
if-no-files-found: error
Loading