Mercurial > octave
view scripts/geometry/delaunay.m @ 29949:f254c302bb9c
remove JIT compiler from Octave sources
As stated in the NEWS file entry added with this changeset, no one
has ever seriously taken on further development of the JIT compiler in
Octave since it was first added as part of a Google Summer of Code
project in 2012 and it still does nothing significant. It is out of
date with the default interpreter that walks the parse tree. Even
though we have fixed the configure script to disable it by default,
people still ask questions about how to build it, but it doesn’t seem
that they are doing that to work on it but because they think it will
make Octave code run faster (it never did, except for some extremely
simple bits of code as examples for demonstration purposes only).
* NEWS: Note change.
* configure.ac, acinclude.m4: Eliminate checks and macros related to
the JIT compiler and LLVM.
* basics.txi, install.txi, octave.texi, vectorize.txi: Remove mention
of JIT compiler and LLVM.
* jit-ir.cc, jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h, jit-util.cc,
jit-util.h, pt-jit.cc, pt-jit.h: Delete.
* libinterp/parse-tree/module.mk: Update.
* Array-jit.cc: Delete.
* libinterp/template-inst/module.mk: Update.
* test/jit.tst: Delete.
* test/module.mk: Update.
* interpreter.cc (interpreter::interpreter): Don't check options for
debug_jit or jit_compiler.
* toplev.cc (F__octave_config_info__): Remove JIT compiler and LLVM
info from struct.
* ov-base.h (octave_base_value::grab, octave_base_value::release):
Delete.
* ov-builtin.h, ov-builtin.cc (octave_builtin::to_jit,
octave_builtin::stash_jit): Delete.
(octave_builtin::m_jtype): Delete data member and all uses.
* ov-usr-fcn.h, ov-usr-fcn.cc (octave_user_function::m_jit_info):
Delete data member and all uses.
(octave_user_function::get_info, octave_user_function::stash_info): Delete.
* options.h (DEBUG_JIT_OPTION, JIT_COMPILER_OPTION): Delete macro
definitions and all uses.
* octave.h, octave.cc (cmdline_options::cmdline_options): Don't handle
DEBUG_JIT_OPTION, JIT_COMPILER_OPTION): Delete.
(cmdline_options::debug_jit, cmdline_options::jit_compiler): Delete
functions and all uses.
(cmdline_options::m_debug_jit, cmdline_options::m_jit_compiler): Delete
data members and all uses.
(octave_getopt_options long_opts): Remove "debug-jit" and
"jit-compiler" from the list.
* pt-eval.cc (tree_evaluator::visit_simple_for_command,
tree_evaluator::visit_complex_for_command,
tree_evaluator::visit_while_command,
tree_evaluator::execute_user_function): Eliminate JIT compiler code.
* pt-loop.h, pt-loop.cc (tree_while_command::get_info,
tree_while_command::stash_info, tree_simple_for_command::get_info,
tree_simple_for_command::stash_info): Delete functions and all uses.
(tree_while_command::m_compiled, tree_simple_for_command::m_compiled):
Delete member variable and all uses.
* usage.h (usage_string, octave_print_verbose_usage_and_exit): Remove
[--debug-jit] and [--jit-compiler] from the message.
* Array.h (Array<T>::Array): Remove constructor that was only intended
to be used by the JIT compiler.
(Array<T>::jit_ref_count, Array<T>::jit_slice_data,
Array<T>::jit_dimensions, Array<T>::jit_array_rep): Delete.
* Marray.h (MArray<T>::MArray): Remove constructor that was only
intended to be used by the JIT compiler.
* NDArray.h (NDArray::NDarray): Remove constructor that was only
intended to be used by the JIT compiler.
* dim-vector.h (dim_vector::to_jit): Delete.
(dim_vector::dim_vector): Remove constructor that was only intended to
be used by the JIT compiler.
* codeql-analysis.yaml, make.yaml: Don't require llvm-dev.
* subst-config-vals.in.sh, subst-cross-config-vals.in.sh: Don't
substitute OCTAVE_CONF_LLVM_CPPFLAGS, OCTAVE_CONF_LLVM_LDFLAGS, or
OCTAVE_CONF_LLVM_LIBS.
* Doxyfile.in: Don't define HAVE_LLVM.
* aspell-octave.en.pws: Eliminate jit, JIT, and LLVM from the list of
spelling exceptions.
* build-env.h, build-env.in.cc (LLVM_CPPFLAGS, LLVM_LDFLAGS,
LLVM_LIBS): Delete variables and all uses.
* libinterp/corefcn/module.mk (%canon_reldir%_libcorefcn_la_CPPFLAGS):
Remove $(LLVM_CPPFLAGS) from the list.
* libinterp/parse-tree/module.mk (%canon_reldir%_libparse_tree_la_CPPFLAGS):
Remove $(LLVM_CPPFLAGS) from the list.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 10 Aug 2021 16:42:29 -0400 |
parents | 7854d5752dd2 |
children | 796f54d4ddbf |
line wrap: on
line source
######################################################################## ## ## Copyright (C) 1999-2021 The Octave Project Developers ## ## See the file COPYRIGHT.md in the top-level directory of this ## distribution or <https://octave.org/copyright/>. ## ## This file is part of Octave. ## ## Octave is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <https://www.gnu.org/licenses/>. ## ######################################################################## ## -*- texinfo -*- ## @deftypefn {} {@var{tri} =} delaunay (@var{x}, @var{y}) ## @deftypefnx {} {@var{tetr} =} delaunay (@var{x}, @var{y}, @var{z}) ## @deftypefnx {} {@var{tri} =} delaunay (@var{x}) ## @deftypefnx {} {@var{tri} =} delaunay (@dots{}, @var{options}) ## Compute the Delaunay triangulation for a 2-D or 3-D set of points. ## ## For 2-D sets, the return value @var{tri} is a set of triangles which ## satisfies the Delaunay circum-circle criterion, i.e., no data point from ## [@var{x}, @var{y}] is within the circum-circle of the defining triangle. ## The set of triangles @var{tri} is a matrix of size [n, 3]. Each row defines ## a triangle and the three columns are the three vertices of the triangle. ## The value of @code{@var{tri}(i,j)} is an index into @var{x} and @var{y} for ## the location of the j-th vertex of the i-th triangle. ## ## For 3-D sets, the return value @var{tetr} is a set of tetrahedrons which ## satisfies the Delaunay circum-circle criterion, i.e., no data point from ## [@var{x}, @var{y}, @var{z}] is within the circum-circle of the defining ## tetrahedron. The set of tetrahedrons is a matrix of size [n, 4]. Each row ## defines a tetrahedron and the four columns are the four vertices of the ## tetrahedron. The value of @code{@var{tetr}(i,j)} is an index into @var{x}, ## @var{y}, @var{z} for the location of the j-th vertex of the i-th ## tetrahedron. ## ## The input @var{x} may also be a matrix with two or three columns where the ## first column contains x-data, the second y-data, and the optional third ## column contains z-data. ## ## An optional final argument, which must be a string or cell array of strings, ## contains options passed to the underlying qhull command. ## See the documentation for the Qhull library for details ## @url{http://www.qhull.org/html/qh-quick.htm#options}. ## The default options are @code{@{"Qt", "Qbb", "Qc"@}}. ## If Qhull fails for 2-D input the triangulation is attempted again with ## the options @code{@{"Qt", "Qbb", "Qc", "Qz"@}} which may result in ## reduced accuracy. ## ## If @var{options} is not present or @code{[]} then the default arguments are ## used. Otherwise, @var{options} replaces the default argument list. ## To append user options to the defaults it is necessary to repeat the ## default arguments in @var{options}. Use a null string to pass no arguments. ## ## @example ## @group ## x = rand (1, 10); ## y = rand (1, 10); ## tri = delaunay (x, y); ## triplot (tri, x, y); ## hold on; ## plot (x, y, "r*"); ## axis ([0,1,0,1]); ## @end group ## @end example ## @seealso{delaunayn, convhull, voronoi, triplot, trimesh, tetramesh, trisurf} ## @end deftypefn function tri = delaunay (varargin) if (nargin < 1 || nargin > 4) print_usage (); endif z = []; options = []; switch (nargin) case 1 if (! ismatrix (varargin{1}) || (columns (varargin{1}) != 2 && columns (varargin{1}) != 3)) error ("delaunay: X must be a matrix with 2 or 3 columns"); else x = varargin{1}(:,1); y = varargin{1}(:,2); if (columns (varargin{1}) == 3) z = varargin{1}(:,3); endif endif case 2 if (isnumeric (varargin{2})) x = varargin{1}; y = varargin{2}; elseif (! (ischar (varargin{2}) || iscellstr (varargin{2}))) error ("delaunay: OPTIONS must be a string or cell array of strings"); else options = varargin{2}; ncols = columns (varargin{1}); if (! ismatrix (varargin{1}) || (ncols != 2 && ncols != 3)) error ("delaunay: X must be a matrix with 2 or 3 columns"); else x = varargin{1}(:,1); y = varargin{1}(:,2); if (ncols == 3) z = varargin{1}(:,3); endif endif endif case 3 if (isnumeric (varargin{3})) x = varargin{1}; y = varargin{2}; z = varargin{3}; elseif (! (ischar (varargin{3}) || iscellstr (varargin{3}))) error ("delaunay: OPTIONS must be a string or cell array of strings"); else x = varargin{1}; y = varargin{2}; options = varargin{3}; endif case 4 x = varargin{1}; y = varargin{2}; z = varargin{3}; options = varargin{4}; if (! (ischar (options) || iscellstr (options))) error ("delaunay: OPTIONS must be a string or cell array of strings"); endif endswitch if (isempty (z)) x = x(:); y = y(:); if (! size_equal (x, y)) error ("delaunay: X and Y must be the same size"); endif tri = delaunayn ([x, y], options); else x = x(:); y = y(:); z = z(:); if (! size_equal (x, y, z)) error ("delaunay: X, Y, and Z must be the same size"); endif tri = delaunayn ([x, y, z], options); endif endfunction %!demo %! old_state = rand ("state"); %! restore_state = onCleanup (@() rand ("state", old_state)); %! rand ("state", 1); %! x = rand (1,10); %! y = rand (1,10); %! tri = delaunay (x,y); %! clf; %! triplot (tri, x, y); %! hold on; %! plot (x, y, "r*"); %! axis ([0,1,0,1]); %!testif HAVE_QHULL %! x = [-1, 0, 1, 0]; %! y = [0, 1, 0, -1]; %! assert (sortrows (sort (delaunay (x, y), 2)), [1,2,4;2,3,4]); %!testif HAVE_QHULL %! x = [-1, 0, 1, 0]; %! y = [0, 1, 0, -1]; %! mat = [x(:), y(:)]; %! assert (sortrows (sort (delaunay (mat), 2)), [1,2,4;2,3,4]); %!testif HAVE_QHULL %! x = [-1, 0, 1, 0, 0]; %! y = [0, 1, 0, -1, 0]; %! assert (sortrows (sort (delaunay (x, y), 2)), [1,2,5;1,4,5;2,3,5;3,4,5]); %!testif HAVE_QHULL %! x = [-1, 0; 0, 1; 1, 0; 0, -1; 0, 0]; %! assert (sortrows (sort (delaunay (x), 2)), [1,2,5;1,4,5;2,3,5;3,4,5]); %!testif HAVE_QHULL %! x = [1 5 2; 5 6 7]; %! y = [5 7 8; 1 2 3]; %! assert (sortrows (sort (delaunay (x, y), 2)), [1,2,4;1,3,4;1,3,5;3,4,6]); ## Test 3-D input %!testif HAVE_QHULL %! x = [-1, -1, 1, 0, -1]; y = [-1, 1, 1, 0, -1]; z = [0, 0, 0, 1, 1]; %! assert (sortrows (sort (delaunay (x, y, z), 2)), [1,2,3,4;1,2,4,5]); ## Input validation tests %!error <Invalid call> delaunay () %!error <Invalid call> delaunay (1,2,3,4,5) %!error <X must be a matrix with 2 or 3 columns> delaunay (ones (2,4)) %!error <OPTIONS must be a string or cell array> delaunay (ones (2,2), struct ()) %!error <X must be a matrix with 2 or 3 columns> delaunay (ones (2,4), "") %!error <OPTIONS must be a string or cell array> delaunay (ones (2,2), ones (2,2), struct ()) %!error <OPTIONS must be a string or cell array> delaunay (ones (2,2), ones (2,2), ones (2,2), struct ()) %!error <X and Y must be the same size> delaunay (1, [1 2]) %!error <X, Y, and Z must be the same size> delaunay (1, [1 2], [1 2])