From af0aa4aec0fc1ecae9c3f921e6dfe7ed2aa7d10a Mon Sep 17 00:00:00 2001 From: Roland Schulz Date: Fri, 10 Jul 2015 22:23:47 -0400 Subject: [PATCH 1/1] Update kernel templates to match kernels Change-Id: I20f41dc9b3e9da670e0c940697fa35d2473ab33b --- .../make_verlet_simd_kernel_files.py | 4 ++-- .../nbnxn_kernel_simd_2xnn_kernel.c.pre | 4 +++- .../nbnxn_kernel_simd_4xn_kernel.c.pre | 4 +++- .../nbnxn_kernel_simd_template.c.pre | 3 ++- .../nbnxn_kernel_simd_template.h.pre | 3 +-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/make_verlet_simd_kernel_files.py b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/make_verlet_simd_kernel_files.py index b7740bfcaf..06ba18d562 100755 --- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/make_verlet_simd_kernel_files.py +++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/make_verlet_simd_kernel_files.py @@ -2,7 +2,7 @@ # # This file is part of the GROMACS molecular simulation package. # -# Copyright (c) 2013,2014, by the GROMACS development team, led by +# Copyright (c) 2013,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. @@ -80,7 +80,7 @@ import collections # Requires Python 2.7 sys.path.append('../../../../../admin') from copyright import create_copyright_header -FileHeader = create_copyright_header('2012,2013,2014') +FileHeader = create_copyright_header('2012,2013,2014,2015') FileHeader += """/* * Note: this file was generated by the Verlet kernel generator for * kernel type {0}. diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_2xnn_kernel.c.pre b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_2xnn_kernel.c.pre index 2dbae1b851..63b73c70ee 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_2xnn_kernel.c.pre +++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_2xnn_kernel.c.pre @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by + * Copyright (c) 2012,2013,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. @@ -40,6 +40,8 @@ */ #include "gmxpre.h" +#include "gromacs/mdlib/nbnxn_simd.h" + #define GMX_SIMD_J_UNROLL_SIZE {7} #include "{4}" diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_4xn_kernel.c.pre b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_4xn_kernel.c.pre index 69872b938c..a43ac5cc34 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_4xn_kernel.c.pre +++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_4xn_kernel.c.pre @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by + * Copyright (c) 2012,2013,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. @@ -40,6 +40,8 @@ */ #include "gmxpre.h" +#include "gromacs/mdlib/nbnxn_simd.h" + #define GMX_SIMD_J_UNROLL_SIZE {7} #include "{4}" diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre index 5e410cdecc..2571a05348 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre +++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by + * Copyright (c) 2012,2013,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. @@ -51,6 +51,7 @@ #include "gromacs/legacyheaders/gmx_omp_nthreads.h" #include "gromacs/legacyheaders/types/force_flags.h" #include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.h" +#include "gromacs/simd/simd.h" #include "gromacs/utility/fatalerror.h" /*! \brief Kinds of electrostatic treatments in SIMD Verlet kernels diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.h.pre b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.h.pre index 22ada3b193..a841aaa9e9 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.h.pre +++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.h.pre @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by + * Copyright (c) 2012,2013,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. @@ -34,7 +34,6 @@ */ #include "gromacs/legacyheaders/typedefs.h" #include "gromacs/mdlib/nbnxn_pairlist.h" -#include "gromacs/mdlib/nbnxn_simd.h" #ifdef __cplusplus extern "C" {{ -- 2.22.0