Merge pull request #1910 from veg/develop

2.5.83

Author: spond

.github/workflows/build_and_test.yml

@@ -2,7 +2,7 @@ name: Build and Test
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, develop ]
 
 jobs:
   build:

CMakeLists.txt

@@ -127,7 +127,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
             list(APPEND HYPHY_SIMD_FLAGS "-mavx2")
             add_compile_definitions(_SLKP_USE_AVX_INTRINSICS)
             set(CMAKE_REQUIRED_FLAGS "-mfma")
-            check_cxx_source_compiles("#include <immintrin.h>\nint main() {\n  __m256d vec = _mm256_setzero_pd();\n  (void)vec;\n  return 0;\n}\n" HYPHY_HAVE_FMA)
+            check_cxx_source_compiles("#include <immintrin.h>\nint main() {\n  __m256d a = _mm256_setzero_pd(); __m256d b = _mm256_setzero_pd(); __m256d c = _mm256_setzero_pd(); (void)_mm256_fmadd_pd(a, b, c); return 0;\n}\n" HYPHY_HAVE_FMA)
             if(HYPHY_HAVE_FMA)
                 list(APPEND HYPHY_SIMD_FLAGS "-mfma")
                 add_compile_definitions(_SLKP_USE_FMA3_INTRINSICS)

compile_commands.json

@@ -115,7 +115,7 @@ _String const kEmptyString, kPromptForFilePlaceholder("PROMPT_FOR_FILE"),
                     "\"ENV=TOLERATE_NUMERICAL_ERRORS=1;\" as the command line "
                     "argument. This often resolves the issue, which is "
                     "indicative of numerical instability."),
-    kHyPhyVersion = _String("2.5.82"),
+    kHyPhyVersion = _String("2.5.83"),
 
     kNoneToken = "None", kNullToken = "null",
     kNoKWMatch = "__input_value_not_given__",