From: Roland Schulz <roland@rschulz.eu>
Date: Thu, 5 Feb 2015 06:28:51 +0000 (-0500)
Subject: Work-around for ICC 15 on Phi
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=aa4b14b2706205705bd87e623dc493d11707fae9;p=alexxy%2Fgromacs.git

Work-around for ICC 15 on Phi

Change-Id: Id72e6fb124974f0d8572a1715bc1f25e536f7c69
---

diff --git a/src/gromacs/gmxlib/rbin.c b/src/gromacs/gmxlib/rbin.c
index 754c648cb2..4b0596482c 100644
--- a/src/gromacs/gmxlib/rbin.c
+++ b/src/gromacs/gmxlib/rbin.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2010,2014, by the GROMACS development team, led by
+ * Copyright (c) 2010,2014,2015, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -85,6 +85,10 @@ int add_binr(t_bin *b, int nr, real r[])
     }
     /* Copy pointer */
     rbuf = b->rbuf+b->nreal;
+
+#if (__ICC == 1500 || __ICL == 1500) && defined __MIC__
+#pragma novector /* Work-around for incorrect vectorization */
+#endif
     for (i = 0; (i < nr); i++)
     {
         rbuf[i] = r[i];