[med-svn] [Git][med-team/hyphy][upstream] New upstream version 2.5.1+dfsg

[Andreas Tille]

Andreas Tille pushed to branch upstream at Debian Med / hyphy


Commits:
a6bb7eb3 by Andreas Tille at 2019-12-06T12:30:31Z
New upstream version 2.5.1+dfsg
- - - - -


3 changed files:

- CMakeLists.txt
- src/core/global_things.cpp
- src/core/strings.cpp


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -189,7 +189,8 @@ endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(DEFAULT_COMPILE_FLAGS "-fsigned-char -O3")
     PCL_CHECK_FOR_AVX()
-    if(${HAVE_AVX_EXTENSIONS})
+
+    if(${HAVE_AVX_EXTENSIONS} AND NOT ${NOAVX})
         set(DEFAULT_COMPILE_FLAGS "${DEFAULT_COMPILE_FLAGS} -march=native -mtune=native -mavx")
         add_definitions (-D_SLKP_USE_AVX_INTRINSICS)
         PCL_CHECK_FOR_FMA3()
@@ -197,7 +198,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
             set(DEFAULT_COMPILE_FLAGS "${DEFAULT_COMPILE_FLAGS} -mfma")
             add_definitions (-D_SLKP_USE_FMA3_INTRINSICS)
         endif (${HAVE_FMA3})
-    else(${HAVE_AVX_EXTENSIONS})
+    else(${HAVE_AVX_EXTENSIONS} AND NOT ${NOAVX})
         PCL_CHECK_FOR_SSE3()
         if(${HAVE_SSE3_EXTENSIONS})
             add_definitions (-D_SLKP_USE_SSE_INTRINSICS)
@@ -290,7 +291,7 @@ if(NOT NODE)
     message("Node not installed; API documentation will not be generated")
 else(NOT NODE)
     add_custom_target(
-        docs ALL
+        docs
         rm -rf ./docs && npm install -g documentation at 4 && documentation build --polyglot -f md ./res/TemplateBatchFiles/libv3/**/*.bf -o ./docs.md
     )
 endif(NOT NODE)


=====================================
src/core/global_things.cpp
=====================================
@@ -119,7 +119,7 @@ namespace hy_global {
                      kErrorStringDatasetRefIndexError ("Dataset index reference out of range"),
                      kErrorStringMatrixExportError    ("Export matrix called with a non-polynomial matrix argument"),
                      kErrorStringNullOperand          ("Attempting to operate on an undefined value; this is probably the result of an earlier 'soft' error condition"),
-                      kHyPhyVersion  = _String ("2.5.0"),
+                      kHyPhyVersion  = _String ("2.5.1"),
     
                     kNoneToken = "None",
                     kNullToken = "null",


=====================================
src/core/strings.cpp
=====================================
@@ -52,7 +52,7 @@
 
 
 _String   compileDate = __DATE__,
-          __HYPHY__VERSION__ = _String ("2.5.0");
+          __HYPHY__VERSION__ = _String ("2.5.1");
 
 using namespace hy_global;
 



View it on GitLab: https://salsa.debian.org/med-team/hyphy/commit/a6bb7eb332e252c39e090b4cc20c87e0a1f115da

-- 
View it on GitLab: https://salsa.debian.org/med-team/hyphy/commit/a6bb7eb332e252c39e090b4cc20c87e0a1f115da
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191206/fe52c74a/attachment-0001.html>