Skip to content

Commit e2484ae

Browse files
Fix build with clang
1 parent 68d9391 commit e2484ae

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

mkl_random/src/mkl_distributions.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@
4444
#define DIST_PRAGMA_VECTOR _Pragma("vector")
4545
#define DIST_PRAGMA_NOVECTOR _Pragma("novector")
4646
#define DIST_ASSUME_ALIGNED(p, b) __assume_aligned((p), (b));
47+
#elif defined(__clang__)
48+
#define DIST_PRAGMA_VECTOR _Pragma("clang loop vectorize(enable)")
49+
#define DIST_PRAGMA_NOVECTOR _Pragma("clang loop vectorize(disable)")
50+
#define DIST_ASSUME_ALIGNED(p, b)
4751
#elif defined(__GNUG__)
4852
#define DIST_PRAGMA_VECTOR _Pragma("GCC ivdep")
4953
#define DIST_PRAGMA_NOVECTOR

mkl_random/src/randomkit.c renamed to mkl_random/src/randomkit.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
#define RK_DEV_RANDOM "/dev/random"
9191
#endif
9292

93-
char *irk_strerror[RK_ERR_MAX] =
93+
const char *irk_strerror[RK_ERR_MAX] =
9494
{
9595
"no error",
9696
"random device unvavailable"};
@@ -350,7 +350,7 @@ void irk_random_vec(irk_state *state, const int len, unsigned int *res)
350350
void irk_fill(void *buffer, size_t size, irk_state *state)
351351
{
352352
unsigned int r;
353-
unsigned char *buf = buffer;
353+
unsigned char *buf = reinterpret_cast<unsigned char *>(buffer);
354354
int err, len;
355355

356356
/* len = size / 4 */

mkl_random/src/randomkit.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ typedef enum {
6363

6464

6565
/* error strings */
66-
extern char *irk_strerror[RK_ERR_MAX];
66+
extern const char *irk_strerror[RK_ERR_MAX];
6767

6868
/* Maximum generated random value */
6969
#define RK_MAX 0xFFFFFFFFUL

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def extensions():
103103
[
104104
os.path.join("mkl_random", "mklrand.pyx"),
105105
os.path.join("mkl_random", "src", "mkl_distributions.cpp"),
106-
os.path.join("mkl_random", "src", "randomkit.c"),
106+
os.path.join("mkl_random", "src", "randomkit.cpp"),
107107
],
108108
depends = [
109109
os.path.join("mkl_random", "src", "mkl_distributions.hpp"),

0 commit comments

Comments
 (0)