Mercurial > octave-nkf
changeset 17311:56404cdcb723
Correct parfor keyword documentation and add some %!tests.
* libinterp/corefcn/help.cc: Correct deftypefn for parfor to use "parfor".
* test/for.tst: Add 2 %!tests for parfor.
* test/jit.tst: Add %!test for parfor for jit.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 21 Aug 2013 19:39:56 -0700 |
| parents | b327c19b6b16 |
| children | 088d014a7fe2 |
| files | libinterp/corefcn/help.cc test/for.tst test/jit.tst |
| diffstat | 3 files changed, 26 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/help.cc Wed Aug 21 18:09:44 2013 -0700 +++ b/libinterp/corefcn/help.cc Wed Aug 21 19:39:56 2013 -0700 @@ -641,8 +641,8 @@ pair_type ("parfor", "-*- texinfo -*-\n\ -@deftypefn {Keyword} {} for @var{i} = @var{range}\n\ -@deftypefnx {Keyword} {} for (@var{i} = @var{range}, @var{maxproc})\n\ +@deftypefn {Keyword} {} parfor @var{i} = @var{range}\n\ +@deftypefnx {Keyword} {} parfor (@var{i} = @var{range}, @var{maxproc})\n\ Begin a for loop that may execute in parallel.\n\ \n\ @example\n\
--- a/test/for.tst Wed Aug 21 18:09:44 2013 -0700 +++ b/test/for.tst Wed Aug 21 19:39:56 2013 -0700 @@ -108,3 +108,18 @@ %! 'foo'; %! endfor %! assert (i, 5); + +%!test +%! parfor i = 1 +%! __printf_assert__ ("%d", i); +%! end # "end" is part of test, check not using "endparfor" +%! __printf_assert__ ("\n"); +%! assert (__prog_output_assert__ ("1")); + +%!test +%! parfor i = 1:4 +%! __printf_assert__ ("%d", i); +%! endparfor +%! __printf_assert__ ("\n"); +%! assert (__prog_output_assert__ ("1234")); +
--- a/test/jit.tst Wed Aug 21 18:09:44 2013 -0700 +++ b/test/jit.tst Wed Aug 21 19:39:56 2013 -0700 @@ -54,6 +54,15 @@ %! endfor %! assert (i, 100); +## Also test parfor keyword +%!testif HAVE_LLVM +%! parfor i=1:1e6 +%! if (i == 100) +%! break; +%! endif +%! endparfor +%! assert (i, 100); + %!testif HAVE_LLVM %! inc = 1e-5; %! result = 0;