Merge pull request #6 from matlab-deep-learning/input_mask_bug

Input mask bug for gpuArray

Author: bwdGitHub

+bert/model.m

@@ -51,7 +51,7 @@
 arguments
     x dlarray {mustBeNumericDlarray,mustBeNonempty}
     parameters {mustBeA(parameters,'struct')}
-    nvp.InputMask {mustBeALogicalOrDlarrayLogical} = logical.empty()
+    nvp.InputMask {mustBeNumericOrLogical} = logical.empty()
     nvp.DropoutProb (1,1) {mustBeNonnegative,mustBeLessThanOrEqual(nvp.DropoutProb,1),mustBeNumeric} = 0
     nvp.AttentionDropoutProb (1,1) {mustBeNonnegative,mustBeLessThanOrEqual(nvp.AttentionDropoutProb,1),mustBeNumeric} = 0
     nvp.Outputs {mustBePositive,mustBeLessThanOrEqualNumLayers(nvp.Outputs,parameters),mustBeInteger,mustBeNumeric} = parameters.Hyperparameters.NumLayers
@@ -72,7 +72,7 @@
     inputMask = x~=nvp.PaddingCode;
 else
     assert(isequal(size(nvp.InputMask),size(x)),"bert:model:InvalidMaskSize","Expected InputMask to have same size as input X.");
-    inputMask = nvp.InputMask;
+    inputMask = logical(nvp.InputMask);
 end
 
 % Assuming CTB format of x.

test/bert/tmodel.m

@@ -261,9 +261,8 @@ function canUseInputMask(test)
 function s = iInvalidInputMask()
 s = struct(...
     'InvalidDims', iInvalidInputCase([true; true; false],"bert:model:InvalidMaskSize"), ...
-    'InvalidTypeString', iInvalidInputCase("foo",'MATLAB:validators:mustBeA'), ...
-    'InvalidTypeCell', iInvalidInputCase({{1, 1, 0}},'MATLAB:validators:mustBeA'), ...
-    'NonLogical', iInvalidInputCase(dlarray([5, 1, 0]),'MATLAB:validators:mustBeA'));
+    'InvalidTypeString', iInvalidInputCase("foo",'MATLAB:validators:mustBeNumericOrLogical'), ...
+    'InvalidTypeCell', iInvalidInputCase({{1, 1, 0}},'MATLAB:validators:mustBeNumericOrLogical'));
 end
 
 function s = iInvalidInputX()