Change-Id: I80b80e242d920862a64db22ae2321dcdb532faa1
},
'4xn' : {
'Define' : 'GMX_NBNXN_SIMD_4XN',
},
'4xn' : {
'Define' : 'GMX_NBNXN_SIMD_4XN',
- 'WidthSetup' : ('#ifdef GMX_NBNXN_HALF_WIDTH_SIMD\n' \
- '#define GMX_USE_HALF_WIDTH_SIMD_HERE\n' \
- '#endif\n'),
'WidthCheck' : ('#if !(GMX_SIMD_REAL_WIDTH == 2 || GMX_SIMD_REAL_WIDTH == 4 || GMX_SIMD_REAL_WIDTH == 8)\n' \
'#error "unsupported SIMD width"\n' \
'#endif\n'),
'WidthCheck' : ('#if !(GMX_SIMD_REAL_WIDTH == 2 || GMX_SIMD_REAL_WIDTH == 4 || GMX_SIMD_REAL_WIDTH == 8)\n' \
'#error "unsupported SIMD width"\n' \
'#endif\n'),
+#include "gromacs/mdlib/nbnxn_simd.h"
+
-{1}
-#include "gromacs/simd/macros.h"
-#include "gromacs/simd/vector_operations.h"
+{1}#include "gromacs/simd/vector_operations.h"
+
{2}
#define GMX_SIMD_J_UNROLL_SIZE {3}
#include "{4}"
{2}
#define GMX_SIMD_J_UNROLL_SIZE {3}
#include "{4}"
/*
* This file is part of the GROMACS molecular simulation package.
*
/*
* This file is part of the GROMACS molecular simulation package.
*
- * Copyright (c) 2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014, 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.
* 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.
+#include "gromacs/mdlib/nbnxn_simd.h"
+
#ifdef __cplusplus
extern "C" {{
#endif
#ifdef __cplusplus
extern "C" {{
#endif
#ifdef GMX_NBNXN_SIMD_4XN
#include "gromacs/simd/vector_operations.h"
#ifdef GMX_NBNXN_SIMD_4XN
#include "gromacs/simd/vector_operations.h"
#if !(GMX_SIMD_REAL_WIDTH == 2 || GMX_SIMD_REAL_WIDTH == 4 || GMX_SIMD_REAL_WIDTH == 8)
#error "unsupported SIMD width"
#endif
#if !(GMX_SIMD_REAL_WIDTH == 2 || GMX_SIMD_REAL_WIDTH == 4 || GMX_SIMD_REAL_WIDTH == 8)
#error "unsupported SIMD width"
#endif