Code

WIP: Remove element classes#1475

Code

Draft

kohr-h wants to merge 136 commits intoodlgroup:masterodlgroup/odl:masterfrom kohr-h:remove_elementkohr-h/odl:remove_elementCopy head branch name to clipboard

+6,336-14,171

Commits

Commits on Apr 13, 2020

• Step 1: remove obvious parts of npy_tensors.py and other modules

  kohr-h

  committed
  90434d5

  Copy full SHA for 90434d5

• Fix doctests of NumpyTensorSpace

  kohr-h

  committed
  8e1cc44

  Copy full SHA for 8e1cc44

• Fix doctests in base_tensors.py, make show a space method

  kohr-h

  committed
  f95bd77

  Copy full SHA for f95bd77

• Step 2: remove DiscreteLpElement and other obvious code

  kohr-h

  committed
  12def9c

  Copy full SHA for 12def9c

• Fix doctests of DiscreteLp, make show a method of DiscreteLp

  kohr-h

  committed
  85daddf

  Copy full SHA for 85daddf

• Fix convolution example

  kohr-h

  committed
  68dd506

  Copy full SHA for 68dd506

• Fix scipy solvers example and some diff operators

  kohr-h

  committed
  e1cbff1

  Copy full SHA for e1cbff1

• Step 3: remove ProductSpaceElement, use np.ndarray with object dtype instead

  kohr-h

  committed
  173a0a6

  Copy full SHA for 173a0a6

• Fix DiscreteLp.__contains__

  kohr-h

  committed
  e87036f

  Copy full SHA for e87036f

• Probably fix diff_ops doctests

  kohr-h

  committed
  63b2b50

  Copy full SHA for 63b2b50

• Fix ProductSpace.show and example show_productspace

  kohr-h

  committed
  4c7f14f

  Copy full SHA for 4c7f14f

• Step 4: Replace pspace weightings by functions

  Show description for c767169
  kohr-h

  committed
  c767169

  Copy full SHA for c767169

• Fix deformation operators

  kohr-h

  committed
  5b5e011

  Copy full SHA for 5b5e011

• Step 5: Remove LinearSpaceElement and its imports

  kohr-h

  committed
  e9fb81f

  Copy full SHA for e9fb81f

• Temporarily fix ProductSpace.__repr__

  kohr-h

  committed
  08d728c

  Copy full SHA for 08d728c

• Fix deformation examples

  kohr-h

  committed
  c6448b2

  Copy full SHA for c6448b2

• Fix space diagnostics

  kohr-h

  committed
  31b73af

  Copy full SHA for 31b73af

• Fix default_ops doctests

  kohr-h

  committed
  26548d6

  Copy full SHA for 26548d6

• Fix doctests in operator.py

  kohr-h

  committed
  9cd0d11

  Copy full SHA for 9cd0d11

• Fix pspace element creation

  kohr-h

  committed
  e9400f9

  Copy full SHA for e9400f9

• Fix pspace_ops doctests

  kohr-h

  committed
  a480ed9

  Copy full SHA for a480ed9

• Fix doctests of tensor_ops.py up to weighting issue

  kohr-h

  committed
  ce443eb

  Copy full SHA for ce443eb

• Step 6: remove remaining weighting classes

  kohr-h

  committed
  05c919a

  Copy full SHA for 05c919a

• Remove __array_ufunc__ functions

  kohr-h

  committed
  d71d905

  Copy full SHA for d71d905

• Fix lp_discr.py doctests

  kohr-h

  committed
  74e7065

  Copy full SHA for 74e7065

• Fix doctests in discr_ops.py

  kohr-h

  committed
  53d4ff2

  Copy full SHA for 53d4ff2

• Fix doctests in tensor_ops.py, add weighting_type to ProductSpace

  kohr-h

  committed
  44c352d

  Copy full SHA for 44c352d

• Remove vector function

  kohr-h

  committed
  6be2e46

  Copy full SHA for 6be2e46

• Fix doctests in pspace.py

  kohr-h

  committed
  1f9f562

  Copy full SHA for 1f9f562

• Fix doctests in emission.py

  kohr-h

  committed
  6f69636

  Copy full SHA for 6f69636

• Fix doctests in geometric.py

  kohr-h

  committed
  c9953f5

  Copy full SHA for c9953f5

• Fix doctests in misc_phantoms.py

  kohr-h

  committed
  ebaef61

  Copy full SHA for ebaef61

• Fix doctests in noise.py

  kohr-h

  committed
  bee4cf2

  Copy full SHA for bee4cf2

• Fix doctests in transmission.py

  kohr-h

  committed
  6bd5e2b

  Copy full SHA for 6bd5e2b

• Fix doctests in utility.py

  kohr-h

  committed
  97d478b

  Copy full SHA for 97d478b

• Fix doctests in default_functionals.py and proximal_operators.py

  kohr-h

  committed
  c15d65d

  Copy full SHA for c15d65d

• Fix doctests in functional.py

  kohr-h

  committed
  13c9c53

  Copy full SHA for 13c9c53

• Fix operator default in-place call

  kohr-h

  committed
  cdc6c30

  Copy full SHA for cdc6c30

• Fix doctests in derivatives.py

  kohr-h

  committed
  830c38c

  Copy full SHA for 830c38c

• Fix doctests in callback.py

  kohr-h

  committed
  e9b62dd

  Copy full SHA for e9b62dd

• Fix doctests in steplen.py

  kohr-h

  committed
  d0803e0

  Copy full SHA for d0803e0

• Fix ray transform and doctests in filtered_back_projection.py

  kohr-h

  committed
  6d35178

  Copy full SHA for 6d35178

• Fix doctests in diagnostics/operator.py

  kohr-h

  committed
  496b957

  Copy full SHA for 496b957

• Fix wrong weighting in PointwiseInnerAdjoint

  kohr-h

  committed
  8e79aca

  Copy full SHA for 8e79aca

• Fix Fourier transforms

  kohr-h

  committed
  3040464

  Copy full SHA for 3040464

• Fix fourier_trafo example

  kohr-h

  committed
  c3db9c3

  Copy full SHA for c3db9c3

• Fix wavelet_trafo example

  kohr-h

  committed
  24f3746

  Copy full SHA for 24f3746

• Fix simple_r example

  kohr-h

  committed
  2647c32

  Copy full SHA for 2647c32

• Fix simple_rn example

  kohr-h

  committed
  6fe1ca8

  Copy full SHA for 6fe1ca8

• Add space argument to CallbackShow

  kohr-h

  committed
  3d38d2a

  Copy full SHA for 3d38d2a

• Fix show_1d example

  kohr-h

  committed
  0e4137a

  Copy full SHA for 0e4137a

• Fix show_2d example

  kohr-h

  committed
  a684460

  Copy full SHA for a684460

• Fix show_2d_complex example

  kohr-h

  committed
  2f5b61b

  Copy full SHA for 2f5b61b

• Fix show_callback example

  kohr-h

  committed
  76536f5

  Copy full SHA for 76536f5

• Fix show_update_1d example

  kohr-h

  committed
  13f2718

  Copy full SHA for 13f2718

• Fix show_update_2d example

  kohr-h

  committed
  e83fe84

  Copy full SHA for e83fe84

• Fix show_update_in_place_2d example

  kohr-h

  committed
  142fda1

  Copy full SHA for 142fda1

• Fix show_vector example

  kohr-h

  committed
  4143a92

  Copy full SHA for 4143a92

• Rename show_examples example

  kohr-h

  committed
  50a2151

  Copy full SHA for 50a2151

• Fix several smooth solvers

  kohr-h

  committed
  e2d8231

  Copy full SHA for e2d8231

• Fix Rosenbrock example

  kohr-h

  committed
  24fc079

  Copy full SHA for 24fc079

• Fix proximal_translation

  kohr-h

  committed
  e8cc5a7

  Copy full SHA for e8cc5a7

• Fix proximal gradient solvers

  kohr-h

  committed
  6f28e14

  Copy full SHA for 6f28e14

• Fix proximal_gradient_denoising.py example

  kohr-h

  committed
  22f4b06

  Copy full SHA for 22f4b06

• Add _multiply and _divide to DiscreteLp

  kohr-h

  committed
  97c0094

  Copy full SHA for 97c0094

• Allow field elements in multiply and divide

  kohr-h

  committed
  e611fbb

  Copy full SHA for e611fbb

• Remove ufuncs from pytest_config

  kohr-h

  committed
  a09ea15

  Copy full SHA for a09ea15

• Fix space_test unittests

  kohr-h

  committed
  7b8d941

  Copy full SHA for 7b8d941

• Remove space_utils_test unittests

  kohr-h

  committed
  29c19a5

  Copy full SHA for 29c19a5

• WIP: fix PDHG and prox ops

  kohr-h

  committed
  24e450d

  Copy full SHA for 24e450d

• WIP: fix tensors_test unittests and weighting

  kohr-h

  committed
  b76d577

  Copy full SHA for b76d577

• Improve fixture printing, remove reduction fixture

  kohr-h

  committed
  eb9612a

  Copy full SHA for eb9612a

• Fix weighted dist on NumpyTensorSpace

  kohr-h

  committed
  93bc9c4

  Copy full SHA for 93bc9c4

• In tensors_test.py, remove obsolete tests and fix remaining ones

  kohr-h

  committed
  f9a890d

  Copy full SHA for f9a890d

• Minor fixes in tensors_test

  kohr-h

  committed
  6f55693

  Copy full SHA for 6f55693

• WIP: fix pspace element creation and pspace_test unittests

  kohr-h

  committed
  ba41a1a

  Copy full SHA for ba41a1a

• Fix wrong LinearSpace.__pow__

  kohr-h

  committed
  e368e52

  Copy full SHA for e368e52

• WIP: fix pspace elements and shape

  Show description for c2c18ed
  kohr-h

  committed
  c2c18ed

  Copy full SHA for c2c18ed

• Silence DeprecationWarning in testutils.py

  kohr-h

  committed
  c28b335

  Copy full SHA for c28b335

• Add ProductSpace.apply

  kohr-h

  committed
  627e529

  Copy full SHA for 627e529

• Fix/remove old pspace tests

  kohr-h

  committed
  e005ece

  Copy full SHA for e005ece

• ENH: implement base_space for power spaces

  kohr-h

  committed
  637d0b0

  Copy full SHA for 637d0b0

• Fix default_functionals doctests

  kohr-h

  committed
  c2b0972

  Copy full SHA for c2b0972

• Remove product space version of matrix_representation, fix as_scipy_operator

  kohr-h

  committed
  1e950a0

  Copy full SHA for 1e950a0

• Fix pspace_ops doctests wrt array dtypes

  kohr-h

  committed
  a769624

  Copy full SHA for a769624

• Fix NumpyTensorSpace __eq__ and __hash__

  kohr-h

  committed
  a594cdb

  Copy full SHA for a594cdb

• Rework ufunc operators and functionals

  kohr-h

  committed
  eb21915

  Copy full SHA for eb21915

• Add back product space dtype to make ufunc_ops work

  kohr-h

  committed
  0a4a782

  Copy full SHA for 0a4a782

• Repair __repr__ of deformation operators and displacement storage

  kohr-h

  committed
  840d3a3

  Copy full SHA for 840d3a3

• Fix or xfail displacement unittests

  kohr-h

  committed
  3037696

  Copy full SHA for 3037696

• Warn instead of raise for unknown ufuncs

  kohr-h

  committed
  719b762

  Copy full SHA for 719b762

• Remove ridiculous old classes

  kohr-h

  committed
  90f9a7d

  Copy full SHA for 90f9a7d

• ENH: make space methods more liberal in accepted input

  kohr-h

  committed
  5640270

  Copy full SHA for 5640270

• Fix some of the smooth solvers

  kohr-h

  committed
  7fa1d69

  Copy full SHA for 7fa1d69

• Repair fixtures of smooth solvers tests

  kohr-h

  committed
  4526715

  Copy full SHA for 4526715

• Add pspace apply2 and restrict membership to object dtype

  kohr-h

  committed
  8609a8b

  Copy full SHA for 8609a8b

• Fix one remaining ufuncs occurrence

  kohr-h

  committed
  42bbd92

  Copy full SHA for 42bbd92

• Fix adam optimizer

  kohr-h

  committed
  d5837ca

  Copy full SHA for d5837ca

• Make all_almost_equal work for object arrays

  kohr-h

  committed
  f123ef6

  Copy full SHA for f123ef6

• Obviousl fixes to functional tests

  kohr-h

  committed
  b991804

  Copy full SHA for b991804

• WIP: make functionals and prox ops work for product spaces

  kohr-h

  committed
  9683721

  Copy full SHA for 9683721

• Remove custom space exceptions, fix/remove obsolete tensor tests

  kohr-h

  committed
  a719e65

  Copy full SHA for a719e65

• Fix and clean up lp_discr_test

  kohr-h

  committed
  76d2ded

  Copy full SHA for 76d2ded

• Fix diff_ops_test

  kohr-h

  committed
  e426057

  Copy full SHA for e426057

• Fix discr_ops_test

  kohr-h

  committed
  046bfee

  Copy full SHA for 046bfee

• Fix/xfail oputils_test

  kohr-h

  committed
  1b20430

  Copy full SHA for 1b20430

• Fix some issues in odl.operator, and fix/xfail tests in operator_test

  kohr-h

  committed
  3413f60

  Copy full SHA for 3413f60

• Fix some bugs in tensor_ops, and fix tensor_ops_test

  kohr-h

  committed
  998dead

  Copy full SHA for 998dead

• Re-instantiate assign and set_zero, fix pspace_ops_test

  kohr-h

  committed
  d3f1c20

  Copy full SHA for d3f1c20

• Big cleanup (space, inner, norm, dist), make CPU projectors work

  kohr-h

  committed
  e3158f5

  Copy full SHA for e3158f5

• Fix astra_setup_test

  kohr-h

  committed
  1b0f26f

  Copy full SHA for 1b0f26f

• Fix iterative solvers and iterative_test

  kohr-h

  committed
  d23616b

  Copy full SHA for d23616b

• WIP: fix non-smooth solvers

  kohr-h

  committed
  d0ede57

  Copy full SHA for d0ede57

• Implement ufuncs on product spaces

  kohr-h

  committed
  d623bbb

  Copy full SHA for d623bbb

• Add reductions to spaces

  kohr-h

  committed
  b7d6fc1

  Copy full SHA for b7d6fc1

• Port functionals to ufuncs and reductions

  kohr-h

  committed
  fcde4fc

  Copy full SHA for fcde4fc

• Fix further proximals and functionals

  kohr-h

  committed
  f94c504

  Copy full SHA for f94c504

• WIP: fix functionals and tests

  kohr-h

  committed
  504297c

  Copy full SHA for 504297c

• Fix some more functionals

  kohr-h

  committed
  d82f272

  Copy full SHA for d82f272

• Fix rest of default_functionals_test

  kohr-h

  committed
  2cd4fa4

  Copy full SHA for 2cd4fa4

• Add LinearSpace.copy method

  kohr-h

  committed
  682a8bc

  Copy full SHA for 682a8bc

• Fix proximal operators and simplify tests

  kohr-h

  committed
  94bd49c

  Copy full SHA for 94bd49c

• Fix KL cross entropy

  kohr-h

  committed
  61aaf2b

  Copy full SHA for 61aaf2b

• Fix unittests in functional_test

  kohr-h

  committed
  d2fb5fe

  Copy full SHA for d2fb5fe

• Fix test of forward_backward and pdhg

  kohr-h

  committed
  7f5a2ab

  Copy full SHA for 7f5a2ab

• Remove FunctionalLeftVectorMult, no more use for it

  kohr-h

  committed
  c5b0671

  Copy full SHA for c5b0671

• Replace .copy() method calls by copy function calls

  kohr-h

  committed
  b9e7387

  Copy full SHA for b9e7387

• Make PointwiseNorm.derivative a bit more efficient and readable

  kohr-h

  committed
  b369725

  Copy full SHA for b369725

• Keep KL functionals from raising warnings

  kohr-h

  committed
  ed8d70d

  Copy full SHA for ed8d70d

• Extend QuadraticForm with proximal and CC with operator

  kohr-h

  committed
  7864ab3

  Copy full SHA for 7864ab3

• Improve memory efficiency of Douglas-Rachford

  kohr-h

  committed
  eba5786

  Copy full SHA for eba5786

• Make default_functionals tests more comprehensive

  kohr-h

  committed
  68822b5

  Copy full SHA for 68822b5

• Misc fixes

  kohr-h

  committed
  5a52dff

  Copy full SHA for 5a52dff

• Put __all__ amendments last in __init__.py files

  kohr-h

  committed
  756d073

  Copy full SHA for 756d073

• Various fixes

  kohr-h

  committed
  fed4e0b

  Copy full SHA for fed4e0b

• Remove references to DiscretizedSpaceElement

  kohr-h

  committed
  9a6aaf8

  Copy full SHA for 9a6aaf8