From 361914f3f154b1d7f229020f6cdba7265e5e59e4 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Fri, 14 Mar 2025 16:31:30 -0400 Subject: [PATCH] remove references to SMALLSMALL from GPU library --- lib/gpu/Makefile.aurora | 4 ++-- lib/gpu/Makefile.cuda | 4 ++-- lib/gpu/Makefile.cuda_mps | 4 ++-- lib/gpu/Makefile.hip | 4 ++-- lib/gpu/Makefile.linux | 4 ++-- lib/gpu/Makefile.linux_multi | 4 ++-- lib/gpu/Makefile.linux_opencl | 4 ++-- lib/gpu/Makefile.oneapi | 4 ++-- lib/gpu/Makefile.oneapi_prof | 4 ++-- lib/gpu/Makefile.serial | 4 ++-- lib/gpu/lal_amoeba.cu | 6 ------ lib/gpu/lal_hippo.cu | 6 ------ lib/gpu/lal_lj_tip4p_long.cu | 6 ------ lib/gpu/lal_neighbor_gpu.cu | 6 ------ lib/gpu/lal_precision.h | 7 +------ lib/gpu/lal_preprocessor.h | 3 +-- 16 files changed, 22 insertions(+), 52 deletions(-) diff --git a/lib/gpu/Makefile.aurora b/lib/gpu/Makefile.aurora index c343e061ee..1f6c9b646a 100644 --- a/lib/gpu/Makefile.aurora +++ b/lib/gpu/Makefile.aurora @@ -11,8 +11,8 @@ EXTRAMAKE = Makefile.lammps.opencl # OCL_TUNE = -DCYPRESS_OCL # -- Uncomment for AMD Cypress OCL_TUNE = -DGENERIC_OCL # -- Uncomment for generic device -# this setting should match LAMMPS Makefile -# one of LAMMPS_SMALLBIG (default), LAMMPS_BIGBIG and LAMMPS_SMALLSMALL +# this setting should match the LAMMPS Makefile +# either LAMMPS_SMALLBIG (default) or LAMMPS_BIGBIG LMP_INC = -DLAMMPS_SMALLBIG diff --git a/lib/gpu/Makefile.cuda b/lib/gpu/Makefile.cuda index 75428c9513..d7552d267c 100644 --- a/lib/gpu/Makefile.cuda +++ b/lib/gpu/Makefile.cuda @@ -11,8 +11,8 @@ ifeq ($(CUDA_HOME),) CUDA_HOME = /usr/local/cuda endif -# this setting should match LAMMPS Makefile -# one of LAMMPS_SMALLBIG (default), LAMMPS_BIGBIG and LAMMPS_SMALLSMALL +# this setting should match the LAMMPS Makefile +# either LAMMPS_SMALLBIG (default) or LAMMPS_BIGBIG LMP_INC = -DLAMMPS_SMALLBIG diff --git a/lib/gpu/Makefile.cuda_mps b/lib/gpu/Makefile.cuda_mps index 22a34c105c..4063de92e7 100644 --- a/lib/gpu/Makefile.cuda_mps +++ b/lib/gpu/Makefile.cuda_mps @@ -11,8 +11,8 @@ ifeq ($(CUDA_HOME),) CUDA_HOME = /usr/local/cuda endif -# this setting should match LAMMPS Makefile -# one of LAMMPS_SMALLBIG (default), LAMMPS_BIGBIG and LAMMPS_SMALLSMALL +# this setting should match the LAMMPS Makefile +# either LAMMPS_SMALLBIG (default) or LAMMPS_BIGBIG LMP_INC = -DLAMMPS_SMALLBIG diff --git a/lib/gpu/Makefile.hip b/lib/gpu/Makefile.hip index 0350c841c4..54085523bf 100644 --- a/lib/gpu/Makefile.hip +++ b/lib/gpu/Makefile.hip @@ -7,8 +7,8 @@ # - change HIP_ARCH for your GPU # ------------------------------------------------------------------------- */ -# this setting should match LAMMPS Makefile -# one of LAMMPS_SMALLBIG (default), LAMMPS_BIGBIG and LAMMPS_SMALLSMALL +# this setting should match the LAMMPS Makefile +# either LAMMPS_SMALLBIG (default) or LAMMPS_BIGBIG LMP_INC = -DLAMMPS_SMALLBIG diff --git a/lib/gpu/Makefile.linux b/lib/gpu/Makefile.linux index e02413f3ba..6b7122ea6b 100644 --- a/lib/gpu/Makefile.linux +++ b/lib/gpu/Makefile.linux @@ -51,8 +51,8 @@ CUDA_ARCH = -arch=sm_60 # Hopper hardware #CUDA_ARCH = -arch=sm_90 -# this setting should match LAMMPS Makefile -# one of LAMMPS_SMALLBIG (default), LAMMPS_BIGBIG and LAMMPS_SMALLSMALL +# this setting should match the LAMMPS Makefile +# either LAMMPS_SMALLBIG (default) or LAMMPS_BIGBIG LMP_INC = -DLAMMPS_SMALLBIG diff --git a/lib/gpu/Makefile.linux_multi b/lib/gpu/Makefile.linux_multi index e3a76d9934..3fac7030ea 100644 --- a/lib/gpu/Makefile.linux_multi +++ b/lib/gpu/Makefile.linux_multi @@ -51,8 +51,8 @@ CUDA_CODE = -gencode arch=compute_50,code=[sm_50,compute_50] -gencode arch=compu CUDA_ARCH += $(CUDA_CODE) -# this setting should match LAMMPS Makefile -# one of LAMMPS_SMALLBIG (default), LAMMPS_BIGBIG and LAMMPS_SMALLSMALL +# this setting should match the LAMMPS Makefile +# either LAMMPS_SMALLBIG (default) or LAMMPS_BIGBIG LMP_INC = -DLAMMPS_SMALLBIG diff --git a/lib/gpu/Makefile.linux_opencl b/lib/gpu/Makefile.linux_opencl index b4b25544ee..1ad4ceba96 100644 --- a/lib/gpu/Makefile.linux_opencl +++ b/lib/gpu/Makefile.linux_opencl @@ -6,8 +6,8 @@ EXTRAMAKE = Makefile.lammps.opencl -# this setting should match LAMMPS Makefile -# one of LAMMPS_SMALLBIG (default), LAMMPS_BIGBIG and LAMMPS_SMALLSMALL +# this setting should match the LAMMPS Makefile +# either LAMMPS_SMALLBIG (default) or LAMMPS_BIGBIG LMP_INC = -DLAMMPS_SMALLBIG diff --git a/lib/gpu/Makefile.oneapi b/lib/gpu/Makefile.oneapi index e67f4bb082..79e52482c7 100644 --- a/lib/gpu/Makefile.oneapi +++ b/lib/gpu/Makefile.oneapi @@ -6,8 +6,8 @@ EXTRAMAKE = Makefile.lammps.opencl -# this setting should match LAMMPS Makefile -# one of LAMMPS_SMALLBIG (default), LAMMPS_BIGBIG and LAMMPS_SMALLSMALL +# this setting should match the LAMMPS Makefile +# either LAMMPS_SMALLBIG (default) or LAMMPS_BIGBIG LMP_INC = -DLAMMPS_SMALLBIG diff --git a/lib/gpu/Makefile.oneapi_prof b/lib/gpu/Makefile.oneapi_prof index 58a03392e2..160b2f0d33 100644 --- a/lib/gpu/Makefile.oneapi_prof +++ b/lib/gpu/Makefile.oneapi_prof @@ -6,8 +6,8 @@ EXTRAMAKE = Makefile.lammps.opencl -# this setting should match LAMMPS Makefile -# one of LAMMPS_SMALLBIG (default), LAMMPS_BIGBIG and LAMMPS_SMALLSMALL +# this setting should match the LAMMPS Makefile +# either LAMMPS_SMALLBIG (default) or LAMMPS_BIGBIG LMP_INC = -DLAMMPS_SMALLBIG diff --git a/lib/gpu/Makefile.serial b/lib/gpu/Makefile.serial index 67d2ce927d..43541ef019 100644 --- a/lib/gpu/Makefile.serial +++ b/lib/gpu/Makefile.serial @@ -45,8 +45,8 @@ CUDA_ARCH = -arch=sm_60 #CUDA_ARCH = -arch=sm_80 #CUDA_ARCH = -arch=sm_86 -# this setting should match LAMMPS Makefile -# one of LAMMPS_SMALLBIG (default), LAMMPS_BIGBIG and LAMMPS_SMALLSMALL +# this setting should match the LAMMPS Makefile +# either LAMMPS_SMALLBIG (default) or LAMMPS_BIGBIG LMP_INC = -DLAMMPS_SMALLBIG diff --git a/lib/gpu/lal_amoeba.cu b/lib/gpu/lal_amoeba.cu index a92509f06d..14d1d3e5de 100644 --- a/lib/gpu/lal_amoeba.cu +++ b/lib/gpu/lal_amoeba.cu @@ -23,9 +23,6 @@ #include "inttypes.h" #define tagint int64_t #endif -#ifdef LAMMPS_SMALLSMALL -#define tagint int -#endif #ifndef _DOUBLE_DOUBLE _texture( pos_tex,float4); _texture( q_tex,float); @@ -43,9 +40,6 @@ _texture( q_tex,int2); #ifdef LAMMPS_BIGBIG #define tagint long #endif -#ifdef LAMMPS_SMALLSMALL -#define tagint int -#endif #endif // defined(NV_KERNEL) || defined(USE_HIP) diff --git a/lib/gpu/lal_hippo.cu b/lib/gpu/lal_hippo.cu index 01ad8e753a..3ae1e5ff21 100644 --- a/lib/gpu/lal_hippo.cu +++ b/lib/gpu/lal_hippo.cu @@ -23,9 +23,6 @@ #include "inttypes.h" #define tagint int64_t #endif -#ifdef LAMMPS_SMALLSMALL -#define tagint int -#endif #ifndef _DOUBLE_DOUBLE _texture( pos_tex,float4); _texture( q_tex,float); @@ -43,9 +40,6 @@ _texture( q_tex,int2); #ifdef LAMMPS_BIGBIG #define tagint long #endif -#ifdef LAMMPS_SMALLSMALL -#define tagint int -#endif #endif // defined(NV_KERNEL) || defined(USE_HIP) diff --git a/lib/gpu/lal_lj_tip4p_long.cu b/lib/gpu/lal_lj_tip4p_long.cu index 26ceb38538..46a47d7710 100644 --- a/lib/gpu/lal_lj_tip4p_long.cu +++ b/lib/gpu/lal_lj_tip4p_long.cu @@ -27,9 +27,6 @@ #define tagint int64_t #endif #endif -#ifdef LAMMPS_SMALLSMALL -#define tagint int -#endif #ifndef _DOUBLE_DOUBLE _texture( pos_tex,float4); _texture( q_tex,float); @@ -50,9 +47,6 @@ _texture( q_tex,int2); #define tagint int64_t #endif #endif -#ifdef LAMMPS_SMALLSMALL -#define tagint int -#endif #define pos_tex x_ #define q_tex q_ #endif diff --git a/lib/gpu/lal_neighbor_gpu.cu b/lib/gpu/lal_neighbor_gpu.cu index 7d0941ccd5..a0fa26b7e4 100644 --- a/lib/gpu/lal_neighbor_gpu.cu +++ b/lib/gpu/lal_neighbor_gpu.cu @@ -28,9 +28,6 @@ #define tagint int64_t #endif #endif -#ifdef LAMMPS_SMALLSMALL -#define tagint int -#endif #ifndef _DOUBLE_DOUBLE _texture( pos_tex,float4); #else @@ -140,9 +137,6 @@ __kernel void kernel_calc_cell_counts(const unsigned *restrict cell_id, #ifdef LAMMPS_BIGBIG #define tagint long #endif -#ifdef LAMMPS_SMALLSMALL -#define tagint int -#endif #endif __kernel void transpose(__global tagint *restrict out, diff --git a/lib/gpu/lal_precision.h b/lib/gpu/lal_precision.h index 85e009e96b..f0df796b49 100644 --- a/lib/gpu/lal_precision.h +++ b/lib/gpu/lal_precision.h @@ -150,8 +150,7 @@ enum{SPHERE_SPHERE,SPHERE_ELLIPSE,ELLIPSE_SPHERE,ELLIPSE_ELLIPSE}; // default to 32-bit smallint and other ints, 64-bit bigint: // same as defined in src/lmptype.h -#if !defined(LAMMPS_SMALLSMALL) && !defined(LAMMPS_BIGBIG) && \ - !defined(LAMMPS_SMALLBIG) +#if !defined(LAMMPS_BIGBIG) && !defined(LAMMPS_SMALLBIG) #define LAMMPS_SMALLBIG #endif @@ -164,9 +163,5 @@ typedef int tagint; typedef int64_t tagint; #define OCL_INT_TYPE "-DLAMMPS_BIGBIG" #endif -#ifdef LAMMPS_SMALLSMALL -typedef int tagint; -#define OCL_INT_TYPE "-DLAMMPS_SMALLSMALL" -#endif #endif // LAL_PRECISION_H diff --git a/lib/gpu/lal_preprocessor.h b/lib/gpu/lal_preprocessor.h index 93d6936f38..d7f7c700c5 100644 --- a/lib/gpu/lal_preprocessor.h +++ b/lib/gpu/lal_preprocessor.h @@ -406,7 +406,6 @@ ucl_inline int sbmask15(int j) { return j >> SBBITS15 & 7; }; // default to 32-bit smallint and other ints, 64-bit bigint: // same as defined in src/lmptype.h -#if !defined(LAMMPS_SMALLSMALL) && !defined(LAMMPS_BIGBIG) && \ - !defined(LAMMPS_SMALLBIG) +#if !defined(LAMMPS_BIGBIG) && !defined(LAMMPS_SMALLBIG) #define LAMMPS_SMALLBIG #endif