remove references to SMALLSMALL from GPU library

2025-03-14 16:31:30 -04:00
parent 557d279774
commit 361914f3f1
16 changed files with 22 additions and 52 deletions
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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)

--- 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)

--- 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
--- 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,
--- 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
--- 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