Michael R. Crusoe pushed to branch master at Debian Med / bio-eagle
Commits: bb3394a2 by Michael R. Crusoe at 2020-12-05T21:49:16+01:00 Add patch for compilation on systems without SSE. - - - - - 3 changed files: - debian/changelog - + debian/patches/non_x86_malloc - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,8 +1,13 @@ bio-eagle (2.4.1-3) UNRELEASED; urgency=medium + [ Andreas Tille ] * Team upload. * Standards-Version: 4.5.1 (routine-update) + [ Michael R. Crusoe ] + * Add patch for compilation on systems without SSE. + Use of "rdtsc" assembly still makes it x86 specific. + -- Andreas Tille <[email protected]> Sat, 05 Dec 2020 16:58:11 +0100 bio-eagle (2.4.1-2) unstable; urgency=medium ===================================== debian/patches/non_x86_malloc ===================================== @@ -0,0 +1,32 @@ +From: Michael R. Crusoe <[email protected]> +Subject: allow compilation on non-x86 +--- bio-eagle.orig/src/MemoryUtils.cpp ++++ bio-eagle/src/MemoryUtils.cpp +@@ -25,8 +25,11 @@ + void *ALIGNED_MALLOC(uint64 size) { + #ifdef USE_MKL_MALLOC + void *p = mkl_malloc(size, MEM_ALIGNMENT); +-#else ++#elif defined(__SSE__) + void *p = _mm_malloc(size, MEM_ALIGNMENT); ++#else ++#include <stdlib.h> ++ void *p = aligned_alloc(MEM_ALIGNMENT, size); + #endif + // TODO: change to assert() or dispense with altogether and change ALIGNED_MALLOC to macro? + if (p == NULL) { +--- bio-eagle.orig/src/MemoryUtils.hpp ++++ bio-eagle/src/MemoryUtils.hpp +@@ -30,9 +30,11 @@ + #ifdef USE_MKL_MALLOC + #include <mkl.h> + #define ALIGNED_FREE mkl_free +-#else ++#elif defined(__SSE__) + #include <xmmintrin.h> + #define ALIGNED_FREE _mm_free ++#else ++#define ALIGNED_FREE free + #endif + + #define ALIGNED_MALLOC_DOUBLES(numDoubles) (double *) ALIGNED_MALLOC((numDoubles)*sizeof(double)) ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ Makefile_config.patch +non_x86_malloc View it on GitLab: https://salsa.debian.org/med-team/bio-eagle/-/commit/bb3394a255475c84dc76e6babd76c269b1fbb79e -- View it on GitLab: https://salsa.debian.org/med-team/bio-eagle/-/commit/bb3394a255475c84dc76e6babd76c269b1fbb79e You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
