1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
From: Michael R. Crusoe <crusoe@debian.org>
Subject: Enable compilation on other 64-bit systems besidex amd64
--- consensuscore.orig/include/ConsensusCore/Edna/EdnaEvaluator.hpp
+++ consensuscore/include/ConsensusCore/Edna/EdnaEvaluator.hpp
@@ -2,8 +2,8 @@
#pragma once
-#include <pmmintrin.h>
-#include <xmmintrin.h>
+#define SIMDE_ENABLE_NATIVE_ALIASES
+#include <simde/x86/sse3.h>
#include <algorithm>
#include <cassert>
--- consensuscore.orig/include/ConsensusCore/LFloat.hpp
+++ consensuscore/include/ConsensusCore/LFloat.hpp
@@ -1,7 +1,8 @@
// Author: David Alexander
#pragma once
-#include <xmmintrin.h>
+#define SIMDE_ENABLE_NATIVE_ALIASES
+#include <simde/x86/sse.h>
#include <cfloat>
#include <ostream>
--- consensuscore.orig/include/ConsensusCore/Matrix/DenseMatrix.hpp
+++ consensuscore/include/ConsensusCore/Matrix/DenseMatrix.hpp
@@ -2,7 +2,8 @@
#pragma once
-#include <xmmintrin.h>
+#define SIMDE_ENABLE_NATIVE_ALIASES
+#include <simde/x86/sse.h>
#include <boost/numeric/ublas/matrix.hpp>
#include <utility>
--- consensuscore.orig/include/ConsensusCore/Matrix/SparseMatrix.hpp
+++ consensuscore/include/ConsensusCore/Matrix/SparseMatrix.hpp
@@ -2,7 +2,8 @@
#pragma once
-#include <xmmintrin.h>
+#define SIMDE_ENABLE_NATIVE_ALIASES
+#include <simde/x86/sse.h>
#include <utility>
#include <vector>
--- consensuscore.orig/include/ConsensusCore/Matrix/SparseVector.hpp
+++ consensuscore/include/ConsensusCore/Matrix/SparseVector.hpp
@@ -2,7 +2,8 @@
#pragma once
-#include <xmmintrin.h>
+#define SIMDE_ENABLE_NATIVE_ALIASES
+#include <simde/x86/sse.h>
#include <utility>
#include <vector>
--- consensuscore.orig/include/ConsensusCore/Quiver/QvEvaluator.hpp
+++ consensuscore/include/ConsensusCore/Quiver/QvEvaluator.hpp
@@ -2,8 +2,8 @@
#pragma once
-#include <pmmintrin.h>
-#include <xmmintrin.h>
+#define SIMDE_ENABLE_NATIVE_ALIASES
+#include <simde/x86/sse3.h>
#include <algorithm>
#include <cassert>
--- consensuscore.orig/include/ConsensusCore/Quiver/detail/SseMath.hpp
+++ consensuscore/include/ConsensusCore/Quiver/detail/SseMath.hpp
@@ -2,7 +2,8 @@
#pragma once
-#include <xmmintrin.h>
+#define SIMDE_ENABLE_NATIVE_ALIASES
+#include <simde/x86/sse.h>
#include <limits>
#include <ConsensusCore/Quiver/detail/sse_mathfun.h>
--- consensuscore.orig/src/C++/Edna/EdnaCounts.cpp
+++ consensuscore/src/C++/Edna/EdnaCounts.cpp
@@ -1,7 +1,7 @@
// Author: Patrick Marks
-#include <pmmintrin.h>
-#include <xmmintrin.h>
+#define SIMDE_ENABLE_NATIVE_ALIASES
+#include <simde/x86/sse3.h>
#include <cassert>
#include <cfloat>
#include <climits>
--- consensuscore.orig/make/Defs.mk
+++ consensuscore/make/Defs.mk
@@ -46,10 +46,10 @@
endif
ifeq ($(GXX),clang++)
- CXX_FLAGS = $(GXX_FLAGS) $(CXX_OPT_FLAGS) -msse3 -fPIC -Qunused-arguments -fno-omit-frame-pointer
+ CXX_FLAGS = $(GXX_FLAGS) $(CXX_OPT_FLAGS) -fPIC -Qunused-arguments -fno-omit-frame-pointer
CXX_STRICT_FLAGS = $(GXX_FLAGS) $(CXX_FLAGS) -pedantic -std=$(CPP_STD) -Wall
else
- CXX_FLAGS = $(CXX_OPT_FLAGS) $(CXX_EXTRA_ARGS) -msse3 -fPIC -fno-omit-frame-pointer
+ CXX_FLAGS = $(CXX_OPT_FLAGS) $(CXX_EXTRA_ARGS) -fPIC -fno-omit-frame-pointer
CXX_STRICT_FLAGS = $(CXX_FLAGS) -pedantic -std=$(CPP_STD) -Wall
endif
--- consensuscore.orig/include/ConsensusCore/Quiver/detail/sse_mathfun.h
+++ consensuscore/include/ConsensusCore/Quiver/detail/sse_mathfun.h
@@ -31,7 +31,8 @@
#pragma once
-#include <xmmintrin.h>
+#define SIMDE_ENABLE_NATIVE_ALIASES
+#include <simde/x86/sse.h>
#include <limits>
#define USE_SSE2
@@ -49,7 +50,7 @@
typedef __m128 v4sf; // vector of 4 float (sse1)
#ifdef USE_SSE2
-#include <emmintrin.h>
+#include <simde/x86/sse2.h>
typedef __m128i v4si; // vector of 4 int (sse2)
#else
typedef __m64 v2si; // vector of 2 int (mmx)
|
