Merge pull request #680 from danfortunato/fix-matlab-isgpuarray

Improve gpuArray checking in MATLAB interface

Author: ahbarnett

matlab/cufinufft.mw

@@ -216,7 +216,7 @@ classdef cufinufft_plan < handle
     % EXECUTE   execute single or many-vector GPU FINUFFT transforms in a plan.
 
       % check if data_in is gpuArray
-      if ~finufft_isgpuarray(data_in)
+      if ~isa(data_in, 'gpuArray')
         error('FINUFFT:badDataDevice','input data must be a gpuArray');
       end
 

matlab/cufinufft_plan.m

@@ -123,7 +123,7 @@ function setpts(plan, xj, yj, zj, s, t, u)
     % EXECUTE   execute single or many-vector GPU FINUFFT transforms in a plan.
 
       % check if data_in is gpuArray
-      if ~finufft_isgpuarray(data_in)
+      if ~isa(data_in, 'gpuArray')
         error('FINUFFT:badDataDevice','input data must be a gpuArray');
       end
 

matlab/finufft.mw

@@ -234,7 +234,7 @@ classdef finufft_plan < handle
     % EXECUTE   execute single or many-vector FINUFFT transforms in a plan.
 
       % check if data_in is gpuArray
-      if finufft_isgpuarray(data_in)
+      if isa(data_in, 'gpuArray')
         error('FINUFFT:badDataDevice','input data must be a cpuArray');
       end
 

matlab/finufft_isgpuarray.m

@@ -125,7 +125,7 @@ function setpts(plan, xj, yj, zj, s, t, u)
     % EXECUTE   execute single or many-vector FINUFFT transforms in a plan.
 
       % check if data_in is gpuArray
-      if finufft_isgpuarray(data_in)
+      if isa(data_in, 'gpuArray')
         error('FINUFFT:badDataDevice','input data must be a cpuArray');
       end
 

matlab/finufft_plan.m

@@ -1,8 +1,8 @@
-function n_transf = valid_ntr(x,c);
+function n_transf = valid_ntr(x,c)
 % VALID_NTR   deduce n_transforms and validate the size of c, for types 1 and 3.
 %             also check for array device consistency.
 
-if finufft_isgpuarray(x) ~= finufft_isgpuarray(c)
+if isa(x, 'gpuArray') ~= isa(c, 'gpuArray')
   error('FINUFFT:mixedDevice','FINUFFT: x and c must be both on GPU or CPU');
 end
 

matlab/valid_ntr.m

@@ -12,34 +12,34 @@
 
 % Barnett 6/19/20, split out from guru so simple ints can check before plan.
 % s,t,u are only checked for type 3.
-% note that isvector([]) is false, finufft_isgpuarray([]) is false, finufft_isgpuarray(gpuArray([])) is true.
+% note that isvector([]) is false, isa([], 'gpuArray') is false, isa(gpuArray([]), 'gpuArray') is true.
 if ~isvector(x), error('FINUFFT:badXshape','FINUFFT x must be a vector'); end
-if finufft_isgpuarray(x) ~= is_gpuarray, error('FINUFFT:badDataDevice', 'input data must be on the specified device'); end
+if isa(x, 'gpuArray') ~= is_gpuarray, error('FINUFFT:badDataDevice', 'input data must be on the specified device'); end
 nj = numel(x);
 if type==3
   nk = numel(s);
   if ~isvector(s), error('FINUFFT:badSshape','FINUFFT s must be a vector'); end
-  if finufft_isgpuarray(s) ~= is_gpuarray, error('FINUFFT:badDataDevice', 'input data must be on the specified device'); end
+  if isa(s, 'gpuArray') ~= is_gpuarray, error('FINUFFT:badDataDevice', 'input data must be on the specified device'); end
 else
   nk = 0;   % dummy output
 end
 if dim>1
   if ~isvector(y), error('FINUFFT:badYshape','FINUFFT y must be a vector'); end
-  if finufft_isgpuarray(y) ~= is_gpuarray, error('FINUFFT:badDataDevice', 'input data must be on the specified device'); end
+  if isa(y, 'gpuArray') ~= is_gpuarray, error('FINUFFT:badDataDevice', 'input data must be on the specified device'); end
   if numel(y)~=nj, error('FINUFFT:badYlen','FINUFFT y must have same length as x'); end
   if type==3
     if ~isvector(t), error('FINUFFT:badTshape','FINUFFT t must be a vector'); end
-    if finufft_isgpuarray(t) ~= is_gpuarray, error('FINUFFT:badDataDevice', 'input data must be on the specified device'); end
+    if isa(t, 'gpuArray') ~= is_gpuarray, error('FINUFFT:badDataDevice', 'input data must be on the specified device'); end
     if numel(t)~=nk, error('FINUFFT:badTlen','FINUFFT t must have same length as s'); end
   end
 end
 if dim>2
   if ~isvector(z), error('FINUFFT:badZshape','FINUFFT z must be a vector'); end
-  if finufft_isgpuarray(z) ~= is_gpuarray, error('FINUFFT:badDataDevice', 'input data must be on the specified device'); end
+  if isa(z, 'gpuArray') ~= is_gpuarray, error('FINUFFT:badDataDevice', 'input data must be on the specified device'); end
   if numel(z)~=nj, error('FINUFFT:badZlen','FINUFFT z must have same length as x'); end
   if type==3
     if ~isvector(u), error('FINUFFT:badUshape','FINUFFT u must be a vector'); end
-    if finufft_isgpuarray(u) ~= is_gpuarray, error('FINUFFT:badDataDevice', 'input data must be on the specified device'); end
+    if isa(u, 'gpuArray') ~= is_gpuarray, error('FINUFFT:badDataDevice', 'input data must be on the specified device'); end
     if numel(u)~=nk, error('FINUFFT:badUlen','FINUFFT u must have same length as s'); end
   end
 end