WIP: Remove element classes #1475
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Checking updated PR...
Comment last updated at 2019-03-21 23:13:40 UTC |
kohr-h
force-pushed
the
remove_element
branch
3 times, most recently
from
409ae01 to
34f8be0
Compare
kohr-h
force-pushed
the
remove_element
branch
2 times, most recently
from
5ffe090 to
a188aa8
Compare
Also fix DiscreteLp space functions
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a WIP version of the more radical proposal in #1458. It's based on #1459 because that's the only reasonable base to start from.
Closes #1458
Closes #1249
TODO
Hard to know what exactly, will update along the way.
NumpyTensorPort useful code fromRemoved functions, beyond the scope of this PR. See ENH: Tensor-valued DiscreteLp #1238__array_ufunc__(space slicing / weight propagation) toNumpyTensorSpaceTensorTensor.showa method ofTensorSpaceDiscreteLpElementDiscreteLpElement.showa method ofDiscreteLpDiscreteLpElementto appropriate placesProductSpaceElementProductSpaceElement.showa method ofProductSpaceProductSpaceinvoke them directly (classes don't work any more since they usex1.spaceand the likes)LinearSpaceElementPassing Doctests
deform/deform/linearized.pyset/set/space.pyset/sets.pyset/domain.pysolvers/solvers/smooth/newton.pysolvers/smooth/nonlinear_cg.pysolvers/smooth/gradient.pysolvers/functional/derivatives.pysolvers/functional/example_funcs.pysolvers/functional/functional.pysolvers/functional/default_functionals.pysolvers/util/steplen.pysolvers/util/callback.pysolvers/iterative/iterative.pysolvers/iterative/statistical.pysolvers/nonsmooth/difference_convex.pysolvers/nonsmooth/admm.pysolvers/nonsmooth/douglas_rachford.pysolvers/nonsmooth/alternating_dual_updates.pysolvers/nonsmooth/forward_backward.pysolvers/nonsmooth/proximal_operators.pysolvers/nonsmooth/proximal_gradient_solvers.pysolvers/nonsmooth/primal_dual_hybrid_gradient.pyufunc_ops/ufunc_ops/ufunc_ops.pyoperator/operator/oputils.pyoperator/default_ops.pyoperator/tensor_ops.pyoperator/pspace_ops.pyoperator/operator.pytrafos/trafos/wavelet.pytrafos/fourier.pytrafos/backends/pyfftw_bindings.pytrafos/backends/pywt_bindings.pytrafos/util/ft_utils.pydiagnostics/diagnostics/space.pydiagnostics/examples.pydiagnostics/operator.pyspace/space/base_tensors.pyspace/entry_points.pyspace/space_utils.pyspace/pspace.pyspace/weighting.pyspace/npy_tensors.pyphantom/phantom/noise.pyphantom/misc_phantoms.pyphantom/emission.pyphantom/geometric.pyphantom/transmission.pyphantom/phantom_utils.pydiscr/discr/diff_ops.pydiscr/grid.pydiscr/lp_discr.pydiscr/discr_utils.pydiscr/discr_ops.pydiscr/partition.pyutil/util/graphics.pyutil/normalize.pyutil/numerics.pyutil/npy_compat.pyutil/utility.pyutil/testutils.pyutil/pytest_config.pyutil/vectorization.pytomo/tomo/analytic/filtered_back_projection.pytomo/backends/skimage_radon.pytomo/backends/astra_cpu.pytomo/backends/astra_cuda.pytomo/backends/astra_setup.pytomo/geometry/geometry.pytomo/geometry/conebeam.pytomo/geometry/detector.pytomo/geometry/spect.pytomo/geometry/parallel.pytomo/util/utility.pytomo/util/testutils.pytomo/operators/ray_trafo.pycontrib/contrib/tensorflow/space.pycontrib/tensorflow/layer.pycontrib/tensorflow/operator.pycontrib/shearlab/shearlab_operator.pycontrib/solvers/spdhg/misc.pycontrib/solvers/spdhg/stochastic_primal_dual_hybrid_gradient.pycontrib/solvers/functional/nonlocalmeans_functionals.pycontrib/datasets/util.pycontrib/datasets/ct/fips.pycontrib/datasets/ct/mayo_dicom_dict.pycontrib/datasets/ct/mayo.pycontrib/datasets/mri/tugraz.pycontrib/datasets/images/cambridge.pycontrib/pyshearlab/pyshearlab_operator.pycontrib/param_opt/param_opt.pycontrib/fom/unsupervised.pycontrib/fom/supervised.pycontrib/fom/util.pycontrib/torch/operator.pycontrib/torch/test/test_operator.pycontrib/mrc/mrc.pycontrib/mrc/uncompr_bin.pycontrib/tomo/elekta.pyPassing Unittests
test/deform/test/deform/linearized_deform_test.pytest/set/test/set/sets_test.pytest/set/domain_test.pytest/set/space_test.pytest/largescale/test/largescale/solvers/nonsmooth/default_functionals_slow_test.pytest/largescale/trafos/fourier_slow_test.pytest/largescale/space/tensor_space_slow_test.pytest/largescale/tomo/analytic_slow_test.pytest/largescale/tomo/ray_transform_slow_test.pytest/solvers/test/solvers/smooth/smooth_test.pytest/solvers/functional/functional_test.pytest/solvers/functional/default_functionals_test.pytest/solvers/util/steplen_test.pytest/solvers/iterative/iterative_test.pytest/solvers/nonsmooth/primal_dual_hybrid_gradient_test.pytest/solvers/nonsmooth/douglas_rachford_test.pytest/solvers/nonsmooth/alternating_dual_updates_test.pytest/solvers/nonsmooth/proximal_utils_test.pytest/solvers/nonsmooth/proximal_operator_test.pytest/solvers/nonsmooth/admm_test.pytest/solvers/nonsmooth/forward_backward_test.pytest/solvers/nonsmooth/difference_convex_test.pytest/operator/test/operator/pspace_ops_test.pytest/operator/tensor_ops_test.pytest/operator/operator_test.pytest/operator/oputils_test.pytest/trafos/test/trafos/wavelet_test.pytest/trafos/fourier_test.pytest/trafos/backends/pyfftw_bindings_test.pytest/trafos/backends/pywt_bindings_test.pytest/trafos/util/ft_utils_test.pytest/space/test/space/tensors_test.pytest/space/space_utils_test.pytest/space/pspace_test.pytest/discr/test/discr/discr_ops_test.pytest/discr/grid_test.pytest/discr/discr_utils_test.pytest/discr/lp_discr_test.pytest/discr/partition_test.pytest/discr/diff_ops_test.pytest/util/test/util/numerics_test.pytest/util/normalize_test.pytest/util/vectorization_test.pytest/util/utility_test.pytest/tomo/test/tomo/backends/astra_cuda_test.pytest/tomo/backends/skimage_test.pytest/tomo/backends/astra_cpu_test.pytest/tomo/backends/astra_setup_test.pytest/tomo/geometry/geometry_test.pytest/tomo/geometry/spect_geometry_test.pytest/tomo/operators/ray_trafo_test.pycontrib/*/test/contrib/tensorflow/test/tensorflow_test.pycontrib/shearlab/test/operator_test.pycontrib/pyshearlab/test/operator_test.pycontrib/param_opt/test/test_param_opt.pycontrib/fom/test/test_unsupervised.pycontrib/fom/test/test_supervised.pycontrib/mrc/test/uncompr_bin_test.pycontrib/mrc/test/mrc_test.pyWorking Examples
deform/deform/linearized_fixed_displacement.pydeform/linearized_fixed_template.pysolvers/solvers/pdhg_tomography_tgv.pysolvers/lbfgs_tomography_tv.pysolvers/douglas_rachford_pd_tomography_tv.pysolvers/kaczmarz_tomography.pysolvers/pdhg_denoising_ROF_algorithm_comparison.pysolvers/pdhg_denoising_L1_HuberTV.pysolvers/lbfgs_tomography.pysolvers/functional_basic_example.pysolvers/proximal_gradient_wavelet_tomography.pysolvers/forward_backward_pd_denoising.pysolvers/admm_tomography.pysolvers/pdhg_denoising.pysolvers/nuclear_norm_tomography.pysolvers/pdhg_denoising_L2_HuberTV.pysolvers/nuclear_norm_minimization.pysolvers/proximal_lang_poisson.pysolvers/scipy_solvers.pysolvers/denoising_with_entropy_type_regularization.pysolvers/bregman_tv_tomography.pysolvers/conjugate_gradient_tomography.pysolvers/adupdates_tomography.pysolvers/douglas_rachford_pd_mri.pysolvers/proximal_gradient_denoising.pysolvers/pdhg_deconvolve.pysolvers/proximal_lang_tomography.pysolvers/pdhg_denoising_tgv.pysolvers/deconvolution_1d.pysolvers/pdhg_denoising_complex.pysolvers/rosenbrock_minimization.pysolvers/functional_basic_example_solver.pysolvers/douglas_rachford_pd_heron.pysolvers/pdhg_tomography.pyufunc_ops/ufunc_ops/ufunc_composition.pyufunc_ops/ufunc_basics.pyufunc_ops/ufunc_solvers.pyoperator/operator/simple_operator.pyoperator/convolution_operator.pytrafos/trafos/fourier_trafo.pytrafos/wavelet_trafo.pydiagnostics/diagnostics/diagonstics_space.pyspace/space/simple_r.pyspace/simple_rn.pyspace/vectorization.pytomo/tomo/filtered_backprojection_cone_2d.pytomo/ray_trafo_parallel_2d.pytomo/ray_trafo_cone_3d.pytomo/ray_trafo_parallel_3d_euler.pytomo/filtered_backprojection_cone_3d_short_scan.pytomo/filtered_backprojection_helical_3d.pytomo/filtered_backprojection_cone_2d_short_scan.pytomo/filtered_backprojection_parallel_2d_complex.pytomo/anisotropic_voxels.pytomo/ray_trafo_parallel_3d.pytomo/filtered_backprojection_parallel_2d.pytomo/filtered_backprojection_parallel_3d.pytomo/ray_trafo_cone_2d.pytomo/ray_trafo_parallel_2d_complex.pytomo/filtered_backprojection_cone_3d.pytomo/ray_trafo_helical_cone_3d.pytomo/checks/check_axes_parallel3d_bp.pytomo/checks/check_axes_cone3d_fp.pytomo/checks/check_axes_parallel2d_bp.pytomo/checks/check_axes_parallel2d_fp.pytomo/checks/check_axes_cone3d_bp.pytomo/checks/check_axes_parallel3d_fp.pytomo/checks/check_axes_cone2d_fp.pytomo/checks/check_axes_cone2d_bp.pytomo/backends/astra_performance_cpu_parallel_2d_cg.pytomo/backends/astra_performance_cuda_cone_3d_cg.pytomo/backends/astra_performance_cuda_parallel_2d_cg.pyvisualization/visualization/visualize_vector_examples.py->visualization/show_examples.pyvisualization/show_productspace.pyvisualization/show_update_1d.pyvisualization/show_2d_complex.pyvisualization/show_update_2d.pyvisualization/show_1d.pyvisualization/show_2d.pyvisualization/show_vector.pyvisualization/show_callback.pyvisualization/show_update_in_place_2d.pycontrib/*/examples/contrib/tensorflow/examples/tensorflow_layer_matrix.pycontrib/tensorflow/examples/tensorflow_layer_productspace.pycontrib/tensorflow/examples/tensorflow_tomography.pycontrib/tensorflow/examples/tensorflow_layer_ray_transform.pycontrib/tensorflow/examples/tensorflow_operator_matrix.pycontrib/shearlab/examples/wave_shear_separation.pycontrib/shearlab/examples/basic_shearlab.pycontrib/solvers/spdhg/examples/PET_1k.pycontrib/solvers/spdhg/examples/deblurring_1k2_dual.pycontrib/solvers/spdhg/examples/PET_linear_rate.pycontrib/solvers/spdhg/examples/ROF_1k2_primal.pycontrib/solvers/spdhg/examples/get_started.pycontrib/solvers/examples/tomography_nonlocalmeans.pycontrib/datasets/ct/examples/mayo_reconstruct.pycontrib/datasets/ct/examples/fips_reconstruct.pycontrib/datasets/mri/examples/tugraz_reconstruct.pycontrib/datasets/images/examples/cambridge_images.pycontrib/pyshearlab/examples/wave_shear_separation.pycontrib/pyshearlab/examples/basic_shearlab.pycontrib/param_opt/examples/find_optimal_parameters.pycontrib/fom/examples/noise_power_spectrum.pycontrib/fom/examples/haarpsi.pycontrib/fom/examples/supervised_comparison.pycontrib/torch/examples/operator_module.pycontrib/torch/examples/operator_autograd.pycontrib/mrc/examples/mrc_io.pycontrib/mrc/examples/raw_binary_with_header_io.pycontrib/tomo/examples/elekta_icon_fbp.pycontrib/tomo/examples/elekta_xvi_algebraic_reconstruction.pycontrib/tomo/examples/elekta_xvi_fbp.pycontrib/tomo/examples/elekta_icon_algebraic_reconstruction.py