ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'amoeba' into amoeba-gpu, update the gpu pair styles with the base class

Browse Source
This commit is contained in:
Trung Nguyen
2022-06-28 12:54:27 -05:00
parent 531e553162 74d1d391b5
commit a14f0cfd6c
2667 changed files with 192256 additions and 71727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/gpu/lal_device.cpp
View File

@ -81,7 +81,7 @@ int DeviceT::init_device(MPI_Comm world, MPI_Comm replica, const int ngpu,
gpu=new UCL_Device();
// ---------------------- OpenCL Compiler Args -------------------------
std::string extra_args="";
std::string extra_args;
if (ocl_args) extra_args+=":"+std::string(ocl_args);
#ifdef LAL_OCL_EXTRA_ARGS
extra_args+=":" LAL_PRE_STRINGIFY(LAL_OCL_EXTRA_ARGS);
@ -144,7 +144,7 @@ int DeviceT::init_device(MPI_Comm world, MPI_Comm replica, const int ngpu,
// Setup OpenCL platform and parameters based on platform
// and device type specifications
std::string ocl_vstring="";
std::string ocl_vstring;
if (device_type_flags != nullptr) ocl_vstring=device_type_flags;
// Setup the OpenCL platform
@ -161,7 +161,7 @@ int DeviceT::init_device(MPI_Comm world, MPI_Comm replica, const int ngpu,
if (_platform_id>=0)
pres=gpu->set_platform(_platform_id);
else {
std::string vendor="";
std::string vendor;
if (device_type_flags!=nullptr) {
if (ocl_vstring=="intelgpu")
vendor="intel";
@ -201,9 +201,9 @@ int DeviceT::init_device(MPI_Comm world, MPI_Comm replica, const int ngpu,
unsigned best_cus = gpu->cus(0);
bool type_match = (gpu->device_type(0) == type);
for (int i = 1; i < gpu->num_devices(); i++) {
if (type_match && gpu->device_type(i)!=type)
if (type_match && (gpu->device_type(i) != type))
continue;
if (type_match && gpu->device_type(i) == type) {
if (!type_match && (gpu->device_type(i) == type)) {
type_match = true;
best_cus = gpu->cus(i);
best_device = i;
@ -583,7 +583,7 @@ template <class numtyp, class acctyp>
void DeviceT::init_message(FILE *screen, const char *name,
const int first_gpu, const int last_gpu) {
#if defined(USE_OPENCL)
std::string fs="";
std::string fs;
#elif defined(USE_CUDART)
std::string fs="";
#else