Updates in tests and automatic building scripts

refresh-bio · Sep 12, 2024 · 1cad745 · 1cad745
1 parent 966faf2
commit 1cad745
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 23 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -28,15 +28,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        machine: [x64_linux, arm64_linux, x64_mac, arm64_mac]
+        machine: [x64_linux]
+        platform: [avx2]
+        compiler: [g++-13]
+        include:
+        - {machine: arm64_linux, platform: arm8, compiler: g++-12}
+        - {machine: x64_mac, platform: avx2, compiler: g++-13}
+        - {machine: arm64_mac, platform: m1, compiler: g++-13}
 
     runs-on: [self-hosted, kmer-db, '${{ matrix.machine }}']  
 
     steps:
     - name: make 
       run: |
         make clean
-        make -j32 CXX=g++-12 STATIC_LINK=true
+        make -j32 CXX=${{matrix.compiler}} STATIC_LINK=true PLATFORM=${{ matrix.platform }}
     - name: tar artifacts
       run: tar -cvzf kmer-db.tar.gz kmer-db LICENSE
 

diff --git a/.github/workflows/self-hosted.yml b/.github/workflows/self-hosted.yml
@@ -14,11 +14,11 @@ jobs:
     name: Checkout
     strategy:
       matrix:
-        machine: [xeon, mac-i7, mac-m1]
+        machine: [x64_linux, x64_mac, arm64_linux, arm64_mac]
     runs-on: [self-hosted, kmer-db, '${{ matrix.machine }}']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -30,15 +30,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        machine: [xeon, mac-i7, mac-m1]
-        compiler: [11]
+        machine: [x64_linux, x64_mac, arm64_linux, arm64_mac]
+        compiler: [g++-11, g++-12, g++-13]
+        include:
+        - {machine: x64_linux, platform: avx2}
+        - {machine: arm64_linux, platform: arm8}
+        - {machine: x64_mac, platform: avx2}
+        - {machine: arm64_mac, platform: m1}
+        exclude:
+        - {machine: arm64_linux, compiler: g++-13}
         force_zlib: [true, false]
+
     runs-on: [self-hosted, kmer-db, '${{ matrix.machine }}']  
 
     steps:
-    - name: make (g++-${{matrix.compiler}}, FORCE_ZLIB=${{matrix.force_zlib}})
+    - name: make (${{matrix.compiler}}, FORCE_ZLIB=${{matrix.force_zlib}}, PLATFORM=${{ matrix.platform}})
       run: | 
-        make -j32 CXX=g++-${{matrix.compiler}} FORCE_ZLIB=${{matrix.force_zlib}}
+        make -j32 CXX=${{matrix.compiler}} FORCE_ZLIB=${{matrix.force_zlib}} PLATFORM=${{ matrix.platform }}
         cp ./kmer-db ./kmer-db-${{matrix.compiler}}-${{matrix.force_zlib}}
         make clean
         
@@ -49,16 +57,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        machine: [xeon, mac-i7, mac-m1]
-        compiler: [11]
-        mode: [unknown, build, all2all, all2all-parts, all2all-sp, new2all, one2all, distance, minhash]
+        machine: [x64_linux, x64_mac, arm64_linux, arm64_mac]
+        compiler: [g++-11, g++-12, g++-13]
+        force_zlib: [false, true]
+        mode: [unknown_mode]
+        exclude:
+        - {machine: arm64_linux, compiler: g++-13}
+        include:
+        - {machine: x64_linux, compiler: g++-13, force_zlib: false, mode: all2all}
+        - {machine: x64_linux, compiler: g++-13, force_zlib: false, mode: all2all-parts} 
+        - {machine: x64_linux, compiler: g++-13, force_zlib: false, mode: all2all-sp} 
+        - {machine: x64_linux, compiler: g++-13, force_zlib: false, mode: new2all} 
+        - {machine: x64_linux, compiler: g++-13, force_zlib: false, mode: one2all} 
+        - {machine: x64_linux, compiler: g++-13, force_zlib: false, mode: distance} 
+        - {machine: x64_linux, compiler: g++-13, force_zlib: false, mode: minhash} 
+
     runs-on: [self-hosted, kmer-db, '${{ matrix.machine }}']
 
     env: 
-      EXEC: ./kmer-db-${{matrix.compiler}}-true
+      EXEC: ./kmer-db-${{matrix.compiler}}-${{matrix.force_zlib}}
 
     steps:
-    - name: help (g++-${{matrix.compiler}}, ${{matrix.mode}})
+    - name: help (${{matrix.compiler}}, ${{matrix.mode}})
       run: | 
        ${EXEC} ${{matrix.mode}} -help
 
@@ -70,9 +90,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        machine: [xeon, mac-i7, mac-m1]
-        compiler: [11]
-        force_zlib: [true, false]
+        machine: [x64_linux, x64_mac, arm64_linux, arm64_mac]
+        compiler: [g++-11, g++-12, g++-13]
+        exclude:
+        - {machine: arm64_linux, compiler: g++-13}
+        force_zlib: [false]
     runs-on: [self-hosted, kmer-db, '${{ matrix.machine }}']
 
     env: 
@@ -188,14 +210,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        machine: [xeon, mac-i7, mac-m1]
-        compiler: [11]
-        threads: [1, 2, 16, 0]
+        machine: [x64_linux, x64_mac, arm64_linux, arm64_mac]
+        compiler: [g++-11, g++-12, g++-13]
+        exclude:
+        - {machine: arm64_linux, compiler: g++-13}
+        force_zlib: [false]
+        threads: [1, 2, 16]
+
     runs-on: [self-hosted, kmer-db, '${{ matrix.machine }}']
 
     env: 
       INPUT_DIR: ./test/virus
-      EXEC: ./kmer-db-${{matrix.compiler}}-false
+      EXEC: ./kmer-db-${{matrix.compiler}}-${{matrix.force_zlib}}
 
     steps:
 

diff --git a/src/version.h b/src/version.h
@@ -1,11 +1,13 @@
 #pragma once
 
-#define VERSION "2.0.4"
-#define DATE "20.08.2024"
+#define VERSION "2.0.5"
+#define DATE "12.09.2024"
 
 /* 
 
 Version history
+2.0.5 (12.09.2024)
+- Updates in tests and automatic building scripts.
 
 2.0.4 (20.08.2024)
 - Above and below options working correctly in all2all-sp mode.
@@ -141,4 +143,4 @@ Initial release
 
 
 
-*/
+*/