Skip to content

Commit 9424c5d

Browse files
authored
Multiple enhancements
- Added Pfasum substitution matrices. - New dissimilarity measure. - Added AVX512 support. - Added gzipped inputs support. - Added distance-based prefiltering in MST Prim's algorithm. - Fix in MedoidTrees - full FAMSA executed always when subtree size is smaller then `-sample_size` parameter. - Automatic deployment of Windows releases.
1 parent 6c27d4a commit 9424c5d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+216777
-212200
lines changed

.github/workflows/deploy.yml

Lines changed: 54 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
machine: [x64_linux, x64_mac, arm64_linux, arm64_mac]
17-
runs-on: [self-hosted, kmer-db, '${{ matrix.machine }}']
17+
runs-on: [self-hosted, famsa, '${{ matrix.machine }}']
1818

1919
steps:
2020
- name: clean
@@ -24,6 +24,22 @@ jobs:
2424
with:
2525
submodules: recursive
2626

27+
########################################################################################
28+
checkout-windows:
29+
name: checkout (Windows)
30+
strategy:
31+
matrix:
32+
machine: [x64_windows]
33+
runs-on: [self-hosted, famsa, '${{ matrix.machine }}']
34+
35+
steps:
36+
- name: clean
37+
run: Remove-Item -Path "${{ github.workspace }}/*" -Recurse -Force
38+
39+
- uses: actions/checkout@v4
40+
with:
41+
submodules: recursive
42+
2743
########################################################################################
2844
make:
2945
name: Make
@@ -33,35 +49,62 @@ jobs:
3349
matrix:
3450
machine: [x64_linux]
3551
platform: [avx2]
36-
compiler: [g++-13]
37-
static: [true]
52+
compiler: [13]
3853
include:
39-
- {machine: arm64_linux, platform: arm8, compiler: g++-12, static: true}
40-
- {machine: x64_mac, platform: avx2, compiler: g++-13, static: false}
41-
- {machine: arm64_mac, platform: m1, compiler: g++-13, static: false}
54+
- {machine: arm64_linux, platform: arm8, compiler: 12}
55+
- {machine: x64_mac, platform: avx2, compiler: 13}
56+
- {machine: arm64_mac, platform: m1, compiler: 13}
4257

4358
runs-on: [self-hosted, famsa, '${{ matrix.machine }}']
4459

4560
steps:
4661
- name: make
47-
run: make -j32 CXX=${{matrix.compiler}} STATIC_LINK=${{ matrix.static }} PLATFORM=${{ matrix.platform }}
62+
run: gmake -j32 CXX=g++-${{matrix.compiler}} CC=gcc-${{matrix.compiler}} STATIC_LINK=true PLATFORM=${{ matrix.platform }}
4863
- name: tar artifacts
49-
run: tar -cvzf famsa.tar.gz famsa LICENSE
64+
run: tar -cvzf famsa.tar.gz LICENSE -C ./bin famsa
65+
66+
67+
########################################################################################
68+
make-windows:
69+
name: Make (Windows)
70+
needs: checkout-windows
71+
strategy:
72+
fail-fast: false
73+
matrix:
74+
machine: [x64_windows]
75+
76+
runs-on: [self-hosted, famsa, '${{ matrix.machine }}']
77+
78+
env:
79+
MSBUILD: "C:/Microsoft Visual Studio/2022/Community/MSBuild/Current/Bin/MSBuild.exe"
80+
81+
steps:
82+
- name: make
83+
run: |
84+
& "$env:MSBUILD" FAMSA.sln /p:Configuration=Release /p:Platform=x64 /m
85+
- name: tar artifacts
86+
run: tar -cvzf famsa.tar.gz LICENSE -C ./x64/Release famsa.exe
5087

5188

5289
########################################################################################
5390
help:
5491
name: Print usage
55-
needs: make
92+
needs:
93+
- make
94+
- make-windows
5695
strategy:
5796
fail-fast: false
5897
matrix:
5998
machine: [x64_linux, x64_mac, arm64_linux, arm64_mac]
99+
exec: [./bin/famsa]
100+
include:
101+
- {machine: x64_windows, exec: ./x64/Release/famsa.exe}
102+
60103
runs-on: [self-hosted, famsa, '${{ matrix.machine }}']
61104

62105
steps:
63106
- name: help
64-
run: ./famsa
107+
run: ${{ matrix.exec }}
65108

66109
########################################################################################
67110
upload:
@@ -70,7 +113,7 @@ jobs:
70113
strategy:
71114
fail-fast: false
72115
matrix:
73-
machine: [x64_linux, x64_mac, arm64_linux, arm64_mac]
116+
machine: [x64_linux, x64_mac, arm64_linux, arm64_mac, x64_windows]
74117
runs-on: [self-hosted, famsa, '${{ matrix.machine }}']
75118

76119
steps:

.github/workflows/main.yml

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,53 @@ on:
99

1010
jobs:
1111

12-
make-tests:
12+
########################################################################################
13+
make:
1314
name: Make
1415
strategy:
16+
fail-fast: false
1517
matrix:
1618
machine: [ubuntu-latest, macOS-13]
17-
runs-on: ['${{ matrix.machine }}']
18-
19-
env:
20-
REF_DIR: ./test/adeno_fiber
21-
INPUT: ./test/adeno_fiber/adeno_fiber
22-
19+
include:
20+
- {machine: ubuntu-latest, gmake_install_command: 'gmake --version', compiler: 12}
21+
- {machine: macOS-13, gmake_install_command: 'brew install make && gmake --version', compiler: 12}
22+
23+
runs-on: ['${{ matrix.machine }}']
24+
2325
steps:
2426
- uses: actions/checkout@v4
2527
with:
2628
submodules: recursive
27-
- name: make
28-
run: |
29-
g++ --version
30-
make -j
31-
32-
- name: copy sl->slink references
33-
run: |
34-
cp ./test/adeno_fiber/sl.fasta ./test/adeno_fiber/slink.fasta
35-
cp ./test/hemopexin/medoid-sl.fasta ./test/hemopexin/medoid-slink.fasta
29+
30+
- name: install gmake
31+
run: ${{ matrix.gmake_install_command }}
3632

33+
- name: get tags
34+
run: |
35+
cd ./libs/igraph
36+
git fetch --prune --unshallow
37+
echo exit code $?
38+
git tag --list
39+
continue-on-error: true
40+
41+
- name: make
42+
run: |
43+
gmake -j CXX=g++-${{matrix.compiler}} CC=gcc-${{matrix.compiler}} STATIC_LINK=true PLATFORM=avx2
44+
cp ./bin/famsa ./famsa
3745
- name: tar artifacts
38-
run: tar -cvf famsa.tar ./famsa ./test
46+
run: tar -cvf famsa.tar ./famsa ./test/adeno_fiber/* ./test/hemopexin/*
3947

4048
- uses: actions/upload-artifact@v4
4149
with:
4250
name: executable-artifact-${{ matrix.machine }}
4351
path: ./famsa.tar
44-
45-
52+
53+
4654
########################################################################################
4755

4856
full-tree:
4957
name: Full tree (adeno-fiber)
50-
needs: make-tests
58+
needs: make
5159
strategy:
5260
fail-fast: false
5361
matrix:

0 commit comments

Comments
 (0)