Reenable static, replace sse2 with sse41

azure-pipelines.yml

@@ -16,19 +16,19 @@ jobs:
       matrix:
         avx2:
           SIMD: 'AVX2'
-          STATIC: 0
+          STATIC: 1
+          MPI: 0
+          BUILD_TYPE: RelWithDebInfo
+        sse41:
+          SIMD: 'SSE4_1'
+          STATIC: 1
           MPI: 0
           BUILD_TYPE: RelWithDebInfo
-        # sse41:
-        #   SIMD: 'SSE4_1'
+        # sse2:
+        #   SIMD: 'SSE2'
         #   STATIC: 1
         #   MPI: 0
         #   BUILD_TYPE: RelWithDebInfo
-        sse2:
-          SIMD: 'SSE2'
-          STATIC: 0
-          MPI: 0
-          BUILD_TYPE: RelWithDebInfo
         avx2_mpi:
           SIMD: 'AVX2'
           STATIC: 0
@@ -57,8 +57,8 @@ jobs:
           export CC=gcc-11 ; export CXX=g++-11
           if [ "${STATIC}" -eq "1" ]; then
               cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=OFF \
-                -DPREFER_STATIC=1 -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
-                -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
+                -DCMAKE_EXE_LINKER_FLAGS="-static -static-libgcc \
+                -static-libstdc++" -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
                 -DENABLE_WERROR=1 -DHAVE_${SIMD}=1 -DHAVE_MPI=${MPI} ..
           else
               cmake -DHAVE_SANITIZER=1 -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
@@ -113,8 +113,8 @@ jobs:
           CC=${CPREF}-linux-gnu-gcc CXX=${CPREF}-linux-gnu-g++ \
            cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DHAVE_TESTS=1 \
             -DBUILD_SHARED_LIBS=OFF \
-            -DCMAKE_EXE_LINKER_FLAGS="-static -static-libgcc -static-libstdc++" \
-            -DPREFER_STATIC=1 -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
+            -DCMAKE_EXE_LINKER_FLAGS="-static -static-libgcc \
+            -static-libstdc++" -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
             -DRust_CARGO_TARGET=${CPREF}-unknown-linux-gnu \
             -DENABLE_WERROR=1 -DHAVE_${SIMD}=1 ..
           make -j $(nproc --all)
@@ -177,30 +177,30 @@ jobs:
           archiveFile: $(Build.SourcesDirectory)/foldseek-osx-universal.tar.gz
           includeRootFolder: true
           archiveType: tar
-      - task: DownloadPipelineArtifact@1
-        inputs:
-          artifactName: foldseek-linux-SSE2
-          targetPath: $(Build.SourcesDirectory)/foldseek/bin
-      - script:
-          chmod +x "${BUILD_SOURCESDIRECTORY}/foldseek/bin/foldseek"
-      - task: ArchiveFiles@2
-        inputs:
-          rootFolderOrFile: $(Build.SourcesDirectory)/foldseek
-          archiveFile: $(Build.SourcesDirectory)/foldseek-linux-sse2.tar.gz
-          includeRootFolder: true
-          archiveType: tar
       # - task: DownloadPipelineArtifact@1
       #   inputs:
-      #     artifactName: foldseek-linux-SSE4_1
+      #     artifactName: foldseek-linux-SSE2
       #     targetPath: $(Build.SourcesDirectory)/foldseek/bin
       # - script:
       #     chmod +x "${BUILD_SOURCESDIRECTORY}/foldseek/bin/foldseek"
       # - task: ArchiveFiles@2
       #   inputs:
       #     rootFolderOrFile: $(Build.SourcesDirectory)/foldseek
-      #     archiveFile: $(Build.SourcesDirectory)/foldseek-linux-sse41.tar.gz
+      #     archiveFile: $(Build.SourcesDirectory)/foldseek-linux-sse2.tar.gz
       #     includeRootFolder: true
       #     archiveType: tar
+      - task: DownloadPipelineArtifact@1
+        inputs:
+          artifactName: foldseek-linux-SSE4_1
+          targetPath: $(Build.SourcesDirectory)/foldseek/bin
+      - script:
+          chmod +x "${BUILD_SOURCESDIRECTORY}/foldseek/bin/foldseek"
+      - task: ArchiveFiles@2
+        inputs:
+          rootFolderOrFile: $(Build.SourcesDirectory)/foldseek
+          archiveFile: $(Build.SourcesDirectory)/foldseek-linux-sse41.tar.gz
+          includeRootFolder: true
+          archiveType: tar
       - task: DownloadPipelineArtifact@1
         inputs:
           artifactName: foldseek-linux-AVX2
@@ -258,15 +258,15 @@ jobs:
           chmod 700 ~/.ssh && chmod 600 ~/.ssh/id_rsa
           ssh-keygen -f ~/.ssh/id_rsa -y > ~/.ssh/id_rsa.pub
           cd "${BUILD_SOURCESDIRECTORY}"
-          # disabled:foldseek-linux-sse41.tar.gz foldseek-linux-ppc64le-POWER8.tar.gz foldseek-linux-ppc64le-POWER9.tar.gz
+          # disabled:foldseek-linux-sse2.tar.gz foldseek-linux-ppc64le-POWER8.tar.gz foldseek-linux-ppc64le-POWER9.tar.gz
           ssh-keygen -Y sign -f ~/.ssh/id_rsa -n file \
              foldseek-osx-universal.tar.gz \
-             foldseek-linux-sse2.tar.gz \
+             foldseek-linux-sse41.tar.gz \
              foldseek-linux-avx2.tar.gz \
              foldseek-linux-arm64.tar.gz
           curl --retry 5 --retry-all-errors -X POST \
             -F file[][email protected] -F signature[][email protected] \
-            -F file[]=@foldseek-linux-sse2.tar.gz -F signature[]=@foldseek-linux-sse2.tar.gz.sig \
+            -F file[]=@foldseek-linux-sse41.tar.gz -F signature[]=@foldseek-linux-sse41.tar.gz.sig \
             -F file[][email protected] -F signature[][email protected] \
             -F file[][email protected] -F signature[][email protected] \
             -F identifier="foldseek" -F directory="${BUILD_SOURCEVERSION}" \