Mercurial > octave
view scripts/image/cmunique.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) 2004-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{Y}, @var{newmap}] =} cmunique (@var{X}, @var{map}) ## @deftypefnx {} {[@var{Y}, @var{newmap}] =} cmunique (@var{RGB}) ## @deftypefnx {} {[@var{Y}, @var{newmap}] =} cmunique (@var{I}) ## Convert an input image @var{X} to an output indexed image @var{Y} which uses ## the smallest colormap possible @var{newmap}. ## ## When the input is an indexed image (@var{X} with colormap @var{map}) the ## output is a colormap @var{newmap} from which any repeated rows have been ## eliminated. The output image, @var{Y}, is the original input image with ## the indices adjusted to match the new, possibly smaller, colormap. ## ## When the input is an RGB image (an @nospell{MxNx3} array), the output ## colormap will contain one entry for every unique color in the original ## image. In the worst case the new map could have as many rows as the ## number of pixels in the original image. ## ## When the input is a grayscale image @var{I}, the output colormap will ## contain one entry for every unique intensity value in the original image. ## In the worst case the new map could have as many rows as the number of ## pixels in the original image. ## ## Implementation Details: ## ## @var{newmap} is always an Mx3 matrix, even if the input image is ## an intensity grayscale image @var{I} (all three RGB planes are ## assigned the same value). ## ## The output image is of class uint8 if the size of the new colormap is ## less than or equal to 256. Otherwise, the output image is of class double. ## ## @seealso{rgb2ind, gray2ind} ## @end deftypefn function [Y, newmap] = cmunique (X, map) if (nargin < 1) print_usage (); endif cls = class (X); if (! any (strcmp (cls, {"uint8", "uint16", "single", "double"}))) error ("cmunique: X is of invalid data type '%s'", cls); endif if (nargin == 2) ## (X, map) case if (! iscolormap (map) || min (map(:)) < 0 || max (map(:)) > 1) error ("cmunique: MAP must be a valid colormap"); endif [newmap,i,j] = unique (map, "rows"); # calculate unique colormap if (isfloat (X)) Y = j(X); # find new indices else Y = j(double (X) + 1); # find new indices, switch to 1-based index endif else switch (size (X,3)) case 1 ## I case [newmap,i,j] = unique (X); # calculate unique colormap newmap = repmat (newmap,1,3); # get a RGB colormap Y = reshape (j, rows (X), columns (X)); # Y is j reshaped case 3 ## RGB case ## build a map with all values map = [X(:,:,1)(:), X(:,:,2)(:), X(:,:,3)(:)]; [newmap,i,j] = unique (map, "rows"); # calculate unique colormap Y = reshape (j, rows (X), columns (X)); # Y is j reshaped otherwise error ("cmunique: X is not a valid image"); endswitch ## if image was uint8 or uint16 we have to convert newmap to [0,1] range if (isinteger (X)) newmap = double (newmap) / double (intmax (cls)); endif endif if (rows (newmap) <= 256) ## convert Y to uint8 and 0-based indexing Y = uint8 (Y-1); endif endfunction %!demo %! [Y, newmap] = cmunique ([1:4;5:8], [hot(4);hot(4)]) %! ## Both rows are equal since map maps colors to the same value %! ## cmunique will give the same indices to both ## Check that output is uint8 in short colormaps %!test %! [Y, newmap] = cmunique ([1:4;5:8], [hot(4);hot(4)]); %! assert (Y, uint8 ([0:3;0:3])); %! assert (newmap, hot (4)); ## Check that output is double in bigger %!test %! [Y, newmap] = cmunique ([1:300;301:600], [hot(300);hot(300)]); %! assert (Y, [1:300;1:300]); %! assert (newmap, hot (300)); ## Check boundary case 256 %!test %! [Y, newmap] = cmunique ([1:256;257:512], [hot(256);hot(256)]); %! assert (Y, uint8 ([0:255;0:255])); %! assert (newmap, hot (256)); ## Check boundary case 257 %!test %! [Y, newmap] = cmunique ([1:257;258:514], [hot(257);hot(257)]); %! assert (Y, [1:257;1:257]); %! assert (newmap, hot (257)); ## Random RGB image %!test %! RGB = rand (10,10,3); %! [Y, newmap] = cmunique (RGB); %! assert (RGB(:,:,1), newmap(:,1)(Y+1)); %! assert (RGB(:,:,2), newmap(:,2)(Y+1)); %! assert (RGB(:,:,3), newmap(:,3)(Y+1)); ## Random uint8 RGB image %!test %! RGB = uint8 (rand (10,10,3)*255); %! RGBd = double (RGB) / 255; %! [Y, newmap] = cmunique (RGB); %! assert (RGBd(:,:,1), newmap(:,1)(Y+1)); %! assert (RGBd(:,:,2), newmap(:,2)(Y+1)); %! assert (RGBd(:,:,3), newmap(:,3)(Y+1)); ## Random uint16 RGB image %!test %! RGB = uint16 (rand (10,10,3)*65535); %! RGBd = double (RGB) / 65535; %! [Y, newmap] = cmunique (RGB); %! assert (RGBd(:,:,1), newmap(:,1)(Y+1)); %! assert (RGBd(:,:,2), newmap(:,2)(Y+1)); %! assert (RGBd(:,:,3), newmap(:,3)(Y+1)); ## Random I image %!test %! I = rand (10,10); %! [Y, newmap] = cmunique (I); %! assert (I, newmap(:,1)(Y+1)); %! assert (I, newmap(:,2)(Y+1)); %! assert (I, newmap(:,3)(Y+1)); ## Random uint8 I image %!test %! I = uint8 (rand (10,10)*256); %! Id = double (I) / 255; %! [Y, newmap] = cmunique (I); %! assert (Id, newmap(:,1)(Y+1)); %! assert (Id, newmap(:,2)(Y+1)); %! assert (Id, newmap(:,3)(Y+1)); ## Random uint16 I image %!test %! I = uint16 (rand (10,10)*65535); %! Id = double (I) / 65535; %! [Y, newmap] = cmunique (I); %! assert (Id, newmap(:,1)(Y+1)); %! assert (Id, newmap(:,2)(Y+1)); %! assert (Id, newmap(:,3)(Y+1)); ## Test input validation %!error <Invalid call> cmunique () %!error <X is of invalid data type> cmunique (uint32 (magic (16))) %!error <MAP must be a valid colormap> cmunique (1, "a") %!error <MAP must be a valid colormap> cmunique (1, i) %!error <MAP must be a valid colormap> cmunique (1, ones (3,3,3)) %!error <MAP must be a valid colormap> cmunique (1, ones (3,2)) %!error <MAP must be a valid colormap> cmunique (1, [-1 1 1]) %!error <MAP must be a valid colormap> cmunique (1, [2 1 1])