Remove majority of OCL command line constants

[alexxy/gromacs.git] / src / gromacs / mdlib / nbnxn_ocl / nbnxn_ocl_jit_support.cpp

diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_jit_support.cpp b/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_jit_support.cpp
index 9c5eaebea3be366be8bf2197aaede93a8f31251c..155cd325895f5ce0ae5d0bc73f6c03982f0c0a24 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_jit_support.cpp
+++ b/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_jit_support.cpp
@@ -198,19 +198,10 @@ nbnxn_gpu_compile_kernels(gmx_nbnxn_ocl_t *nb)
          */
 
         extraDefines += gmx::formatString(
-                    " -DCENTRAL=%d "
-                    "-DNBNXN_GPU_NCLUSTER_PER_SUPERCLUSTER=%d -DNBNXN_GPU_CLUSTER_SIZE=%d -DNBNXN_GPU_JGROUP_SIZE=%d "
-                    "-DGMX_NBNXN_PRUNE_KERNEL_J4_CONCURRENCY=%d "
-                    "-DNBNXN_MIN_RSQ=%s %s",
-                    CENTRAL,                                                /* Defined in ishift.h */
-                    c_nbnxnGpuNumClusterPerSupercluster,                    /* Defined in nbnxn_pairlist.h */
+                    " -DNBNXN_GPU_CLUSTER_SIZE=%d "
+                    "%s",
                     c_nbnxnGpuClusterSize,                                  /* Defined in nbnxn_pairlist.h */
-                    c_nbnxnGpuJgroupSize,                                   /* Defined in nbnxn_pairlist.h */
-                    getOclPruneKernelJ4Concurrency(nb->dev_info->vendor_e), /* In nbnxn_ocl_types.h  */
-                    STRINGIFY_MACRO(NBNXN_MIN_RSQ)                          /* Defined in nbnxn_consts.h */
-                                                                            /* NBNXN_MIN_RSQ passed as string to avoid
-                                                                                floating point representation problems with sprintf */
-                    , (nb->bPrefetchLjParam) ? "-DIATYPE_SHMEM" : ""
+                    (nb->bPrefetchLjParam) ? "-DIATYPE_SHMEM" : ""
                     );
 
         try