Mercurial > octave
view scripts/image/im2double.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) 2007-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 {} {} im2double (@var{img}) ## @deftypefnx {} {} im2double (@var{img}, "indexed") ## Convert image to double precision. ## ## The conversion of @var{img} to double precision, is dependent ## on the type of input image. The following input classes are ## supported: ## ## @table @samp ## @item uint8, uint16, and int16 ## The range of values from the class is scaled to the interval [0 1]. ## ## @item logical ## True and false values are assigned a value of 0 and 1 respectively. ## ## @item single ## Values are cast to double. ## ## @item double ## Returns the same image. ## ## @end table ## ## If @var{img} is an indexed image, then the second argument should be ## the string @qcode{"indexed"}. If so, then @var{img} must either be ## of floating point class, or unsigned integer class and it will simply ## be cast to double. If it is an integer class, a +1 offset is applied. ## ## @seealso{double} ## @end deftypefn function img = im2double (img, im_type) if (nargin < 1) print_usage (); endif if (nargin == 1) ## "normal" (non-indexed) images switch (class (img)) case "uint8", img = double (img) / 255; case "uint16", img = double (img) / 65535; case "int16", img = (double (img) + 32768) / 65535; case "single", img = double (img); case "logical", img = double (img); case "double", # do nothing otherwise, error ('im2double: IMG is of unsupported class "%s"', class (img)); endswitch else ## indexed images if (! strcmpi (im_type, "indexed")) error ('im2double: second input argument must be the string "indexed"'); elseif (any (isa (img, {"uint8", "uint16"}))) img = double (img) + 1; elseif (isfloat (img) || isbool (img)) img = double (img); else ## Technically, it could also be of logical class and we do not ## enforce positive integers for floating for Matlab compatibility. ## Still, no need to tell that to the user. error (["im2double: if IMG is indexed, then it must be positive " ... "integer floating points, or unsigned integer class"]); endif endif endfunction %!assert (im2double ([1 2 3]), [1 2 3]) %!assert (im2double (single ([1 2 3])), [1 2 3]) %!assert (im2double (uint8 ([0 127 128 255])), [0 127/255 128/255 1]) %!assert (im2double (uint16 ([0 127 128 65535])), [0 127/65535 128/65535 1]) %!assert (im2double (int16 ([-32768 -32767 -32766 32767])), %! [0 1/65535 2/65535 1]) %!assert (im2double (uint8 ([0 1 255]), "indexed"), [1 2 256]) %!assert (im2double (uint16 ([0 1 2557]), "indexed"), [1 2 2558]) %!assert (im2double ([3 25], "indexed"), [3 25]) %!assert (im2double (single ([3 25]), "indexed"), [3 25]) ## Test for ND input %!function test_im2double_nd (cls, low, high) %! in = rand (2, 4, 2, 3, 2); %! in *= high - low; %! in += low; %! in = cast (in, cls); %! out = zeros (size (in)); %! for n = 1:12 %! out(:,:,n) = im2double (in(:,:,n)); %! endfor %! assert (im2double (in), out); %!endfunction %!test %! test_im2double_nd ("double", 0, 1); %! test_im2double_nd ("single", 0, 1); %! test_im2double_nd ("uint8", 0, 255); %! test_im2double_nd ("uint16", 0, 6535); %! test_im2double_nd ("int16", -32768, 32767); ## Test lack of input check for Matlab compatibility %!assert (im2double ([0 1 2], "indexed"), [0 1 2]) %!assert (im2double ([0 -1 -2], "indexed"), [0 -1 -2]) %!assert (im2double ([0 -1.5 -2], "indexed"), [0 -1.5 -2]) %!assert (im2double ([0 -1.5 -2i], "indexed"), [0 -1.5 -2i]) %!assert (im2double ([false true], "indexed"), [0 1]) %!error <unsigned integer class> im2double (int16 ([17 8]), "indexed") %!error <unsigned integer class> im2double (int16 ([-7 8]), "indexed") %!error <must be the string "indexed"> im2double ([1 2 3], "non-indexed")