From 8fc4edf35c768e4669814c118bf518578637339b Mon Sep 17 00:00:00 2001 From: Teemu Murtola Date: Mon, 8 Sep 2014 17:09:39 +0300 Subject: [PATCH] Use absolute include paths in nbnxn kernels Currently, the WIP automatic include sorter expects these files to be included as paths relative to src/, and so does doc-check after changes done for the include sorter. Change the generator source files to account for this, and regenerate the kernels. Can be improved in the future. Make the kernel generator work even if the current working directory is not the same as the script directory. Change-Id: Ibc603dd0c85291f0c8fede394d9fa35b39c3a0a4 --- .../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_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.c | 6 +++--- ...nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.c | 6 +++--- ...nxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.c | 6 +++--- .../simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.c | 6 +++--- ...bnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.c | 6 +++--- .../nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_F_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.c | 6 +++--- .../simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.c | 6 +++--- 183 files changed, 547 insertions(+), 545 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 b3fdecc014..b7740bfcaf 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 @@ -75,6 +75,7 @@ import re import sys import os +os.chdir(os.path.dirname(os.path.abspath(__file__))) import collections # Requires Python 2.7 sys.path.append('../../../../../admin') from copyright import create_copyright_header @@ -163,6 +164,7 @@ for type in VerletKernelTypeDict: KernelNamePrefix = 'nbnxn_kernel' KernelsName = "{0}_simd_{1}".format(KernelNamePrefix,type) KernelsHeaderFileName = "{0}.h".format(KernelsName,type) + KernelsHeaderPathName = "gromacs/mdlib/nbnxn_kernels/simd_{0}/{1}".format(type,KernelsHeaderFileName) KernelFunctionLookupTable = {} KernelDeclarations = '' KernelTemplate = read_kernel_template("{0}_kernel.c.pre".format(KernelsName)) @@ -189,7 +191,7 @@ for type in VerletKernelTypeDict: ElectrostaticsDict[elec]['define'], VdwTreatmentDict[ljtreat]['define'], EnergiesComputationDict[ener]['define'], - KernelsHeaderFileName, + KernelsHeaderPathName, KernelName, " " * (len(KernelName) + 1), VerletKernelTypeDict[type]['UnrollSize'], 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 3df39d1b35..2dbae1b851 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 @@ -48,7 +48,7 @@ {3} #ifdef {0} -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* {0} */ #ifdef CALC_ENERGIES @@ -71,7 +71,7 @@ void {6}real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef {0} -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* {0} */ {{ /* No need to call gmx_incons() here, because the only function 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 1cea2e52db..69872b938c 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 @@ -48,7 +48,7 @@ {3} #ifdef {0} -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* {0} */ #ifdef CALC_ENERGIES @@ -71,7 +71,7 @@ void {6}real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef {0} -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* {0} */ {{ /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.c index 92fa205924..af3cddcaba 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_2xnn(const nbnxn_pairlist_t gmx_un real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.c index a185b34ae1..cab3a81e6c 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_2xnn(const nbnxn_pairlist_t gmx_u real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.c index 2bd610475a..3ea52e5713 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_2xnn(const nbnxn_pairlist_t gm real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.c index f8df0d1608..ba6c3484e0 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_2xnn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.c index 60b44eaad7..8c1f1bf319 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_2xnn(const nbnxn_pairlist_t gmx_unu real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.c index 98d9a76743..bb98a336b9 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_2xnn(const nbnxn_pairlist_t gmx_ real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.c index a0bdcaf9da..39e8aab2fc 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_2xnn(const nbnxn_pairlist_t gmx_ real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.c index cf16f338da..349b54084e 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_2xnn(const nbnxn_pairlist_t gmx real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c index c9f31aac3e..6be1d1e476 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -57,7 +57,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -80,7 +80,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_2xnn(const nbnxn_pairlist_t real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.c index c9db2f695e..f078e47607 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.c index 492fdf47b6..d2bf932364 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.c index 9a61c3587a..1e2ba35641 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unu real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.c index 0dbe141f1c..18247249a3 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.c index b3dbe7df32..93bd804307 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.c index a2607afccc..cceaf2eb5d 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unu real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.c index 6486f87398..36c340a8f9 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_2xnn(const nbnxn_pairlist_t gmx_unused *nb real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.c index e78d7efbab..87450fcf62 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_2xnn(const nbnxn_pairlist_t gmx_unused *n real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.c index 7be3d0d382..7c2637c26a 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.c index e55c12ba31..f5fe39ca11 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_F_2xnn(const nbnxn_pairlist_t gmx_unused *n real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.c index 02b0770e1b..2b32f242e7 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_2xnn(const nbnxn_pairlist_t gmx_unused * real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c index e36e0b7a5c..e79107a0c9 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unuse real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.c index 2bb3d60974..c838ad2181 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_F_2xnn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.c index 71a1d8f726..f5eaa4faaa 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_VF_2xnn(const nbnxn_pairlist_t gmx_unused *nb real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.c index 9ce999afe1..ecae99f539 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.c index 2630368ef6..69f5ef4d74 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.c index a36d02901e..75c875e283 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.c index 36bdb2edeb..b08bcd4e00 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unu real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.c index b1f8efab0c..bd57798ddd 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_FORCE_SWITCH @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_F_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.c index 9c6436c01d..37e3775552 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_FORCE_SWITCH @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_VF_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.c index 17ac8b6bac..0038130fdd 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_FORCE_SWITCH @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unused *nb real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.c index 78bb68c6d5..b279d7ccb1 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_POT_SWITCH @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_F_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.c index e7a92694b2..6e28781ed5 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_POT_SWITCH @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VF_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.c index be8310d57a..b804656537 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_POT_SWITCH @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unused *nb real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.c index 595a4e17c3..03fb7b24bb 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJ_F_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.c index 4b5e396930..a61e355b2f 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJ_VF_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.c index 9c615fc056..a1793eb96d 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJ_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.c index ac1bac3559..05118e2c62 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_2xnn(const nbnxn_pairlist_t gmx real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.c index 8ca1201c63..b05cbdc30a 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_2xnn(const nbnxn_pairlist_t gm real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.c index 7d287bb470..626f0145b8 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_2xnn(const nbnxn_pairlist_t real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.c index 3104a954bb..7cdb2eaad9 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_2xnn(const nbnxn_pairlist_t gmx_u real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.c index 43c39692c6..cf6d3cd48c 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_2xnn(const nbnxn_pairlist_t gmx_ real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.c index e776859785..718601a87e 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_2xnn(const nbnxn_pairlist_t g real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.c index 8d56d5fbef..e661ec3b3d 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_2xnn(const nbnxn_pairlist_t g real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.c index 85f4c82af4..f231bafded 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_2xnn(const nbnxn_pairlist_t real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c index 27597daf25..7a57912fbb 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -57,7 +57,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_2xnn(const nbnxn_pairlist_t real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.c index 8d94349b59..29d3554d0b 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_2xnn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.c index a1445b9728..e19ba53e1d 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_2xnn(const nbnxn_pairlist_t gmx_unu real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.c index b3355d178e..0098e41491 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_2xnn(const nbnxn_pairlist_t gmx_ real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.c index 3e50b33502..8d25dfeb6a 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_2xnn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.c index a252346e1b..145d00dea4 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_2xnn(const nbnxn_pairlist_t gmx_unu real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.c index 7689552cb8..4f6103b846 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_2xnn(const nbnxn_pairlist_t gmx_ real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.c index 01b4a1fed1..3f12026d74 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.c index 28da502b13..36efbb2bce 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.c index 6a5e1caa72..4d04f3e872 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unu real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.c index ca80a2c5a2..56eaa69c99 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.c index a3dcc895e9..3d7fbb36db 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_2xnn(const nbnxn_pairlist_t gmx_unuse real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.c index 8230bd5231..575058440d 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_2xnn(const nbnxn_pairlist_t gmx_un real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.c index 7da7b8b028..b4a0a96dd6 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_2xnn(const nbnxn_pairlist_t gmx_unused * real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.c index a501786277..0f06e7e152 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.c index 04955a9f4a..3fb2510be2 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.c index d57d9ea30e..7b0768c943 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_2xnn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.c index e3873090df..b32a7d11e2 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_2xnn(const nbnxn_pairlist_t gmx_unu real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.c index 60dc327d9c..004a236bfb 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_2xnn(const nbnxn_pairlist_t gmx_ real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.c index fde68ab89c..40e218ad71 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_FORCE_SWITCH @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_F_2xnn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.c index da22fa6c61..11e1d686f4 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_FORCE_SWITCH @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_2xnn(const nbnxn_pairlist_t gmx_unused *nb real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.c index afa5cf4527..c4a8f35fab 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_FORCE_SWITCH @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.c index a9956bec68..f24498ee3d 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_POT_SWITCH @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_F_2xnn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.c index 932b8613e0..737daff0ff 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_POT_SWITCH @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_2xnn(const nbnxn_pairlist_t gmx_unused *nb real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.c index a025333737..a18b5ccf61 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_POT_SWITCH @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.c index 7e692d8502..11ff86c8d8 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_F_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.c index df0e6015ee..d268f01207 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_VF_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.c index d6851b72fb..44b98c55f5 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unused *nb real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.c index 312f517b48..ceb0bde4f5 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_F_2xnn(const nbnxn_pairlist_t gmx_unused *n real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.c index 6514acf3d3..d3ad5b91a8 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_2xnn(const nbnxn_pairlist_t gmx_unused * real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.c index 744a8499ed..0044b4250d 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unuse real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.c index 304bbedfc3..41374a7f00 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_F_2xnn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.c index 466e022b1a..b60766f94e 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_VF_2xnn(const nbnxn_pairlist_t gmx_unused *nb real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.c index 065842ee12..aa1444145e 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.c index d8fd357f21..13441f0e39 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_CUT @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.c index a4617e519e..df538906e0 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_CUT @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_2xnn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.c index 6ebd8b599a..a1a7c412bd 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_CUT @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unu real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.c index c2750861f3..a25c2bb9a9 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_FORCE_SWITCH @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_F_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.c index 466a32fc36..43ddf01acb 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_FORCE_SWITCH @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_VF_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.c index 019637174f..2a56307b2f 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_FORCE_SWITCH @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unused *nb real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.c index 5b445bc227..6e58109513 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_POT_SWITCH @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_F_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.c index c247be24e5..a29ad7969e 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_POT_SWITCH @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_VF_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.c index 936249a191..f5d7c317b5 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_POT_SWITCH @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unused *nb real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.c index 7fb0aafa4e..18ccd0fca6 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_F_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJ_F_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.c index 6ba517b12f..1f8fb7dc78 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJ_VF_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.c index 0006e37314..b6d89da0c7 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 2 -#include "nbnxn_kernel_simd_2xnn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h" #define CALC_COUL_RF #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h" #endif /* GMX_NBNXN_SIMD_2XNN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJ_VgrpF_2xnn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_2XNN -#include "nbnxn_kernel_simd_2xnn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h" #else /* GMX_NBNXN_SIMD_2XNN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.c index b6912b1ce0..c25e20657b 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_F_4xn(const nbnxn_pairlist_t gmx_unu real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.c index 4d589ded9e..3d656ca578 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VF_4xn(const nbnxn_pairlist_t gmx_un real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.c index cd44b55d63..a33780c1f8 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombGeom_VgrpF_4xn(const nbnxn_pairlist_t gmx real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.c index ec4c2ad9c2..992b1d928e 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_F_4xn(const nbnxn_pairlist_t gmx_unuse real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.c index 071b439555..51864b3777 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VF_4xn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.c index a1d43fbc8d..35a0c18461 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJCombLB_VgrpF_4xn(const nbnxn_pairlist_t gmx_u real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.c index 7d1b2a0790..5976fd8fbf 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_F_4xn(const nbnxn_pairlist_t gmx_u real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.c index 05dd5803d4..1bebf3b7a8 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VF_4xn(const nbnxn_pairlist_t gmx_ real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c index 923eefdfc1..8d27735f0d 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -57,7 +57,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -80,7 +80,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJEwCombGeom_VgrpF_4xn(const nbnxn_pairlist_t g real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.c index 5c594bf235..af75543a08 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_F_4xn(const nbnxn_pairlist_t gmx_unused * real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.c index 11ed136c49..493b5522d5 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VF_4xn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.c index 50548c7ac3..fb0f0ba423 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJFSw_VgrpF_4xn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.c index 0a46f1f338..5a7f31fe6d 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_F_4xn(const nbnxn_pairlist_t gmx_unused * real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.c index e8a021dda4..17d45a63ea 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VF_4xn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.c index b87c169c8d..c64ef620b8 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJPSw_VgrpF_4xn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.c index 75ee506ec0..e16b387454 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_F_4xn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.c index daa4077604..0ea8f4edaf 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_VF_4xn(const nbnxn_pairlist_t gmx_unused *nb real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.c index e34e4fae8f..defafbd699 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEwTwinCut_VdwLJ_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.c index 674921906f..3ca1f1aeeb 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_F_4xn(const nbnxn_pairlist_t gmx_unused *nb real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.c index e7d3ae2397..6f4d2ad3a0 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_VF_4xn(const nbnxn_pairlist_t gmx_unused *n real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.c index bdfcaad849..ca22c74c83 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.c index c2b8077f29..c94fb2e3cc 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_F_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.c index 388c77b797..ca440173af 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_VF_4xn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.c index 585e6fa629..69bad94b77 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJCombLB_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused * real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.c index ab7dedeea0..f90727ca24 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_F_4xn(const nbnxn_pairlist_t gmx_unused * real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.c index 370fbfc1be..23b5a598ca 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VF_4xn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.c index af5b8890bc..8d30e9bebe 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecEw_VdwLJEwCombGeom_VgrpF_4xn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.c index 1fbc70dbdf..1da4a2bf55 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_FORCE_SWITCH @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_F_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.c index 7da6ae093f..9fa9e4606c 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_FORCE_SWITCH @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_VF_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.c index 7977cb675c..ac11905c7c 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_FORCE_SWITCH @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJFSw_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.c index f5ea20ada6..38365e1f33 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_POT_SWITCH @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_F_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.c index 6b20f3a2be..31da77cf37 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_POT_SWITCH @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.c index a51fe16829..052f30b4e6 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_POT_SWITCH @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_F_4xn.c index 8ab3354b20..67c2ec7afc 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJ_F_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.c index d6ca4d86dd..c6a3b33d86 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecEw_VdwLJ_VF_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.c index 548cd68b30..909c01a95d 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_EWALD #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecEw_VdwLJ_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.c index 878f847f7b..2c31aec0dc 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_F_4xn(const nbnxn_pairlist_t gmx_ real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.c index d884c0dd01..c38a39bc1f 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VF_4xn(const nbnxn_pairlist_t gmx real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.c index 933385105a..dd97997fd5 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombGeom_VgrpF_4xn(const nbnxn_pairlist_t real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.c index 0bf9f70973..7bb9dfbbd7 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_F_4xn(const nbnxn_pairlist_t gmx_un real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.c index c48d03a142..c8cff5cb91 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VF_4xn(const nbnxn_pairlist_t gmx_u real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.c index b1a9bba85b..87df91626b 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJCombLB_VgrpF_4xn(const nbnxn_pairlist_t gm real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.c index 1362cd0bd0..af8977de09 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_F_4xn(const nbnxn_pairlist_t gm real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.c index 9b984eb98c..b1e8334e6e 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VF_4xn(const nbnxn_pairlist_t g real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c index f76e070c2c..e87d41b460 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -57,7 +57,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -80,7 +80,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJEwCombGeom_VgrpF_4xn(const nbnxn_pairlist_t real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.c index c4ece087fe..a53704cc0c 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_F_4xn(const nbnxn_pairlist_t gmx_unuse real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.c index 4c1a1266cc..8f14030302 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VF_4xn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.c index f8fcee805e..b5de54ffd0 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJFSw_VgrpF_4xn(const nbnxn_pairlist_t gmx_u real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.c index 386bbf0f19..39f91daf41 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_F_4xn(const nbnxn_pairlist_t gmx_unuse real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.c index 238c9ee0bf..8d2a2a5ca8 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VF_4xn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.c index 6a08aefae1..2363c56399 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJPSw_VgrpF_4xn(const nbnxn_pairlist_t gmx_u real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.c index 6c28e93511..c27fbc7919 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_F_4xn(const nbnxn_pairlist_t gmx_unused * real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.c index e1d764c5be..597ccebd97 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VF_4xn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.c index 048c895d02..8cf34c0e92 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define VDW_CUTOFF_CHECK /* Use twin-range cut-off */ @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTabTwinCut_VdwLJ_VgrpF_4xn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.c index ebd3ef988b..f1b4672510 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_F_4xn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.c index 0a223cd91f..9a0e265fc2 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VF_4xn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.c index 7dfdb7463d..d52387b147 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombGeom_VgrpF_4xn(const nbnxn_pairlist_t gmx_unu real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.c index c369001f27..28d13ebcb7 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_F_4xn(const nbnxn_pairlist_t gmx_unused *n real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.c index 0f9f9a88cb..063b7dbead 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_VF_4xn(const nbnxn_pairlist_t gmx_unused * real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.c index a7fc39cfdd..841d3183db 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJCombLB_VgrpF_4xn(const nbnxn_pairlist_t gmx_unuse real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.c index 7ac56575f4..749bfac6b6 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_F_4xn(const nbnxn_pairlist_t gmx_unuse real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.c index 79a56a2fa4..b85597c7b4 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VF_4xn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.c index 8f2002026c..3fcc0df958 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecQSTab_VdwLJEwCombGeom_VgrpF_4xn(const nbnxn_pairlist_t gmx_u real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.c index 2a7dec2304..4c949841e5 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_FORCE_SWITCH @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_F_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.c index 84d1db5b2f..b7924a089a 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_FORCE_SWITCH @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_VF_4xn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.c index acff6ca1e0..1faa919b93 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_FORCE_SWITCH @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJFSw_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused * real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.c index 2c3c2ca24d..854601cd92 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_POT_SWITCH @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_F_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.c index db9ace5eb3..c70d75dfeb 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_POT_SWITCH @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_VF_4xn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.c index a1b62d83bc..7fafdc148b 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_POT_SWITCH @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJPSw_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused * real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.c index e5221fe728..50244f263b 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_F_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.c index 4fb8c18bc3..d72013f90b 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_VF_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.c index 1fa4a051dd..eb661637f7 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_TAB #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecQSTab_VdwLJ_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.c index b04a7f7f40..5a0a775bef 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_F_4xn(const nbnxn_pairlist_t gmx_unused *nb real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.c index 71a287186e..7e81a25cab 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_VF_4xn(const nbnxn_pairlist_t gmx_unused *n real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.c index 584ce4b7bf..507a41f0ed 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJCombGeom_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.c index 6e74f582ac..5c2498e1a8 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_F_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.c index 167ca686ba..04078b18e9 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_VF_4xn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.c index 9244e71767..2043603110 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJCombLB_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused * real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.c index 83d33f6fc5..53e9a056d9 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_CUT @@ -55,7 +55,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_F_4xn(const nbnxn_pairlist_t gmx_unused * real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.c index 82d9f04a9f..7739c59669 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_CUT @@ -55,7 +55,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VF_4xn(const nbnxn_pairlist_t gmx_unused real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.c index b62a2d1aaf..2a2852a170 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_CUT @@ -56,7 +56,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -79,7 +79,7 @@ nbnxn_kernel_ElecRF_VdwLJEwCombGeom_VgrpF_4xn(const nbnxn_pairlist_t gmx_unus real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.c index 42a6afc879..878a77c1d7 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_FORCE_SWITCH @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_F_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.c index 12acfa0e43..333b58c65f 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_FORCE_SWITCH @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_VF_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.c index d3898338ef..58f35877dd 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_FORCE_SWITCH @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJFSw_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.c index edc207a38a..6a3cdf502f 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_POT_SWITCH @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_F_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.c index 7fee136be7..efa5e54da9 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_POT_SWITCH @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_VF_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.c index a6d6d2a629..7c960842a3 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_POT_SWITCH @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJPSw_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused *nbl real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_F_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_F_4xn.c index 5dfa958973..8515978f71 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_F_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_F_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_CUT @@ -54,7 +54,7 @@ /* Will not calculate energies */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJ_F_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.c index 86ece6a26c..a6bb59bb1a 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_CUT @@ -54,7 +54,7 @@ #define CALC_ENERGIES #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -77,7 +77,7 @@ nbnxn_kernel_ElecRF_VdwLJ_VF_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.c index daed2c5eb0..fb9c5d3693 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn.c @@ -46,7 +46,7 @@ #include "gmxpre.h" #define GMX_SIMD_J_UNROLL_SIZE 1 -#include "nbnxn_kernel_simd_4xn.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h" #define CALC_COUL_RF #define LJ_CUT @@ -55,7 +55,7 @@ #define ENERGY_GROUPS #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_common.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h" #endif /* GMX_NBNXN_SIMD_4XN */ #ifdef CALC_ENERGIES @@ -78,7 +78,7 @@ nbnxn_kernel_ElecRF_VdwLJ_VgrpF_4xn(const nbnxn_pairlist_t gmx_unused *nbl, real gmx_unused *fshift) #endif /* CALC_ENERGIES */ #ifdef GMX_NBNXN_SIMD_4XN -#include "nbnxn_kernel_simd_4xn_outer.h" +#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h" #else /* GMX_NBNXN_SIMD_4XN */ { /* No need to call gmx_incons() here, because the only function -- 2.22.0