From 80a141d9c8034bcc8305dc1e4cd40249110e94a3 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Tue, 1 Nov 2022 03:38:08 -0400 Subject: [PATCH] silence compiler warnings --- lib/gpu/geryon/ocl_texture.h | 4 ++-- lib/gpu/geryon/ucl_d_vec.h | 2 +- lib/gpu/lal_base_atomic.cpp | 3 +-- lib/gpu/lal_base_charge.cpp | 3 +-- lib/gpu/lal_base_dipole.cpp | 3 +-- lib/gpu/lal_base_dpd.cpp | 3 +-- lib/gpu/lal_base_ellipsoid.cpp | 3 +-- lib/gpu/lal_base_three.cpp | 3 +-- lib/gpu/lal_device.cpp | 4 ++-- lib/gpu/lal_neighbor.cpp | 4 ++-- lib/gpu/lal_tersoff.cpp | 2 +- lib/gpu/lal_tersoff_mod.cpp | 2 +- lib/gpu/lal_tersoff_zbl.cpp | 2 +- 13 files changed, 16 insertions(+), 22 deletions(-) diff --git a/lib/gpu/geryon/ocl_texture.h b/lib/gpu/geryon/ocl_texture.h index 43de4b258c..8ddde5b2a3 100644 --- a/lib/gpu/geryon/ocl_texture.h +++ b/lib/gpu/geryon/ocl_texture.h @@ -76,7 +76,7 @@ class UCL_Const { /// Copy from array on host to const memory template inline void update_device(UCL_H_Vec &src, const int numel) { - const int bytes=numel*sizeof(numtyp); + const size_t bytes=numel*sizeof(numtyp); if (_global_bytes < bytes) { if (_global_bytes) CL_SAFE_CALL(clReleaseMemObject(_global)); cl_int e; @@ -84,7 +84,7 @@ class UCL_Const { CL_SAFE_CALL(e); } CL_SAFE_CALL(clEnqueueWriteBuffer(_cq, _global, CL_FALSE, 0, bytes, - (void *)src.begin(), 0, NULL, NULL)); + (void *)src.begin(), 0, NULL, NULL)); } /// Get device ptr associated with object inline const cl_mem * begin() const { return &_global; } diff --git a/lib/gpu/geryon/ucl_d_vec.h b/lib/gpu/geryon/ucl_d_vec.h index 6c10568f86..9158e145b3 100644 --- a/lib/gpu/geryon/ucl_d_vec.h +++ b/lib/gpu/geryon/ucl_d_vec.h @@ -375,7 +375,7 @@ class UCL_D_Vec : public UCL_BaseMat { /// Resize (only if bigger) the allocation to contain cols elements /** \note Cannot be used on views **/ inline int resize_ib(const int cols) - { if (cols>_cols) return resize(cols); else return UCL_SUCCESS; } + { if (cols > (int)_cols) return resize(cols); else return UCL_SUCCESS; } /// Set each element to zero asynchronously in the default command_queue inline void zero() { zero(_cq); } diff --git a/lib/gpu/lal_base_atomic.cpp b/lib/gpu/lal_base_atomic.cpp index b668399a48..bb0e815b3f 100644 --- a/lib/gpu/lal_base_atomic.cpp +++ b/lib/gpu/lal_base_atomic.cpp @@ -340,8 +340,7 @@ void BaseAtomicT::compile_kernels(UCL_Device &dev, const void *pair_str, #if defined(LAL_OCL_EV_JIT) mx_subgroup_sz = std::min(mx_subgroup_sz, k_pair_noev.max_subgroup_size(_block_size)); #endif - if (_threads_per_atom > mx_subgroup_sz) - _threads_per_atom = mx_subgroup_sz; + if (_threads_per_atom > (int)mx_subgroup_sz) _threads_per_atom = mx_subgroup_sz; device->set_simd_size(mx_subgroup_sz); } #endif diff --git a/lib/gpu/lal_base_charge.cpp b/lib/gpu/lal_base_charge.cpp index 84fbddd4e9..4a59f70d83 100644 --- a/lib/gpu/lal_base_charge.cpp +++ b/lib/gpu/lal_base_charge.cpp @@ -359,8 +359,7 @@ void BaseChargeT::compile_kernels(UCL_Device &dev, const void *pair_str, #if defined(LAL_OCL_EV_JIT) mx_subgroup_sz = std::min(mx_subgroup_sz, k_pair_noev.max_subgroup_size(_block_size)); #endif - if (_threads_per_atom > mx_subgroup_sz) - _threads_per_atom = mx_subgroup_sz; + if (_threads_per_atom > (int)mx_subgroup_sz) _threads_per_atom = mx_subgroup_sz; device->set_simd_size(mx_subgroup_sz); } #endif diff --git a/lib/gpu/lal_base_dipole.cpp b/lib/gpu/lal_base_dipole.cpp index 439637cbde..66e03de651 100644 --- a/lib/gpu/lal_base_dipole.cpp +++ b/lib/gpu/lal_base_dipole.cpp @@ -361,8 +361,7 @@ void BaseDipoleT::compile_kernels(UCL_Device &dev, const void *pair_str, #if defined(LAL_OCL_EV_JIT) mx_subgroup_sz = std::min(mx_subgroup_sz, k_pair_noev.max_subgroup_size(_block_size)); #endif - if (_threads_per_atom > mx_subgroup_sz) - _threads_per_atom = mx_subgroup_sz; + if (_threads_per_atom > (int)mx_subgroup_sz) _threads_per_atom = mx_subgroup_sz; device->set_simd_size(mx_subgroup_sz); } #endif diff --git a/lib/gpu/lal_base_dpd.cpp b/lib/gpu/lal_base_dpd.cpp index d3c3353415..44b86abeeb 100644 --- a/lib/gpu/lal_base_dpd.cpp +++ b/lib/gpu/lal_base_dpd.cpp @@ -361,8 +361,7 @@ void BaseDPDT::compile_kernels(UCL_Device &dev, const void *pair_str, #if defined(LAL_OCL_EV_JIT) mx_subgroup_sz = std::min(mx_subgroup_sz, k_pair_noev.max_subgroup_size(_block_size)); #endif - if (_threads_per_atom > mx_subgroup_sz) - _threads_per_atom = mx_subgroup_sz; + if (_threads_per_atom > (int)mx_subgroup_sz) _threads_per_atom = mx_subgroup_sz; device->set_simd_size(mx_subgroup_sz); } #endif diff --git a/lib/gpu/lal_base_ellipsoid.cpp b/lib/gpu/lal_base_ellipsoid.cpp index ca7dc645bc..0bc20615a1 100644 --- a/lib/gpu/lal_base_ellipsoid.cpp +++ b/lib/gpu/lal_base_ellipsoid.cpp @@ -569,8 +569,7 @@ void BaseEllipsoidT::compile_kernels(UCL_Device &dev, if (e_s) mx_subgroup_sz = std::min(mx_subgroup_sz, k_ellipsoid_sphere_noev.max_subgroup_size(_block_size)); #endif - if (_threads_per_atom > mx_subgroup_sz) - _threads_per_atom = mx_subgroup_sz; + if (_threads_per_atom > (int)mx_subgroup_sz) _threads_per_atom = mx_subgroup_sz; device->set_simd_size(mx_subgroup_sz); } #endif diff --git a/lib/gpu/lal_base_three.cpp b/lib/gpu/lal_base_three.cpp index 8ba6147582..3457955b3e 100644 --- a/lib/gpu/lal_base_three.cpp +++ b/lib/gpu/lal_base_three.cpp @@ -471,8 +471,7 @@ void BaseThreeT::compile_kernels(UCL_Device &dev, const void *pair_str, mx_subgroup_sz = std::min(mx_subgroup_sz, k_three_center_noev.max_subgroup_size(_block_size)); mx_subgroup_sz = std::min(mx_subgroup_sz, k_three_end_noev.max_subgroup_size(_block_size)); #endif - if (_threads_per_atom > mx_subgroup_sz) - _threads_per_atom = mx_subgroup_sz; + if (_threads_per_atom > (int)mx_subgroup_sz) _threads_per_atom = mx_subgroup_sz; device->set_simd_size(mx_subgroup_sz); } #endif diff --git a/lib/gpu/lal_device.cpp b/lib/gpu/lal_device.cpp index 8a4784d309..0d9578b491 100644 --- a/lib/gpu/lal_device.cpp +++ b/lib/gpu/lal_device.cpp @@ -86,7 +86,7 @@ int DeviceT::init_device(MPI_Comm world, MPI_Comm replica, const int ngpu, #ifdef LAL_OCL_EXTRA_ARGS extra_args+=":" LAL_PRE_STRINGIFY(LAL_OCL_EXTRA_ARGS); #endif - for (int i=0; iplatform_name(); - for (int i=0; i='a') pname[i]=toupper(pname[i]); if (pname.find("NVIDIA")!=std::string::npos) diff --git a/lib/gpu/lal_neighbor.cpp b/lib/gpu/lal_neighbor.cpp index 373da141ad..a327fdd45b 100644 --- a/lib/gpu/lal_neighbor.cpp +++ b/lib/gpu/lal_neighbor.cpp @@ -632,7 +632,7 @@ void Neighbor::build_nbor_list(double **x, const int inum, const int host_inum, subgroup_count += cell_subgroup_counts[i]; cell_subgroup_counts[i] += cell_subgroup_counts[i-1]; } - if (subgroup_count > subgroup2cell.numel()) { + if (subgroup_count > (int)subgroup2cell.numel()) { subgroup2cell.clear(); success = success && (subgroup2cell.alloc(1.1*subgroup_count,*dev, UCL_READ_WRITE,UCL_READ_ONLY) == UCL_SUCCESS); @@ -702,7 +702,7 @@ void Neighbor::build_nbor_list(double **x, const int inum, const int host_inum, _old_ncellz = ncellz; const int bin_stencil_stride = cells_in_cutoff * 2 + 1; const int bin_stencil_size = bin_stencil_stride * bin_stencil_stride; - if (bin_stencil_size > _host_bin_stencil.numel()) + if (bin_stencil_size > (int)_host_bin_stencil.numel()) _host_bin_stencil.alloc(bin_stencil_size,*dev); for (int s = 0; s_nall; - if (nall*this->nbor->max_nbors() > _zetaij.cols()) { + if (nall*this->nbor->max_nbors() > (int)_zetaij.cols()) { int _nmax=static_cast(static_cast(nall)*1.10); _zetaij.clear(); _zetaij_eng.clear(); diff --git a/lib/gpu/lal_tersoff_mod.cpp b/lib/gpu/lal_tersoff_mod.cpp index 7f050c8eee..4c5e60f737 100644 --- a/lib/gpu/lal_tersoff_mod.cpp +++ b/lib/gpu/lal_tersoff_mod.cpp @@ -252,7 +252,7 @@ int TersoffMT::loop(const int eflag, const int vflag, const int evatom, // re-allocate zetaij if necessary int nall = this->_nall; - if (nall*this->nbor->max_nbors() > _zetaij.cols()) { + if (nall*this->nbor->max_nbors() > (int)_zetaij.cols()) { int _nmax=static_cast(static_cast(nall)*1.10); _zetaij.clear(); success = success && (_zetaij.alloc(this->nbor->max_nbors()*_nmax, diff --git a/lib/gpu/lal_tersoff_zbl.cpp b/lib/gpu/lal_tersoff_zbl.cpp index b3d7df9a3e..1499416b66 100644 --- a/lib/gpu/lal_tersoff_zbl.cpp +++ b/lib/gpu/lal_tersoff_zbl.cpp @@ -276,7 +276,7 @@ int TersoffZT::loop(const int eflag, const int vflag, const int evatom, // re-allocate zetaij if necessary int nall = this->_nall; - if (nall*this->nbor->max_nbors() > _zetaij.cols()) { + if (nall*this->nbor->max_nbors() > (int)_zetaij.cols()) { int _nmax=static_cast(static_cast(nall)*1.10); _zetaij.clear(); success = success && (_zetaij.alloc(this->nbor->max_nbors()*_nmax,