From cad2eb907f4b07ee284c62b9e22c6ebb8a5c96f4 Mon Sep 17 00:00:00 2001 From: Fahri Ali Rahman Date: Sat, 2 Nov 2024 18:27:31 +0700 Subject: [PATCH] Restructure utility functions (#305) * restructure various array utility: move from array/ to utility/ dir * rename NMTOOLS_TESTING_OUTPUT_PRECISION to NMTOOLS_TESTING_PRECISION * move files from utils/ to utility/ * fix example * fix example * fix invalid ci yaml * skip some gcc-79 constexpr tests on ci because uses too much memory * reduce number of jobs on gcc ci to avoid oom --- .github/workflows/gcc-9.yml | 12 ++-- .../app/src/main/jni/src/nmtools-demo.cpp | 4 +- examples/arduino/manip/src/main.cpp | 2 +- examples/arduino/ufuncs/src/main.cpp | 2 +- examples/mbed/manip/src/main.cpp | 2 +- examples/mbed/ufuncs/src/main.cpp | 2 +- examples/nmtools/array/src/broadcast_to.cpp | 2 +- examples/nmtools/array/src/expand_dims.cpp | 2 +- examples/nmtools/array/src/flatten.cpp | 2 +- examples/nmtools/array/src/repeat.cpp | 2 +- examples/nmtools/array/src/reshape.cpp | 2 +- examples/nmtools/array/src/squeeze.cpp | 2 +- examples/nmtools/array/src/tile.cpp | 2 +- examples/nmtools/array/src/transpose.cpp | 5 +- examples/web/manip/manip.cpp | 2 +- examples/web/ufuncs/ufuncs.cpp | 2 +- include/nmtools/array/detail.hpp | 20 ------ include/nmtools/array/dtypes.hpp | 7 --- include/nmtools/array/dynamic.hpp | 6 -- include/nmtools/array/eval.hpp | 8 +-- include/nmtools/array/eval/cuda/evaluator.hpp | 2 +- include/nmtools/array/eval/hip/evaluator.hpp | 2 +- include/nmtools/array/eval/opencl/context.hpp | 2 +- .../nmtools/array/eval/opencl/evaluator.hpp | 2 +- .../array/eval/simd/evaluator/ufunc.hpp | 2 +- .../nmtools/array/eval/simd/index/matmul.hpp | 2 +- .../nmtools/array/eval/simd/index/ufunc.hpp | 2 +- include/nmtools/array/eval/sycl/context.hpp | 4 +- include/nmtools/array/eval/sycl/evaluator.hpp | 2 +- include/nmtools/array/fixed.hpp | 6 -- .../array/functional/compute_graph.hpp | 4 +- include/nmtools/array/functional/expand.hpp | 2 +- include/nmtools/array/functional/functor.hpp | 4 +- include/nmtools/array/functional/indexing.hpp | 2 +- .../array/functional/ufunc/accumulate.hpp | 2 +- .../nmtools/array/functional/ufunc/outer.hpp | 2 +- .../nmtools/array/functional/ufunc/reduce.hpp | 2 +- .../nmtools/array/functional/ufunc/ufunc.hpp | 6 +- include/nmtools/array/impl/boost.hpp | 2 +- include/nmtools/array/impl/stl.hpp | 2 +- include/nmtools/array/impl/utl.hpp | 2 +- include/nmtools/array/index/alias.hpp | 4 +- include/nmtools/array/index/arange.hpp | 4 +- include/nmtools/array/index/argsort.hpp | 4 +- include/nmtools/array/index/array_slice.hpp | 2 +- include/nmtools/array/index/atleast_nd.hpp | 2 +- .../nmtools/array/index/broadcast_shape.hpp | 4 +- include/nmtools/array/index/broadcast_to.hpp | 2 +- include/nmtools/array/index/choose.hpp | 4 +- .../nmtools/array/index/compute_indices.hpp | 4 +- .../nmtools/array/index/compute_offset.hpp | 2 +- .../nmtools/array/index/compute_strides.hpp | 4 +- include/nmtools/array/index/concatenate.hpp | 4 +- include/nmtools/array/index/contains.hpp | 4 +- include/nmtools/array/index/count.hpp | 4 +- include/nmtools/array/index/cumsum.hpp | 4 +- include/nmtools/array/index/expand_dims.hpp | 6 +- include/nmtools/array/index/flatten.hpp | 2 +- include/nmtools/array/index/flip.hpp | 2 +- include/nmtools/array/index/free_axes.hpp | 4 +- include/nmtools/array/index/gather.hpp | 4 +- include/nmtools/array/index/insert_index.hpp | 2 +- include/nmtools/array/index/logical_not.hpp | 4 +- include/nmtools/array/index/matmul.hpp | 2 +- include/nmtools/array/index/max.hpp | 2 +- include/nmtools/array/index/moveaxis.hpp | 2 +- include/nmtools/array/index/ndenumerate.hpp | 4 +- include/nmtools/array/index/ndindex.hpp | 4 +- include/nmtools/array/index/nonzero.hpp | 2 +- .../nmtools/array/index/normalize_axis.hpp | 4 +- include/nmtools/array/index/outer.hpp | 4 +- include/nmtools/array/index/pad.hpp | 2 +- include/nmtools/array/index/pooling.hpp | 4 +- include/nmtools/array/index/product.hpp | 4 +- include/nmtools/array/index/range.hpp | 2 +- include/nmtools/array/index/reduce.hpp | 2 +- include/nmtools/array/index/ref.hpp | 4 +- include/nmtools/array/index/remove_dims.hpp | 4 +- .../array/index/remove_single_dims.hpp | 2 +- include/nmtools/array/index/repeat.hpp | 2 +- include/nmtools/array/index/reshape.hpp | 2 +- include/nmtools/array/index/resize.hpp | 2 +- include/nmtools/array/index/reverse.hpp | 4 +- include/nmtools/array/index/roll.hpp | 2 +- include/nmtools/array/index/scatter.hpp | 4 +- include/nmtools/array/index/slice.hpp | 4 +- .../nmtools/array/index/sliding_window.hpp | 2 +- include/nmtools/array/index/squeeze.hpp | 4 +- include/nmtools/array/index/sum.hpp | 2 +- include/nmtools/array/index/take.hpp | 4 +- include/nmtools/array/index/tile.hpp | 4 +- include/nmtools/array/index/transpose.hpp | 2 +- include/nmtools/array/index/tuple_at.hpp | 4 +- include/nmtools/array/index/ufunc.hpp | 2 +- include/nmtools/array/index/where.hpp | 4 +- include/nmtools/array/kind.hpp | 23 ------- include/nmtools/array/meta.hpp | 7 --- .../nmtools/array/ndarray/base_ndarray.hpp | 6 +- include/nmtools/array/ndarray/dynamic.hpp | 8 +-- include/nmtools/array/ndarray/fixed.hpp | 8 +-- include/nmtools/array/ndarray/hybrid.hpp | 6 +- include/nmtools/array/ndarray/ndarray.hpp | 6 +- include/nmtools/array/utility.hpp | 7 --- include/nmtools/array/utility/apply_at.hpp | 19 ------ include/nmtools/array/utility/at.hpp | 8 --- include/nmtools/array/utility/cast.hpp | 29 --------- include/nmtools/array/vector.hpp | 7 --- .../nmtools/array/view/activations/celu.hpp | 4 +- .../nmtools/array/view/activations/elu.hpp | 4 +- .../array/view/activations/hardshrink.hpp | 4 +- .../array/view/activations/hardswish.hpp | 2 +- .../array/view/activations/hardtanh.hpp | 4 +- .../array/view/activations/leaky_relu.hpp | 4 +- .../array/view/activations/log_sigmoid.hpp | 2 +- .../nmtools/array/view/activations/mish.hpp | 2 +- .../nmtools/array/view/activations/prelu.hpp | 4 +- .../nmtools/array/view/activations/relu.hpp | 2 +- .../nmtools/array/view/activations/relu6.hpp | 2 +- .../nmtools/array/view/activations/selu.hpp | 2 +- .../array/view/activations/sigmoid.hpp | 2 +- .../nmtools/array/view/activations/silu.hpp | 2 +- .../array/view/activations/softplus.hpp | 4 +- .../array/view/activations/softshrink.hpp | 4 +- .../array/view/activations/softsign.hpp | 2 +- .../array/view/activations/tanhshrink.hpp | 2 +- include/nmtools/array/view/alias.hpp | 4 +- include/nmtools/array/view/arange.hpp | 4 +- include/nmtools/array/view/argsort.hpp | 2 +- include/nmtools/array/view/array_slice.hpp | 2 +- include/nmtools/array/view/atleast_nd.hpp | 4 +- .../nmtools/array/view/broadcast_arrays.hpp | 2 +- include/nmtools/array/view/column_stack.hpp | 2 +- include/nmtools/array/view/concatenate.hpp | 2 +- include/nmtools/array/view/convnd.hpp | 2 +- include/nmtools/array/view/decorator.hpp | 6 +- include/nmtools/array/view/diagflat.hpp | 10 +-- include/nmtools/array/view/diagonal.hpp | 10 +-- include/nmtools/array/view/discrete.hpp | 2 +- include/nmtools/array/view/dot.hpp | 2 +- include/nmtools/array/view/dstack.hpp | 2 +- include/nmtools/array/view/expand.hpp | 10 +-- include/nmtools/array/view/expand_dims.hpp | 2 +- include/nmtools/array/view/eye.hpp | 10 +-- include/nmtools/array/view/flatten.hpp | 2 +- include/nmtools/array/view/flip.hpp | 2 +- include/nmtools/array/view/full.hpp | 2 +- include/nmtools/array/view/hstack.hpp | 2 +- include/nmtools/array/view/indexing.hpp | 4 +- include/nmtools/array/view/inner.hpp | 2 +- include/nmtools/array/view/kron.hpp | 2 +- include/nmtools/array/view/matmul.hpp | 2 +- include/nmtools/array/view/mean.hpp | 2 +- include/nmtools/array/view/moveaxis.hpp | 2 +- .../nmtools/array/view/mutable_indexing.hpp | 2 +- include/nmtools/array/view/mutable_ref.hpp | 4 +- include/nmtools/array/view/pad.hpp | 8 +-- include/nmtools/array/view/pooling.hpp | 2 +- include/nmtools/array/view/random.hpp | 4 +- include/nmtools/array/view/ref.hpp | 4 +- .../array/view/ref/initializer_list.hpp | 2 +- include/nmtools/array/view/repeat.hpp | 2 +- include/nmtools/array/view/reshape.hpp | 10 +-- include/nmtools/array/view/resize.hpp | 4 +- include/nmtools/array/view/roll.hpp | 2 +- include/nmtools/array/view/slice.hpp | 4 +- include/nmtools/array/view/sliding_window.hpp | 2 +- include/nmtools/array/view/split.hpp | 4 +- include/nmtools/array/view/squeeze.hpp | 2 +- include/nmtools/array/view/swapaxes.hpp | 2 +- include/nmtools/array/view/take.hpp | 2 +- .../nmtools/array/view/take_along_axis.hpp | 2 +- include/nmtools/array/view/tensordot.hpp | 2 +- include/nmtools/array/view/tile.hpp | 4 +- include/nmtools/array/view/transpose.hpp | 6 +- include/nmtools/array/view/tri.hpp | 10 +-- include/nmtools/array/view/tril.hpp | 10 +-- include/nmtools/array/view/triu.hpp | 10 +-- .../nmtools/array/view/ufunc/accumulate.hpp | 12 ++-- include/nmtools/array/view/ufunc/detail.hpp | 6 +- include/nmtools/array/view/ufunc/outer.hpp | 10 +-- include/nmtools/array/view/ufunc/reduce.hpp | 12 ++-- include/nmtools/array/view/ufunc/ufunc.hpp | 10 +-- include/nmtools/array/view/ufuncs/add.hpp | 2 +- include/nmtools/array/view/ufuncs/arccos.hpp | 2 +- include/nmtools/array/view/ufuncs/arccosh.hpp | 2 +- include/nmtools/array/view/ufuncs/arcsin.hpp | 2 +- include/nmtools/array/view/ufuncs/arcsinh.hpp | 2 +- include/nmtools/array/view/ufuncs/arctan.hpp | 2 +- include/nmtools/array/view/ufuncs/arctan2.hpp | 2 +- include/nmtools/array/view/ufuncs/arctanh.hpp | 2 +- .../nmtools/array/view/ufuncs/bitwise_and.hpp | 2 +- .../nmtools/array/view/ufuncs/bitwise_or.hpp | 2 +- .../nmtools/array/view/ufuncs/bitwise_xor.hpp | 2 +- include/nmtools/array/view/ufuncs/cbrt.hpp | 2 +- include/nmtools/array/view/ufuncs/ceil.hpp | 2 +- include/nmtools/array/view/ufuncs/cos.hpp | 2 +- include/nmtools/array/view/ufuncs/cosh.hpp | 2 +- include/nmtools/array/view/ufuncs/divide.hpp | 2 +- include/nmtools/array/view/ufuncs/exp.hpp | 2 +- include/nmtools/array/view/ufuncs/exp2.hpp | 2 +- include/nmtools/array/view/ufuncs/expm1.hpp | 2 +- include/nmtools/array/view/ufuncs/fabs.hpp | 2 +- include/nmtools/array/view/ufuncs/floor.hpp | 2 +- include/nmtools/array/view/ufuncs/greater.hpp | 2 +- include/nmtools/array/view/ufuncs/invert.hpp | 2 +- .../nmtools/array/view/ufuncs/isfinite.hpp | 2 +- include/nmtools/array/view/ufuncs/isinf.hpp | 2 +- include/nmtools/array/view/ufuncs/isnan.hpp | 2 +- include/nmtools/array/view/ufuncs/ldexp.hpp | 2 +- include/nmtools/array/view/ufuncs/less.hpp | 2 +- .../nmtools/array/view/ufuncs/less_equal.hpp | 2 +- include/nmtools/array/view/ufuncs/log.hpp | 2 +- include/nmtools/array/view/ufuncs/log10.hpp | 2 +- include/nmtools/array/view/ufuncs/log1p.hpp | 2 +- include/nmtools/array/view/ufuncs/log2.hpp | 2 +- .../nmtools/array/view/ufuncs/logical_and.hpp | 2 +- .../nmtools/array/view/ufuncs/logical_not.hpp | 2 +- .../nmtools/array/view/ufuncs/logical_or.hpp | 2 +- .../nmtools/array/view/ufuncs/logical_xor.hpp | 2 +- include/nmtools/array/view/ufuncs/maximum.hpp | 2 +- include/nmtools/array/view/ufuncs/mod.hpp | 2 +- .../nmtools/array/view/ufuncs/multiply.hpp | 2 +- .../nmtools/array/view/ufuncs/negative.hpp | 2 +- .../nmtools/array/view/ufuncs/not_equal.hpp | 2 +- .../nmtools/array/view/ufuncs/positive.hpp | 2 +- .../nmtools/array/view/ufuncs/reciprocal.hpp | 2 +- include/nmtools/array/view/ufuncs/rint.hpp | 2 +- include/nmtools/array/view/ufuncs/signbit.hpp | 2 +- include/nmtools/array/view/ufuncs/sin.hpp | 2 +- include/nmtools/array/view/ufuncs/sinh.hpp | 2 +- include/nmtools/array/view/ufuncs/sqrt.hpp | 2 +- include/nmtools/array/view/ufuncs/square.hpp | 2 +- .../nmtools/array/view/ufuncs/subtract.hpp | 2 +- include/nmtools/array/view/ufuncs/tan.hpp | 2 +- include/nmtools/array/view/ufuncs/tanh.hpp | 2 +- include/nmtools/array/view/ufuncs/trunc.hpp | 2 +- include/nmtools/array/view/vstack.hpp | 2 +- include/nmtools/array/view/where.hpp | 4 +- .../{array/utility => platform}/embind.hpp | 4 +- .../{array/utility => platform}/jni.hpp | 0 include/nmtools/testing/array_cast.hpp | 2 +- .../{ => testing}/benchmarks/bench.hpp | 0 include/nmtools/testing/data/array/arange.hpp | 2 +- include/nmtools/testing/data/array/expm1.hpp | 4 +- include/nmtools/testing/data/array/ones.hpp | 2 +- include/nmtools/testing/data/array/zeros.hpp | 2 +- include/nmtools/testing/data/index/gather.hpp | 2 +- include/nmtools/testing/doctest.hpp | 2 +- include/nmtools/testing/string.hpp | 2 +- include/nmtools/testing/testing.hpp | 16 ++--- .../{utils => utility}/apply_isclose.hpp | 2 +- .../{utils => utility}/apply_isequal.hpp | 2 +- .../{array => }/utility/apply_resize.hpp | 0 .../{utils => utility}/apply_to_string.hpp | 2 +- .../nmtools/{array => utility}/as_static.hpp | 2 +- include/nmtools/{array => utility}/at.hpp | 0 include/nmtools/{array => utility}/cast.hpp | 62 +++++++++++++++++-- include/nmtools/utility/ct_digraph.hpp | 2 +- include/nmtools/{array => utility}/data.hpp | 0 .../nmtools/{utils => utility}/isclose.hpp | 8 +-- .../{utils => utility}/isclose/isclose.hpp | 0 .../nmtools/{utils => utility}/isequal.hpp | 6 +- .../{utils => utility}/isequal/isequal.hpp | 0 .../{array => utility}/random_engine.hpp | 0 include/nmtools/{array => utility}/shape.hpp | 3 +- .../nmtools/{utils => utility}/to_string.hpp | 4 +- .../to_string/common_types.hpp | 8 +-- .../to_string/to_string.hpp | 0 tests/array/array/activations/celu.cpp | 2 +- tests/array/array/activations/elu.cpp | 2 +- tests/array/array/activations/hardshrink.cpp | 2 +- tests/array/array/activations/hardswish.cpp | 2 +- tests/array/array/activations/hardtanh.cpp | 2 +- tests/array/array/activations/leaky_relu.cpp | 2 +- tests/array/array/activations/log_sigmoid.cpp | 2 +- tests/array/array/activations/mish.cpp | 2 +- tests/array/array/activations/prelu.cpp | 2 +- tests/array/array/activations/relu.cpp | 2 +- tests/array/array/activations/relu6.cpp | 2 +- tests/array/array/activations/selu.cpp | 2 +- tests/array/array/activations/sigmoid.cpp | 2 +- tests/array/array/activations/silu.cpp | 2 +- tests/array/array/activations/softplus.cpp | 2 +- tests/array/array/activations/softshrink.cpp | 2 +- tests/array/array/activations/softsign.cpp | 2 +- tests/array/array/activations/tanhshrink.cpp | 2 +- tests/array/array/arange.cpp | 2 +- tests/array/array/batch_norm.cpp | 6 +- tests/array/array/compress.cpp | 2 +- tests/array/array/concatenate.cpp | 2 +- tests/array/array/cumprod.cpp | 2 +- tests/array/array/cumsum.cpp | 2 +- tests/array/array/expand_dims.cpp | 2 +- tests/array/array/flatten.cpp | 2 +- tests/array/array/full.cpp | 2 +- tests/array/array/linspace.cpp | 2 +- tests/array/array/mean.cpp | 2 +- tests/array/array/ones.cpp | 2 +- tests/array/array/pooling.cpp | 4 +- tests/array/array/prod.cpp | 2 +- tests/array/array/repeat.cpp | 2 +- tests/array/array/reshape.cpp | 2 +- tests/array/array/resize.cpp | 2 +- tests/array/array/softmax.cpp | 2 +- tests/array/array/softmin.cpp | 2 +- tests/array/array/split.cpp | 6 +- tests/array/array/stddev.cpp | 2 +- tests/array/array/sum.cpp | 2 +- tests/array/array/take.cpp | 2 +- tests/array/array/tile.cpp | 2 +- tests/array/array/ufuncs/add.cpp | 8 +-- tests/array/array/ufuncs/amax.cpp | 2 +- tests/array/array/ufuncs/amin.cpp | 2 +- tests/array/array/ufuncs/arccos.cpp | 2 +- tests/array/array/ufuncs/arccosh.cpp | 2 +- tests/array/array/ufuncs/arcsin.cpp | 2 +- tests/array/array/ufuncs/arcsinh.cpp | 2 +- tests/array/array/ufuncs/arctan.cpp | 2 +- tests/array/array/ufuncs/arctan2.cpp | 2 +- tests/array/array/ufuncs/arctanh.cpp | 2 +- tests/array/array/ufuncs/bitwise_and.cpp | 2 +- tests/array/array/ufuncs/bitwise_or.cpp | 2 +- tests/array/array/ufuncs/bitwise_xor.cpp | 2 +- tests/array/array/ufuncs/cbrt.cpp | 2 +- tests/array/array/ufuncs/ceil.cpp | 2 +- tests/array/array/ufuncs/clip.cpp | 2 +- tests/array/array/ufuncs/cos.cpp | 2 +- tests/array/array/ufuncs/cosh.cpp | 6 +- tests/array/array/ufuncs/degrees.cpp | 2 +- tests/array/array/ufuncs/divide.cpp | 2 +- tests/array/array/ufuncs/equal.cpp | 2 +- tests/array/array/ufuncs/exp.cpp | 2 +- tests/array/array/ufuncs/exp2.cpp | 2 +- tests/array/array/ufuncs/expm1.cpp | 6 +- tests/array/array/ufuncs/fabs.cpp | 2 +- tests/array/array/ufuncs/floor.cpp | 2 +- tests/array/array/ufuncs/fmax.cpp | 8 +-- tests/array/array/ufuncs/fmin.cpp | 8 +-- tests/array/array/ufuncs/fmod.cpp | 8 +-- tests/array/array/ufuncs/greater.cpp | 2 +- tests/array/array/ufuncs/greater_equal.cpp | 2 +- tests/array/array/ufuncs/hypot.cpp | 2 +- tests/array/array/ufuncs/invert.cpp | 2 +- tests/array/array/ufuncs/isfinite.cpp | 2 +- tests/array/array/ufuncs/isinf.cpp | 2 +- tests/array/array/ufuncs/isnan.cpp | 2 +- tests/array/array/ufuncs/ldexp.cpp | 2 +- tests/array/array/ufuncs/left_shift.cpp | 8 +-- tests/array/array/ufuncs/less.cpp | 2 +- tests/array/array/ufuncs/less_equal.cpp | 2 +- tests/array/array/ufuncs/log.cpp | 2 +- tests/array/array/ufuncs/log10.cpp | 2 +- tests/array/array/ufuncs/log1p.cpp | 2 +- tests/array/array/ufuncs/log2.cpp | 2 +- tests/array/array/ufuncs/logical_and.cpp | 2 +- tests/array/array/ufuncs/logical_not.cpp | 2 +- tests/array/array/ufuncs/logical_or.cpp | 2 +- tests/array/array/ufuncs/logical_xor.cpp | 2 +- tests/array/array/ufuncs/maximum.cpp | 8 +-- tests/array/array/ufuncs/minimum.cpp | 8 +-- tests/array/array/ufuncs/multiply.cpp | 8 +-- tests/array/array/ufuncs/negative.cpp | 2 +- tests/array/array/ufuncs/not_equal.cpp | 2 +- tests/array/array/ufuncs/positive.cpp | 2 +- tests/array/array/ufuncs/power.cpp | 8 +-- tests/array/array/ufuncs/rad2deg.cpp | 2 +- tests/array/array/ufuncs/reciprocal.cpp | 2 +- tests/array/array/ufuncs/right_shift.cpp | 8 +-- tests/array/array/ufuncs/rint.cpp | 2 +- tests/array/array/ufuncs/signbit.cpp | 2 +- tests/array/array/ufuncs/sin.cpp | 2 +- tests/array/array/ufuncs/sinh.cpp | 6 +- tests/array/array/ufuncs/sqrt.cpp | 2 +- tests/array/array/ufuncs/square.cpp | 2 +- tests/array/array/ufuncs/subtract.cpp | 8 +-- tests/array/array/ufuncs/tan.cpp | 2 +- tests/array/array/ufuncs/tanh.cpp | 2 +- tests/array/array/ufuncs/trunc.cpp | 2 +- tests/array/array/var.cpp | 2 +- tests/array/array/where.cpp | 2 +- tests/array/array/zeros.cpp | 2 +- tests/array/ndarray/dynamic.cpp | 2 +- tests/array/ndarray/fixed.cpp | 2 +- tests/array/ndarray/ndarray.cpp | 2 +- tests/array/utility/apply_at.cpp | 6 +- tests/array/utility/at.cpp | 4 +- tests/array/utility/cast.cpp | 6 +- tests/array/utility/data.cpp | 2 +- tests/array/utils/isclose.cpp | 6 +- tests/array/utils/to_string.cpp | 6 +- tests/cuda/array/slice.cpp | 2 +- tests/cuda/array/ufuncs/sinh.cpp | 4 +- tests/functional/src/combinator/bury.cpp | 2 +- tests/functional/src/graph/batch_norm.cpp | 2 +- tests/functional/src/resize.cpp | 2 +- tests/functional/src/ufuncs/cosh.cpp | 4 +- tests/functional/src/ufuncs/sinh.cpp | 4 +- tests/hip/array/slice.cpp | 2 +- tests/hip/array/ufuncs/sinh.cpp | 4 +- tests/index/src/argsort.cpp | 2 +- tests/index/src/array_slice.cpp | 2 +- tests/index/src/broadcast_shape.cpp | 2 +- tests/index/src/choose.cpp | 2 +- tests/index/src/compress.cpp | 4 +- tests/index/src/compute_strides.cpp | 2 +- tests/index/src/concatenate.cpp | 4 +- tests/index/src/gather.cpp | 4 +- tests/index/src/insert_index.cpp | 6 +- tests/index/src/matmul.cpp | 8 +-- tests/index/src/moveaxis.cpp | 2 +- tests/index/src/ndindex.cpp | 2 +- tests/index/src/normalize_axis.cpp | 2 +- tests/index/src/outer.cpp | 4 +- tests/index/src/pooling.cpp | 8 +-- tests/index/src/remove_single_dims.cpp | 2 +- tests/index/src/repeat.cpp | 4 +- tests/index/src/reverse.cpp | 2 +- tests/index/src/scatter.cpp | 2 +- tests/index/src/slice.cpp | 8 +-- tests/index/src/take.cpp | 4 +- tests/index/src/take_along_axis.cpp | 2 +- tests/index/src/tile.cpp | 4 +- tests/meta/traits/has_square_bracket.cpp | 6 +- tests/meta/traits/ndarray.cpp | 6 +- tests/meta/transform/get_element_type.cpp | 6 +- tests/meta/transform/nested_array_dim.cpp | 6 +- .../transform/remove_nested_array_extents.cpp | 6 +- tests/meta/transform/replace_element_type.cpp | 4 +- tests/opencl/kernels/log.cpp | 4 +- tests/opencl/kernels/log10.cpp | 4 +- tests/opencl/kernels/reciprocal.cpp | 4 +- tests/opencl/kernels/sinh.cpp | 4 +- tests/opencl/kernels/sqrt.cpp | 4 +- tests/opencl/kernels/tan.cpp | 4 +- .../arduino/manip/test/test_main.cpp | 6 +- .../arduino/meta/test/test_main.cpp | 2 +- .../platformio/mbed/manip/test/test_main.cpp | 4 +- .../platformio/mbed/ufuncs/test/test_main.cpp | 6 +- tests/sycl/array/slice.cpp | 2 +- tests/sycl/composition/subtract_exp.cpp | 2 +- tests/view/src/activations/celu.cpp | 2 +- tests/view/src/activations/elu.cpp | 2 +- tests/view/src/activations/hardshrink.cpp | 2 +- tests/view/src/activations/hardswish.cpp | 2 +- tests/view/src/activations/hardtanh.cpp | 2 +- tests/view/src/activations/leaky_relu.cpp | 2 +- tests/view/src/activations/log_sigmoid.cpp | 2 +- tests/view/src/activations/mish.cpp | 2 +- tests/view/src/activations/prelu.cpp | 2 +- tests/view/src/activations/relu.cpp | 2 +- tests/view/src/activations/relu6.cpp | 2 +- tests/view/src/activations/selu.cpp | 2 +- tests/view/src/activations/sigmoid.cpp | 2 +- tests/view/src/activations/silu.cpp | 2 +- tests/view/src/activations/softplus.cpp | 2 +- tests/view/src/activations/softshrink.cpp | 2 +- tests/view/src/activations/softsign.cpp | 2 +- tests/view/src/activations/tanhshrink.cpp | 2 +- tests/view/src/argsort.cpp | 2 +- tests/view/src/atleast_1d.cpp | 2 +- tests/view/src/atleast_2d.cpp | 2 +- tests/view/src/batch_norm.cpp | 6 +- tests/view/src/composition/mean_subtract.cpp | 2 +- .../src/composition/square_sum_divide.cpp | 4 +- .../src/composition/subtract_fabs_square.cpp | 2 +- tests/view/src/compress.cpp | 2 +- tests/view/src/conv1d-5.cpp | 2 +- tests/view/src/cumprod.cpp | 2 +- tests/view/src/cumsum.cpp | 2 +- tests/view/src/full.cpp | 2 +- tests/view/src/linspace.cpp | 2 +- tests/view/src/moveaxis.cpp | 2 +- tests/view/src/mutable_ref.cpp | 8 +-- tests/view/src/mutable_slice.cpp | 2 +- tests/view/src/ones.cpp | 2 +- tests/view/src/pad.cpp | 2 +- tests/view/src/pooling.cpp | 4 +- tests/view/src/prod.cpp | 2 +- tests/view/src/ref.cpp | 8 +-- tests/view/src/repeat.cpp | 2 +- tests/view/src/resize.cpp | 2 +- tests/view/src/slice.cpp | 4 +- tests/view/src/softmax.cpp | 2 +- tests/view/src/softmin.cpp | 2 +- tests/view/src/split.cpp | 8 +-- tests/view/src/stddev.cpp | 2 +- tests/view/src/take.cpp | 2 +- tests/view/src/take_along_axis.cpp | 2 +- tests/view/src/tile.cpp | 2 +- tests/view/src/ufuncs/amax.cpp | 2 +- tests/view/src/ufuncs/amin.cpp | 2 +- tests/view/src/ufuncs/arccos.cpp | 2 +- tests/view/src/ufuncs/arccosh.cpp | 2 +- tests/view/src/ufuncs/arcsin.cpp | 2 +- tests/view/src/ufuncs/arcsinh.cpp | 2 +- tests/view/src/ufuncs/arctan.cpp | 2 +- tests/view/src/ufuncs/arctanh.cpp | 2 +- tests/view/src/ufuncs/cosh.cpp | 4 +- tests/view/src/ufuncs/degrees.cpp | 2 +- tests/view/src/ufuncs/expm1.cpp | 4 +- tests/view/src/ufuncs/rad2deg.cpp | 2 +- tests/view/src/ufuncs/sinh.cpp | 4 +- tests/view/src/zeros.cpp | 2 +- 503 files changed, 809 insertions(+), 898 deletions(-) delete mode 100644 include/nmtools/array/detail.hpp delete mode 100644 include/nmtools/array/dtypes.hpp delete mode 100644 include/nmtools/array/dynamic.hpp delete mode 100644 include/nmtools/array/fixed.hpp delete mode 100644 include/nmtools/array/kind.hpp delete mode 100644 include/nmtools/array/meta.hpp delete mode 100644 include/nmtools/array/utility.hpp delete mode 100644 include/nmtools/array/utility/apply_at.hpp delete mode 100644 include/nmtools/array/utility/at.hpp delete mode 100644 include/nmtools/array/utility/cast.hpp delete mode 100644 include/nmtools/array/vector.hpp rename include/nmtools/{array/utility => platform}/embind.hpp (95%) rename include/nmtools/{array/utility => platform}/jni.hpp (100%) rename include/nmtools/{ => testing}/benchmarks/bench.hpp (100%) rename include/nmtools/{utils => utility}/apply_isclose.hpp (99%) rename include/nmtools/{utils => utility}/apply_isequal.hpp (99%) rename include/nmtools/{array => }/utility/apply_resize.hpp (100%) rename include/nmtools/{utils => utility}/apply_to_string.hpp (79%) rename include/nmtools/{array => utility}/as_static.hpp (97%) rename include/nmtools/{array => utility}/at.hpp (100%) rename include/nmtools/{array => utility}/cast.hpp (89%) rename include/nmtools/{array => utility}/data.hpp (100%) rename include/nmtools/{utils => utility}/isclose.hpp (98%) rename include/nmtools/{utils => utility}/isclose/isclose.hpp (100%) rename include/nmtools/{utils => utility}/isequal.hpp (99%) rename include/nmtools/{utils => utility}/isequal/isequal.hpp (100%) rename include/nmtools/{array => utility}/random_engine.hpp (100%) rename include/nmtools/{array => utility}/shape.hpp (99%) rename include/nmtools/{utils => utility}/to_string.hpp (51%) rename include/nmtools/{utils => utility}/to_string/common_types.hpp (98%) rename include/nmtools/{utils => utility}/to_string/to_string.hpp (100%) diff --git a/.github/workflows/gcc-9.yml b/.github/workflows/gcc-9.yml index 60cf83a0f..5a2a6cb9b 100644 --- a/.github/workflows/gcc-9.yml +++ b/.github/workflows/gcc-9.yml @@ -24,7 +24,7 @@ jobs: - name: setup doctest run: bash scripts/download_doctest_header.sh -d include/ - name: build - run: mkdir -p build/ && cd build/ && cmake .. && make -j2 VERBOSE=1 + run: mkdir -p build/ && cd build/ && cmake .. && make -j1 VERBOSE=1 - name: run tests run: | build/tests/array/numeric-tests-doctest @@ -45,8 +45,8 @@ jobs: platform: x64 - name: setup doctest run: bash scripts/download_doctest_header.sh -d include/ - - build: - run: mkdir -p build/ && cd build/ && cmake -DNMTOOLS_TEST_ALL=OFF -DNMTOOLS_BUILD_INDEX_TESTS=ON .. && make -j2 VERBOSE=1 numeric-tests-index-doctest + - name: build + run: mkdir -p build/ && cd build/ && cmake -DNMTOOLS_TEST_ALL=OFF -DNMTOOLS_BUILD_INDEX_TESTS=ON .. && make -j1 VERBOSE=1 numeric-tests-index-doctest - name: run tests run: | build/tests/index/numeric-tests-index-doctest @@ -64,7 +64,7 @@ jobs: - name: setup doctest run: bash scripts/download_doctest_header.sh -d include/ - name: build - run: mkdir -p build/ && cd build/ && cmake -DNMTOOLS_BUILD_CONSTEXPR_TESTS=ON -DNMTOOLS_BUILD_META_TESTS=OFF -DNMTOOLS_BUILD_UTL_TESTS=OFF -DNMTOOLS_TEST_ALL=OFF -DNMTOOLS_TEST_ARRAY_EVAL=ON .. && make -j2 VERBOSE=1 + run: mkdir -p build/ && cd build/ && cmake -DNMTOOLS_BUILD_CONSTEXPR_TESTS=ON -DNMTOOLS_BUILD_META_TESTS=OFF -DNMTOOLS_BUILD_UTL_TESTS=OFF -DNMTOOLS_TEST_ALL=OFF -DNMTOOLS_TEST_ARRAY_EVAL=ON .. && make -j1 VERBOSE=1 - name: run tests run: | build/tests/array/numeric-tests-doctest @@ -82,7 +82,7 @@ jobs: - name: setup doctest run: bash scripts/download_doctest_header.sh -d include/ - name: build - run: mkdir -p build/ && cd build/ && cmake -DNMTOOLS_BUILD_CONSTEXPR_TESTS=ON -DNMTOOLS_BUILD_META_TESTS=OFF -DNMTOOLS_BUILD_UTL_TESTS=OFF -DNMTOOLS_TEST_ALL=OFF -DNMTOOLS_TEST_ARRAY_EVAL=ON -DNMTOOLS_TESTING_GENERIC_NDARRAY=ON -DNMTOOLS_TESTING_NOSTL=OFF .. && make -j2 VERBOSE=1 + run: mkdir -p build/ && cd build/ && cmake -DNMTOOLS_BUILD_CONSTEXPR_TESTS=ON -DNMTOOLS_BUILD_META_TESTS=OFF -DNMTOOLS_BUILD_UTL_TESTS=OFF -DNMTOOLS_TEST_ALL=OFF -DNMTOOLS_TEST_ARRAY_EVAL=ON -DNMTOOLS_TESTING_GENERIC_NDARRAY=ON -DNMTOOLS_TESTING_NOSTL=OFF .. && make -j1 VERBOSE=1 - name: run tests run: | build/tests/array/numeric-tests-doctest @@ -100,7 +100,7 @@ jobs: - name: setup doctest run: bash scripts/download_doctest_header.sh -d include/ - name: build - run: mkdir -p build/ && cd build/ && cmake -DNMTOOLS_BUILD_CONSTEXPR_TESTS=ON -DNMTOOLS_BUILD_META_TESTS=OFF -DNMTOOLS_BUILD_UTL_TESTS=OFF -DNMTOOLS_TEST_ALL=OFF -DNMTOOLS_TEST_ARRAY_EVAL=ON -DNMTOOLS_TESTING_GENERIC_NDARRAY=ON -DNMTOOLS_TESTING_NOSTL=ON .. && make -j2 VERBOSE=1 + run: mkdir -p build/ && cd build/ && cmake -DNMTOOLS_BUILD_CONSTEXPR_TESTS=ON -DNMTOOLS_BUILD_META_TESTS=OFF -DNMTOOLS_BUILD_UTL_TESTS=OFF -DNMTOOLS_TEST_ALL=OFF -DNMTOOLS_TEST_ARRAY_EVAL=ON -DNMTOOLS_TESTING_GENERIC_NDARRAY=ON -DNMTOOLS_TESTING_NOSTL=ON .. && make -j1 VERBOSE=1 - name: run tests run: | build/tests/array/numeric-tests-doctest diff --git a/examples/android/nmtoolsdemo/app/src/main/jni/src/nmtools-demo.cpp b/examples/android/nmtoolsdemo/app/src/main/jni/src/nmtools-demo.cpp index 3bf4ae81e..a0c391c0c 100644 --- a/examples/android/nmtoolsdemo/app/src/main/jni/src/nmtools-demo.cpp +++ b/examples/android/nmtoolsdemo/app/src/main/jni/src/nmtools-demo.cpp @@ -23,8 +23,8 @@ #include "nmtools/array/random_engine.hpp" #include "nmtools/array/index/ndenumerate.hpp" -#include "nmtools/utils/to_string.hpp" -#include "nmtools/array/utility/jni.hpp" +#include "nmtools/utility/to_string.hpp" +#include "nmtools/platform/jni.hpp" namespace nm = nmtools; namespace na = nm::array; diff --git a/examples/arduino/manip/src/main.cpp b/examples/arduino/manip/src/main.cpp index 4f3505751..3ac566a16 100644 --- a/examples/arduino/manip/src/main.cpp +++ b/examples/arduino/manip/src/main.cpp @@ -25,7 +25,7 @@ #include "nmtools/array/view/mutable_flatten.hpp" #include "nmtools/array/array/flatten.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" #include "nmtools/utils/apply_to_string.hpp" #include diff --git a/examples/arduino/ufuncs/src/main.cpp b/examples/arduino/ufuncs/src/main.cpp index 17155a319..1fe3bacf1 100644 --- a/examples/arduino/ufuncs/src/main.cpp +++ b/examples/arduino/ufuncs/src/main.cpp @@ -3,7 +3,7 @@ #include "nmtools/array/array/sum.hpp" #include "nmtools/array/array/matmul.hpp" #include "nmtools/array/array/mean.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" #include diff --git a/examples/mbed/manip/src/main.cpp b/examples/mbed/manip/src/main.cpp index 37b17c3e4..272df3a8b 100644 --- a/examples/mbed/manip/src/main.cpp +++ b/examples/mbed/manip/src/main.cpp @@ -28,7 +28,7 @@ #include "nmtools/array/view/mutable_flatten.hpp" #include "nmtools/array/array/flatten.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" namespace nm = nmtools; namespace view = nm::view; diff --git a/examples/mbed/ufuncs/src/main.cpp b/examples/mbed/ufuncs/src/main.cpp index cef1c6cc9..a6f5c50db 100644 --- a/examples/mbed/ufuncs/src/main.cpp +++ b/examples/mbed/ufuncs/src/main.cpp @@ -9,7 +9,7 @@ #include "nmtools/array/ndarray/fixed.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" namespace nm = nmtools; namespace na = nm::array; diff --git a/examples/nmtools/array/src/broadcast_to.cpp b/examples/nmtools/array/src/broadcast_to.cpp index d70fb065a..85113f14c 100644 --- a/examples/nmtools/array/src/broadcast_to.cpp +++ b/examples/nmtools/array/src/broadcast_to.cpp @@ -1,6 +1,6 @@ #include "nmtools/array/view/broadcast_to.hpp" #include "nmtools/array/ndarray.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" #include #include diff --git a/examples/nmtools/array/src/expand_dims.cpp b/examples/nmtools/array/src/expand_dims.cpp index 9ad872a74..7c4168afb 100644 --- a/examples/nmtools/array/src/expand_dims.cpp +++ b/examples/nmtools/array/src/expand_dims.cpp @@ -1,6 +1,6 @@ #include "nmtools/array/view/expand_dims.hpp" #include "nmtools/array/ndarray.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" #include #include diff --git a/examples/nmtools/array/src/flatten.cpp b/examples/nmtools/array/src/flatten.cpp index 480a82a7f..ad6d2cc4d 100644 --- a/examples/nmtools/array/src/flatten.cpp +++ b/examples/nmtools/array/src/flatten.cpp @@ -1,6 +1,6 @@ #include "nmtools/array/view/flatten.hpp" #include "nmtools/array/ndarray.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" #include #include diff --git a/examples/nmtools/array/src/repeat.cpp b/examples/nmtools/array/src/repeat.cpp index c167cc839..60fd60e26 100644 --- a/examples/nmtools/array/src/repeat.cpp +++ b/examples/nmtools/array/src/repeat.cpp @@ -1,6 +1,6 @@ #include "nmtools/array/view/repeat.hpp" #include "nmtools/array/ndarray.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" #include #include diff --git a/examples/nmtools/array/src/reshape.cpp b/examples/nmtools/array/src/reshape.cpp index c615425a6..0cdbe8121 100644 --- a/examples/nmtools/array/src/reshape.cpp +++ b/examples/nmtools/array/src/reshape.cpp @@ -1,6 +1,6 @@ #include "nmtools/array/view/reshape.hpp" #include "nmtools/array/ndarray.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" #include #include diff --git a/examples/nmtools/array/src/squeeze.cpp b/examples/nmtools/array/src/squeeze.cpp index 0ffd237e6..20889adbd 100644 --- a/examples/nmtools/array/src/squeeze.cpp +++ b/examples/nmtools/array/src/squeeze.cpp @@ -1,6 +1,6 @@ #include "nmtools/array/view/squeeze.hpp" #include "nmtools/array/ndarray.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" #include #include diff --git a/examples/nmtools/array/src/tile.cpp b/examples/nmtools/array/src/tile.cpp index 45ebe29a4..8bfcdd1fc 100644 --- a/examples/nmtools/array/src/tile.cpp +++ b/examples/nmtools/array/src/tile.cpp @@ -1,6 +1,6 @@ #include "nmtools/array/view/tile.hpp" #include "nmtools/array/ndarray.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" #include #include diff --git a/examples/nmtools/array/src/transpose.cpp b/examples/nmtools/array/src/transpose.cpp index 909f56509..bb301a184 100644 --- a/examples/nmtools/array/src/transpose.cpp +++ b/examples/nmtools/array/src/transpose.cpp @@ -1,8 +1,7 @@ #include "nmtools/array/view/transpose.hpp" -#include "nmtools/array/utility/cast.hpp" +#include "nmtools/utility/cast.hpp" #include "nmtools/array/ndarray.hpp" -#include "nmtools/utils/to_string.hpp" -#include "nmtools/array/cast.hpp" +#include "nmtools/utility/to_string.hpp" #include #include diff --git a/examples/web/manip/manip.cpp b/examples/web/manip/manip.cpp index 3533cbae3..ae5821e63 100644 --- a/examples/web/manip/manip.cpp +++ b/examples/web/manip/manip.cpp @@ -21,7 +21,7 @@ #include "nmtools/array/array/atleast_1d.hpp" #include "nmtools/array/array/arange.hpp" -#include "nmtools/array/utility/embind.hpp" +#include "nmtools/platform/embind.hpp" #include namespace em = emscripten; diff --git a/examples/web/ufuncs/ufuncs.cpp b/examples/web/ufuncs/ufuncs.cpp index 7955189c1..f8d1d2c69 100644 --- a/examples/web/ufuncs/ufuncs.cpp +++ b/examples/web/ufuncs/ufuncs.cpp @@ -2,7 +2,7 @@ #include "nmtools/array/view/ufuncs/clip.hpp" #include "nmtools/array/array/ufuncs/exp.hpp" -#include "nmtools/array/utility/embind.hpp" +#include "nmtools/platform/embind.hpp" #include namespace em = emscripten; diff --git a/include/nmtools/array/detail.hpp b/include/nmtools/array/detail.hpp deleted file mode 100644 index b02801ea6..000000000 --- a/include/nmtools/array/detail.hpp +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef NMTOOLS_ARRAY_DETAIL_HPP -#define NMTOOLS_ARRAY_DETAIL_HPP - -// TODO: remove this file - -#include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" - -#include "nmtools/array/index/as_tuple.hpp" -#include "nmtools/array/index/product.hpp" -#include "nmtools/array/index/compute_indices.hpp" -#include "nmtools/array/index/compute_offset.hpp" -#include "nmtools/array/index/compute_strides.hpp" - -namespace nmtools::detail -{ - using ::nmtools::index::as_tuple; -} // namespace nmtools::detail - -#endif // NMTOOLS_ARRAY_DETAIL_HPP \ No newline at end of file diff --git a/include/nmtools/array/dtypes.hpp b/include/nmtools/array/dtypes.hpp deleted file mode 100644 index 9f206570b..000000000 --- a/include/nmtools/array/dtypes.hpp +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef NMTOOLS_ARRAY_DTYPES_HPP -#define NMTOOLS_ARRAY_DTYPES_HPP - -// TODO: remove -#include "nmtools/dtypes.hpp" - -#endif // NMTOOLS_ARRAY_DTYPES_HPP \ No newline at end of file diff --git a/include/nmtools/array/dynamic.hpp b/include/nmtools/array/dynamic.hpp deleted file mode 100644 index 463f27b58..000000000 --- a/include/nmtools/array/dynamic.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef NMTOOLS_ARRAY_DYNAMIC_HPP -#define NMTOOLS_ARRAY_DYNAMIC_HPP - -#include "nmtools/array/ndarray/dynamic.hpp" - -#endif // NMTOOLS_ARRAY_DYNAMIC_HPP \ No newline at end of file diff --git a/include/nmtools/array/eval.hpp b/include/nmtools/array/eval.hpp index 8b7a498f0..69e0f94df 100644 --- a/include/nmtools/array/eval.hpp +++ b/include/nmtools/array/eval.hpp @@ -9,10 +9,10 @@ #include "nmtools/array/ndarray.hpp" -#include "nmtools/utils/isequal.hpp" -#include "nmtools/array/utility/apply_at.hpp" -#include "nmtools/array/utility/apply_resize.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/isequal.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/apply_resize.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::array { diff --git a/include/nmtools/array/eval/cuda/evaluator.hpp b/include/nmtools/array/eval/cuda/evaluator.hpp index 2cb3438a9..b8832af93 100644 --- a/include/nmtools/array/eval/cuda/evaluator.hpp +++ b/include/nmtools/array/eval/cuda/evaluator.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_EVAL_CUDA_EVALUATOR_HPP #include "nmtools/array/eval.hpp" -#include "nmtools/array/data.hpp" +#include "nmtools/utility/data.hpp" #include "nmtools/array/eval/cuda/context.hpp" #include "nmtools/array/functional.hpp" diff --git a/include/nmtools/array/eval/hip/evaluator.hpp b/include/nmtools/array/eval/hip/evaluator.hpp index 1675e5c6c..29ef550f0 100644 --- a/include/nmtools/array/eval/hip/evaluator.hpp +++ b/include/nmtools/array/eval/hip/evaluator.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_EVAL_HIP_EVALUATOR_HPP #include "nmtools/array/eval.hpp" -#include "nmtools/array/data.hpp" +#include "nmtools/utility/data.hpp" #include "nmtools/array/eval/hip/context.hpp" #include "nmtools/array/functional.hpp" diff --git a/include/nmtools/array/eval/opencl/context.hpp b/include/nmtools/array/eval/opencl/context.hpp index 047fb4550..65149bb2f 100644 --- a/include/nmtools/array/eval/opencl/context.hpp +++ b/include/nmtools/array/eval/opencl/context.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_EVAL_OPENCL_CONTEXT_HPP #include "nmtools/array/eval.hpp" -#include "nmtools/array/data.hpp" +#include "nmtools/utility/data.hpp" #include // for CL_PLATFORM_ICD_SUFFIX_KHR diff --git a/include/nmtools/array/eval/opencl/evaluator.hpp b/include/nmtools/array/eval/opencl/evaluator.hpp index 24d1948bd..5722fb645 100644 --- a/include/nmtools/array/eval/opencl/evaluator.hpp +++ b/include/nmtools/array/eval/opencl/evaluator.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_EVAL_OPENCL_EVALUATOR_HPP #include "nmtools/array/eval.hpp" -#include "nmtools/array/data.hpp" +#include "nmtools/utility/data.hpp" #include "nmtools/array/eval/opencl/context.hpp" #include diff --git a/include/nmtools/array/eval/simd/evaluator/ufunc.hpp b/include/nmtools/array/eval/simd/evaluator/ufunc.hpp index d00e407fa..b4bf6e58b 100644 --- a/include/nmtools/array/eval/simd/evaluator/ufunc.hpp +++ b/include/nmtools/array/eval/simd/evaluator/ufunc.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_EVAL_SIMD_EVALUATOR_UFUNC_HPP #include "nmtools/array/eval.hpp" -#include "nmtools/array/data.hpp" +#include "nmtools/utility/data.hpp" #include "nmtools/array/eval/simd/index.hpp" #include "nmtools/array/eval/simd/ufunc.hpp" #include "nmtools/array/eval/simd/bit_width.hpp" diff --git a/include/nmtools/array/eval/simd/index/matmul.hpp b/include/nmtools/array/eval/simd/index/matmul.hpp index 986f0aa10..f65dfcf03 100644 --- a/include/nmtools/array/eval/simd/index/matmul.hpp +++ b/include/nmtools/array/eval/simd/index/matmul.hpp @@ -3,7 +3,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/index/product.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/eval/simd/index/common.hpp" namespace nmtools::index diff --git a/include/nmtools/array/eval/simd/index/ufunc.hpp b/include/nmtools/array/eval/simd/index/ufunc.hpp index e3ab7f7a6..20da47b95 100644 --- a/include/nmtools/array/eval/simd/index/ufunc.hpp +++ b/include/nmtools/array/eval/simd/index/ufunc.hpp @@ -3,7 +3,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/index/product.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/eval/simd/index/common.hpp" #include "nmtools/array/index/compute_offset.hpp" #include "nmtools/array/index/compute_strides.hpp" diff --git a/include/nmtools/array/eval/sycl/context.hpp b/include/nmtools/array/eval/sycl/context.hpp index b2c51feec..f0c3b69d6 100644 --- a/include/nmtools/array/eval/sycl/context.hpp +++ b/include/nmtools/array/eval/sycl/context.hpp @@ -6,8 +6,8 @@ #include "nmtools/array/functional/functor.hpp" #include "nmtools/array/eval/kernel_helper.hpp" #include "nmtools/exception.hpp" -#include "nmtools/utils/to_string.hpp" -#include "nmtools/array/as_static.hpp" +#include "nmtools/utility/to_string.hpp" +#include "nmtools/utility/as_static.hpp" #include "nmtools/utl/vector.hpp" #include diff --git a/include/nmtools/array/eval/sycl/evaluator.hpp b/include/nmtools/array/eval/sycl/evaluator.hpp index 732255225..ef1bbe0e1 100644 --- a/include/nmtools/array/eval/sycl/evaluator.hpp +++ b/include/nmtools/array/eval/sycl/evaluator.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_EVAL_SYCL_EVALUATOR_HPP #include "nmtools/array/eval.hpp" -#include "nmtools/array/data.hpp" +#include "nmtools/utility/data.hpp" #include "nmtools/array/eval/sycl/context.hpp" #include "nmtools/array/functional.hpp" diff --git a/include/nmtools/array/fixed.hpp b/include/nmtools/array/fixed.hpp deleted file mode 100644 index 3fe99d19f..000000000 --- a/include/nmtools/array/fixed.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef NMTOOLS_ARRAY_FIXED_HPP -#define NMTOOLS_ARRAY_FIXED_HPP - -#include "nmtools/array/ndarray/fixed.hpp" - -#endif // NMTOOLS_ARRAY_FIXED_HPP \ No newline at end of file diff --git a/include/nmtools/array/functional/compute_graph.hpp b/include/nmtools/array/functional/compute_graph.hpp index 62ae68818..0395f2fd6 100644 --- a/include/nmtools/array/functional/compute_graph.hpp +++ b/include/nmtools/array/functional/compute_graph.hpp @@ -273,8 +273,8 @@ namespace nmtools::functional }; // get_compute_graph_t } // namespace nmtools::functional -#include "nmtools/utils/to_string/to_string.hpp" -#include "nmtools/utils/to_string/common_types.hpp" +#include "nmtools/utility/to_string/to_string.hpp" +#include "nmtools/utility/to_string/common_types.hpp" #if NMTOOLS_HAS_STRING diff --git a/include/nmtools/array/functional/expand.hpp b/include/nmtools/array/functional/expand.hpp index 6c8b2dca3..6a957568c 100644 --- a/include/nmtools/array/functional/expand.hpp +++ b/include/nmtools/array/functional/expand.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_FUNCTIONAL_EXPAND_HPP #define NMTOOLS_ARRAY_FUNCTIONAL_EXPAND_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/functional/functor.hpp" #include "nmtools/array/view/expand.hpp" diff --git a/include/nmtools/array/functional/functor.hpp b/include/nmtools/array/functional/functor.hpp index 7f00f04dc..7e01c68df 100644 --- a/include/nmtools/array/functional/functor.hpp +++ b/include/nmtools/array/functional/functor.hpp @@ -8,8 +8,8 @@ #include "nmtools/utility/ct_map.hpp" #include "nmtools/utility/ct_digraph.hpp" #include "nmtools/utility/tuple_slice.hpp" -#include "nmtools/utils/isequal/isequal.hpp" -#include "nmtools/utils/isclose/isclose.hpp" +#include "nmtools/utility/isequal/isequal.hpp" +#include "nmtools/utility/isclose/isclose.hpp" #include "nmtools/utility/fwd.hpp" #include "nmtools/utility/unwrap.hpp" diff --git a/include/nmtools/array/functional/indexing.hpp b/include/nmtools/array/functional/indexing.hpp index 47c8234ce..f8c5fd538 100644 --- a/include/nmtools/array/functional/indexing.hpp +++ b/include/nmtools/array/functional/indexing.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_FUNCTIONAL_INDEXING_HPP #define NMTOOLS_ARRAY_FUNCTIONAL_INDEXING_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/functional/functor.hpp" #include "nmtools/array/view/indexing.hpp" diff --git a/include/nmtools/array/functional/ufunc/accumulate.hpp b/include/nmtools/array/functional/ufunc/accumulate.hpp index aafa334e2..9771e4e55 100644 --- a/include/nmtools/array/functional/ufunc/accumulate.hpp +++ b/include/nmtools/array/functional/ufunc/accumulate.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_FUNCTIONAL_UFUNC_ACCUMULATE_HPP #define NMTOOLS_ARRAY_FUNCTIONAL_UFUNC_ACCUMULATE_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/functional/functor.hpp" #include "nmtools/array/view/ufunc.hpp" diff --git a/include/nmtools/array/functional/ufunc/outer.hpp b/include/nmtools/array/functional/ufunc/outer.hpp index e4a6b6591..257424d0c 100644 --- a/include/nmtools/array/functional/ufunc/outer.hpp +++ b/include/nmtools/array/functional/ufunc/outer.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_FUNCTIONAL_UFUNC_OUTER_HPP #define NMTOOLS_ARRAY_FUNCTIONAL_UFUNC_OUTER_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/functional/functor.hpp" #include "nmtools/array/view/ufunc.hpp" diff --git a/include/nmtools/array/functional/ufunc/reduce.hpp b/include/nmtools/array/functional/ufunc/reduce.hpp index edbdee182..579c79ee8 100644 --- a/include/nmtools/array/functional/ufunc/reduce.hpp +++ b/include/nmtools/array/functional/ufunc/reduce.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_FUNCTIONAL_UFUNC_REDUCE_HPP #define NMTOOLS_ARRAY_FUNCTIONAL_UFUNC_REDUCE_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/functional/functor.hpp" #include "nmtools/array/view/ufunc.hpp" diff --git a/include/nmtools/array/functional/ufunc/ufunc.hpp b/include/nmtools/array/functional/ufunc/ufunc.hpp index 81302ee05..754306004 100644 --- a/include/nmtools/array/functional/ufunc/ufunc.hpp +++ b/include/nmtools/array/functional/ufunc/ufunc.hpp @@ -4,11 +4,11 @@ #include "nmtools/array/view/ufunc/ufunc.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/array/functional/functor.hpp" -#include "nmtools/utils/to_string/to_string.hpp" -#include "nmtools/utils/to_string/common_types.hpp" +#include "nmtools/utility/to_string/to_string.hpp" +#include "nmtools/utility/to_string/common_types.hpp" #include "nmtools/array/functional/indexing.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/isequal.hpp" namespace nmtools::functional::fun { diff --git a/include/nmtools/array/impl/boost.hpp b/include/nmtools/array/impl/boost.hpp index d4a1e4b81..d58b1a681 100644 --- a/include/nmtools/array/impl/boost.hpp +++ b/include/nmtools/array/impl/boost.hpp @@ -8,7 +8,7 @@ #include #include -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/meta.hpp" #include "nmtools/meta/boost.hpp" #include "nmtools/utility/boost/get.hpp" diff --git a/include/nmtools/array/impl/stl.hpp b/include/nmtools/array/impl/stl.hpp index 603e1c0c7..e82208e1a 100644 --- a/include/nmtools/array/impl/stl.hpp +++ b/include/nmtools/array/impl/stl.hpp @@ -3,7 +3,7 @@ // Actual implementations for various customization point in nmtools for STL -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include #include diff --git a/include/nmtools/array/impl/utl.hpp b/include/nmtools/array/impl/utl.hpp index 622c1927b..9261af061 100644 --- a/include/nmtools/array/impl/utl.hpp +++ b/include/nmtools/array/impl/utl.hpp @@ -3,7 +3,7 @@ // Actual implementation for customization point for UTL -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/utl.hpp" diff --git a/include/nmtools/array/index/alias.hpp b/include/nmtools/array/index/alias.hpp index c5d7a1aba..b4c9838c1 100644 --- a/include/nmtools/array/index/alias.hpp +++ b/include/nmtools/array/index/alias.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_INDEX_ALIAS_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/max.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/arange.hpp b/include/nmtools/array/index/arange.hpp index 578b68d9a..209a0b075 100644 --- a/include/nmtools/array/index/arange.hpp +++ b/include/nmtools/array/index/arange.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_INDEX_ARANGE_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/index/argsort.hpp b/include/nmtools/array/index/argsort.hpp index 9a62e33a9..57c87737c 100644 --- a/include/nmtools/array/index/argsort.hpp +++ b/include/nmtools/array/index/argsort.hpp @@ -1,8 +1,8 @@ #ifndef NMTOOLS_ARRAY_INDEX_ARGSORT_HPP #define NMTOOLS_ARRAY_INDEX_ARGSORT_HPP -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/meta.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/array_slice.hpp b/include/nmtools/array/index/array_slice.hpp index e963097cf..cdfabb0d8 100644 --- a/include/nmtools/array/index/array_slice.hpp +++ b/include/nmtools/array/index/array_slice.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_ARRAY_SLICE_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/ref.hpp" #include "nmtools/array/index/broadcast_shape.hpp" diff --git a/include/nmtools/array/index/atleast_nd.hpp b/include/nmtools/array/index/atleast_nd.hpp index 3a318fe17..0a769ca6f 100644 --- a/include/nmtools/array/index/atleast_nd.hpp +++ b/include/nmtools/array/index/atleast_nd.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_ATLEAST_ND_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/ndarray.hpp" // TODO: move to shape.hpp diff --git a/include/nmtools/array/index/broadcast_shape.hpp b/include/nmtools/array/index/broadcast_shape.hpp index ae45deb5a..52360efe1 100644 --- a/include/nmtools/array/index/broadcast_shape.hpp +++ b/include/nmtools/array/index/broadcast_shape.hpp @@ -3,8 +3,8 @@ #include "nmtools/constants.hpp" #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/ref.hpp" #include "nmtools/array/index/max.hpp" #include "nmtools/array/index/sum.hpp" diff --git a/include/nmtools/array/index/broadcast_to.hpp b/include/nmtools/array/index/broadcast_to.hpp index eb8864270..d7556f70d 100644 --- a/include/nmtools/array/index/broadcast_to.hpp +++ b/include/nmtools/array/index/broadcast_to.hpp @@ -4,7 +4,7 @@ #include "nmtools/meta.hpp" #include "nmtools/utl.hpp" #include "nmtools/array/ndarray.hpp" -#include "nmtools/array/utility/at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/index/tuple_at.hpp" #include "nmtools/array/index/gather.hpp" #include "nmtools/array/index/compute_strides.hpp" diff --git a/include/nmtools/array/index/choose.hpp b/include/nmtools/array/index/choose.hpp index fd6a3e6d2..0f2b4eac0 100644 --- a/include/nmtools/array/index/choose.hpp +++ b/include/nmtools/array/index/choose.hpp @@ -1,8 +1,8 @@ #ifndef NMTOOLS_ARRAY_INDEX_EXTRACT_HPP #define NMTOOLS_ARRAY_INDEX_EXTRACT_HPP -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/ndarray/hybrid.hpp" #include "nmtools/array/ndarray/fixed.hpp" #include "nmtools/array/index/tuple_at.hpp" diff --git a/include/nmtools/array/index/compute_indices.hpp b/include/nmtools/array/index/compute_indices.hpp index d567cdb6e..3d3e41836 100644 --- a/include/nmtools/array/index/compute_indices.hpp +++ b/include/nmtools/array/index/compute_indices.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_INDEX_COMPUTE_INDICES_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/tuple_at.hpp" #include "nmtools/array/index/compute_strides.hpp" diff --git a/include/nmtools/array/index/compute_offset.hpp b/include/nmtools/array/index/compute_offset.hpp index 556c3a256..1e28aaf49 100644 --- a/include/nmtools/array/index/compute_offset.hpp +++ b/include/nmtools/array/index/compute_offset.hpp @@ -3,7 +3,7 @@ #include "nmtools/def.hpp" #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/index/tuple_at.hpp" #include "nmtools/assert.hpp" diff --git a/include/nmtools/array/index/compute_strides.hpp b/include/nmtools/array/index/compute_strides.hpp index fcf5a23f8..cebbb1693 100644 --- a/include/nmtools/array/index/compute_strides.hpp +++ b/include/nmtools/array/index/compute_strides.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_INDEX_COMPUTE_STRIDES_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/index/concatenate.hpp b/include/nmtools/array/index/concatenate.hpp index e3e8a77ed..916316e5e 100644 --- a/include/nmtools/array/index/concatenate.hpp +++ b/include/nmtools/array/index/concatenate.hpp @@ -3,11 +3,11 @@ #include "nmtools/constants.hpp" #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/index/tuple_at.hpp" #include "nmtools/array/index/product.hpp" #include "nmtools/array/index/compute_indices.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/index/contains.hpp b/include/nmtools/array/index/contains.hpp index 80c8beac4..4d05d6d36 100644 --- a/include/nmtools/array/index/contains.hpp +++ b/include/nmtools/array/index/contains.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_INDEX_CONTAINS_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/utility/isequal.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/index/count.hpp b/include/nmtools/array/index/count.hpp index 6ba1289cd..b45c886d5 100644 --- a/include/nmtools/array/index/count.hpp +++ b/include/nmtools/array/index/count.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_INDEX_COUNT_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/index/cumsum.hpp b/include/nmtools/array/index/cumsum.hpp index dd4a5542b..8a3b19972 100644 --- a/include/nmtools/array/index/cumsum.hpp +++ b/include/nmtools/array/index/cumsum.hpp @@ -3,8 +3,8 @@ #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/constants.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/expand_dims.hpp b/include/nmtools/array/index/expand_dims.hpp index 7686ab892..01f578c18 100644 --- a/include/nmtools/array/index/expand_dims.hpp +++ b/include/nmtools/array/index/expand_dims.hpp @@ -2,9 +2,9 @@ #define NMTOOLS_ARRAY_INDEX_EXPAND_DIMS_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/isequal.hpp" #include "nmtools/array/ndarray/hybrid.hpp" #include "nmtools/array/index/contains.hpp" #include "nmtools/array/index/normalize_axis.hpp" diff --git a/include/nmtools/array/index/flatten.hpp b/include/nmtools/array/index/flatten.hpp index d759a17e4..cb2e58cd2 100644 --- a/include/nmtools/array/index/flatten.hpp +++ b/include/nmtools/array/index/flatten.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_FLATTEN_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/index/flip.hpp b/include/nmtools/array/index/flip.hpp index 061f6d13a..893eebe40 100644 --- a/include/nmtools/array/index/flip.hpp +++ b/include/nmtools/array/index/flip.hpp @@ -3,7 +3,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/index/count.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/utility.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/free_axes.hpp b/include/nmtools/array/index/free_axes.hpp index 6a75b517c..9d8cc3bc0 100644 --- a/include/nmtools/array/index/free_axes.hpp +++ b/include/nmtools/array/index/free_axes.hpp @@ -3,8 +3,8 @@ #include "nmtools/def.hpp" #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/ndarray.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/gather.hpp b/include/nmtools/array/index/gather.hpp index 9ea823f4e..47d47c970 100644 --- a/include/nmtools/array/index/gather.hpp +++ b/include/nmtools/array/index/gather.hpp @@ -3,9 +3,9 @@ #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/index/tuple_at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/ndarray.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/insert_index.hpp b/include/nmtools/array/index/insert_index.hpp index 01e452fe3..2b87c465c 100644 --- a/include/nmtools/array/index/insert_index.hpp +++ b/include/nmtools/array/index/insert_index.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_INSERT_INDEX_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/index/normalize_axis.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/logical_not.hpp b/include/nmtools/array/index/logical_not.hpp index 865627918..cfc9e43dc 100644 --- a/include/nmtools/array/index/logical_not.hpp +++ b/include/nmtools/array/index/logical_not.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_INDEX_LOGICAL_NOT_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/ndarray.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/matmul.hpp b/include/nmtools/array/index/matmul.hpp index 5bcc35d24..b6d91fed6 100644 --- a/include/nmtools/array/index/matmul.hpp +++ b/include/nmtools/array/index/matmul.hpp @@ -7,7 +7,7 @@ #include "nmtools/array/index/broadcast_to.hpp" #include "nmtools/array/index/product.hpp" #include "nmtools/array/ndarray.hpp" -#include "nmtools/array/at.hpp" +#include "nmtools/utility/at.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/max.hpp b/include/nmtools/array/index/max.hpp index 0b4eb4c16..9b0f28ce6 100644 --- a/include/nmtools/array/index/max.hpp +++ b/include/nmtools/array/index/max.hpp @@ -3,7 +3,7 @@ #include "nmtools/constants.hpp" #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" +#include "nmtools/utility/at.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/index/moveaxis.hpp b/include/nmtools/array/index/moveaxis.hpp index 0e6ba2a66..84fcb70c4 100644 --- a/include/nmtools/array/index/moveaxis.hpp +++ b/include/nmtools/array/index/moveaxis.hpp @@ -3,7 +3,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/ndarray.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/normalize_axis.hpp" #include "nmtools/array/index/argsort.hpp" diff --git a/include/nmtools/array/index/ndenumerate.hpp b/include/nmtools/array/index/ndenumerate.hpp index 9012c2267..58f9ca1fd 100644 --- a/include/nmtools/array/index/ndenumerate.hpp +++ b/include/nmtools/array/index/ndenumerate.hpp @@ -4,8 +4,8 @@ #include "nmtools/array/index/ndindex.hpp" #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/index/ndindex.hpp b/include/nmtools/array/index/ndindex.hpp index 86383c909..f6f35d202 100644 --- a/include/nmtools/array/index/ndindex.hpp +++ b/include/nmtools/array/index/ndindex.hpp @@ -6,8 +6,8 @@ #include "nmtools/array/index/compute_indices.hpp" #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/index/nonzero.hpp b/include/nmtools/array/index/nonzero.hpp index 4d477c979..e8a6d582d 100644 --- a/include/nmtools/array/index/nonzero.hpp +++ b/include/nmtools/array/index/nonzero.hpp @@ -3,7 +3,7 @@ #include "nmtools/def.hpp" #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/ndarray/hybrid.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/normalize_axis.hpp b/include/nmtools/array/index/normalize_axis.hpp index 06e763172..cee1a29da 100644 --- a/include/nmtools/array/index/normalize_axis.hpp +++ b/include/nmtools/array/index/normalize_axis.hpp @@ -1,8 +1,8 @@ #ifndef NMTOOLS_ARRAY_INDEX_NORMALIZE_AXIS_HPP #define NMTOOLS_ARRAY_INDEX_NORMALIZE_AXIS_HPP -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/meta.hpp" #include "nmtools/utl.hpp" diff --git a/include/nmtools/array/index/outer.hpp b/include/nmtools/array/index/outer.hpp index ced7b4dcd..5b471ed46 100644 --- a/include/nmtools/array/index/outer.hpp +++ b/include/nmtools/array/index/outer.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_INDEX_OUTER_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/ndarray.hpp" #include "nmtools/array/index/product.hpp" diff --git a/include/nmtools/array/index/pad.hpp b/include/nmtools/array/index/pad.hpp index acf8360f4..2286591e3 100644 --- a/include/nmtools/array/index/pad.hpp +++ b/include/nmtools/array/index/pad.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_PAD_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/ref.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/pooling.hpp b/include/nmtools/array/index/pooling.hpp index 8a0911a28..93eeb8558 100644 --- a/include/nmtools/array/index/pooling.hpp +++ b/include/nmtools/array/index/pooling.hpp @@ -1,8 +1,8 @@ #ifndef NMTOOLS_ARRAY_INDEX_POOLING_HPP #define NMTOOLS_ARRAY_INDEX_POOLING_HPP -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/assert.hpp" #include "nmtools/meta.hpp" diff --git a/include/nmtools/array/index/product.hpp b/include/nmtools/array/index/product.hpp index 680cc88b3..fe2cdd683 100644 --- a/include/nmtools/array/index/product.hpp +++ b/include/nmtools/array/index/product.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_INDEX_PRODUCT_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/array/utility/at.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/utility/at.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/index/range.hpp b/include/nmtools/array/index/range.hpp index 286e8d8bc..ca29b1d08 100644 --- a/include/nmtools/array/index/range.hpp +++ b/include/nmtools/array/index/range.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_RANGE_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/index/reduce.hpp b/include/nmtools/array/index/reduce.hpp index fc73f8664..7f45d8c0b 100644 --- a/include/nmtools/array/index/reduce.hpp +++ b/include/nmtools/array/index/reduce.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_REDUCE_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/normalize_axis.hpp" #include "nmtools/utility/unwrap.hpp" diff --git a/include/nmtools/array/index/ref.hpp b/include/nmtools/array/index/ref.hpp index e92045d4f..4aadcef9e 100644 --- a/include/nmtools/array/index/ref.hpp +++ b/include/nmtools/array/index/ref.hpp @@ -1,8 +1,8 @@ #ifndef NMTOOLS_ARRAY_INDEX_REF_HPP #define NMTOOLS_ARRAY_INDEX_REF_HPP -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/meta.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/remove_dims.hpp b/include/nmtools/array/index/remove_dims.hpp index da3434b8a..b254b31f3 100644 --- a/include/nmtools/array/index/remove_dims.hpp +++ b/include/nmtools/array/index/remove_dims.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_INDEX_REMOVE_DIMS_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/ndarray/hybrid.hpp" #include "nmtools/constants.hpp" #include "nmtools/array/index/ref.hpp" diff --git a/include/nmtools/array/index/remove_single_dims.hpp b/include/nmtools/array/index/remove_single_dims.hpp index 146ae8c25..308de3632 100644 --- a/include/nmtools/array/index/remove_single_dims.hpp +++ b/include/nmtools/array/index/remove_single_dims.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_REMOVE_SINGLE_DIMS_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/ndarray/hybrid.hpp" #include "nmtools/array/index/filter.hpp" diff --git a/include/nmtools/array/index/repeat.hpp b/include/nmtools/array/index/repeat.hpp index d4e2a5f4a..49d081de5 100644 --- a/include/nmtools/array/index/repeat.hpp +++ b/include/nmtools/array/index/repeat.hpp @@ -4,7 +4,7 @@ #include "nmtools/constants.hpp" #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/compute_indices.hpp" #include "nmtools/array/index/where.hpp" #include "nmtools/array/index/cumsum.hpp" diff --git a/include/nmtools/array/index/reshape.hpp b/include/nmtools/array/index/reshape.hpp index 1215d49b7..74710f2c5 100644 --- a/include/nmtools/array/index/reshape.hpp +++ b/include/nmtools/array/index/reshape.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_RESHAPE_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/product.hpp" #include "nmtools/array/index/ref.hpp" diff --git a/include/nmtools/array/index/resize.hpp b/include/nmtools/array/index/resize.hpp index d511e2c75..4bcb24885 100644 --- a/include/nmtools/array/index/resize.hpp +++ b/include/nmtools/array/index/resize.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_RESIZE_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/ndarray.hpp" diff --git a/include/nmtools/array/index/reverse.hpp b/include/nmtools/array/index/reverse.hpp index f3c005e88..8037df85f 100644 --- a/include/nmtools/array/index/reverse.hpp +++ b/include/nmtools/array/index/reverse.hpp @@ -1,8 +1,8 @@ #ifndef NMTOOLS_ARRAY_INDEX_REVERSE_HPP #define NMTOOLS_ARRAY_INDEX_REVERSE_HPP -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/meta.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/roll.hpp b/include/nmtools/array/index/roll.hpp index 2a7a9f9f4..daa7db6b0 100644 --- a/include/nmtools/array/index/roll.hpp +++ b/include/nmtools/array/index/roll.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_ROLL_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/normalize_axis.hpp" #include "nmtools/utility/has_value.hpp" #include "nmtools/utility/unwrap.hpp" diff --git a/include/nmtools/array/index/scatter.hpp b/include/nmtools/array/index/scatter.hpp index de6f491db..96784f915 100644 --- a/include/nmtools/array/index/scatter.hpp +++ b/include/nmtools/array/index/scatter.hpp @@ -3,8 +3,8 @@ #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/ndarray.hpp" #include "nmtools/utl/static_vector.hpp" diff --git a/include/nmtools/array/index/slice.hpp b/include/nmtools/array/index/slice.hpp index 77b5e5c74..017e1b991 100644 --- a/include/nmtools/array/index/slice.hpp +++ b/include/nmtools/array/index/slice.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_DYNAMIC_SLICE_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/constants.hpp" #include "nmtools/math.hpp" #include "nmtools/array/ndarray.hpp" @@ -836,7 +836,7 @@ namespace nmtools::meta #include "nmtools/constants.hpp" #include "nmtools/meta.hpp" #include "nmtools/array/index/ref.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/math.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/sliding_window.hpp b/include/nmtools/array/index/sliding_window.hpp index 0e34a249f..422143ca7 100644 --- a/include/nmtools/array/index/sliding_window.hpp +++ b/include/nmtools/array/index/sliding_window.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_SLIDING_WINDOW_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/ndarray.hpp" #include "nmtools/array/index/normalize_axis.hpp" #include "nmtools/platform/math/constexpr.hpp" diff --git a/include/nmtools/array/index/squeeze.hpp b/include/nmtools/array/index/squeeze.hpp index c3a63093e..6cd2f4876 100644 --- a/include/nmtools/array/index/squeeze.hpp +++ b/include/nmtools/array/index/squeeze.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_INDEX_SQUEEZE_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/ndarray.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/sum.hpp b/include/nmtools/array/index/sum.hpp index 63a978f72..8cfcc17a9 100644 --- a/include/nmtools/array/index/sum.hpp +++ b/include/nmtools/array/index/sum.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_SUM_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" +#include "nmtools/utility/at.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/index/take.hpp b/include/nmtools/array/index/take.hpp index fc31ec80a..673ac2bdc 100644 --- a/include/nmtools/array/index/take.hpp +++ b/include/nmtools/array/index/take.hpp @@ -3,8 +3,8 @@ #include "nmtools/constants.hpp" #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/array/utility/at.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/index/compute_indices.hpp" #include "nmtools/array/ndarray/hybrid.hpp" diff --git a/include/nmtools/array/index/tile.hpp b/include/nmtools/array/index/tile.hpp index fd22658b0..e47132e91 100644 --- a/include/nmtools/array/index/tile.hpp +++ b/include/nmtools/array/index/tile.hpp @@ -1,8 +1,8 @@ #ifndef NMTOOLS_ARRAY_INDEX_TILE_HPP #define NMTOOLS_ARRAY_INDEX_TILE_HPP -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/constants.hpp" #include "nmtools/meta.hpp" #include "nmtools/array/ndarray.hpp" diff --git a/include/nmtools/array/index/transpose.hpp b/include/nmtools/array/index/transpose.hpp index 1fadfdfe0..b38fde21f 100644 --- a/include/nmtools/array/index/transpose.hpp +++ b/include/nmtools/array/index/transpose.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_TRANSPOSE_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/ref.hpp" #include "nmtools/array/ndarray.hpp" #include "nmtools/utl/static_vector.hpp" diff --git a/include/nmtools/array/index/tuple_at.hpp b/include/nmtools/array/index/tuple_at.hpp index 384ff6c09..d312ada82 100644 --- a/include/nmtools/array/index/tuple_at.hpp +++ b/include/nmtools/array/index/tuple_at.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_INDEX_TUPLE_AT_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/index/ufunc.hpp b/include/nmtools/array/index/ufunc.hpp index a03a7fdb1..2bdcdf6b8 100644 --- a/include/nmtools/array/index/ufunc.hpp +++ b/include/nmtools/array/index/ufunc.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_UFUNC_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/utility/unwrap.hpp" namespace nmtools::index diff --git a/include/nmtools/array/index/where.hpp b/include/nmtools/array/index/where.hpp index 8245c5421..c644e829a 100644 --- a/include/nmtools/array/index/where.hpp +++ b/include/nmtools/array/index/where.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_INDEX_WHERE_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/ndarray.hpp" namespace nmtools::index diff --git a/include/nmtools/array/kind.hpp b/include/nmtools/array/kind.hpp deleted file mode 100644 index 6f6a7e95e..000000000 --- a/include/nmtools/array/kind.hpp +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef NMTOOLS_ARRAY_KIND_HPP -#define NMTOOLS_ARRAY_KIND_HPP - -namespace nmtools::array::kind -{ - /** - * @brief helper tag for easy dispatch - * - */ - struct fixed_t {}; - struct hybrid_t {}; - struct dynamic_t {}; - - /** - * @brief helper inline variable for each tag - * - */ - inline constexpr auto fixed = fixed_t {}; - inline constexpr auto hybrid = hybrid_t {}; - inline constexpr auto dynamic = dynamic_t {}; -} // namespace nmtools::array::kind - -#endif // NMTOOLS_ARRAY_KIND_HPP \ No newline at end of file diff --git a/include/nmtools/array/meta.hpp b/include/nmtools/array/meta.hpp deleted file mode 100644 index fd6a9f607..000000000 --- a/include/nmtools/array/meta.hpp +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef NMTOOLS_ARRAY_META_HPP -#define NMTOOLS_ARRAY_META_HPP - -// TODO: remove this file -#include "nmtools/meta/array.hpp" - -#endif // NMTOOLS_ARRAY_META_HPP \ No newline at end of file diff --git a/include/nmtools/array/ndarray/base_ndarray.hpp b/include/nmtools/array/ndarray/base_ndarray.hpp index b3e6fef88..4c3a1c5dd 100644 --- a/include/nmtools/array/ndarray/base_ndarray.hpp +++ b/include/nmtools/array/ndarray/base_ndarray.hpp @@ -7,9 +7,9 @@ #include "nmtools/array/index/compute_indices.hpp" #include "nmtools/array/index/compute_offset.hpp" #include "nmtools/array/index/reverse.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/array/utility.hpp" -#include "nmtools/array/utility/cast.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/cast.hpp" #include "nmtools/utility/get.hpp" // experimental version that combine all three to single class diff --git a/include/nmtools/array/ndarray/dynamic.hpp b/include/nmtools/array/ndarray/dynamic.hpp index 89a85cc54..74beeaa4c 100644 --- a/include/nmtools/array/ndarray/dynamic.hpp +++ b/include/nmtools/array/ndarray/dynamic.hpp @@ -8,7 +8,7 @@ #include "nmtools/array/view/flatten.hpp" #include "nmtools/array/view/mutable_flatten.hpp" #include "nmtools/array/view/ref/initializer_list.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/assert.hpp" #include @@ -437,7 +437,7 @@ namespace nmtools::meta } // namespace nmtools::meta -#include "nmtools/array/fixed.hpp" +#include "nmtools/array/ndarray/fixed.hpp" namespace nmtools::meta { @@ -461,8 +461,8 @@ namespace nmtools::meta /** @} */ // end group meta } // namespace nmtools::meta -#include "nmtools/array/shape.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/utility/isequal.hpp" namespace nmtools::array { diff --git a/include/nmtools/array/ndarray/fixed.hpp b/include/nmtools/array/ndarray/fixed.hpp index 5ad814636..470968079 100644 --- a/include/nmtools/array/ndarray/fixed.hpp +++ b/include/nmtools/array/ndarray/fixed.hpp @@ -3,8 +3,8 @@ #include "nmtools/meta.hpp" #include "nmtools/array/index/compute_strides.hpp" -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/utility/forward.hpp" #include "nmtools/array/index/product.hpp" @@ -483,8 +483,8 @@ namespace nmtools::meta #include "nmtools/array/view/flatten.hpp" // view::flatten #include "nmtools/array/view/mutable_flatten.hpp" // view::mutable_flatten -#include "nmtools/utils/isequal.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/isequal.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::array { diff --git a/include/nmtools/array/ndarray/hybrid.hpp b/include/nmtools/array/ndarray/hybrid.hpp index b9e9189db..547b758af 100644 --- a/include/nmtools/array/ndarray/hybrid.hpp +++ b/include/nmtools/array/ndarray/hybrid.hpp @@ -9,7 +9,7 @@ #include "nmtools/array/view/ref.hpp" #include "nmtools/array/view/flatten.hpp" #include "nmtools/array/view/mutable_flatten.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/assert.hpp" #include "nmtools/platform.hpp" @@ -678,8 +678,8 @@ namespace nmtools::meta /** @} */ // end group meta } // namespace nmtools::meta -#include "nmtools/array/shape.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/utility/isequal.hpp" namespace nmtools::array { diff --git a/include/nmtools/array/ndarray/ndarray.hpp b/include/nmtools/array/ndarray/ndarray.hpp index ab09f0183..602b25a3b 100644 --- a/include/nmtools/array/ndarray/ndarray.hpp +++ b/include/nmtools/array/ndarray/ndarray.hpp @@ -7,11 +7,11 @@ #include "nmtools/array/index/compute_indices.hpp" #include "nmtools/array/index/compute_offset.hpp" #include "nmtools/array/index/reverse.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/array/utility.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/utility/at.hpp" // NOTE: to include nmtools_hybrid_ndarray macro #include "nmtools/array/ndarray/hybrid.hpp" -#include "nmtools/array/utility/cast.hpp" +#include "nmtools/utility/cast.hpp" #include "nmtools/utility/get.hpp" #include "nmtools/array/ndarray/base_ndarray.hpp" diff --git a/include/nmtools/array/utility.hpp b/include/nmtools/array/utility.hpp deleted file mode 100644 index 57a01b919..000000000 --- a/include/nmtools/array/utility.hpp +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef NMTOOLS_ARRAY_UTILITY_HPP -#define NMTOOLS_ARRAY_UTILITY_HPP - -// TODO: remove this file -#include "nmtools/array/utility/at.hpp" - -#endif // NMTOOLS_ARRAY_UTILITY_HPP \ No newline at end of file diff --git a/include/nmtools/array/utility/apply_at.hpp b/include/nmtools/array/utility/apply_at.hpp deleted file mode 100644 index 2b35654b9..000000000 --- a/include/nmtools/array/utility/apply_at.hpp +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file apply_at.hpp - * @author Fahri Ali Rahman (ali.rahman.fahri@gmail.com) - * @brief Contains definition of apply_at - * @version 0.1 - * @date 2020-11-17 - * - * @copyright Copyright (c) 2020 - * - */ - -#ifndef NMTOOLS_ARRAY_UTILITY_APPLY_AT_HPP -#define NMTOOLS_ARRAY_UTILITY_APPLY_AT_HPP - -// forward to array/at.hpp for now -// TODO: remove this file -#include "nmtools/array/at.hpp" - -#endif // NMTOOLS_ARRAY_UTILITY_APPLY_AT_HPP \ No newline at end of file diff --git a/include/nmtools/array/utility/at.hpp b/include/nmtools/array/utility/at.hpp deleted file mode 100644 index b509b1180..000000000 --- a/include/nmtools/array/utility/at.hpp +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef NMTOOLS_ARRAY_UTILITY_AT_HPP -#define NMTOOLS_ARRAY_UTILITY_AT_HPP - -// forward to array/at.hpp for now -// TODO: remove this file -#include "nmtools/array/at.hpp" - -#endif // NMTOOLS_ARRAY_UTILITY_AT_HPP \ No newline at end of file diff --git a/include/nmtools/array/utility/cast.hpp b/include/nmtools/array/utility/cast.hpp deleted file mode 100644 index 7fddc4d4b..000000000 --- a/include/nmtools/array/utility/cast.hpp +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef NMTOOLS_ARRAY_UTILITY_CAST_HPP -#define NMTOOLS_ARRAY_UTILITY_CAST_HPP - -#include "nmtools/meta.hpp" -#include "nmtools/array/utility/apply_resize.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/array/view/flatten.hpp" -#include "nmtools/array/view/mutable_flatten.hpp" - -#include "nmtools/utils/isequal.hpp" - -namespace nmtools -{ - /** - * @brief tag to resolve return type of cast op - * - */ - struct cast_t {}; - - struct cast_kind_t {}; - - namespace meta::error - { - template - struct CAST_KIND_UNSUPPORTED : detail::fail_t {}; - } -} // namespace nmtools - -#endif // NMTOOLS_ARRAY_UTILITY_CAST_HPP \ No newline at end of file diff --git a/include/nmtools/array/vector.hpp b/include/nmtools/array/vector.hpp deleted file mode 100644 index 369e2f50c..000000000 --- a/include/nmtools/array/vector.hpp +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef NMTOOLS_ARRAY_VECTOR_HPP -#define NMTOOLS_ARRAY_VECTOR_HPP - -#include "nmtools/array/vector/fixed.hpp" -#include "nmtools/array/vector/dynamic.hpp" - -#endif // NMTOOLS_ARRAY_VECTOR_HPP \ No newline at end of file diff --git a/include/nmtools/array/view/activations/celu.hpp b/include/nmtools/array/view/activations/celu.hpp index 98b47121c..8b1209cab 100644 --- a/include/nmtools/array/view/activations/celu.hpp +++ b/include/nmtools/array/view/activations/celu.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_CELU_HPP #include "nmtools/array/view/ufunc.hpp" -#include "nmtools/utils/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/math.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/activations/elu.hpp b/include/nmtools/array/view/activations/elu.hpp index fd64b7bd8..140c7991c 100644 --- a/include/nmtools/array/view/activations/elu.hpp +++ b/include/nmtools/array/view/activations/elu.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_ELU_HPP #include "nmtools/array/view/ufunc.hpp" -#include "nmtools/utils/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/math.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/activations/hardshrink.hpp b/include/nmtools/array/view/activations/hardshrink.hpp index ebc67340b..d41b9dcf0 100644 --- a/include/nmtools/array/view/activations/hardshrink.hpp +++ b/include/nmtools/array/view/activations/hardshrink.hpp @@ -1,8 +1,8 @@ #ifndef NMTOOLS_ARRAY_VIEW_ACTIVATION_HARDSHRINK_HPP #define NMTOOLS_ARRAY_VIEW_ACTIVATION_HARDSHRINK_HPP -#include "nmtools/utils/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/activations/hardswish.hpp b/include/nmtools/array/view/activations/hardswish.hpp index ec7dba112..a36a16ab5 100644 --- a/include/nmtools/array/view/activations/hardswish.hpp +++ b/include/nmtools/array/view/activations/hardswish.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_HARDSWISH_HPP #include "nmtools/array/view/ufunc.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::view::fun { diff --git a/include/nmtools/array/view/activations/hardtanh.hpp b/include/nmtools/array/view/activations/hardtanh.hpp index 056353583..54f6d5c9c 100644 --- a/include/nmtools/array/view/activations/hardtanh.hpp +++ b/include/nmtools/array/view/activations/hardtanh.hpp @@ -1,8 +1,8 @@ #ifndef NMTOOLS_ARRAY_VIEW_ACTIVATIONS_HARDTANH_HPP #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_HARDTANH_HPP -#include "nmtools/utils/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/activations/leaky_relu.hpp b/include/nmtools/array/view/activations/leaky_relu.hpp index 3c0d88ad6..d5818acc8 100644 --- a/include/nmtools/array/view/activations/leaky_relu.hpp +++ b/include/nmtools/array/view/activations/leaky_relu.hpp @@ -1,8 +1,8 @@ #ifndef NMTOOLS_ARRAY_VIEW_ACTIVATIONS_LEAKY_RELU_HPP #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_LEAKY_RELU_HPP -#include "nmtools/utils/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/activations/log_sigmoid.hpp b/include/nmtools/array/view/activations/log_sigmoid.hpp index 93185abe8..16c10c480 100644 --- a/include/nmtools/array/view/activations/log_sigmoid.hpp +++ b/include/nmtools/array/view/activations/log_sigmoid.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_LOG_SIGMOID_HPP #include "nmtools/array/view/ufunc.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/math.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/activations/mish.hpp b/include/nmtools/array/view/activations/mish.hpp index c1de9f4fa..7c4357f75 100644 --- a/include/nmtools/array/view/activations/mish.hpp +++ b/include/nmtools/array/view/activations/mish.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_MISH_HPP #include "nmtools/array/view/ufunc.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/activations/softplus.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/activations/prelu.hpp b/include/nmtools/array/view/activations/prelu.hpp index d16e4a0d1..9d98b95cb 100644 --- a/include/nmtools/array/view/activations/prelu.hpp +++ b/include/nmtools/array/view/activations/prelu.hpp @@ -1,8 +1,8 @@ #ifndef NMTOOLS_ARRAY_VIEW_ACTIVATIONS_PRELU_HPP #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_PRELU_HPP -#include "nmtools/utils/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/activations/relu.hpp b/include/nmtools/array/view/activations/relu.hpp index cd4dcb9d5..6da7ff502 100644 --- a/include/nmtools/array/view/activations/relu.hpp +++ b/include/nmtools/array/view/activations/relu.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_ACTIVATIONS_RELU_HPP #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_RELU_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/activations/relu6.hpp b/include/nmtools/array/view/activations/relu6.hpp index abd8cd51f..b2b6aaea2 100644 --- a/include/nmtools/array/view/activations/relu6.hpp +++ b/include/nmtools/array/view/activations/relu6.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_ACTIVATIONS_RELU6_HPP #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_RELU6_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/activations/selu.hpp b/include/nmtools/array/view/activations/selu.hpp index de551cb11..9f77af7b3 100644 --- a/include/nmtools/array/view/activations/selu.hpp +++ b/include/nmtools/array/view/activations/selu.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_ACTIVATIONS_SELU_HPP #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_SELU_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/activations/sigmoid.hpp b/include/nmtools/array/view/activations/sigmoid.hpp index 28a46c944..1278c6553 100644 --- a/include/nmtools/array/view/activations/sigmoid.hpp +++ b/include/nmtools/array/view/activations/sigmoid.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_ACTIVATIONS_SIGMOID_HPP #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_SIGMOID_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/activations/silu.hpp b/include/nmtools/array/view/activations/silu.hpp index 21087df90..4acee646e 100644 --- a/include/nmtools/array/view/activations/silu.hpp +++ b/include/nmtools/array/view/activations/silu.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_ACTIVATIONS_SILU_HPP #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_SILU_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/array/view/activations/sigmoid.hpp" diff --git a/include/nmtools/array/view/activations/softplus.hpp b/include/nmtools/array/view/activations/softplus.hpp index 5a00e82cf..8c01fcc81 100644 --- a/include/nmtools/array/view/activations/softplus.hpp +++ b/include/nmtools/array/view/activations/softplus.hpp @@ -1,8 +1,8 @@ #ifndef NMTOOLS_ARRAY_VIEW_ACTIVATIONS_SOFTPLUS_HPP #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_SOFTPLUS_HPP -#include "nmtools/utils/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/activations/softshrink.hpp b/include/nmtools/array/view/activations/softshrink.hpp index 49b244a17..d8a8ca042 100644 --- a/include/nmtools/array/view/activations/softshrink.hpp +++ b/include/nmtools/array/view/activations/softshrink.hpp @@ -3,8 +3,8 @@ #include "nmtools/array/view/ufunc.hpp" // TODO: maybe do not include all parts of isclose here, refactor to isclose_t maybe -#include "nmtools/utils/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::view::fun { diff --git a/include/nmtools/array/view/activations/softsign.hpp b/include/nmtools/array/view/activations/softsign.hpp index fb68b0ba4..3f1b6baa7 100644 --- a/include/nmtools/array/view/activations/softsign.hpp +++ b/include/nmtools/array/view/activations/softsign.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_ACTIVATION_SOFTSIGN_HPP #define NMTOOLS_ARRAY_VIEW_ACTIVATION_SOFTSIGN_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/activations/tanhshrink.hpp b/include/nmtools/array/view/activations/tanhshrink.hpp index 2902d2e6d..950fdbe72 100644 --- a/include/nmtools/array/view/activations/tanhshrink.hpp +++ b/include/nmtools/array/view/activations/tanhshrink.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_ACTIVATIONS_TANHSHRINK_HPP #include "nmtools/array/view/ufunc.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/math.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/alias.hpp b/include/nmtools/array/view/alias.hpp index 93d95e369..e5e0fc448 100644 --- a/include/nmtools/array/view/alias.hpp +++ b/include/nmtools/array/view/alias.hpp @@ -2,11 +2,11 @@ #define NMTOOLS_ARRAY_VIEW_ALIAS_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/utility/fwd.hpp" #include "nmtools/utility/unwrap.hpp" #include "nmtools/array/index/max.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/view/decorator.hpp" namespace nmtools::view diff --git a/include/nmtools/array/view/arange.hpp b/include/nmtools/array/view/arange.hpp index c22f93e96..7a178f6b2 100644 --- a/include/nmtools/array/view/arange.hpp +++ b/include/nmtools/array/view/arange.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_VIEW_ARANGE_HPP #include "nmtools/array/view/decorator.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/array/dtypes.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/dtypes.hpp" #include "nmtools/array/index/arange.hpp" #include "nmtools/meta.hpp" #include "nmtools/constants.hpp" diff --git a/include/nmtools/array/view/argsort.hpp b/include/nmtools/array/view/argsort.hpp index fbf8129c7..4a46c2d9a 100644 --- a/include/nmtools/array/view/argsort.hpp +++ b/include/nmtools/array/view/argsort.hpp @@ -10,7 +10,7 @@ #include "nmtools/array/view/slice.hpp" #include "nmtools/array/view/mutable_slice.hpp" #include "nmtools/array/view/flatten.hpp" -#include "nmtools/array/utility/apply_resize.hpp" +#include "nmtools/utility/apply_resize.hpp" // for iota #include diff --git a/include/nmtools/array/view/array_slice.hpp b/include/nmtools/array/view/array_slice.hpp index d93615608..30d860781 100644 --- a/include/nmtools/array/view/array_slice.hpp +++ b/include/nmtools/array/view/array_slice.hpp @@ -7,7 +7,7 @@ #include "nmtools/array/index/ndindex.hpp" #include "nmtools/array/view/discrete.hpp" #include "nmtools/array/view/ref.hpp" -#include "nmtools/array/utility/apply_resize.hpp" +#include "nmtools/utility/apply_resize.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/atleast_nd.hpp b/include/nmtools/array/view/atleast_nd.hpp index 86be7d4e4..a3771fe69 100644 --- a/include/nmtools/array/view/atleast_nd.hpp +++ b/include/nmtools/array/view/atleast_nd.hpp @@ -5,8 +5,8 @@ #include "nmtools/utility/fwd.hpp" #include "nmtools/array/index/atleast_nd.hpp" #include "nmtools/array/view/indexing.hpp" -#include "nmtools/array/as_static.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/as_static.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/reshape.hpp" namespace nmtools::view diff --git a/include/nmtools/array/view/broadcast_arrays.hpp b/include/nmtools/array/view/broadcast_arrays.hpp index 838bd85c3..19500415b 100644 --- a/include/nmtools/array/view/broadcast_arrays.hpp +++ b/include/nmtools/array/view/broadcast_arrays.hpp @@ -3,7 +3,7 @@ #include "nmtools/array/view/broadcast_to.hpp" #include "nmtools/array/index/broadcast_shape.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/meta.hpp" #include "nmtools/assert.hpp" #include "nmtools/array/view/alias.hpp" diff --git a/include/nmtools/array/view/column_stack.hpp b/include/nmtools/array/view/column_stack.hpp index 94d349bb4..ec6cc3d18 100644 --- a/include/nmtools/array/view/column_stack.hpp +++ b/include/nmtools/array/view/column_stack.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_COLUMN_STACK_HPP #define NMTOOLS_ARRAY_VIEW_COLUMN_STACK_HPP -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/meta.hpp" namespace nmtools::index diff --git a/include/nmtools/array/view/concatenate.hpp b/include/nmtools/array/view/concatenate.hpp index 4435ee5e1..57f60a431 100644 --- a/include/nmtools/array/view/concatenate.hpp +++ b/include/nmtools/array/view/concatenate.hpp @@ -4,7 +4,7 @@ #include "nmtools/array/view/decorator.hpp" #include "nmtools/array/index/concatenate.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/convnd.hpp b/include/nmtools/array/view/convnd.hpp index dc41e7aa8..3fdba3c7d 100644 --- a/include/nmtools/array/view/convnd.hpp +++ b/include/nmtools/array/view/convnd.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_CONVND_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/view/decorator.hpp b/include/nmtools/array/view/decorator.hpp index c318c1378..0decc7be6 100644 --- a/include/nmtools/array/view/decorator.hpp +++ b/include/nmtools/array/view/decorator.hpp @@ -3,11 +3,11 @@ #include "nmtools/meta.hpp" #include "nmtools/utility.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/max.hpp" #include "nmtools/array/index/sum.hpp" -#include "nmtools/array/data.hpp" -#include "nmtools/array/utility/apply_at.hpp" +#include "nmtools/utility/data.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/index/ref.hpp" #include "nmtools/array/index/product.hpp" #include "nmtools/array/index/alias.hpp" diff --git a/include/nmtools/array/view/diagflat.hpp b/include/nmtools/array/view/diagflat.hpp index 17467b416..6491c1fd0 100644 --- a/include/nmtools/array/view/diagflat.hpp +++ b/include/nmtools/array/view/diagflat.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_DIAGFLAT_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { @@ -79,15 +79,15 @@ namespace nmtools::meta /*===========================================================================*/ #include "nmtools/array/view/decorator.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/view/indexing.hpp" #include "nmtools/array/view/flatten.hpp" #include "nmtools/array/index/product.hpp" #include "nmtools/utility/unwrap.hpp" #include "nmtools/utility/has_value.hpp" -#include "nmtools/utils/isequal/isequal.hpp" -#include "nmtools/utils/isclose/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isequal/isequal.hpp" +#include "nmtools/utility/isclose/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/diagonal.hpp b/include/nmtools/array/view/diagonal.hpp index a722fec0d..63b34b867 100644 --- a/include/nmtools/array/view/diagonal.hpp +++ b/include/nmtools/array/view/diagonal.hpp @@ -3,7 +3,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/index/normalize_axis.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/utility/unwrap.hpp" namespace nmtools::index @@ -180,13 +180,13 @@ namespace nmtools::meta } // nmtools::meta #include "nmtools/array/view/decorator.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/view/indexing.hpp" #include "nmtools/array/index/product.hpp" #include "nmtools/utility/unwrap.hpp" -#include "nmtools/utils/isequal/isequal.hpp" -#include "nmtools/utils/isclose/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isequal/isequal.hpp" +#include "nmtools/utility/isclose/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/discrete.hpp b/include/nmtools/array/view/discrete.hpp index 7e02dec54..68fd93e76 100644 --- a/include/nmtools/array/view/discrete.hpp +++ b/include/nmtools/array/view/discrete.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_DISCRETE_HPP #define NMTOOLS_ARRAY_VIEW_DISCRETE_HPP -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/meta.hpp" #include "nmtools/assert.hpp" diff --git a/include/nmtools/array/view/dot.hpp b/include/nmtools/array/view/dot.hpp index c6ae45425..a405e18ec 100644 --- a/include/nmtools/array/view/dot.hpp +++ b/include/nmtools/array/view/dot.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_DOT_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/view/dstack.hpp b/include/nmtools/array/view/dstack.hpp index ab188a09d..ea58d22ee 100644 --- a/include/nmtools/array/view/dstack.hpp +++ b/include/nmtools/array/view/dstack.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_DSTACK_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/view/expand.hpp b/include/nmtools/array/view/expand.hpp index fefd23afc..8815b5c83 100644 --- a/include/nmtools/array/view/expand.hpp +++ b/include/nmtools/array/view/expand.hpp @@ -6,7 +6,7 @@ /*=====================================================================*/ -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/normalize_axis.hpp" namespace nmtools::index @@ -250,10 +250,10 @@ namespace nmtools::meta /*=====================================================================*/ -#include "nmtools/array/as_static.hpp" -#include "nmtools/utils/isequal/isequal.hpp" -#include "nmtools/utils/isclose/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/as_static.hpp" +#include "nmtools/utility/isequal/isequal.hpp" +#include "nmtools/utility/isclose/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::args { diff --git a/include/nmtools/array/view/expand_dims.hpp b/include/nmtools/array/view/expand_dims.hpp index 1e9021125..9069cc376 100644 --- a/include/nmtools/array/view/expand_dims.hpp +++ b/include/nmtools/array/view/expand_dims.hpp @@ -3,7 +3,7 @@ #include "nmtools/array/index/expand_dims.hpp" #include "nmtools/array/view/reshape.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/eye.hpp b/include/nmtools/array/view/eye.hpp index 19b06a7c0..7b1195f53 100644 --- a/include/nmtools/array/view/eye.hpp +++ b/include/nmtools/array/view/eye.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_EYE_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { @@ -80,13 +80,13 @@ namespace nmtools::meta /*===========================================================================*/ #include "nmtools/array/view/decorator.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/view/indexing.hpp" #include "nmtools/array/view/zeros.hpp" #include "nmtools/array/index/product.hpp" -#include "nmtools/utils/isequal/isequal.hpp" -#include "nmtools/utils/isclose/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isequal/isequal.hpp" +#include "nmtools/utility/isclose/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/flatten.hpp b/include/nmtools/array/view/flatten.hpp index 1895206f8..53b9f3227 100644 --- a/include/nmtools/array/view/flatten.hpp +++ b/include/nmtools/array/view/flatten.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_FLATTEN_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/view/reshape.hpp" namespace nmtools::view diff --git a/include/nmtools/array/view/flip.hpp b/include/nmtools/array/view/flip.hpp index 18f70855d..89df980d8 100644 --- a/include/nmtools/array/view/flip.hpp +++ b/include/nmtools/array/view/flip.hpp @@ -4,7 +4,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/index/flip.hpp" #include "nmtools/array/view/slice.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/full.hpp b/include/nmtools/array/view/full.hpp index 74535bf73..5631ea01a 100644 --- a/include/nmtools/array/view/full.hpp +++ b/include/nmtools/array/view/full.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_FULL_HPP #include "nmtools/array/view/decorator.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/meta.hpp" #include "nmtools/constants.hpp" diff --git a/include/nmtools/array/view/hstack.hpp b/include/nmtools/array/view/hstack.hpp index f0a0cf47f..7c9fc84d5 100644 --- a/include/nmtools/array/view/hstack.hpp +++ b/include/nmtools/array/view/hstack.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_HSTACK_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/view/indexing.hpp b/include/nmtools/array/view/indexing.hpp index a2fff3e05..aa6d2997c 100644 --- a/include/nmtools/array/view/indexing.hpp +++ b/include/nmtools/array/view/indexing.hpp @@ -6,8 +6,8 @@ #include "nmtools/array/view/decorator.hpp" #include "nmtools/utility/unwrap.hpp" #include "nmtools/utility/fwd.hpp" -#include "nmtools/utils/to_string/to_string.hpp" -#include "nmtools/array/as_static.hpp" +#include "nmtools/utility/to_string/to_string.hpp" +#include "nmtools/utility/as_static.hpp" namespace nmtools::args { diff --git a/include/nmtools/array/view/inner.hpp b/include/nmtools/array/view/inner.hpp index 1bbacb9cf..73de5b630 100644 --- a/include/nmtools/array/view/inner.hpp +++ b/include/nmtools/array/view/inner.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_INNER_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/view/kron.hpp b/include/nmtools/array/view/kron.hpp index ac6b233ff..0b628f990 100644 --- a/include/nmtools/array/view/kron.hpp +++ b/include/nmtools/array/view/kron.hpp @@ -2,7 +2,7 @@ #define NTMOOLS_ARRAY_VIEW_KRON_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/view/matmul.hpp b/include/nmtools/array/view/matmul.hpp index f20f4e1e7..221af2f9d 100644 --- a/include/nmtools/array/view/matmul.hpp +++ b/include/nmtools/array/view/matmul.hpp @@ -9,7 +9,7 @@ #include "nmtools/array/view/ufunc.hpp" #include "nmtools/array/view/ufuncs/add.hpp" #include "nmtools/array/view/ufuncs/multiply.hpp" -#include "nmtools/array/at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/meta.hpp" #include "nmtools/utility/fwd.hpp" diff --git a/include/nmtools/array/view/mean.hpp b/include/nmtools/array/view/mean.hpp index 01eb50cf1..3ec22f265 100644 --- a/include/nmtools/array/view/mean.hpp +++ b/include/nmtools/array/view/mean.hpp @@ -7,7 +7,7 @@ #include "nmtools/array/index/product.hpp" #include "nmtools/array/index/ref.hpp" #include "nmtools/array/index/normalize_axis.hpp" -#include "nmtools/array/dtypes.hpp" +#include "nmtools/dtypes.hpp" #include "nmtools/meta.hpp" namespace nmtools::meta diff --git a/include/nmtools/array/view/moveaxis.hpp b/include/nmtools/array/view/moveaxis.hpp index 2225a9539..d02f2fb62 100644 --- a/include/nmtools/array/view/moveaxis.hpp +++ b/include/nmtools/array/view/moveaxis.hpp @@ -5,7 +5,7 @@ #include "nmtools/array/index/normalize_axis.hpp" #include "nmtools/array/index/moveaxis.hpp" #include "nmtools/array/view/transpose.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/meta.hpp" namespace nmtools::view::detail diff --git a/include/nmtools/array/view/mutable_indexing.hpp b/include/nmtools/array/view/mutable_indexing.hpp index a2dc28880..c5780b8c5 100644 --- a/include/nmtools/array/view/mutable_indexing.hpp +++ b/include/nmtools/array/view/mutable_indexing.hpp @@ -3,7 +3,7 @@ #include "nmtools/array/view/indexing.hpp" #include "nmtools/array/index/ndenumerate.hpp" -#include "nmtools/utils/isequal/isequal.hpp" +#include "nmtools/utility/isequal/isequal.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/mutable_ref.hpp b/include/nmtools/array/view/mutable_ref.hpp index 41acc2224..eba3fd4eb 100644 --- a/include/nmtools/array/view/mutable_ref.hpp +++ b/include/nmtools/array/view/mutable_ref.hpp @@ -3,8 +3,8 @@ #include "nmtools/traits.hpp" #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/view/decorator.hpp" #include "nmtools/array/view/ref.hpp" diff --git a/include/nmtools/array/view/pad.hpp b/include/nmtools/array/view/pad.hpp index 921f1484c..21bf5f3bc 100644 --- a/include/nmtools/array/view/pad.hpp +++ b/include/nmtools/array/view/pad.hpp @@ -2,13 +2,13 @@ #define NMTOOLS_ARRAY_VIEW_PAD_HPP #include "nmtools/array/view/decorator.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/pad.hpp" #include "nmtools/array/index/product.hpp" #include "nmtools/array/view/indexing.hpp" -#include "nmtools/utils/isequal/isequal.hpp" -#include "nmtools/utils/isclose/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isequal/isequal.hpp" +#include "nmtools/utility/isclose/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/pooling.hpp b/include/nmtools/array/view/pooling.hpp index 116ef7613..75a540635 100644 --- a/include/nmtools/array/view/pooling.hpp +++ b/include/nmtools/array/view/pooling.hpp @@ -8,7 +8,7 @@ #include "nmtools/array/view/ufunc.hpp" #include "nmtools/array/view/mean.hpp" #include "nmtools/array/view/ufuncs/maximum.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/meta.hpp" namespace nmtools::view diff --git a/include/nmtools/array/view/random.hpp b/include/nmtools/array/view/random.hpp index 86145dc1f..d70e1fa8c 100644 --- a/include/nmtools/array/view/random.hpp +++ b/include/nmtools/array/view/random.hpp @@ -4,8 +4,8 @@ #include "nmtools/meta.hpp" #include "nmtools/array/view/decorator.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/array/dtypes.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/dtypes.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/ref.hpp b/include/nmtools/array/view/ref.hpp index 96ed1357f..406f9c98b 100644 --- a/include/nmtools/array/view/ref.hpp +++ b/include/nmtools/array/view/ref.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_VIEW_REF_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/view/decorator.hpp" namespace nmtools::view diff --git a/include/nmtools/array/view/ref/initializer_list.hpp b/include/nmtools/array/view/ref/initializer_list.hpp index f101fa236..693eb7e8f 100644 --- a/include/nmtools/array/view/ref/initializer_list.hpp +++ b/include/nmtools/array/view/ref/initializer_list.hpp @@ -14,7 +14,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/view/ref.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include #include diff --git a/include/nmtools/array/view/repeat.hpp b/include/nmtools/array/view/repeat.hpp index 5365bf784..64a64f5bb 100644 --- a/include/nmtools/array/view/repeat.hpp +++ b/include/nmtools/array/view/repeat.hpp @@ -3,7 +3,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/view/indexing.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/product.hpp" #include "nmtools/array/index/repeat.hpp" diff --git a/include/nmtools/array/view/reshape.hpp b/include/nmtools/array/view/reshape.hpp index c91917d75..8de83b055 100644 --- a/include/nmtools/array/view/reshape.hpp +++ b/include/nmtools/array/view/reshape.hpp @@ -3,18 +3,18 @@ #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/view/indexing.hpp" -#include "nmtools/array/as_static.hpp" +#include "nmtools/utility/as_static.hpp" #include "nmtools/array/index/reshape.hpp" #include "nmtools/array/index/compute_indices.hpp" #include "nmtools/array/index/compute_offset.hpp" #include "nmtools/array/index/compute_strides.hpp" -#include "nmtools/utils/isequal/isequal.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isequal/isequal.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/utility/unwrap.hpp" namespace nmtools::view diff --git a/include/nmtools/array/view/resize.hpp b/include/nmtools/array/view/resize.hpp index d49cfe1e2..5434707dd 100644 --- a/include/nmtools/array/view/resize.hpp +++ b/include/nmtools/array/view/resize.hpp @@ -3,9 +3,9 @@ #include "nmtools/array/view/indexing.hpp" #include "nmtools/array/index/resize.hpp" -#include "nmtools/array/as_static.hpp" +#include "nmtools/utility/as_static.hpp" #include "nmtools/utility/unwrap.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/roll.hpp b/include/nmtools/array/view/roll.hpp index 85d4676ac..d3d9dd622 100644 --- a/include/nmtools/array/view/roll.hpp +++ b/include/nmtools/array/view/roll.hpp @@ -6,7 +6,7 @@ #include "nmtools/array/view/indexing.hpp" #include "nmtools/array/view/flatten.hpp" #include "nmtools/array/view/reshape.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/slice.hpp b/include/nmtools/array/view/slice.hpp index d8917f5ca..ae7585f05 100644 --- a/include/nmtools/array/view/slice.hpp +++ b/include/nmtools/array/view/slice.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_VIEW_SLICE_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/view/indexing.hpp" #include "nmtools/array/index/slice.hpp" diff --git a/include/nmtools/array/view/sliding_window.hpp b/include/nmtools/array/view/sliding_window.hpp index cd569f7a6..53aa32667 100644 --- a/include/nmtools/array/view/sliding_window.hpp +++ b/include/nmtools/array/view/sliding_window.hpp @@ -8,7 +8,7 @@ #include "nmtools/array/view/decorator.hpp" #include "nmtools/utility/unwrap.hpp" #include "nmtools/utility/fwd.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/split.hpp b/include/nmtools/array/view/split.hpp index 48c25806e..0baa800ed 100644 --- a/include/nmtools/array/view/split.hpp +++ b/include/nmtools/array/view/split.hpp @@ -2,8 +2,8 @@ #define NMTOOLS_ARRAY_VIEW_SPLIT_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/at.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/constants.hpp" #include "nmtools/array/view/slice.hpp" diff --git a/include/nmtools/array/view/squeeze.hpp b/include/nmtools/array/view/squeeze.hpp index 6426e48a6..d55c474f0 100644 --- a/include/nmtools/array/view/squeeze.hpp +++ b/include/nmtools/array/view/squeeze.hpp @@ -3,7 +3,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/view/reshape.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/squeeze.hpp" namespace nmtools::view diff --git a/include/nmtools/array/view/swapaxes.hpp b/include/nmtools/array/view/swapaxes.hpp index 91a255db9..7a7e481e7 100644 --- a/include/nmtools/array/view/swapaxes.hpp +++ b/include/nmtools/array/view/swapaxes.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_SWAPAXES_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/normalize_axis.hpp" #include "nmtools/utility/unwrap.hpp" diff --git a/include/nmtools/array/view/take.hpp b/include/nmtools/array/view/take.hpp index 38c5dce6e..78c765ffd 100644 --- a/include/nmtools/array/view/take.hpp +++ b/include/nmtools/array/view/take.hpp @@ -4,7 +4,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/view/decorator.hpp" #include "nmtools/array/index/take.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/take_along_axis.hpp b/include/nmtools/array/view/take_along_axis.hpp index a50adc325..b7d8dd35f 100644 --- a/include/nmtools/array/view/take_along_axis.hpp +++ b/include/nmtools/array/view/take_along_axis.hpp @@ -12,7 +12,7 @@ #include "nmtools/array/view/discrete.hpp" #include "nmtools/array/view/decorator.hpp" #include "nmtools/array/view/broadcast_arrays.hpp" -#include "nmtools/array/utility/apply_resize.hpp" +#include "nmtools/utility/apply_resize.hpp" // for index::split #include "nmtools/array/index/matmul.hpp" diff --git a/include/nmtools/array/view/tensordot.hpp b/include/nmtools/array/view/tensordot.hpp index 8d82683eb..0ee0e8dc1 100644 --- a/include/nmtools/array/view/tensordot.hpp +++ b/include/nmtools/array/view/tensordot.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_TENSORDOT_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/range.hpp" #include "nmtools/array/index/normalize_axis.hpp" #include "nmtools/utility/unwrap.hpp" diff --git a/include/nmtools/array/view/tile.hpp b/include/nmtools/array/view/tile.hpp index 568951d09..1b26712e8 100644 --- a/include/nmtools/array/view/tile.hpp +++ b/include/nmtools/array/view/tile.hpp @@ -3,8 +3,8 @@ #include "nmtools/array/view/indexing.hpp" #include "nmtools/array/index/tile.hpp" -#include "nmtools/array/as_static.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/as_static.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/transpose.hpp b/include/nmtools/array/view/transpose.hpp index ec8fe9678..6115a688f 100644 --- a/include/nmtools/array/view/transpose.hpp +++ b/include/nmtools/array/view/transpose.hpp @@ -7,10 +7,10 @@ #include "nmtools/array/index/scatter.hpp" #include "nmtools/array/index/reverse.hpp" -#include "nmtools/utils/isequal/isequal.hpp" +#include "nmtools/utility/isequal/isequal.hpp" #include "nmtools/array/view/indexing.hpp" -#include "nmtools/array/as_static.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/as_static.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/tri.hpp b/include/nmtools/array/view/tri.hpp index 58e987d75..5a7d277d2 100644 --- a/include/nmtools/array/view/tri.hpp +++ b/include/nmtools/array/view/tri.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_TRI_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { @@ -80,13 +80,13 @@ namespace nmtools::meta /*===========================================================================*/ #include "nmtools/array/view/decorator.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/view/indexing.hpp" #include "nmtools/array/view/zeros.hpp" #include "nmtools/array/index/product.hpp" -#include "nmtools/utils/isequal/isequal.hpp" -#include "nmtools/utils/isclose/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isequal/isequal.hpp" +#include "nmtools/utility/isclose/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/tril.hpp b/include/nmtools/array/view/tril.hpp index 670b68f90..6ea07576f 100644 --- a/include/nmtools/array/view/tril.hpp +++ b/include/nmtools/array/view/tril.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_TRIL_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { @@ -161,12 +161,12 @@ namespace nmtools::meta /*=======================================================================*/ #include "nmtools/array/view/decorator.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/view/indexing.hpp" #include "nmtools/array/index/product.hpp" -#include "nmtools/utils/isequal/isequal.hpp" -#include "nmtools/utils/isclose/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isequal/isequal.hpp" +#include "nmtools/utility/isclose/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/triu.hpp b/include/nmtools/array/view/triu.hpp index c54407d49..5f3f08ce1 100644 --- a/include/nmtools/array/view/triu.hpp +++ b/include/nmtools/array/view/triu.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_VIEW_TRIU_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { @@ -161,12 +161,12 @@ namespace nmtools::meta /*=======================================================================*/ #include "nmtools/array/view/decorator.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/view/indexing.hpp" #include "nmtools/array/index/product.hpp" -#include "nmtools/utils/isequal/isequal.hpp" -#include "nmtools/utils/isclose/isclose.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isequal/isequal.hpp" +#include "nmtools/utility/isclose/isclose.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::view { diff --git a/include/nmtools/array/view/ufunc/accumulate.hpp b/include/nmtools/array/view/ufunc/accumulate.hpp index c1efa07c4..7b6a3be7c 100644 --- a/include/nmtools/array/view/ufunc/accumulate.hpp +++ b/include/nmtools/array/view/ufunc/accumulate.hpp @@ -3,7 +3,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/view/ref.hpp" -#include "nmtools/array/utility/apply_at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/view/decorator.hpp" #include "nmtools/array/view/slice.hpp" #include "nmtools/array/view/flatten.hpp" @@ -12,17 +12,17 @@ #include "nmtools/array/index/remove_dims.hpp" #include "nmtools/array/index/where.hpp" #include "nmtools/array/index/sum.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/array/dtypes.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/dtypes.hpp" #include "nmtools/array/ndarray.hpp" #include "nmtools/array/eval.hpp" #include "nmtools/constants.hpp" -#include "nmtools/array/as_static.hpp" +#include "nmtools/utility/as_static.hpp" #include "nmtools/array/view/ufunc/reduce.hpp" #include "nmtools/array/view/ufunc/detail.hpp" -#include "nmtools/utils/to_string/to_string.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/to_string/to_string.hpp" +#include "nmtools/utility/isequal.hpp" namespace nmtools::args { diff --git a/include/nmtools/array/view/ufunc/detail.hpp b/include/nmtools/array/view/ufunc/detail.hpp index da642245b..580e8669b 100644 --- a/include/nmtools/array/view/ufunc/detail.hpp +++ b/include/nmtools/array/view/ufunc/detail.hpp @@ -3,7 +3,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/view/ref.hpp" -#include "nmtools/array/utility/apply_at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/view/decorator.hpp" #include "nmtools/array/view/slice.hpp" #include "nmtools/array/view/flatten.hpp" @@ -12,8 +12,8 @@ #include "nmtools/array/index/remove_dims.hpp" #include "nmtools/array/index/where.hpp" #include "nmtools/array/index/sum.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/array/dtypes.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/dtypes.hpp" #include "nmtools/array/ndarray.hpp" #include "nmtools/array/eval.hpp" #include "nmtools/constants.hpp" diff --git a/include/nmtools/array/view/ufunc/outer.hpp b/include/nmtools/array/view/ufunc/outer.hpp index 809926bba..5ba1787b9 100644 --- a/include/nmtools/array/view/ufunc/outer.hpp +++ b/include/nmtools/array/view/ufunc/outer.hpp @@ -3,7 +3,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/view/ref.hpp" -#include "nmtools/array/utility/apply_at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/view/decorator.hpp" #include "nmtools/array/view/slice.hpp" #include "nmtools/array/view/flatten.hpp" @@ -12,15 +12,15 @@ #include "nmtools/array/index/remove_dims.hpp" #include "nmtools/array/index/where.hpp" #include "nmtools/array/index/sum.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/array/dtypes.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/dtypes.hpp" #include "nmtools/array/ndarray.hpp" #include "nmtools/array/eval.hpp" #include "nmtools/constants.hpp" -#include "nmtools/array/as_static.hpp" +#include "nmtools/utility/as_static.hpp" #include "nmtools/array/view/ufunc/detail.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" namespace nmtools::args { diff --git a/include/nmtools/array/view/ufunc/reduce.hpp b/include/nmtools/array/view/ufunc/reduce.hpp index 357a8a864..52bccc4d8 100644 --- a/include/nmtools/array/view/ufunc/reduce.hpp +++ b/include/nmtools/array/view/ufunc/reduce.hpp @@ -3,7 +3,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/view/ref.hpp" -#include "nmtools/array/utility/apply_at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/view/decorator.hpp" #include "nmtools/array/view/slice.hpp" #include "nmtools/array/view/flatten.hpp" @@ -13,16 +13,16 @@ #include "nmtools/array/index/where.hpp" #include "nmtools/array/index/sum.hpp" #include "nmtools/array/index/product.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/array/dtypes.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/dtypes.hpp" #include "nmtools/array/ndarray.hpp" #include "nmtools/array/eval.hpp" #include "nmtools/constants.hpp" -#include "nmtools/array/as_static.hpp" +#include "nmtools/utility/as_static.hpp" #include "nmtools/array/view/ufunc/detail.hpp" -#include "nmtools/utils/isequal.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/isequal.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/index/reduce.hpp" namespace nmtools::args diff --git a/include/nmtools/array/view/ufunc/ufunc.hpp b/include/nmtools/array/view/ufunc/ufunc.hpp index 00560a05a..13bbd6aa6 100644 --- a/include/nmtools/array/view/ufunc/ufunc.hpp +++ b/include/nmtools/array/view/ufunc/ufunc.hpp @@ -3,7 +3,7 @@ #include "nmtools/meta.hpp" #include "nmtools/array/view/ref.hpp" -#include "nmtools/array/utility/apply_at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/view/decorator.hpp" #include "nmtools/array/view/slice.hpp" #include "nmtools/array/view/flatten.hpp" @@ -13,14 +13,14 @@ #include "nmtools/array/index/where.hpp" #include "nmtools/array/index/sum.hpp" #include "nmtools/array/index/ufunc.hpp" -#include "nmtools/array/shape.hpp" -#include "nmtools/array/dtypes.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/dtypes.hpp" #include "nmtools/array/ndarray.hpp" #include "nmtools/array/eval.hpp" #include "nmtools/constants.hpp" -#include "nmtools/array/as_static.hpp" +#include "nmtools/utility/as_static.hpp" -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc/detail.hpp" namespace nmtools::args diff --git a/include/nmtools/array/view/ufuncs/add.hpp b/include/nmtools/array/view/ufuncs/add.hpp index e2ee8da01..973a90c55 100644 --- a/include/nmtools/array/view/ufuncs/add.hpp +++ b/include/nmtools/array/view/ufuncs/add.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_ADD_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_ADD_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/arccos.hpp b/include/nmtools/array/view/ufuncs/arccos.hpp index e82ac6a7b..c184c070e 100644 --- a/include/nmtools/array/view/ufuncs/arccos.hpp +++ b/include/nmtools/array/view/ufuncs/arccos.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_ARCCOS_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_ARCCOS_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/arccosh.hpp b/include/nmtools/array/view/ufuncs/arccosh.hpp index da3adbc8a..875382b16 100644 --- a/include/nmtools/array/view/ufuncs/arccosh.hpp +++ b/include/nmtools/array/view/ufuncs/arccosh.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_ARCCOSH_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_ARCCOSH_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/arcsin.hpp b/include/nmtools/array/view/ufuncs/arcsin.hpp index 2cc837e26..6c39064bd 100644 --- a/include/nmtools/array/view/ufuncs/arcsin.hpp +++ b/include/nmtools/array/view/ufuncs/arcsin.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_ARCSIN_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_ARCSIN_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/arcsinh.hpp b/include/nmtools/array/view/ufuncs/arcsinh.hpp index 90e49815e..03ff49687 100644 --- a/include/nmtools/array/view/ufuncs/arcsinh.hpp +++ b/include/nmtools/array/view/ufuncs/arcsinh.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_ARCSINH_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_ARCSINH_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/arctan.hpp b/include/nmtools/array/view/ufuncs/arctan.hpp index b0fe8ea1b..9ad32be7e 100644 --- a/include/nmtools/array/view/ufuncs/arctan.hpp +++ b/include/nmtools/array/view/ufuncs/arctan.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_ARCTAN_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_ARCTAN_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/arctan2.hpp b/include/nmtools/array/view/ufuncs/arctan2.hpp index 64861011b..e291efee1 100644 --- a/include/nmtools/array/view/ufuncs/arctan2.hpp +++ b/include/nmtools/array/view/ufuncs/arctan2.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_ARCTAN2_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_ARCTAN2_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/arctanh.hpp b/include/nmtools/array/view/ufuncs/arctanh.hpp index f9f429ee9..0634b3462 100644 --- a/include/nmtools/array/view/ufuncs/arctanh.hpp +++ b/include/nmtools/array/view/ufuncs/arctanh.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_ARCTANH_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_ARCTANH_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/bitwise_and.hpp b/include/nmtools/array/view/ufuncs/bitwise_and.hpp index 3663e67aa..e22b64f7c 100644 --- a/include/nmtools/array/view/ufuncs/bitwise_and.hpp +++ b/include/nmtools/array/view/ufuncs/bitwise_and.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_BITWISE_AND_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_BITWISE_AND_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/bitwise_or.hpp b/include/nmtools/array/view/ufuncs/bitwise_or.hpp index 573de0eb6..0bd325636 100644 --- a/include/nmtools/array/view/ufuncs/bitwise_or.hpp +++ b/include/nmtools/array/view/ufuncs/bitwise_or.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_BITWISE_OR_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_BITWISE_OR_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/bitwise_xor.hpp b/include/nmtools/array/view/ufuncs/bitwise_xor.hpp index 3e972b403..6e72d2cf5 100644 --- a/include/nmtools/array/view/ufuncs/bitwise_xor.hpp +++ b/include/nmtools/array/view/ufuncs/bitwise_xor.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_BITWISE_XOR_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_BITWISE_XOR_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/cbrt.hpp b/include/nmtools/array/view/ufuncs/cbrt.hpp index 842b49e1b..22d312d9d 100644 --- a/include/nmtools/array/view/ufuncs/cbrt.hpp +++ b/include/nmtools/array/view/ufuncs/cbrt.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_CBRT_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_CBRT_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/ceil.hpp b/include/nmtools/array/view/ufuncs/ceil.hpp index f786b7bff..faad5148d 100644 --- a/include/nmtools/array/view/ufuncs/ceil.hpp +++ b/include/nmtools/array/view/ufuncs/ceil.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_CEIL_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_CEIL_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/cos.hpp b/include/nmtools/array/view/ufuncs/cos.hpp index f96e0f63b..7910ac3f6 100644 --- a/include/nmtools/array/view/ufuncs/cos.hpp +++ b/include/nmtools/array/view/ufuncs/cos.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_COS_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_COS_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/cosh.hpp b/include/nmtools/array/view/ufuncs/cosh.hpp index 5f0165ce6..b640f4e3d 100644 --- a/include/nmtools/array/view/ufuncs/cosh.hpp +++ b/include/nmtools/array/view/ufuncs/cosh.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_COSH_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_COSH_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/divide.hpp b/include/nmtools/array/view/ufuncs/divide.hpp index 8c6194596..06b311f84 100644 --- a/include/nmtools/array/view/ufuncs/divide.hpp +++ b/include/nmtools/array/view/ufuncs/divide.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_DIVIDE_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_DIVIDE_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/exp.hpp b/include/nmtools/array/view/ufuncs/exp.hpp index 5c3bd9a94..eed3c9031 100644 --- a/include/nmtools/array/view/ufuncs/exp.hpp +++ b/include/nmtools/array/view/ufuncs/exp.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_EXP_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_EXP_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/exp2.hpp b/include/nmtools/array/view/ufuncs/exp2.hpp index 0aa6eb2fc..75ae60c2c 100644 --- a/include/nmtools/array/view/ufuncs/exp2.hpp +++ b/include/nmtools/array/view/ufuncs/exp2.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_EXP2_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_EXP2_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/expm1.hpp b/include/nmtools/array/view/ufuncs/expm1.hpp index 0605a12e2..96360d062 100644 --- a/include/nmtools/array/view/ufuncs/expm1.hpp +++ b/include/nmtools/array/view/ufuncs/expm1.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_EXPM1_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_EXPM1_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/fabs.hpp b/include/nmtools/array/view/ufuncs/fabs.hpp index 5ca7d02f9..e23f3cf68 100644 --- a/include/nmtools/array/view/ufuncs/fabs.hpp +++ b/include/nmtools/array/view/ufuncs/fabs.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_FABS_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_FABS_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/floor.hpp b/include/nmtools/array/view/ufuncs/floor.hpp index 6e8ec2476..c4f1e57b0 100644 --- a/include/nmtools/array/view/ufuncs/floor.hpp +++ b/include/nmtools/array/view/ufuncs/floor.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_FLOOR_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_FLOOR_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/greater.hpp b/include/nmtools/array/view/ufuncs/greater.hpp index 8de4a25ee..4f958d4d9 100644 --- a/include/nmtools/array/view/ufuncs/greater.hpp +++ b/include/nmtools/array/view/ufuncs/greater.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_GREATER_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_GREATER_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/invert.hpp b/include/nmtools/array/view/ufuncs/invert.hpp index 5b63b9a41..5b55b758e 100644 --- a/include/nmtools/array/view/ufuncs/invert.hpp +++ b/include/nmtools/array/view/ufuncs/invert.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_INVERT_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_INVERT_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::meta::error diff --git a/include/nmtools/array/view/ufuncs/isfinite.hpp b/include/nmtools/array/view/ufuncs/isfinite.hpp index b28d5e2c5..ab43219e8 100644 --- a/include/nmtools/array/view/ufuncs/isfinite.hpp +++ b/include/nmtools/array/view/ufuncs/isfinite.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_ISFINITE_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_ISFINITE_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/isinf.hpp b/include/nmtools/array/view/ufuncs/isinf.hpp index b5a71659b..eae0f08af 100644 --- a/include/nmtools/array/view/ufuncs/isinf.hpp +++ b/include/nmtools/array/view/ufuncs/isinf.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_ISINF_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_ISINF_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/isnan.hpp b/include/nmtools/array/view/ufuncs/isnan.hpp index f883d4ad4..6bf9dfd6f 100644 --- a/include/nmtools/array/view/ufuncs/isnan.hpp +++ b/include/nmtools/array/view/ufuncs/isnan.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_ISNAN_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_ISNAN_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/ldexp.hpp b/include/nmtools/array/view/ufuncs/ldexp.hpp index e92c1bd6a..f525c41fd 100644 --- a/include/nmtools/array/view/ufuncs/ldexp.hpp +++ b/include/nmtools/array/view/ufuncs/ldexp.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_LDEXP_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_LDEXP_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/less.hpp b/include/nmtools/array/view/ufuncs/less.hpp index 0c9cb945a..3532fc7e8 100644 --- a/include/nmtools/array/view/ufuncs/less.hpp +++ b/include/nmtools/array/view/ufuncs/less.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_LESS_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_LESS_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/less_equal.hpp b/include/nmtools/array/view/ufuncs/less_equal.hpp index 476420c96..f39f86d84 100644 --- a/include/nmtools/array/view/ufuncs/less_equal.hpp +++ b/include/nmtools/array/view/ufuncs/less_equal.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_LESS_EQUAL_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_LESS_EQUAL_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/log.hpp b/include/nmtools/array/view/ufuncs/log.hpp index 078ee87bf..c222d90ed 100644 --- a/include/nmtools/array/view/ufuncs/log.hpp +++ b/include/nmtools/array/view/ufuncs/log.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_LOG_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_LOG_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/log10.hpp b/include/nmtools/array/view/ufuncs/log10.hpp index b8d65e946..98d883726 100644 --- a/include/nmtools/array/view/ufuncs/log10.hpp +++ b/include/nmtools/array/view/ufuncs/log10.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_LOG10_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_LOG10_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/log1p.hpp b/include/nmtools/array/view/ufuncs/log1p.hpp index e003d061b..cb6cb3782 100644 --- a/include/nmtools/array/view/ufuncs/log1p.hpp +++ b/include/nmtools/array/view/ufuncs/log1p.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_LOG1P_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_LOG1P_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/log2.hpp b/include/nmtools/array/view/ufuncs/log2.hpp index dd4abed60..26f1c644f 100644 --- a/include/nmtools/array/view/ufuncs/log2.hpp +++ b/include/nmtools/array/view/ufuncs/log2.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_LOG2_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_LOG2_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/logical_and.hpp b/include/nmtools/array/view/ufuncs/logical_and.hpp index be2bc45fc..2f8b3e219 100644 --- a/include/nmtools/array/view/ufuncs/logical_and.hpp +++ b/include/nmtools/array/view/ufuncs/logical_and.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_LOGICAL_AND_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_LOGICAL_AND_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/logical_not.hpp b/include/nmtools/array/view/ufuncs/logical_not.hpp index 5b2e74e82..7416d89cd 100644 --- a/include/nmtools/array/view/ufuncs/logical_not.hpp +++ b/include/nmtools/array/view/ufuncs/logical_not.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_LOGICAL_NOT_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_LOGICAL_NOT_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/logical_or.hpp b/include/nmtools/array/view/ufuncs/logical_or.hpp index aa3302ec9..1a54350c4 100644 --- a/include/nmtools/array/view/ufuncs/logical_or.hpp +++ b/include/nmtools/array/view/ufuncs/logical_or.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_LOGICAL_OR_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_LOGICAL_OR_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/logical_xor.hpp b/include/nmtools/array/view/ufuncs/logical_xor.hpp index bfadcd07e..661a52b84 100644 --- a/include/nmtools/array/view/ufuncs/logical_xor.hpp +++ b/include/nmtools/array/view/ufuncs/logical_xor.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_LOGICAL_XOR_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_LOGICAL_XOR_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/maximum.hpp b/include/nmtools/array/view/ufuncs/maximum.hpp index 19303372c..b1d92eadb 100644 --- a/include/nmtools/array/view/ufuncs/maximum.hpp +++ b/include/nmtools/array/view/ufuncs/maximum.hpp @@ -95,7 +95,7 @@ namespace nmtools::view } // outer_maximum } -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #if NMTOOLS_HAS_STRING diff --git a/include/nmtools/array/view/ufuncs/mod.hpp b/include/nmtools/array/view/ufuncs/mod.hpp index f92af8e19..27bc94b79 100644 --- a/include/nmtools/array/view/ufuncs/mod.hpp +++ b/include/nmtools/array/view/ufuncs/mod.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_MOD_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_MOD_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/multiply.hpp b/include/nmtools/array/view/ufuncs/multiply.hpp index 1918fb6e6..fca06bb27 100644 --- a/include/nmtools/array/view/ufuncs/multiply.hpp +++ b/include/nmtools/array/view/ufuncs/multiply.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_MULTIPLY_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_MULTIPLY_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/constants.hpp" diff --git a/include/nmtools/array/view/ufuncs/negative.hpp b/include/nmtools/array/view/ufuncs/negative.hpp index 1de7b48b6..66ab87823 100644 --- a/include/nmtools/array/view/ufuncs/negative.hpp +++ b/include/nmtools/array/view/ufuncs/negative.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_NEGATIVE_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_NEGATIVE_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/not_equal.hpp b/include/nmtools/array/view/ufuncs/not_equal.hpp index 761751492..ce614fa5a 100644 --- a/include/nmtools/array/view/ufuncs/not_equal.hpp +++ b/include/nmtools/array/view/ufuncs/not_equal.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_NOT_EQUAL_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_NOT_EQUAL_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/positive.hpp b/include/nmtools/array/view/ufuncs/positive.hpp index 54afb7f0f..4dc2ac96c 100644 --- a/include/nmtools/array/view/ufuncs/positive.hpp +++ b/include/nmtools/array/view/ufuncs/positive.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_POSITIVE_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_POSITIVE_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/reciprocal.hpp b/include/nmtools/array/view/ufuncs/reciprocal.hpp index 2e98df028..c4bb2dc93 100644 --- a/include/nmtools/array/view/ufuncs/reciprocal.hpp +++ b/include/nmtools/array/view/ufuncs/reciprocal.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_RECIPROCAL_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_RECIPROCAL_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/rint.hpp b/include/nmtools/array/view/ufuncs/rint.hpp index 0711f26a7..9d63d2f24 100644 --- a/include/nmtools/array/view/ufuncs/rint.hpp +++ b/include/nmtools/array/view/ufuncs/rint.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_RINT_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_RINT_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/signbit.hpp b/include/nmtools/array/view/ufuncs/signbit.hpp index b5039771c..0336143f3 100644 --- a/include/nmtools/array/view/ufuncs/signbit.hpp +++ b/include/nmtools/array/view/ufuncs/signbit.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_SIGNBIT_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_SIGNBIT_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/sin.hpp b/include/nmtools/array/view/ufuncs/sin.hpp index 62a747eff..e2379c928 100644 --- a/include/nmtools/array/view/ufuncs/sin.hpp +++ b/include/nmtools/array/view/ufuncs/sin.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_SIN_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_SIN_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/sinh.hpp b/include/nmtools/array/view/ufuncs/sinh.hpp index b7996587b..2889275c9 100644 --- a/include/nmtools/array/view/ufuncs/sinh.hpp +++ b/include/nmtools/array/view/ufuncs/sinh.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_SINH_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_SINH_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/sqrt.hpp b/include/nmtools/array/view/ufuncs/sqrt.hpp index b5fbb7f23..bbcc59040 100644 --- a/include/nmtools/array/view/ufuncs/sqrt.hpp +++ b/include/nmtools/array/view/ufuncs/sqrt.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_SQRT_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_SQRT_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/square.hpp b/include/nmtools/array/view/ufuncs/square.hpp index 76f4a51df..f881ad64a 100644 --- a/include/nmtools/array/view/ufuncs/square.hpp +++ b/include/nmtools/array/view/ufuncs/square.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_SQUARE_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_SQUARE_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/subtract.hpp b/include/nmtools/array/view/ufuncs/subtract.hpp index cd9c1e681..3108861c8 100644 --- a/include/nmtools/array/view/ufuncs/subtract.hpp +++ b/include/nmtools/array/view/ufuncs/subtract.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_SUBTRACT_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_SUBTRACT_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" namespace nmtools::view::fun diff --git a/include/nmtools/array/view/ufuncs/tan.hpp b/include/nmtools/array/view/ufuncs/tan.hpp index 0d3df8900..958cebbda 100644 --- a/include/nmtools/array/view/ufuncs/tan.hpp +++ b/include/nmtools/array/view/ufuncs/tan.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_TAN_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_TAN_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/tanh.hpp b/include/nmtools/array/view/ufuncs/tanh.hpp index c4744e24e..6877bfbd8 100644 --- a/include/nmtools/array/view/ufuncs/tanh.hpp +++ b/include/nmtools/array/view/ufuncs/tanh.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_TANH_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_TANH_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/ufuncs/trunc.hpp b/include/nmtools/array/view/ufuncs/trunc.hpp index 8990886ac..3515a7de7 100644 --- a/include/nmtools/array/view/ufuncs/trunc.hpp +++ b/include/nmtools/array/view/ufuncs/trunc.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_ARRAY_VIEW_UFUNCS_TRUNC_HPP #define NMTOOLS_ARRAY_VIEW_UFUNCS_TRUNC_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #include "nmtools/array/view/ufunc.hpp" #include "nmtools/math.hpp" diff --git a/include/nmtools/array/view/vstack.hpp b/include/nmtools/array/view/vstack.hpp index 16480619f..0daa1476c 100644 --- a/include/nmtools/array/view/vstack.hpp +++ b/include/nmtools/array/view/vstack.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_ARRAY_INDEX_VSTACK_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" namespace nmtools::index { diff --git a/include/nmtools/array/view/where.hpp b/include/nmtools/array/view/where.hpp index 5881cfefc..de7b93b63 100644 --- a/include/nmtools/array/view/where.hpp +++ b/include/nmtools/array/view/where.hpp @@ -1,10 +1,10 @@ #ifndef NMTOOLS_ARRAY_VIEW_WHERE_HPP #define NMTOOLS_ARRAY_VIEW_WHERE_HPP -#include "nmtools/array/utility/apply_at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/array/view/decorator.hpp" #include "nmtools/array/view/broadcast_arrays.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/isequal.hpp" #include "nmtools/meta.hpp" namespace nmtools::view diff --git a/include/nmtools/array/utility/embind.hpp b/include/nmtools/platform/embind.hpp similarity index 95% rename from include/nmtools/array/utility/embind.hpp rename to include/nmtools/platform/embind.hpp index 6b4755b49..4c7a3c8d5 100644 --- a/include/nmtools/array/utility/embind.hpp +++ b/include/nmtools/platform/embind.hpp @@ -5,8 +5,8 @@ #include "nmtools/array/array/flatten.hpp" #include "nmtools/meta.hpp" #include "nmtools/constants.hpp" -#include "nmtools/array/utility/cast.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/cast.hpp" +#include "nmtools/utility/shape.hpp" #include #include diff --git a/include/nmtools/array/utility/jni.hpp b/include/nmtools/platform/jni.hpp similarity index 100% rename from include/nmtools/array/utility/jni.hpp rename to include/nmtools/platform/jni.hpp diff --git a/include/nmtools/testing/array_cast.hpp b/include/nmtools/testing/array_cast.hpp index ca08a7342..93e502c03 100644 --- a/include/nmtools/testing/array_cast.hpp +++ b/include/nmtools/testing/array_cast.hpp @@ -3,7 +3,7 @@ #include "nmtools/testing/platform.hpp" #include "nmtools/constants.hpp" -#include "nmtools/array/cast.hpp" +#include "nmtools/utility/cast.hpp" // macro for testing purpose diff --git a/include/nmtools/benchmarks/bench.hpp b/include/nmtools/testing/benchmarks/bench.hpp similarity index 100% rename from include/nmtools/benchmarks/bench.hpp rename to include/nmtools/testing/benchmarks/bench.hpp diff --git a/include/nmtools/testing/data/array/arange.hpp b/include/nmtools/testing/data/array/arange.hpp index b9c37dadc..3634631f3 100644 --- a/include/nmtools/testing/data/array/arange.hpp +++ b/include/nmtools/testing/data/array/arange.hpp @@ -4,7 +4,7 @@ #include "nmtools/array/ndarray/dynamic.hpp" #include "nmtools/array/ndarray/hybrid.hpp" #include "nmtools/array/ndarray/fixed.hpp" -#include "nmtools/array/dtypes.hpp" +#include "nmtools/dtypes.hpp" #include "nmtools/testing/testing.hpp" #include diff --git a/include/nmtools/testing/data/array/expm1.hpp b/include/nmtools/testing/data/array/expm1.hpp index fb4ec99c0..12b578c12 100644 --- a/include/nmtools/testing/data/array/expm1.hpp +++ b/include/nmtools/testing/data/array/expm1.hpp @@ -10,8 +10,8 @@ #include // lower testing precision for expm1 -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-5 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-5 namespace nm = nmtools; namespace na = nm::array; diff --git a/include/nmtools/testing/data/array/ones.hpp b/include/nmtools/testing/data/array/ones.hpp index 5de9a693f..cafa5f641 100644 --- a/include/nmtools/testing/data/array/ones.hpp +++ b/include/nmtools/testing/data/array/ones.hpp @@ -4,7 +4,7 @@ #include "nmtools/array/ndarray/dynamic.hpp" #include "nmtools/array/ndarray/hybrid.hpp" #include "nmtools/array/ndarray/fixed.hpp" -#include "nmtools/array/dtypes.hpp" +#include "nmtools/dtypes.hpp" #include "nmtools/constants.hpp" #include "nmtools/testing/testing.hpp" diff --git a/include/nmtools/testing/data/array/zeros.hpp b/include/nmtools/testing/data/array/zeros.hpp index e522c0f0c..8056856c8 100644 --- a/include/nmtools/testing/data/array/zeros.hpp +++ b/include/nmtools/testing/data/array/zeros.hpp @@ -4,7 +4,7 @@ #include "nmtools/array/ndarray/dynamic.hpp" #include "nmtools/array/ndarray/hybrid.hpp" #include "nmtools/array/ndarray/fixed.hpp" -#include "nmtools/array/dtypes.hpp" +#include "nmtools/dtypes.hpp" #include "nmtools/testing/testing.hpp" #include diff --git a/include/nmtools/testing/data/index/gather.hpp b/include/nmtools/testing/data/index/gather.hpp index 30f1a95e8..f4f072d58 100644 --- a/include/nmtools/testing/data/index/gather.hpp +++ b/include/nmtools/testing/data/index/gather.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_TESTING_DATA_INDEX_GATHER_HPP #include "nmtools/array/index/gather.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/isequal.hpp" #include "nmtools/constants.hpp" #include "nmtools/testing/doctest.hpp" diff --git a/include/nmtools/testing/doctest.hpp b/include/nmtools/testing/doctest.hpp index 31979230b..9aa7cf2f0 100644 --- a/include/nmtools/testing/doctest.hpp +++ b/include/nmtools/testing/doctest.hpp @@ -3,7 +3,7 @@ #include "nmtools/testing/testing.hpp" #include "nmtools/utility/fwd.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" namespace meta = nmtools::meta; namespace utils = nmtools::utils; diff --git a/include/nmtools/testing/string.hpp b/include/nmtools/testing/string.hpp index 8c3f79081..8cd8eaed9 100644 --- a/include/nmtools/testing/string.hpp +++ b/include/nmtools/testing/string.hpp @@ -4,7 +4,7 @@ #include "nmtools/testing/platform.hpp" #include "nmtools/meta.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" #define NMTOOLS_TESTING_GET_TYPENAME NMTOOLS_TYPENAME_TO_STRING diff --git a/include/nmtools/testing/testing.hpp b/include/nmtools/testing/testing.hpp index 5ad31ff4b..4b4389487 100644 --- a/include/nmtools/testing/testing.hpp +++ b/include/nmtools/testing/testing.hpp @@ -2,9 +2,9 @@ #define NMTOOLS_TESTING_HPP #include "nmtools/platform.hpp" -#include "nmtools/utils/isclose.hpp" -#include "nmtools/utils/isequal.hpp" -#include "nmtools/utils/apply_isequal.hpp" +#include "nmtools/utility/isclose.hpp" +#include "nmtools/utility/isequal.hpp" +#include "nmtools/utility/apply_isequal.hpp" #include "nmtools/testing/string.hpp" #include "nmtools/testing/array_cast.hpp" @@ -34,8 +34,8 @@ auto var_name = nmtools::testing::cast(var); #define STRINGIFY(array) \ nmtools::utils::to_string(array) -#ifndef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION (1e-6) +#ifndef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION (1e-6) #endif /** @@ -65,7 +65,7 @@ nmtools::utils::to_string(array) */ #define NMTOOLS_ASSERT_CLOSE_DOCTEST(result,expect) \ { \ - auto result_ = isclose(result,expect,NMTOOLS_TESTING_OUTPUT_PRECISION); \ + auto result_ = isclose(result,expect,NMTOOLS_TESTING_PRECISION); \ auto result_typename = NMTOOLS_TESTING_GET_TYPENAME(decltype(result)); \ auto expect_typename = NMTOOLS_TESTING_GET_TYPENAME(decltype(expect)); \ std::string message {}; \ @@ -80,7 +80,7 @@ nmtools::utils::to_string(array) #define NMTOOLS_STATIC_ASSERT_CLOSE_DOCTEST(result,expect) \ { \ - constexpr auto result_ = isclose(result,expect,NMTOOLS_TESTING_OUTPUT_PRECISION); \ + constexpr auto result_ = isclose(result,expect,NMTOOLS_TESTING_PRECISION); \ std::string message {}; \ message = message + \ + "\n\tActual : " + STRINGIFY(result) \ @@ -183,7 +183,7 @@ NMTOOLS_TESTING_LOG_TYPEINFO_IMPL( \ #define NMTOOLS_TESTING_CONSTEXPR_ISCLOSE_TEST(func, expect, ...) \ { \ constexpr auto result = func(__VA_ARGS__); \ - static_assert(isclose(result,expect,NMTOOLS_TESTING_OUTPUT_PRECISION)); \ + static_assert(isclose(result,expect,NMTOOLS_TESTING_PRECISION)); \ /* TODO: check return type! */ \ } \ diff --git a/include/nmtools/utils/apply_isclose.hpp b/include/nmtools/utility/apply_isclose.hpp similarity index 99% rename from include/nmtools/utils/apply_isclose.hpp rename to include/nmtools/utility/apply_isclose.hpp index 5ce899439..5cf7c3392 100644 --- a/include/nmtools/utils/apply_isclose.hpp +++ b/include/nmtools/utility/apply_isclose.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_UTILS_APPLY_ISCLOSE_HPP #define NMTOOLS_UTILS_APPLY_ISCLOSE_HPP -#include "nmtools/utils/isclose.hpp" +#include "nmtools/utility/isclose.hpp" namespace nmtools::utils { diff --git a/include/nmtools/utils/apply_isequal.hpp b/include/nmtools/utility/apply_isequal.hpp similarity index 99% rename from include/nmtools/utils/apply_isequal.hpp rename to include/nmtools/utility/apply_isequal.hpp index d704f7d94..81d6ccbfd 100644 --- a/include/nmtools/utils/apply_isequal.hpp +++ b/include/nmtools/utility/apply_isequal.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_UTILS_APPLY_ISEQUAL_HPP #define NMTOOLS_UTILS_APPLY_ISEQUAL_HPP -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/isequal.hpp" namespace nmtools::utils { diff --git a/include/nmtools/array/utility/apply_resize.hpp b/include/nmtools/utility/apply_resize.hpp similarity index 100% rename from include/nmtools/array/utility/apply_resize.hpp rename to include/nmtools/utility/apply_resize.hpp diff --git a/include/nmtools/utils/apply_to_string.hpp b/include/nmtools/utility/apply_to_string.hpp similarity index 79% rename from include/nmtools/utils/apply_to_string.hpp rename to include/nmtools/utility/apply_to_string.hpp index 59474519a..b240a8f27 100644 --- a/include/nmtools/utils/apply_to_string.hpp +++ b/include/nmtools/utility/apply_to_string.hpp @@ -2,6 +2,6 @@ #define NMTOOLS_UTILS_APPLY_TO_STRING_HPP // TODO: remove this file -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" #endif // NMTOOLS_UTILS_APPLY_TO_STRING_HPP \ No newline at end of file diff --git a/include/nmtools/array/as_static.hpp b/include/nmtools/utility/as_static.hpp similarity index 97% rename from include/nmtools/array/as_static.hpp rename to include/nmtools/utility/as_static.hpp index acf084edd..0eb17fc8c 100644 --- a/include/nmtools/array/as_static.hpp +++ b/include/nmtools/utility/as_static.hpp @@ -3,7 +3,7 @@ #include "nmtools/meta.hpp" #include "nmtools/utility/fwd.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/utility/forward.hpp" // #include "nmtools/array/ndarray.hpp" // for nmtools_static_vector #include "nmtools/utl/static_vector.hpp" diff --git a/include/nmtools/array/at.hpp b/include/nmtools/utility/at.hpp similarity index 100% rename from include/nmtools/array/at.hpp rename to include/nmtools/utility/at.hpp diff --git a/include/nmtools/array/cast.hpp b/include/nmtools/utility/cast.hpp similarity index 89% rename from include/nmtools/array/cast.hpp rename to include/nmtools/utility/cast.hpp index 264322d2e..3bf79ad1d 100644 --- a/include/nmtools/array/cast.hpp +++ b/include/nmtools/utility/cast.hpp @@ -1,23 +1,75 @@ +#ifndef NMTOOLS_ARRAY_KIND_HPP +#define NMTOOLS_ARRAY_KIND_HPP + +namespace nmtools::array::kind +{ + /** + * @brief helper tag for easy dispatch + * + */ + struct fixed_t {}; + struct hybrid_t {}; + struct dynamic_t {}; + + /** + * @brief helper inline variable for each tag + * + */ + inline constexpr auto fixed = fixed_t {}; + inline constexpr auto hybrid = hybrid_t {}; + inline constexpr auto dynamic = dynamic_t {}; +} // namespace nmtools::array::kind + +#endif // NMTOOLS_ARRAY_KIND_HPP + +#ifndef NMTOOLS_ARRAY_UTILITY_CAST_HPP +#define NMTOOLS_ARRAY_UTILITY_CAST_HPP + +#include "nmtools/meta.hpp" +#include "nmtools/utility/apply_resize.hpp" +#include "nmtools/utility/shape.hpp" +#include "nmtools/array/view/flatten.hpp" +#include "nmtools/array/view/mutable_flatten.hpp" + +#include "nmtools/utility/isequal.hpp" + +namespace nmtools +{ + /** + * @brief tag to resolve return type of cast op + * + */ + struct cast_t {}; + + struct cast_kind_t {}; + + namespace meta::error + { + template + struct CAST_KIND_UNSUPPORTED : detail::fail_t {}; + } +} // namespace nmtools + +#endif // NMTOOLS_ARRAY_UTILITY_CAST_HPP + #ifndef NMTOOLS_ARRAY_CAST_HPP #define NMTOOLS_ARRAY_CAST_HPP #include "nmtools/meta.hpp" #include "nmtools/array/ndarray/ndarray.hpp" -#include "nmtools/array/kind.hpp" -#include "nmtools/array/utility/cast.hpp" #ifndef NMTOOLS_TESTING_DISABLE_DYNAMIC_ALLOCATION #include "nmtools/array/ndarray/dynamic.hpp" #endif #include "nmtools/array/index/product.hpp" -#include "nmtools/array/utility/apply_resize.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/apply_resize.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/view/flatten.hpp" #include "nmtools/array/view/mutable_flatten.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/isequal.hpp" #include "nmtools/utility/tuple_cat.hpp" #include "nmtools/utl.hpp" diff --git a/include/nmtools/utility/ct_digraph.hpp b/include/nmtools/utility/ct_digraph.hpp index 50c6151ab..4ddf6d8f0 100644 --- a/include/nmtools/utility/ct_digraph.hpp +++ b/include/nmtools/utility/ct_digraph.hpp @@ -2,7 +2,7 @@ #define NMTOOLS_UTILITY_CT_DIGRAPH_HPP #include "nmtools/meta.hpp" -#include "nmtools/array/at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/utility/ct_map.hpp" namespace nmtools::utility diff --git a/include/nmtools/array/data.hpp b/include/nmtools/utility/data.hpp similarity index 100% rename from include/nmtools/array/data.hpp rename to include/nmtools/utility/data.hpp diff --git a/include/nmtools/utils/isclose.hpp b/include/nmtools/utility/isclose.hpp similarity index 98% rename from include/nmtools/utils/isclose.hpp rename to include/nmtools/utility/isclose.hpp index 9352e1e1a..6ca14b8b8 100644 --- a/include/nmtools/utils/isclose.hpp +++ b/include/nmtools/utility/isclose.hpp @@ -3,13 +3,13 @@ #include "nmtools/meta.hpp" #include "nmtools/assert.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/ndindex.hpp" -#include "nmtools/array/utility/apply_at.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/isequal.hpp" #include "nmtools/math.hpp" #include "nmtools/platform/math/constexpr.hpp" -#include "nmtools/utils/isclose/isclose.hpp" +#include "nmtools/utility/isclose/isclose.hpp" #include "nmtools/utility/unwrap.hpp" #ifndef NMTOOLS_ISCLOSE_NAN_HANDLING diff --git a/include/nmtools/utils/isclose/isclose.hpp b/include/nmtools/utility/isclose/isclose.hpp similarity index 100% rename from include/nmtools/utils/isclose/isclose.hpp rename to include/nmtools/utility/isclose/isclose.hpp diff --git a/include/nmtools/utils/isequal.hpp b/include/nmtools/utility/isequal.hpp similarity index 99% rename from include/nmtools/utils/isequal.hpp rename to include/nmtools/utility/isequal.hpp index 7f2467463..cb13b5d76 100644 --- a/include/nmtools/utils/isequal.hpp +++ b/include/nmtools/utility/isequal.hpp @@ -3,10 +3,10 @@ #include "nmtools/meta.hpp" #include "nmtools/assert.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/ndindex.hpp" -#include "nmtools/array/utility/apply_at.hpp" -#include "nmtools/utils/isequal/isequal.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/isequal/isequal.hpp" #include "nmtools/utility/unwrap.hpp" namespace nmtools::utils diff --git a/include/nmtools/utils/isequal/isequal.hpp b/include/nmtools/utility/isequal/isequal.hpp similarity index 100% rename from include/nmtools/utils/isequal/isequal.hpp rename to include/nmtools/utility/isequal/isequal.hpp diff --git a/include/nmtools/array/random_engine.hpp b/include/nmtools/utility/random_engine.hpp similarity index 100% rename from include/nmtools/array/random_engine.hpp rename to include/nmtools/utility/random_engine.hpp diff --git a/include/nmtools/array/shape.hpp b/include/nmtools/utility/shape.hpp similarity index 99% rename from include/nmtools/array/shape.hpp rename to include/nmtools/utility/shape.hpp index cd6258929..33a3b0aad 100644 --- a/include/nmtools/array/shape.hpp +++ b/include/nmtools/utility/shape.hpp @@ -3,8 +3,7 @@ #include "nmtools/meta.hpp" -#include "nmtools/array/utility/at.hpp" -#include "nmtools/array/utility/apply_at.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/constants.hpp" #include "nmtools/utility.hpp" diff --git a/include/nmtools/utils/to_string.hpp b/include/nmtools/utility/to_string.hpp similarity index 51% rename from include/nmtools/utils/to_string.hpp rename to include/nmtools/utility/to_string.hpp index 3fd44d3ae..9b8f03e8c 100644 --- a/include/nmtools/utils/to_string.hpp +++ b/include/nmtools/utility/to_string.hpp @@ -1,7 +1,7 @@ #ifndef NMTOOLS_UTILS_TO_STRING_HPP #define NMTOOLS_UTILS_TO_STRING_HPP -#include "nmtools/utils/to_string/to_string.hpp" -#include "nmtools/utils/to_string/common_types.hpp" +#include "nmtools/utility/to_string/to_string.hpp" +#include "nmtools/utility/to_string/common_types.hpp" #endif // NMTOOLS_UTILS_TO_STRING_HPP \ No newline at end of file diff --git a/include/nmtools/utils/to_string/common_types.hpp b/include/nmtools/utility/to_string/common_types.hpp similarity index 98% rename from include/nmtools/utils/to_string/common_types.hpp rename to include/nmtools/utility/to_string/common_types.hpp index c25c4d69a..135cfbde1 100644 --- a/include/nmtools/utils/to_string/common_types.hpp +++ b/include/nmtools/utility/to_string/common_types.hpp @@ -1,16 +1,16 @@ #ifndef NMTOOLS_UTILS_TO_STRING_COMMON_TYPES_HPP #define NMTOOLS_UTILS_TO_STRING_COMMON_TYPES_HPP -#include "nmtools/utils/to_string/to_string.hpp" +#include "nmtools/utility/to_string/to_string.hpp" #if NMTOOLS_HAS_STRING #include "nmtools/meta.hpp" -#include "nmtools/array/utility.hpp" -#include "nmtools/array/shape.hpp" +#include "nmtools/utility/at.hpp" +#include "nmtools/utility/shape.hpp" #include "nmtools/array/index/ndindex.hpp" #include "nmtools/array/ndarray.hpp" -#include "nmtools/array/utility/apply_at.hpp" +#include "nmtools/utility/at.hpp" namespace nmtools::utils { diff --git a/include/nmtools/utils/to_string/to_string.hpp b/include/nmtools/utility/to_string/to_string.hpp similarity index 100% rename from include/nmtools/utils/to_string/to_string.hpp rename to include/nmtools/utility/to_string/to_string.hpp diff --git a/tests/array/array/activations/celu.cpp b/tests/array/array/activations/celu.cpp index 98d9c441d..09e3c36ca 100644 --- a/tests/array/array/activations/celu.cpp +++ b/tests/array/array/activations/celu.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::celu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs celu fn to callable lambda diff --git a/tests/array/array/activations/elu.cpp b/tests/array/array/activations/elu.cpp index c570d5bf3..d0088a1b5 100644 --- a/tests/array/array/activations/elu.cpp +++ b/tests/array/array/activations/elu.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::elu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs elu fn to callable lambda diff --git a/tests/array/array/activations/hardshrink.cpp b/tests/array/array/activations/hardshrink.cpp index b1c0bb68b..7c661f7f0 100644 --- a/tests/array/array/activations/hardshrink.cpp +++ b/tests/array/array/activations/hardshrink.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::hardshrink(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs hardshrink fn to callable lambda diff --git a/tests/array/array/activations/hardswish.cpp b/tests/array/array/activations/hardswish.cpp index 303b937e7..65930ac68 100644 --- a/tests/array/array/activations/hardswish.cpp +++ b/tests/array/array/activations/hardswish.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::hardswish(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs hardswish fn to callable lambda diff --git a/tests/array/array/activations/hardtanh.cpp b/tests/array/array/activations/hardtanh.cpp index e89089549..7c1171b02 100644 --- a/tests/array/array/activations/hardtanh.cpp +++ b/tests/array/array/activations/hardtanh.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::hardtanh(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs hardtanh fn to callable lambda diff --git a/tests/array/array/activations/leaky_relu.cpp b/tests/array/array/activations/leaky_relu.cpp index 15a58722a..56800b602 100644 --- a/tests/array/array/activations/leaky_relu.cpp +++ b/tests/array/array/activations/leaky_relu.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::leaky_relu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs leaky_relu fn to callable lambda diff --git a/tests/array/array/activations/log_sigmoid.cpp b/tests/array/array/activations/log_sigmoid.cpp index 508119ade..d9d8fb427 100644 --- a/tests/array/array/activations/log_sigmoid.cpp +++ b/tests/array/array/activations/log_sigmoid.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::log_sigmoid(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs log_sigmoid fn to callable lambda diff --git a/tests/array/array/activations/mish.cpp b/tests/array/array/activations/mish.cpp index 654fb7047..c7f820a03 100644 --- a/tests/array/array/activations/mish.cpp +++ b/tests/array/array/activations/mish.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::mish(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs mish fn to callable lambda diff --git a/tests/array/array/activations/prelu.cpp b/tests/array/array/activations/prelu.cpp index 623d27196..0bde6cc05 100644 --- a/tests/array/array/activations/prelu.cpp +++ b/tests/array/array/activations/prelu.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::prelu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs prelu fn to callable lambda diff --git a/tests/array/array/activations/relu.cpp b/tests/array/array/activations/relu.cpp index d219475bc..39dda7df6 100644 --- a/tests/array/array/activations/relu.cpp +++ b/tests/array/array/activations/relu.cpp @@ -39,7 +39,7 @@ namespace nm = nmtools; nm::array::relu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs relu fn to callable lambda diff --git a/tests/array/array/activations/relu6.cpp b/tests/array/array/activations/relu6.cpp index a9ea92b75..997de4353 100644 --- a/tests/array/array/activations/relu6.cpp +++ b/tests/array/array/activations/relu6.cpp @@ -39,7 +39,7 @@ namespace nm = nmtools; nm::array::relu6(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs relu6 fn to callable lambda diff --git a/tests/array/array/activations/selu.cpp b/tests/array/array/activations/selu.cpp index 821381666..f53f90cc8 100644 --- a/tests/array/array/activations/selu.cpp +++ b/tests/array/array/activations/selu.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::selu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs selu fn to callable lambda diff --git a/tests/array/array/activations/sigmoid.cpp b/tests/array/array/activations/sigmoid.cpp index 0a90a33e8..e294e8f07 100644 --- a/tests/array/array/activations/sigmoid.cpp +++ b/tests/array/array/activations/sigmoid.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::sigmoid(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs sigmoid fn to callable lambda diff --git a/tests/array/array/activations/silu.cpp b/tests/array/array/activations/silu.cpp index 9bdccb645..46d05aa6d 100644 --- a/tests/array/array/activations/silu.cpp +++ b/tests/array/array/activations/silu.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::silu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs silu fn to callable lambda diff --git a/tests/array/array/activations/softplus.cpp b/tests/array/array/activations/softplus.cpp index f50b1cc7d..47dd93264 100644 --- a/tests/array/array/activations/softplus.cpp +++ b/tests/array/array/activations/softplus.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::softplus(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs softplus fn to callable lambda diff --git a/tests/array/array/activations/softshrink.cpp b/tests/array/array/activations/softshrink.cpp index 1930f9b27..87b2afd68 100644 --- a/tests/array/array/activations/softshrink.cpp +++ b/tests/array/array/activations/softshrink.cpp @@ -28,7 +28,7 @@ namespace array = nmtools::array; nm::array::softshrink(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs softshrink fn to callable lambda diff --git a/tests/array/array/activations/softsign.cpp b/tests/array/array/activations/softsign.cpp index fdf8fc532..7f90e7f02 100644 --- a/tests/array/array/activations/softsign.cpp +++ b/tests/array/array/activations/softsign.cpp @@ -28,7 +28,7 @@ namespace array = nmtools::array; nm::array::softsign(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs softsign fn to callable lambda diff --git a/tests/array/array/activations/tanhshrink.cpp b/tests/array/array/activations/tanhshrink.cpp index 0ce2f7c65..2ad95b00d 100644 --- a/tests/array/array/activations/tanhshrink.cpp +++ b/tests/array/array/activations/tanhshrink.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::tanhshrink(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs tanhshrink fn to callable lambda diff --git a/tests/array/array/arange.cpp b/tests/array/array/arange.cpp index b13d6dab1..df571a0f3 100644 --- a/tests/array/array/arange.cpp +++ b/tests/array/array/arange.cpp @@ -10,7 +10,7 @@ nm::array::arange(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arange fn to callable lambda diff --git a/tests/array/array/batch_norm.cpp b/tests/array/array/batch_norm.cpp index 0982fe5e7..f87086cb2 100644 --- a/tests/array/array/batch_norm.cpp +++ b/tests/array/array/batch_norm.cpp @@ -3,14 +3,14 @@ #include "nmtools/testing/doctest.hpp" // TODO: improve precision -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION (1e-4) +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION (1e-4) #define RUN_batch_norm_impl(...) \ nmtools::array::batch_norm(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nmtools::benchmarks::TrackedBench; // create immediately invoked lambda // that packs batch_norm fn to callable lambda diff --git a/tests/array/array/compress.cpp b/tests/array/array/compress.cpp index 7ff135d40..e390849b5 100644 --- a/tests/array/array/compress.cpp +++ b/tests/array/array/compress.cpp @@ -28,7 +28,7 @@ namespace na = nm::array; nm::array::compress(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs compress fn to callable lambda diff --git a/tests/array/array/concatenate.cpp b/tests/array/array/concatenate.cpp index 9cf4735cb..f969c58f4 100644 --- a/tests/array/array/concatenate.cpp +++ b/tests/array/array/concatenate.cpp @@ -34,7 +34,7 @@ namespace na = nm::array; nm::array::concatenate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs concatenate fn to callable lambda diff --git a/tests/array/array/cumprod.cpp b/tests/array/array/cumprod.cpp index df070cf5d..a990590fc 100644 --- a/tests/array/array/cumprod.cpp +++ b/tests/array/array/cumprod.cpp @@ -13,7 +13,7 @@ namespace array = nm::array; nm::array::cumprod(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs cumprod fn to callable lambda diff --git a/tests/array/array/cumsum.cpp b/tests/array/array/cumsum.cpp index 074dbbc56..a3b0c2d99 100644 --- a/tests/array/array/cumsum.cpp +++ b/tests/array/array/cumsum.cpp @@ -13,7 +13,7 @@ namespace array = nm::array; nm::array::cumsum(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs cumsum fn to callable lambda diff --git a/tests/array/array/expand_dims.cpp b/tests/array/array/expand_dims.cpp index ff6fd07d5..310769ed4 100644 --- a/tests/array/array/expand_dims.cpp +++ b/tests/array/array/expand_dims.cpp @@ -33,7 +33,7 @@ namespace meta = nm::meta; nm::array::expand_dims(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs expand_dims fn to callable lambda diff --git a/tests/array/array/flatten.cpp b/tests/array/array/flatten.cpp index e7d71e686..74397e0ce 100644 --- a/tests/array/array/flatten.cpp +++ b/tests/array/array/flatten.cpp @@ -29,7 +29,7 @@ namespace meta = nm::meta; nm::array::flatten(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs flatten fn to callable lambda diff --git a/tests/array/array/full.cpp b/tests/array/array/full.cpp index bfcf16fc6..9c15ca008 100644 --- a/tests/array/array/full.cpp +++ b/tests/array/array/full.cpp @@ -10,7 +10,7 @@ nm::array::full(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs full fn to callable lambda diff --git a/tests/array/array/linspace.cpp b/tests/array/array/linspace.cpp index 632eb0aff..d6ffd3e8c 100644 --- a/tests/array/array/linspace.cpp +++ b/tests/array/array/linspace.cpp @@ -1,6 +1,6 @@ #include "nmtools/array/array/linspace.hpp" #include "nmtools/testing/data/array/linspace.hpp" -#include "nmtools/utils/apply_isclose.hpp" +#include "nmtools/utility/apply_isclose.hpp" #include "nmtools/testing/doctest.hpp" #define LINSPACE_SUBCASE(case_name, ...) \ diff --git a/tests/array/array/mean.cpp b/tests/array/array/mean.cpp index 1508f9e6a..db3a3072c 100644 --- a/tests/array/array/mean.cpp +++ b/tests/array/array/mean.cpp @@ -25,7 +25,7 @@ namespace na = nm::array; nm::array::mean(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs mean fn to callable lambda diff --git a/tests/array/array/ones.cpp b/tests/array/array/ones.cpp index bf6a47ef7..8512c873d 100644 --- a/tests/array/array/ones.cpp +++ b/tests/array/array/ones.cpp @@ -10,7 +10,7 @@ nm::array::ones(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs ones fn to callable lambda diff --git a/tests/array/array/pooling.cpp b/tests/array/array/pooling.cpp index af7ce8d3b..9011f094d 100644 --- a/tests/array/array/pooling.cpp +++ b/tests/array/array/pooling.cpp @@ -28,7 +28,7 @@ namespace na = nm::array; nm::array::max_pool2d(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs max_pool2d fn to callable lambda @@ -370,7 +370,7 @@ TEST_CASE("max_pool2d(case10)" * doctest::test_suite("array::max_pool2d")) nm::array::avg_pool2d(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs avg_pool2d fn to callable lambda diff --git a/tests/array/array/prod.cpp b/tests/array/array/prod.cpp index eb66f4acf..0b4f1d17b 100644 --- a/tests/array/array/prod.cpp +++ b/tests/array/array/prod.cpp @@ -13,7 +13,7 @@ namespace array = nm::array; nm::array::prod(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs prod fn to callable lambda diff --git a/tests/array/array/repeat.cpp b/tests/array/array/repeat.cpp index b5b47b333..1e962067e 100644 --- a/tests/array/array/repeat.cpp +++ b/tests/array/array/repeat.cpp @@ -29,7 +29,7 @@ namespace na = nm::array; nm::array::repeat(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs repeat fn to callable lambda diff --git a/tests/array/array/reshape.cpp b/tests/array/array/reshape.cpp index 6a8c9753f..71305ef92 100644 --- a/tests/array/array/reshape.cpp +++ b/tests/array/array/reshape.cpp @@ -29,7 +29,7 @@ namespace meta = nm::meta; nm::array::reshape(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs reshape fn to callable lambda diff --git a/tests/array/array/resize.cpp b/tests/array/array/resize.cpp index be297f9f6..e6d504d20 100644 --- a/tests/array/array/resize.cpp +++ b/tests/array/array/resize.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::array::resize(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs resize fn to callable lambda diff --git a/tests/array/array/softmax.cpp b/tests/array/array/softmax.cpp index cf1107ed3..ce39b00a4 100644 --- a/tests/array/array/softmax.cpp +++ b/tests/array/array/softmax.cpp @@ -6,7 +6,7 @@ nmtools::array::softmax(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nmtools::benchmarks::TrackedBench; // create immediately invoked lambda // that packs softmax fn to callable lambda diff --git a/tests/array/array/softmin.cpp b/tests/array/array/softmin.cpp index b3dac2935..b18e96196 100644 --- a/tests/array/array/softmin.cpp +++ b/tests/array/array/softmin.cpp @@ -6,7 +6,7 @@ nmtools::array::softmin(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nmtools::benchmarks::TrackedBench; // create immediately invoked lambda // that packs softmin fn to callable lambda diff --git a/tests/array/array/split.cpp b/tests/array/array/split.cpp index 85786627a..cadbbe3d7 100644 --- a/tests/array/array/split.cpp +++ b/tests/array/array/split.cpp @@ -21,14 +21,14 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #include "nmtools/testing/doctest.hpp" #include "nmtools/testing/data/array/split.hpp" -#include "nmtools/utils/apply_isequal.hpp" -#include "nmtools/utils/apply_to_string.hpp" +#include "nmtools/utility/apply_isequal.hpp" +#include "nmtools/utility/apply_to_string.hpp" #define RUN_split_impl(...) \ nm::array::split(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs split fn to callable lambda diff --git a/tests/array/array/stddev.cpp b/tests/array/array/stddev.cpp index 2039aceef..a782b8138 100644 --- a/tests/array/array/stddev.cpp +++ b/tests/array/array/stddev.cpp @@ -6,7 +6,7 @@ nmtools::array::stddev(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs stddev fn to callable lambda diff --git a/tests/array/array/sum.cpp b/tests/array/array/sum.cpp index aee165a54..15a6c9b32 100644 --- a/tests/array/array/sum.cpp +++ b/tests/array/array/sum.cpp @@ -13,7 +13,7 @@ namespace array = nm::array; nm::array::sum(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs sum fn to callable lambda diff --git a/tests/array/array/take.cpp b/tests/array/array/take.cpp index b58fa5859..670d5c6dc 100644 --- a/tests/array/array/take.cpp +++ b/tests/array/array/take.cpp @@ -29,7 +29,7 @@ namespace na = nm::array; nm::array::take(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs take fn to callable lambda diff --git a/tests/array/array/tile.cpp b/tests/array/array/tile.cpp index 854bafc6a..e40334274 100644 --- a/tests/array/array/tile.cpp +++ b/tests/array/array/tile.cpp @@ -29,7 +29,7 @@ namespace na = nm::array; nm::array::tile(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs tile fn to callable lambda diff --git a/tests/array/array/ufuncs/add.cpp b/tests/array/array/ufuncs/add.cpp index 446405743..fc3b5b906 100644 --- a/tests/array/array/ufuncs/add.cpp +++ b/tests/array/array/ufuncs/add.cpp @@ -48,7 +48,7 @@ using nm::True; na::add(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs add fn to callable lambda @@ -91,7 +91,7 @@ SUBCASE(#case_name) \ na::fn::add::reduce(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs add.reduce fn to callable lambda @@ -134,7 +134,7 @@ SUBCASE(#case_name) \ na::add.accumulate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs add.accumulate fn to callable lambda @@ -177,7 +177,7 @@ SUBCASE(#case_name) \ na::add.outer(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs add.outer fn to callable lambda diff --git a/tests/array/array/ufuncs/amax.cpp b/tests/array/array/ufuncs/amax.cpp index 46e2765f9..c0ae5e1f3 100644 --- a/tests/array/array/ufuncs/amax.cpp +++ b/tests/array/array/ufuncs/amax.cpp @@ -9,7 +9,7 @@ namespace na = nm::array; nm::array::amax(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs amax fn to callable lambda diff --git a/tests/array/array/ufuncs/amin.cpp b/tests/array/array/ufuncs/amin.cpp index 2ac0eb7ec..18c001fb2 100644 --- a/tests/array/array/ufuncs/amin.cpp +++ b/tests/array/array/ufuncs/amin.cpp @@ -9,7 +9,7 @@ namespace na = nm::array; nm::array::amin(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs amin fn to callable lambda diff --git a/tests/array/array/ufuncs/arccos.cpp b/tests/array/array/ufuncs/arccos.cpp index 59d3caf9e..772b75478 100644 --- a/tests/array/array/ufuncs/arccos.cpp +++ b/tests/array/array/ufuncs/arccos.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::array::arccos(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arccos fn to callable lambda diff --git a/tests/array/array/ufuncs/arccosh.cpp b/tests/array/array/ufuncs/arccosh.cpp index ccee69a9b..bd525c5fd 100644 --- a/tests/array/array/ufuncs/arccosh.cpp +++ b/tests/array/array/ufuncs/arccosh.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::array::arccosh(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arccosh fn to callable lambda diff --git a/tests/array/array/ufuncs/arcsin.cpp b/tests/array/array/ufuncs/arcsin.cpp index 7e2255148..2fe891b0d 100644 --- a/tests/array/array/ufuncs/arcsin.cpp +++ b/tests/array/array/ufuncs/arcsin.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::array::arcsin(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arcsin fn to callable lambda diff --git a/tests/array/array/ufuncs/arcsinh.cpp b/tests/array/array/ufuncs/arcsinh.cpp index 3982f97b0..4dce96765 100644 --- a/tests/array/array/ufuncs/arcsinh.cpp +++ b/tests/array/array/ufuncs/arcsinh.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::array::arcsinh(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arcsinh fn to callable lambda diff --git a/tests/array/array/ufuncs/arctan.cpp b/tests/array/array/ufuncs/arctan.cpp index 2cb7bee89..de110b17d 100644 --- a/tests/array/array/ufuncs/arctan.cpp +++ b/tests/array/array/ufuncs/arctan.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::array::arctan(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arctan fn to callable lambda diff --git a/tests/array/array/ufuncs/arctan2.cpp b/tests/array/array/ufuncs/arctan2.cpp index ed78823fb..9c58c307a 100644 --- a/tests/array/array/ufuncs/arctan2.cpp +++ b/tests/array/array/ufuncs/arctan2.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::array::arctan2(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arctan2 fn to callable lambda diff --git a/tests/array/array/ufuncs/arctanh.cpp b/tests/array/array/ufuncs/arctanh.cpp index b42999f34..3472b8649 100644 --- a/tests/array/array/ufuncs/arctanh.cpp +++ b/tests/array/array/ufuncs/arctanh.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::array::arctanh(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arctanh fn to callable lambda diff --git a/tests/array/array/ufuncs/bitwise_and.cpp b/tests/array/array/ufuncs/bitwise_and.cpp index cb52b2b84..e20940f71 100644 --- a/tests/array/array/ufuncs/bitwise_and.cpp +++ b/tests/array/array/ufuncs/bitwise_and.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::array::bitwise_and(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs bitwise_and fn to callable lambda diff --git a/tests/array/array/ufuncs/bitwise_or.cpp b/tests/array/array/ufuncs/bitwise_or.cpp index 93b5ee990..efa6c496e 100644 --- a/tests/array/array/ufuncs/bitwise_or.cpp +++ b/tests/array/array/ufuncs/bitwise_or.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::array::bitwise_or(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs bitwise_or fn to callable lambda diff --git a/tests/array/array/ufuncs/bitwise_xor.cpp b/tests/array/array/ufuncs/bitwise_xor.cpp index 342a646d0..288f8c106 100644 --- a/tests/array/array/ufuncs/bitwise_xor.cpp +++ b/tests/array/array/ufuncs/bitwise_xor.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::bitwise_xor(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs bitwise_xor fn to callable lambda diff --git a/tests/array/array/ufuncs/cbrt.cpp b/tests/array/array/ufuncs/cbrt.cpp index d13b26c1e..a60dc8acf 100644 --- a/tests/array/array/ufuncs/cbrt.cpp +++ b/tests/array/array/ufuncs/cbrt.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::cbrt(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs cbrt fn to callable lambda diff --git a/tests/array/array/ufuncs/ceil.cpp b/tests/array/array/ufuncs/ceil.cpp index d07d112eb..9accf2e1b 100644 --- a/tests/array/array/ufuncs/ceil.cpp +++ b/tests/array/array/ufuncs/ceil.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::ceil(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs ceil fn to callable lambda diff --git a/tests/array/array/ufuncs/clip.cpp b/tests/array/array/ufuncs/clip.cpp index c902135eb..678d6c69b 100644 --- a/tests/array/array/ufuncs/clip.cpp +++ b/tests/array/array/ufuncs/clip.cpp @@ -28,7 +28,7 @@ namespace na = nm::array; nm::array::clip(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs clip fn to callable lambda diff --git a/tests/array/array/ufuncs/cos.cpp b/tests/array/array/ufuncs/cos.cpp index 9d0fbc5c2..a6be508d9 100644 --- a/tests/array/array/ufuncs/cos.cpp +++ b/tests/array/array/ufuncs/cos.cpp @@ -28,7 +28,7 @@ namespace na = nm::array; nm::array::cos(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs cos fn to callable lambda diff --git a/tests/array/array/ufuncs/cosh.cpp b/tests/array/array/ufuncs/cosh.cpp index 0373f59c4..9b8428a29 100644 --- a/tests/array/array/ufuncs/cosh.cpp +++ b/tests/array/array/ufuncs/cosh.cpp @@ -6,8 +6,8 @@ #include // lower testing precision for cosh -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-5 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-5 namespace nm = nmtools; namespace na = nm::array; @@ -16,7 +16,7 @@ namespace na = nm::array; nm::array::cosh(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs cosh fn to callable lambda diff --git a/tests/array/array/ufuncs/degrees.cpp b/tests/array/array/ufuncs/degrees.cpp index 0cbcd4ee0..ea26850ef 100644 --- a/tests/array/array/ufuncs/degrees.cpp +++ b/tests/array/array/ufuncs/degrees.cpp @@ -14,7 +14,7 @@ inline auto name##_ds_hb = nmtools::cast(name, nmtools::array::kind::ndarray_cs_ inline auto name##_ds_db = nmtools::cast(name, nmtools::array::kind::ndarray_cs_db); #endif -#define NMTOOLS_TESTING_OUTPUT_PRECISION (1e-3) +#define NMTOOLS_TESTING_PRECISION (1e-3) #include "nmtools/array/array/ufuncs/degrees.hpp" #include "nmtools/testing/data/array/degrees.hpp" diff --git a/tests/array/array/ufuncs/divide.cpp b/tests/array/array/ufuncs/divide.cpp index 586f13c7f..b4ecdd19f 100644 --- a/tests/array/array/ufuncs/divide.cpp +++ b/tests/array/array/ufuncs/divide.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::array::divide(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs divide fn to callable lambda diff --git a/tests/array/array/ufuncs/equal.cpp b/tests/array/array/ufuncs/equal.cpp index e5cbfdca7..fbdf1abd3 100644 --- a/tests/array/array/ufuncs/equal.cpp +++ b/tests/array/array/ufuncs/equal.cpp @@ -14,7 +14,7 @@ namespace view = nm::view; nm::array::equal(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs equal fn to callable lambda diff --git a/tests/array/array/ufuncs/exp.cpp b/tests/array/array/ufuncs/exp.cpp index d01827474..914497658 100644 --- a/tests/array/array/ufuncs/exp.cpp +++ b/tests/array/array/ufuncs/exp.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::exp(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs exp fn to callable lambda diff --git a/tests/array/array/ufuncs/exp2.cpp b/tests/array/array/ufuncs/exp2.cpp index 50b9fd57f..6482e15bc 100644 --- a/tests/array/array/ufuncs/exp2.cpp +++ b/tests/array/array/ufuncs/exp2.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::array::exp2(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs exp2 fn to callable lambda diff --git a/tests/array/array/ufuncs/expm1.cpp b/tests/array/array/ufuncs/expm1.cpp index 4cb030893..4c5cd4912 100644 --- a/tests/array/array/ufuncs/expm1.cpp +++ b/tests/array/array/ufuncs/expm1.cpp @@ -6,8 +6,8 @@ #include // lower testing precision for expm1 -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-5 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-5 namespace nm = nmtools; namespace na = nm::array; @@ -16,7 +16,7 @@ namespace na = nm::array; nm::array::expm1(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs expm1 fn to callable lambda diff --git a/tests/array/array/ufuncs/fabs.cpp b/tests/array/array/ufuncs/fabs.cpp index 91755a405..a08410052 100644 --- a/tests/array/array/ufuncs/fabs.cpp +++ b/tests/array/array/ufuncs/fabs.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::array::fabs(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs fabs fn to callable lambda diff --git a/tests/array/array/ufuncs/floor.cpp b/tests/array/array/ufuncs/floor.cpp index d6d60c814..fede69a0c 100644 --- a/tests/array/array/ufuncs/floor.cpp +++ b/tests/array/array/ufuncs/floor.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::floor(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs floor fn to callable lambda diff --git a/tests/array/array/ufuncs/fmax.cpp b/tests/array/array/ufuncs/fmax.cpp index 850c8dd10..a91c37f96 100644 --- a/tests/array/array/ufuncs/fmax.cpp +++ b/tests/array/array/ufuncs/fmax.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::fmax(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs fmax fn to callable lambda @@ -63,7 +63,7 @@ TEST_CASE("fmax(case2)" * doctest::test_suite("array::fmax")) nm::array::fmax.reduce(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs reduce_fmax fn to callable lambda @@ -212,7 +212,7 @@ TEST_CASE("reduce_fmax(case13)" * doctest::test_suite("array::reduce_fmax")) nm::array::fmax.accumulate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs accumulate_fmax fn to callable lambda @@ -275,7 +275,7 @@ TEST_CASE("accumulate_fmax(case3)" * doctest::test_suite("array::accumulate_fmax nm::array::fmax.outer(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs outer_fmax fn to callable lambda diff --git a/tests/array/array/ufuncs/fmin.cpp b/tests/array/array/ufuncs/fmin.cpp index 60e1f1513..4876b0538 100644 --- a/tests/array/array/ufuncs/fmin.cpp +++ b/tests/array/array/ufuncs/fmin.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::fmin(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs fmin fn to callable lambda @@ -63,7 +63,7 @@ TEST_CASE("fmin(case2)" * doctest::test_suite("array::fmin")) nm::array::fmin.reduce(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs reduce_fmin fn to callable lambda @@ -204,7 +204,7 @@ TEST_CASE("reduce_fmin(case12)" * doctest::test_suite("array::reduce_fmin")) nm::array::fmin.accumulate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs accumulate_fmin fn to callable lambda @@ -267,7 +267,7 @@ TEST_CASE("accumulate_fmin(case3)" * doctest::test_suite("array::accumulate_fmin nm::array::fmin.outer(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs outer_fmin fn to callable lambda diff --git a/tests/array/array/ufuncs/fmod.cpp b/tests/array/array/ufuncs/fmod.cpp index ff0fef92d..879014b4e 100644 --- a/tests/array/array/ufuncs/fmod.cpp +++ b/tests/array/array/ufuncs/fmod.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::fmod(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs fmod fn to callable lambda @@ -63,7 +63,7 @@ TEST_CASE("fmod(case2)" * doctest::test_suite("array::fmod")) nm::array::fmod.reduce(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs reduce_fmod fn to callable lambda @@ -166,7 +166,7 @@ TEST_CASE("reduce_fmod(case8)" * doctest::test_suite("array::reduce_fmod")) nm::array::fmod.accumulate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs accumulate_fmod fn to callable lambda @@ -229,7 +229,7 @@ TEST_CASE("accumulate_fmod(case3)" * doctest::test_suite("array::accumulate_fmod nm::array::fmod.outer(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs outer_fmod fn to callable lambda diff --git a/tests/array/array/ufuncs/greater.cpp b/tests/array/array/ufuncs/greater.cpp index 147ea41fb..29cb9c3cd 100644 --- a/tests/array/array/ufuncs/greater.cpp +++ b/tests/array/array/ufuncs/greater.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::greater(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs greater fn to callable lambda diff --git a/tests/array/array/ufuncs/greater_equal.cpp b/tests/array/array/ufuncs/greater_equal.cpp index f06773e4c..44a7039a1 100644 --- a/tests/array/array/ufuncs/greater_equal.cpp +++ b/tests/array/array/ufuncs/greater_equal.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::greater_equal(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs greater_equal fn to callable lambda diff --git a/tests/array/array/ufuncs/hypot.cpp b/tests/array/array/ufuncs/hypot.cpp index 182d1934b..a32cbe1d2 100644 --- a/tests/array/array/ufuncs/hypot.cpp +++ b/tests/array/array/ufuncs/hypot.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::view::hypot(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs hypot fn to callable lambda diff --git a/tests/array/array/ufuncs/invert.cpp b/tests/array/array/ufuncs/invert.cpp index 3d0011f6d..bfdd2cabc 100644 --- a/tests/array/array/ufuncs/invert.cpp +++ b/tests/array/array/ufuncs/invert.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::array::invert(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs invert fn to callable lambda diff --git a/tests/array/array/ufuncs/isfinite.cpp b/tests/array/array/ufuncs/isfinite.cpp index 2e5d812e2..7cb617d02 100644 --- a/tests/array/array/ufuncs/isfinite.cpp +++ b/tests/array/array/ufuncs/isfinite.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::isfinite(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs isfinite fn to callable lambda diff --git a/tests/array/array/ufuncs/isinf.cpp b/tests/array/array/ufuncs/isinf.cpp index b9f28587f..8babc30ae 100644 --- a/tests/array/array/ufuncs/isinf.cpp +++ b/tests/array/array/ufuncs/isinf.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::isinf(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs isinf fn to callable lambda diff --git a/tests/array/array/ufuncs/isnan.cpp b/tests/array/array/ufuncs/isnan.cpp index 3c2612d4b..45df95d7e 100644 --- a/tests/array/array/ufuncs/isnan.cpp +++ b/tests/array/array/ufuncs/isnan.cpp @@ -14,7 +14,7 @@ namespace view = nm::view; nm::array::isnan(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs isnan fn to callable lambda diff --git a/tests/array/array/ufuncs/ldexp.cpp b/tests/array/array/ufuncs/ldexp.cpp index 0d4d24bd7..ffdd70abf 100644 --- a/tests/array/array/ufuncs/ldexp.cpp +++ b/tests/array/array/ufuncs/ldexp.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::ldexp(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs ldexp fn to callable lambda diff --git a/tests/array/array/ufuncs/left_shift.cpp b/tests/array/array/ufuncs/left_shift.cpp index ee59eef44..821f9783d 100644 --- a/tests/array/array/ufuncs/left_shift.cpp +++ b/tests/array/array/ufuncs/left_shift.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::left_shift(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs left_shift fn to callable lambda @@ -63,7 +63,7 @@ TEST_CASE("left_shift(case2)" * doctest::test_suite("array::left_shift")) nm::array::left_shift.reduce(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs reduce_left_shift fn to callable lambda @@ -174,7 +174,7 @@ TEST_CASE("reduce_left_shift(case9)" * doctest::test_suite("array::reduce_left_s nm::array::left_shift.accumulate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs accumulate_left_shift fn to callable lambda @@ -237,7 +237,7 @@ TEST_CASE("accumulate_left_shift(case3)" * doctest::test_suite("array::accumulat nm::view::outer_left_shift(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs outer_left_shift fn to callable lambda diff --git a/tests/array/array/ufuncs/less.cpp b/tests/array/array/ufuncs/less.cpp index eb684c192..95d64223f 100644 --- a/tests/array/array/ufuncs/less.cpp +++ b/tests/array/array/ufuncs/less.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::less(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs less fn to callable lambda diff --git a/tests/array/array/ufuncs/less_equal.cpp b/tests/array/array/ufuncs/less_equal.cpp index ad116afa7..038f0db6d 100644 --- a/tests/array/array/ufuncs/less_equal.cpp +++ b/tests/array/array/ufuncs/less_equal.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::less_equal(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs less_equal fn to callable lambda diff --git a/tests/array/array/ufuncs/log.cpp b/tests/array/array/ufuncs/log.cpp index ec53a4cb9..00dad5e17 100644 --- a/tests/array/array/ufuncs/log.cpp +++ b/tests/array/array/ufuncs/log.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::log(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs log fn to callable lambda diff --git a/tests/array/array/ufuncs/log10.cpp b/tests/array/array/ufuncs/log10.cpp index f672dbd58..1aed21316 100644 --- a/tests/array/array/ufuncs/log10.cpp +++ b/tests/array/array/ufuncs/log10.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::log10(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs log10 fn to callable lambda diff --git a/tests/array/array/ufuncs/log1p.cpp b/tests/array/array/ufuncs/log1p.cpp index 5066a38f2..898a37f46 100644 --- a/tests/array/array/ufuncs/log1p.cpp +++ b/tests/array/array/ufuncs/log1p.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::log1p(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs log1p fn to callable lambda diff --git a/tests/array/array/ufuncs/log2.cpp b/tests/array/array/ufuncs/log2.cpp index 8c4fa68a9..bd67da846 100644 --- a/tests/array/array/ufuncs/log2.cpp +++ b/tests/array/array/ufuncs/log2.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::log2(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs log2 fn to callable lambda diff --git a/tests/array/array/ufuncs/logical_and.cpp b/tests/array/array/ufuncs/logical_and.cpp index b163727c7..fdad90943 100644 --- a/tests/array/array/ufuncs/logical_and.cpp +++ b/tests/array/array/ufuncs/logical_and.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::logical_and(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs logical_and fn to callable lambda diff --git a/tests/array/array/ufuncs/logical_not.cpp b/tests/array/array/ufuncs/logical_not.cpp index c9b48635d..5e4b2eb8c 100644 --- a/tests/array/array/ufuncs/logical_not.cpp +++ b/tests/array/array/ufuncs/logical_not.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::logical_not(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs logical_not fn to callable lambda diff --git a/tests/array/array/ufuncs/logical_or.cpp b/tests/array/array/ufuncs/logical_or.cpp index de0e3bb8c..3c52d4b06 100644 --- a/tests/array/array/ufuncs/logical_or.cpp +++ b/tests/array/array/ufuncs/logical_or.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::logical_or(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs logical_or fn to callable lambda diff --git a/tests/array/array/ufuncs/logical_xor.cpp b/tests/array/array/ufuncs/logical_xor.cpp index 0fe66f206..6421e2fd2 100644 --- a/tests/array/array/ufuncs/logical_xor.cpp +++ b/tests/array/array/ufuncs/logical_xor.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::logical_xor(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs logical_xor fn to callable lambda diff --git a/tests/array/array/ufuncs/maximum.cpp b/tests/array/array/ufuncs/maximum.cpp index 3fc3b52b1..3926b9d80 100644 --- a/tests/array/array/ufuncs/maximum.cpp +++ b/tests/array/array/ufuncs/maximum.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::maximum(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs maximum fn to callable lambda @@ -64,7 +64,7 @@ TEST_CASE("maximum(case2)" * doctest::test_suite("array::maximum")) nm::array::maximum.reduce(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs reduce_maximum fn to callable lambda @@ -205,7 +205,7 @@ TEST_CASE("reduce_maximum(case12)" * doctest::test_suite("array::reduce_maximum" nm::array::maximum.accumulate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs accumulate_maximum fn to callable lambda @@ -268,7 +268,7 @@ TEST_CASE("accumulate_maximum(case3)" * doctest::test_suite("array::accumulate_m nm::array::maximum.outer(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs outer_maximum fn to callable lambda diff --git a/tests/array/array/ufuncs/minimum.cpp b/tests/array/array/ufuncs/minimum.cpp index 0da42e52b..eb1098968 100644 --- a/tests/array/array/ufuncs/minimum.cpp +++ b/tests/array/array/ufuncs/minimum.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::minimum(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs minimum fn to callable lambda @@ -64,7 +64,7 @@ TEST_CASE("minimum(case2)" * doctest::test_suite("array::minimum")) nm::array::minimum.reduce(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs reduce_minimum fn to callable lambda @@ -205,7 +205,7 @@ TEST_CASE("reduce_minimum(case12)" * doctest::test_suite("array::reduce_minimum" nm::array::minimum.accumulate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs accumulate_minimum fn to callable lambda @@ -268,7 +268,7 @@ TEST_CASE("accumulate_minimum(case3)" * doctest::test_suite("array::accumulate_m nm::array::minimum.outer(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs outer_minimum fn to callable lambda diff --git a/tests/array/array/ufuncs/multiply.cpp b/tests/array/array/ufuncs/multiply.cpp index 1c760cffc..77236eb85 100644 --- a/tests/array/array/ufuncs/multiply.cpp +++ b/tests/array/array/ufuncs/multiply.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::view::multiply(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs multiply fn to callable lambda @@ -63,7 +63,7 @@ TEST_CASE("multiply(case2)" * doctest::test_suite("array::multiply")) nm::array::multiply.reduce(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs reduce_multiply fn to callable lambda @@ -202,7 +202,7 @@ TEST_CASE("reduce_multiply(case13)" * doctest::test_suite("array::reduce_multipl nm::array::multiply.accumulate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs accumulate_multiply fn to callable lambda @@ -265,7 +265,7 @@ TEST_CASE("accumulate_multiply(case3)" * doctest::test_suite("array::accumulate_ nm::array::multiply.outer(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs outer_multiply fn to callable lambda diff --git a/tests/array/array/ufuncs/negative.cpp b/tests/array/array/ufuncs/negative.cpp index ac5ebc20e..600627196 100644 --- a/tests/array/array/ufuncs/negative.cpp +++ b/tests/array/array/ufuncs/negative.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::negative(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs negative fn to callable lambda diff --git a/tests/array/array/ufuncs/not_equal.cpp b/tests/array/array/ufuncs/not_equal.cpp index 251b089ed..d838057e0 100644 --- a/tests/array/array/ufuncs/not_equal.cpp +++ b/tests/array/array/ufuncs/not_equal.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::not_equal(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs not_equal fn to callable lambda diff --git a/tests/array/array/ufuncs/positive.cpp b/tests/array/array/ufuncs/positive.cpp index 3a8a173f4..aa13d70a0 100644 --- a/tests/array/array/ufuncs/positive.cpp +++ b/tests/array/array/ufuncs/positive.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::positive(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs positive fn to callable lambda diff --git a/tests/array/array/ufuncs/power.cpp b/tests/array/array/ufuncs/power.cpp index 9c6fae1ac..a5f6d01f5 100644 --- a/tests/array/array/ufuncs/power.cpp +++ b/tests/array/array/ufuncs/power.cpp @@ -14,7 +14,7 @@ using std::tuple; nm::array::power(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs power fn to callable lambda @@ -65,7 +65,7 @@ TEST_CASE("power(case2)" * doctest::test_suite("array::power")) nm::array::power.reduce(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs reduce_power fn to callable lambda @@ -179,7 +179,7 @@ TEST_CASE("reduce_power(case9)" * doctest::test_suite("array::reduce_power")) nm::array::power.accumulate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs accumulate_power fn to callable lambda @@ -234,7 +234,7 @@ TEST_CASE("accumulate_power(case2)" * doctest::test_suite("array::accumulate_pow nm::array::power.outer(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs outer_power fn to callable lambda diff --git a/tests/array/array/ufuncs/rad2deg.cpp b/tests/array/array/ufuncs/rad2deg.cpp index 331501bda..faca56106 100644 --- a/tests/array/array/ufuncs/rad2deg.cpp +++ b/tests/array/array/ufuncs/rad2deg.cpp @@ -14,7 +14,7 @@ inline auto name##_ds_hb = nmtools::cast(name, nmtools::array::kind::ndarray_cs_ inline auto name##_ds_db = nmtools::cast(name, nmtools::array::kind::ndarray_cs_db); #endif -#define NMTOOLS_TESTING_OUTPUT_PRECISION (1e-3) +#define NMTOOLS_TESTING_PRECISION (1e-3) #include "nmtools/array/array/ufuncs/rad2deg.hpp" #include "nmtools/testing/data/array/rad2deg.hpp" diff --git a/tests/array/array/ufuncs/reciprocal.cpp b/tests/array/array/ufuncs/reciprocal.cpp index fe8c01794..67a4b51b4 100644 --- a/tests/array/array/ufuncs/reciprocal.cpp +++ b/tests/array/array/ufuncs/reciprocal.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::reciprocal(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs reciprocal fn to callable lambda diff --git a/tests/array/array/ufuncs/right_shift.cpp b/tests/array/array/ufuncs/right_shift.cpp index 5149b91bb..312243518 100644 --- a/tests/array/array/ufuncs/right_shift.cpp +++ b/tests/array/array/ufuncs/right_shift.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::right_shift(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs right_shift fn to callable lambda @@ -63,7 +63,7 @@ TEST_CASE("right_shift(case2)" * doctest::test_suite("view::right_shift")) nm::array::right_shift.reduce(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs reduce_right_shift fn to callable lambda @@ -166,7 +166,7 @@ TEST_CASE("reduce_right_shift(case8)" * doctest::test_suite("array::reduce_right nm::array::right_shift.accumulate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs accumulate_right_shift fn to callable lambda @@ -229,7 +229,7 @@ TEST_CASE("accumulate_right_shift(case3)" * doctest::test_suite("array::accumula nm::array::right_shift.outer(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs outer_right_shift fn to callable lambda diff --git a/tests/array/array/ufuncs/rint.cpp b/tests/array/array/ufuncs/rint.cpp index c98a8b262..5ec72ef42 100644 --- a/tests/array/array/ufuncs/rint.cpp +++ b/tests/array/array/ufuncs/rint.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::rint(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs rint fn to callable lambda diff --git a/tests/array/array/ufuncs/signbit.cpp b/tests/array/array/ufuncs/signbit.cpp index eee205bd7..5e84f4885 100644 --- a/tests/array/array/ufuncs/signbit.cpp +++ b/tests/array/array/ufuncs/signbit.cpp @@ -13,7 +13,7 @@ namespace na = nm::array; nm::array::signbit(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs signbit fn to callable lambda diff --git a/tests/array/array/ufuncs/sin.cpp b/tests/array/array/ufuncs/sin.cpp index 4aff1d48b..3d56a04b2 100644 --- a/tests/array/array/ufuncs/sin.cpp +++ b/tests/array/array/ufuncs/sin.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::sin(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs sin fn to callable lambda diff --git a/tests/array/array/ufuncs/sinh.cpp b/tests/array/array/ufuncs/sinh.cpp index 0ee86b252..66d896b1e 100644 --- a/tests/array/array/ufuncs/sinh.cpp +++ b/tests/array/array/ufuncs/sinh.cpp @@ -6,8 +6,8 @@ #include // lower testing precision for sinh -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 7e-5 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 7e-5 namespace nm = nmtools; namespace na = nm::array; @@ -16,7 +16,7 @@ namespace na = nm::array; nm::array::sinh(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs sinh fn to callable lambda diff --git a/tests/array/array/ufuncs/sqrt.cpp b/tests/array/array/ufuncs/sqrt.cpp index fc019e9f9..7493d2707 100644 --- a/tests/array/array/ufuncs/sqrt.cpp +++ b/tests/array/array/ufuncs/sqrt.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::sqrt(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs sqrt fn to callable lambda diff --git a/tests/array/array/ufuncs/square.cpp b/tests/array/array/ufuncs/square.cpp index a78f04999..53eb79c57 100644 --- a/tests/array/array/ufuncs/square.cpp +++ b/tests/array/array/ufuncs/square.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::square(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs square fn to callable lambda diff --git a/tests/array/array/ufuncs/subtract.cpp b/tests/array/array/ufuncs/subtract.cpp index 6d52975b0..91f754a27 100644 --- a/tests/array/array/ufuncs/subtract.cpp +++ b/tests/array/array/ufuncs/subtract.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::subtract(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs subtract fn to callable lambda @@ -63,7 +63,7 @@ TEST_CASE("subtract(case2)" * doctest::test_suite("array::subtract")) nm::array::subtract.reduce(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs reduce_subtract fn to callable lambda @@ -166,7 +166,7 @@ TEST_CASE("reduce_subtract(case8)" * doctest::test_suite("array::reduce_subtract nm::array::subtract.accumulate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs accumulate_subtract fn to callable lambda @@ -229,7 +229,7 @@ TEST_CASE("accumulate_subtract(case3)" * doctest::test_suite("array::accumulate_ nm::array::subtract.outer(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs outer_subtract fn to callable lambda diff --git a/tests/array/array/ufuncs/tan.cpp b/tests/array/array/ufuncs/tan.cpp index 23a966370..9bf9b83b1 100644 --- a/tests/array/array/ufuncs/tan.cpp +++ b/tests/array/array/ufuncs/tan.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::tan(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs tan fn to callable lambda diff --git a/tests/array/array/ufuncs/tanh.cpp b/tests/array/array/ufuncs/tanh.cpp index c1e2fac87..b6a2dcb54 100644 --- a/tests/array/array/ufuncs/tanh.cpp +++ b/tests/array/array/ufuncs/tanh.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::tanh(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs tanh fn to callable lambda diff --git a/tests/array/array/ufuncs/trunc.cpp b/tests/array/array/ufuncs/trunc.cpp index 966104b70..d342ee48c 100644 --- a/tests/array/array/ufuncs/trunc.cpp +++ b/tests/array/array/ufuncs/trunc.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::array::trunc(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs trunc fn to callable lambda diff --git a/tests/array/array/var.cpp b/tests/array/array/var.cpp index f6ecd45ef..490cd9685 100644 --- a/tests/array/array/var.cpp +++ b/tests/array/array/var.cpp @@ -8,7 +8,7 @@ namespace nm = nmtools; nmtools::array::var(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs var fn to callable lambda diff --git a/tests/array/array/where.cpp b/tests/array/array/where.cpp index bea1c8ba4..53366e6a4 100644 --- a/tests/array/array/where.cpp +++ b/tests/array/array/where.cpp @@ -25,7 +25,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ nm::array::where(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs where fn to callable lambda diff --git a/tests/array/array/zeros.cpp b/tests/array/array/zeros.cpp index f73d97b8e..7474d5df6 100644 --- a/tests/array/array/zeros.cpp +++ b/tests/array/array/zeros.cpp @@ -10,7 +10,7 @@ nm::array::zeros(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs zeros fn to callable lambda diff --git a/tests/array/ndarray/dynamic.cpp b/tests/array/ndarray/dynamic.cpp index be2415ebe..6ffcb1672 100644 --- a/tests/array/ndarray/dynamic.cpp +++ b/tests/array/ndarray/dynamic.cpp @@ -1,4 +1,4 @@ -#include "nmtools/array/dynamic.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" #include "nmtools/testing/doctest.hpp" #include diff --git a/tests/array/ndarray/fixed.cpp b/tests/array/ndarray/fixed.cpp index 3fb648d69..6e8bc2818 100644 --- a/tests/array/ndarray/fixed.cpp +++ b/tests/array/ndarray/fixed.cpp @@ -1,4 +1,4 @@ -#include "nmtools/array/fixed.hpp" +#include "nmtools/array/ndarray/fixed.hpp" #include "nmtools/testing/doctest.hpp" #include diff --git a/tests/array/ndarray/ndarray.cpp b/tests/array/ndarray/ndarray.cpp index 75013d047..888d18103 100644 --- a/tests/array/ndarray/ndarray.cpp +++ b/tests/array/ndarray/ndarray.cpp @@ -9,7 +9,7 @@ #include "nmtools/array/index/ndindex.hpp" #include "nmtools/utl.hpp" #include "nmtools/testing/doctest.hpp" -#include "nmtools/array/cast.hpp" +#include "nmtools/utility/cast.hpp" namespace nm = nmtools; namespace na = nm::array; diff --git a/tests/array/utility/apply_at.cpp b/tests/array/utility/apply_at.cpp index 2c51864f2..d01485242 100644 --- a/tests/array/utility/apply_at.cpp +++ b/tests/array/utility/apply_at.cpp @@ -2,9 +2,9 @@ #define NMTOOLS_TEST_SKIP_DYNAMIC_SIZE_ARRAY // NOTE: seems like it is required to include these headers first // TODO: fix dependency -#include "nmtools/array/fixed.hpp" -#include "nmtools/array/dynamic.hpp" -#include "nmtools/array/utility/apply_at.hpp" +#include "nmtools/array/ndarray/fixed.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/testing/doctest.hpp" #include diff --git a/tests/array/utility/at.cpp b/tests/array/utility/at.cpp index d3922c651..7191deda5 100644 --- a/tests/array/utility/at.cpp +++ b/tests/array/utility/at.cpp @@ -2,8 +2,8 @@ #define NMTOOLS_TEST_SKIP_DYNAMIC_SIZE_ARRAY // NOTE: seems like it is required to include these headers first // TODO: fix dependency -#include "nmtools/array/fixed.hpp" -#include "nmtools/array/dynamic.hpp" +#include "nmtools/array/ndarray/fixed.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" #include "nmtools/constants.hpp" #include "nmtools/testing/doctest.hpp" diff --git a/tests/array/utility/cast.cpp b/tests/array/utility/cast.cpp index 904cb789f..11d8baa43 100644 --- a/tests/array/utility/cast.cpp +++ b/tests/array/utility/cast.cpp @@ -1,6 +1,6 @@ -#include "nmtools/array/dynamic.hpp" -#include "nmtools/array/fixed.hpp" -#include "nmtools/array/utility/cast.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" +#include "nmtools/array/ndarray/fixed.hpp" +#include "nmtools/utility/cast.hpp" #include "nmtools/testing/doctest.hpp" #include diff --git a/tests/array/utility/data.cpp b/tests/array/utility/data.cpp index 4dc76cb4a..25a8e23dd 100644 --- a/tests/array/utility/data.cpp +++ b/tests/array/utility/data.cpp @@ -1,4 +1,4 @@ -#include "nmtools/array/data.hpp" +#include "nmtools/utility/data.hpp" #include "nmtools/array/ndarray.hpp" #include "nmtools/testing/doctest.hpp" diff --git a/tests/array/utils/isclose.cpp b/tests/array/utils/isclose.cpp index 6b62b5c1e..b254113d1 100644 --- a/tests/array/utils/isclose.cpp +++ b/tests/array/utils/isclose.cpp @@ -1,6 +1,6 @@ -#include "nmtools/array/dynamic.hpp" -#include "nmtools/array/fixed.hpp" -#include "nmtools/utils/isclose.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" +#include "nmtools/array/ndarray/fixed.hpp" +#include "nmtools/utility/isclose.hpp" #if __has_include("doctest/doctest.h") #include "doctest/doctest.h" #else diff --git a/tests/array/utils/to_string.cpp b/tests/array/utils/to_string.cpp index 81833fb05..94829810a 100644 --- a/tests/array/utils/to_string.cpp +++ b/tests/array/utils/to_string.cpp @@ -1,6 +1,6 @@ -#include "nmtools/array/dynamic.hpp" -#include "nmtools/array/fixed.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" +#include "nmtools/array/ndarray/fixed.hpp" +#include "nmtools/utility/to_string.hpp" #include "nmtools/testing/doctest.hpp" #include #include diff --git a/tests/cuda/array/slice.cpp b/tests/cuda/array/slice.cpp index c216579e9..a5e8a844f 100644 --- a/tests/cuda/array/slice.cpp +++ b/tests/cuda/array/slice.cpp @@ -18,7 +18,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #include "nmtools/array/array/slice.hpp" #include "nmtools/testing/doctest.hpp" #include "nmtools/array/eval/cuda.hpp" -#include "nmtools/utils/apply_isclose.hpp" +#include "nmtools/utility/apply_isclose.hpp" #if not(defined(__CUDA__) && defined(__CUDA_ARCH__)) #include "nmtools/testing/data/array/slice.hpp" diff --git a/tests/cuda/array/ufuncs/sinh.cpp b/tests/cuda/array/ufuncs/sinh.cpp index 70c40c6fd..9dca524db 100644 --- a/tests/cuda/array/ufuncs/sinh.cpp +++ b/tests/cuda/array/ufuncs/sinh.cpp @@ -24,8 +24,8 @@ namespace nm = nmtools; namespace na = nm::array; namespace cuda = na::cuda; -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-3 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-3 #define SINH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ diff --git a/tests/functional/src/combinator/bury.cpp b/tests/functional/src/combinator/bury.cpp index 8eabe5a86..854892e79 100644 --- a/tests/functional/src/combinator/bury.cpp +++ b/tests/functional/src/combinator/bury.cpp @@ -5,7 +5,7 @@ #include "nmtools/array/functional/ufuncs/divide.hpp" #include "nmtools/array/functional/ufuncs/subtract.hpp" #include "nmtools/testing/doctest.hpp" -#include "nmtools/utils/apply_isequal.hpp" +#include "nmtools/utility/apply_isequal.hpp" namespace nm = nmtools; namespace na = nmtools::array; diff --git a/tests/functional/src/graph/batch_norm.cpp b/tests/functional/src/graph/batch_norm.cpp index abcde6134..59f18060a 100644 --- a/tests/functional/src/graph/batch_norm.cpp +++ b/tests/functional/src/graph/batch_norm.cpp @@ -3,7 +3,7 @@ #include "nmtools/array/array/random.hpp" #include "nmtools/array/array/moveaxis.hpp" #include "nmtools/array/array/atleast_nd.hpp" -#include "nmtools/array/random_engine.hpp" +#include "nmtools/utility/random_engine.hpp" #include "nmtools/array/view/batch_norm.hpp" #include "nmtools/array/functional/batch_norm.hpp" #include "nmtools/utility/has_value.hpp" diff --git a/tests/functional/src/resize.cpp b/tests/functional/src/resize.cpp index 2d74bc23c..9d329ebd3 100644 --- a/tests/functional/src/resize.cpp +++ b/tests/functional/src/resize.cpp @@ -2,7 +2,7 @@ #include "nmtools/array/functional/functor.hpp" #include "nmtools/testing/data/array/resize.hpp" #include "nmtools/array/functional/indexing.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/to_string.hpp" #include "nmtools/testing/doctest.hpp" namespace nm = nmtools; diff --git a/tests/functional/src/ufuncs/cosh.cpp b/tests/functional/src/ufuncs/cosh.cpp index f89a6c2fe..c901d6fc4 100644 --- a/tests/functional/src/ufuncs/cosh.cpp +++ b/tests/functional/src/ufuncs/cosh.cpp @@ -3,8 +3,8 @@ #include "nmtools/testing/doctest.hpp" // lower testing precision for cosh -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-5 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-5 namespace nm = nmtools; namespace fn = nm::functional; diff --git a/tests/functional/src/ufuncs/sinh.cpp b/tests/functional/src/ufuncs/sinh.cpp index 69fdf9d86..ad3ec40f3 100644 --- a/tests/functional/src/ufuncs/sinh.cpp +++ b/tests/functional/src/ufuncs/sinh.cpp @@ -3,8 +3,8 @@ #include "nmtools/testing/doctest.hpp" // lower testing precision for sinh -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 7e-5 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 7e-5 namespace nm = nmtools; namespace fn = nm::functional; diff --git a/tests/hip/array/slice.cpp b/tests/hip/array/slice.cpp index 02b852cd7..3ff6f6305 100644 --- a/tests/hip/array/slice.cpp +++ b/tests/hip/array/slice.cpp @@ -18,7 +18,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #include "nmtools/array/array/slice.hpp" #include "nmtools/testing/doctest.hpp" #include "nmtools/array/eval/hip.hpp" -#include "nmtools/utils/apply_isclose.hpp" +#include "nmtools/utility/apply_isclose.hpp" #if not(defined(__HIP__) && defined(__HIP_ARCH__)) #include "nmtools/testing/data/array/slice.hpp" diff --git a/tests/hip/array/ufuncs/sinh.cpp b/tests/hip/array/ufuncs/sinh.cpp index ab55de8a5..aa78c70f2 100644 --- a/tests/hip/array/ufuncs/sinh.cpp +++ b/tests/hip/array/ufuncs/sinh.cpp @@ -24,8 +24,8 @@ namespace nm = nmtools; namespace na = nm::array; namespace hip = na::hip; -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-3 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-3 #define SINH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ diff --git a/tests/index/src/argsort.cpp b/tests/index/src/argsort.cpp index a3ccd315e..f08639acc 100644 --- a/tests/index/src/argsort.cpp +++ b/tests/index/src/argsort.cpp @@ -147,7 +147,7 @@ NMTOOLS_TESTING_DECLARE_CASE(index, constexpr_argsort) nmtools::index::argsort(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nmtools::benchmarks::TrackedBench; // create immediately invoked lambda // that packs argsort fn to callable lambda diff --git a/tests/index/src/array_slice.cpp b/tests/index/src/array_slice.cpp index 3422e9779..74398f2d3 100644 --- a/tests/index/src/array_slice.cpp +++ b/tests/index/src/array_slice.cpp @@ -12,7 +12,7 @@ namespace na = nm::array; nm::index::shape_array_slice(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs shape_array_slice fn to callable lambda diff --git a/tests/index/src/broadcast_shape.cpp b/tests/index/src/broadcast_shape.cpp index 235937189..fb3e1e938 100644 --- a/tests/index/src/broadcast_shape.cpp +++ b/tests/index/src/broadcast_shape.cpp @@ -11,7 +11,7 @@ namespace meta = nm::meta; nm::index::broadcast_shape(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs broadcast_shape fn to callable lambda diff --git a/tests/index/src/choose.cpp b/tests/index/src/choose.cpp index efb5c3c8f..52fd86486 100644 --- a/tests/index/src/choose.cpp +++ b/tests/index/src/choose.cpp @@ -65,7 +65,7 @@ NMTOOLS_TESTING_DECLARE_CASE(index, choose) nmtools::index::choose(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nmtools::benchmarks::TrackedBench; // create immediately invoked lambda // that packs choose fn to callable lambda diff --git a/tests/index/src/compress.cpp b/tests/index/src/compress.cpp index 2495ee23b..87387d46d 100644 --- a/tests/index/src/compress.cpp +++ b/tests/index/src/compress.cpp @@ -224,7 +224,7 @@ NMTOOLS_TESTING_DECLARE_CASE(index, compress) nm::index::shape_compress(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs shape_compress fn to callable lambda @@ -437,7 +437,7 @@ TEST_CASE("shape_compress(case6)" * doctest::test_suite("index::shape_compress") nm::index::compress(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs compress fn to callable lambda diff --git a/tests/index/src/compute_strides.cpp b/tests/index/src/compute_strides.cpp index 9af08b3bc..7b5a252ef 100644 --- a/tests/index/src/compute_strides.cpp +++ b/tests/index/src/compute_strides.cpp @@ -1,6 +1,6 @@ #include "nmtools/array/index/compute_strides.hpp" #include "nmtools/testing/data/index/compute_strides.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/isequal.hpp" #include "nmtools/testing/doctest.hpp" using nmtools::utils::isequal; diff --git a/tests/index/src/concatenate.cpp b/tests/index/src/concatenate.cpp index 6a4bf0bd2..e1c354728 100644 --- a/tests/index/src/concatenate.cpp +++ b/tests/index/src/concatenate.cpp @@ -95,7 +95,7 @@ NMTOOLS_TESTING_DECLARE_CASE(shape_concatenate) nm::index::shape_concatenate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs shape_concatenate fn to callable lambda @@ -461,7 +461,7 @@ NMTOOLS_TESTING_DECLARE_CASE(index, concatenate) nm::index::concatenate(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs concatenate fn to callable lambda diff --git a/tests/index/src/gather.cpp b/tests/index/src/gather.cpp index c8a0fa2d2..e31c6adbd 100644 --- a/tests/index/src/gather.cpp +++ b/tests/index/src/gather.cpp @@ -1,7 +1,7 @@ #include "nmtools/array/index/gather.hpp" // TODO: remove as_tuple #include "nmtools/array/index/as_tuple.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/isequal.hpp" #include "nmtools/constants.hpp" #include "nmtools/testing/doctest.hpp" #include "nmtools/testing/data/index/gather.hpp" @@ -24,7 +24,7 @@ using nmtools_array; nm::index::gather(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs gather fn to callable lambda diff --git a/tests/index/src/insert_index.cpp b/tests/index/src/insert_index.cpp index 45898aef6..4e13d6896 100644 --- a/tests/index/src/insert_index.cpp +++ b/tests/index/src/insert_index.cpp @@ -1,7 +1,7 @@ #include "nmtools/array/index/insert_index.hpp" #include "nmtools/utility/flatten_either.hpp" -#include "nmtools/utils/apply_isequal.hpp" -#include "nmtools/utils/apply_to_string.hpp" +#include "nmtools/utility/apply_isequal.hpp" +#include "nmtools/utility/apply_to_string.hpp" #include "nmtools/testing/doctest.hpp" NMTOOLS_TESTING_DECLARE_CASE(index, insert_index) @@ -196,7 +196,7 @@ namespace na = nm::array; nm::index::insert_index(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs insert_index fn to callable lambda diff --git a/tests/index/src/matmul.cpp b/tests/index/src/matmul.cpp index 1f8f197f9..945690a5e 100644 --- a/tests/index/src/matmul.cpp +++ b/tests/index/src/matmul.cpp @@ -6,7 +6,7 @@ namespace nm = nmtools; namespace na = nm::array; namespace kind = na::kind; -#include "nmtools/utils/apply_isequal.hpp" +#include "nmtools/utility/apply_isequal.hpp" // split for matmul NMTOOLS_TESTING_DECLARE_CASE(array, split) @@ -383,7 +383,7 @@ NMTOOLS_TESTING_DECLARE_CASE(index, matmul) nmtools::index::split(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs split fn to callable lambda @@ -472,7 +472,7 @@ TEST_CASE("split(case6)" * doctest::test_suite("view::detail::split")) nmtools::index::shape_matmul(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs shape_matmul fn to callable lambda @@ -675,7 +675,7 @@ TEST_CASE("shape_matmul(case10)" * doctest::test_suite("view::detail::shape_matm nmtools::view::detail::matmul(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs matmul fn to callable lambda diff --git a/tests/index/src/moveaxis.cpp b/tests/index/src/moveaxis.cpp index f554885b0..cd2f458c3 100644 --- a/tests/index/src/moveaxis.cpp +++ b/tests/index/src/moveaxis.cpp @@ -510,7 +510,7 @@ namespace na = nm::array; nm::index::moveaxis_to_transpose(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs moveaxis_to_transpose fn to callable lambda diff --git a/tests/index/src/ndindex.cpp b/tests/index/src/ndindex.cpp index ffe500e5a..e6b028500 100644 --- a/tests/index/src/ndindex.cpp +++ b/tests/index/src/ndindex.cpp @@ -1,5 +1,5 @@ #include "nmtools/array/index/ndindex.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/isequal.hpp" #include "nmtools/constants.hpp" #include "nmtools/testing/doctest.hpp" #include diff --git a/tests/index/src/normalize_axis.cpp b/tests/index/src/normalize_axis.cpp index 2390cbad6..b70c9da47 100644 --- a/tests/index/src/normalize_axis.cpp +++ b/tests/index/src/normalize_axis.cpp @@ -170,7 +170,7 @@ NMTOOLS_TESTING_DECLARE_CASE(index, normalize_axis) nm::index::normalize_axis(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs normalize_axis fn to callable lambda diff --git a/tests/index/src/outer.cpp b/tests/index/src/outer.cpp index 2289f7e9d..3da9b800e 100644 --- a/tests/index/src/outer.cpp +++ b/tests/index/src/outer.cpp @@ -67,7 +67,7 @@ NMTOOLS_TESTING_DECLARE_CASE(index, shape_outer) nm::index::shape_outer(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs shape_outer fn to callable lambda @@ -203,7 +203,7 @@ NMTOOLS_TESTING_DECLARE_CASE(index, outer) nm::index::outer(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs outer fn to callable lambda diff --git a/tests/index/src/pooling.cpp b/tests/index/src/pooling.cpp index d8ee636c2..73a0b1e55 100644 --- a/tests/index/src/pooling.cpp +++ b/tests/index/src/pooling.cpp @@ -1,8 +1,8 @@ #include "nmtools/array/index/pooling.hpp" #include "nmtools/meta.hpp" #include "nmtools/testing/doctest.hpp" -#include "nmtools/utils/apply_isequal.hpp" -#include "nmtools/utils/apply_to_string.hpp" +#include "nmtools/utility/apply_isequal.hpp" +#include "nmtools/utility/apply_to_string.hpp" #include "nmtools/testing/data/array/pooling.hpp" @@ -13,7 +13,7 @@ namespace na = nm::array; nm::index::shape_pool2d(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs shape_pool2d fn to callable lambda @@ -162,7 +162,7 @@ TEST_CASE("shape_pool2d(case6)" * doctest::test_suite("index::constexpr_shape_po nm::index::slice_pool2d(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs slice_pool2d fn to callable lambda diff --git a/tests/index/src/remove_single_dims.cpp b/tests/index/src/remove_single_dims.cpp index 77cf93648..297a001bb 100644 --- a/tests/index/src/remove_single_dims.cpp +++ b/tests/index/src/remove_single_dims.cpp @@ -16,7 +16,7 @@ namespace kind = na::kind; ::nmtools::index::remove_single_dims(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs remove_single_dims fn to callable lambda diff --git a/tests/index/src/repeat.cpp b/tests/index/src/repeat.cpp index 3beb02978..fada2353c 100644 --- a/tests/index/src/repeat.cpp +++ b/tests/index/src/repeat.cpp @@ -14,7 +14,7 @@ using namespace nm::literals; nm::index::shape_repeat(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs shape_repeat fn to callable lambda @@ -187,7 +187,7 @@ namespace nm = nmtools; nm::index::repeat(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs repeat fn to callable lambda diff --git a/tests/index/src/reverse.cpp b/tests/index/src/reverse.cpp index aeb9e6280..1b8a11f9a 100644 --- a/tests/index/src/reverse.cpp +++ b/tests/index/src/reverse.cpp @@ -1,5 +1,5 @@ #include "nmtools/array/index/reverse.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/isequal.hpp" #include "nmtools/constants.hpp" #include "nmtools/testing/doctest.hpp" #include diff --git a/tests/index/src/scatter.cpp b/tests/index/src/scatter.cpp index fbed8b673..72faf721d 100644 --- a/tests/index/src/scatter.cpp +++ b/tests/index/src/scatter.cpp @@ -1,5 +1,5 @@ #include "nmtools/array/index/scatter.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/isequal.hpp" #include "nmtools/constants.hpp" #include "nmtools/testing/doctest.hpp" #include diff --git a/tests/index/src/slice.cpp b/tests/index/src/slice.cpp index 8037c0996..a3ae1ed16 100644 --- a/tests/index/src/slice.cpp +++ b/tests/index/src/slice.cpp @@ -21,7 +21,7 @@ using namespace nm::literals; nm::index::shape_slice(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs shape_slice fn to callable lambda @@ -455,7 +455,7 @@ TEST_CASE("shape_slice(case34)" * doctest::test_suite("index::shape_slice")) nm::index::shape_dynamic_slice(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs shape_dynamic_slice fn to callable lambda @@ -729,7 +729,7 @@ TEST_CASE("shape_dynamic_slice(case22)" * doctest::test_suite("index::shape_dyna nm::index::slice(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs slice fn to callable lambda @@ -752,7 +752,7 @@ RUN_slice_impl(__VA_ARGS__); nm::index::dynamic_slice(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs dynamic_slice fn to callable lambda diff --git a/tests/index/src/take.cpp b/tests/index/src/take.cpp index 1924837be..4d48f1dde 100644 --- a/tests/index/src/take.cpp +++ b/tests/index/src/take.cpp @@ -170,7 +170,7 @@ NMTOOLS_TESTING_DECLARE_CASE(index, take) nm::index::shape_take(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs shape_take fn to callable lambda @@ -268,7 +268,7 @@ TEST_CASE("shape_take(case3)" * doctest::test_suite("index::constexpr_shape_take nm::index::take(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs take fn to callable lambda diff --git a/tests/index/src/take_along_axis.cpp b/tests/index/src/take_along_axis.cpp index 14e719fcb..c9c1e17c8 100644 --- a/tests/index/src/take_along_axis.cpp +++ b/tests/index/src/take_along_axis.cpp @@ -9,7 +9,7 @@ namespace na = nm::array; nm::index::shape_take_along_axis(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs shape_take_along_axis fn to callable lambda diff --git a/tests/index/src/tile.cpp b/tests/index/src/tile.cpp index dcfc363c7..22391580b 100644 --- a/tests/index/src/tile.cpp +++ b/tests/index/src/tile.cpp @@ -194,7 +194,7 @@ NMTOOLS_TESTING_DECLARE_CASE(constexpr_shape_tile) nm::index::shape_tile(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs shape_tile fn to callable lambda @@ -546,7 +546,7 @@ NMTOOLS_TESTING_DECLARE_CASE(tile) nm::index::tile(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs tile fn to callable lambda diff --git a/tests/meta/traits/has_square_bracket.cpp b/tests/meta/traits/has_square_bracket.cpp index fc725f7e1..beb198c83 100644 --- a/tests/meta/traits/has_square_bracket.cpp +++ b/tests/meta/traits/has_square_bracket.cpp @@ -10,10 +10,10 @@ */ #include "nmtools/meta.hpp" -#include "nmtools/array/fixed.hpp" -#include "nmtools/array/dynamic.hpp" +#include "nmtools/array/ndarray/fixed.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" // NOTE: need to include utility for std::array fixed_size specialization -#include "nmtools/array/utility.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/testing/testing.hpp" #if __has_include("doctest/doctest.h") diff --git a/tests/meta/traits/ndarray.cpp b/tests/meta/traits/ndarray.cpp index 215641af8..e0537cd7a 100644 --- a/tests/meta/traits/ndarray.cpp +++ b/tests/meta/traits/ndarray.cpp @@ -8,10 +8,10 @@ * */ #include "nmtools/meta.hpp" -#include "nmtools/array/fixed.hpp" -#include "nmtools/array/dynamic.hpp" +#include "nmtools/array/ndarray/fixed.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" // NOTE: need to include utility for nmtools_array fixed_size specialization -#include "nmtools/array/utility.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/testing/testing.hpp" #if __has_include("doctest/doctest.h") diff --git a/tests/meta/transform/get_element_type.cpp b/tests/meta/transform/get_element_type.cpp index 51f6a94a2..2c67f9879 100644 --- a/tests/meta/transform/get_element_type.cpp +++ b/tests/meta/transform/get_element_type.cpp @@ -1,8 +1,8 @@ #include "nmtools/meta.hpp" -#include "nmtools/array/fixed.hpp" -#include "nmtools/array/dynamic.hpp" +#include "nmtools/array/ndarray/fixed.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" // NOTE: need to include utility for std::array fixed_size specialization -#include "nmtools/array/utility.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/testing/testing.hpp" #if __has_include("doctest/doctest.h") diff --git a/tests/meta/transform/nested_array_dim.cpp b/tests/meta/transform/nested_array_dim.cpp index b014c453b..b66c64097 100644 --- a/tests/meta/transform/nested_array_dim.cpp +++ b/tests/meta/transform/nested_array_dim.cpp @@ -1,7 +1,7 @@ #include "nmtools/meta.hpp" -#include "nmtools/array/fixed.hpp" -#include "nmtools/array/dynamic.hpp" -#include "nmtools/array/utility.hpp" +#include "nmtools/array/ndarray/fixed.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/testing/doctest.hpp" #include diff --git a/tests/meta/transform/remove_nested_array_extents.cpp b/tests/meta/transform/remove_nested_array_extents.cpp index cef6be9df..986a273a0 100644 --- a/tests/meta/transform/remove_nested_array_extents.cpp +++ b/tests/meta/transform/remove_nested_array_extents.cpp @@ -1,8 +1,8 @@ #include "nmtools/meta.hpp" -#include "nmtools/array/fixed.hpp" -#include "nmtools/array/dynamic.hpp" +#include "nmtools/array/ndarray/fixed.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" // NOTE: need to include utility for std::array fixed_size specialization -#include "nmtools/array/utility.hpp" +#include "nmtools/utility/at.hpp" #include "nmtools/testing/testing.hpp" #if __has_include("doctest/doctest.h") diff --git a/tests/meta/transform/replace_element_type.cpp b/tests/meta/transform/replace_element_type.cpp index e1daf3ee1..27cfce734 100644 --- a/tests/meta/transform/replace_element_type.cpp +++ b/tests/meta/transform/replace_element_type.cpp @@ -1,6 +1,6 @@ #include "nmtools/meta.hpp" -#include "nmtools/array/fixed.hpp" -#include "nmtools/array/dynamic.hpp" +#include "nmtools/array/ndarray/fixed.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" #include "nmtools/testing/doctest.hpp" #include diff --git a/tests/opencl/kernels/log.cpp b/tests/opencl/kernels/log.cpp index 6406d7087..22d25d334 100644 --- a/tests/opencl/kernels/log.cpp +++ b/tests/opencl/kernels/log.cpp @@ -7,8 +7,8 @@ #include "nmtools/array/array/ufuncs/log.hpp" #include "nmtools/testing/doctest.hpp" -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-3 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-3 namespace nm = nmtools; namespace na = nm::array; diff --git a/tests/opencl/kernels/log10.cpp b/tests/opencl/kernels/log10.cpp index deb13082d..d9d19a97b 100644 --- a/tests/opencl/kernels/log10.cpp +++ b/tests/opencl/kernels/log10.cpp @@ -7,8 +7,8 @@ #include "nmtools/array/array/ufuncs/log10.hpp" #include "nmtools/testing/doctest.hpp" -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-3 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-3 namespace nm = nmtools; namespace na = nm::array; diff --git a/tests/opencl/kernels/reciprocal.cpp b/tests/opencl/kernels/reciprocal.cpp index 2586b2bee..7da46eb38 100644 --- a/tests/opencl/kernels/reciprocal.cpp +++ b/tests/opencl/kernels/reciprocal.cpp @@ -7,8 +7,8 @@ #include "nmtools/array/array/ufuncs/reciprocal.hpp" #include "nmtools/testing/doctest.hpp" -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-3 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-3 namespace nm = nmtools; namespace na = nm::array; diff --git a/tests/opencl/kernels/sinh.cpp b/tests/opencl/kernels/sinh.cpp index 4b7268089..a66d5180e 100644 --- a/tests/opencl/kernels/sinh.cpp +++ b/tests/opencl/kernels/sinh.cpp @@ -11,8 +11,8 @@ namespace nm = nmtools; namespace na = nm::array; namespace opencl = na::opencl; -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-3 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-3 #define OPENCL_TEST(array,fn,...) \ { \ diff --git a/tests/opencl/kernels/sqrt.cpp b/tests/opencl/kernels/sqrt.cpp index 2100a9935..4484968f3 100644 --- a/tests/opencl/kernels/sqrt.cpp +++ b/tests/opencl/kernels/sqrt.cpp @@ -11,8 +11,8 @@ namespace nm = nmtools; namespace na = nm::array; namespace opencl = na::opencl; -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-3 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-3 #define OPENCL_TEST(array,fn,...) \ { \ diff --git a/tests/opencl/kernels/tan.cpp b/tests/opencl/kernels/tan.cpp index b8cfb5417..5a6d81ed8 100644 --- a/tests/opencl/kernels/tan.cpp +++ b/tests/opencl/kernels/tan.cpp @@ -7,8 +7,8 @@ #include "nmtools/array/array/ufuncs/tan.hpp" #include "nmtools/testing/doctest.hpp" -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-3 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-3 namespace nm = nmtools; namespace na = nm::array; diff --git a/tests/platformio/arduino/manip/test/test_main.cpp b/tests/platformio/arduino/manip/test/test_main.cpp index ec16bc4d0..31e8a5f3e 100644 --- a/tests/platformio/arduino/manip/test/test_main.cpp +++ b/tests/platformio/arduino/manip/test/test_main.cpp @@ -20,9 +20,9 @@ #include "nmtools/testing/data/array/broadcast_to.hpp" #include "nmtools/testing/data/array/split.hpp" -#include "nmtools/utils/isequal.hpp" -#include "nmtools/utils/isclose.hpp" -#include "nmtools/utils/apply_isequal.hpp" +#include "nmtools/utility/isequal.hpp" +#include "nmtools/utility/isclose.hpp" +#include "nmtools/utility/apply_isequal.hpp" #include #include diff --git a/tests/platformio/arduino/meta/test/test_main.cpp b/tests/platformio/arduino/meta/test/test_main.cpp index bc2b5050f..355b105f7 100644 --- a/tests/platformio/arduino/meta/test/test_main.cpp +++ b/tests/platformio/arduino/meta/test/test_main.cpp @@ -5,7 +5,7 @@ #include "nmtools/array/array/activations/relu.hpp" #include "nmtools/array/array/ufuncs/add.hpp" #include "nmtools/array/array/matmul.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/isequal.hpp" #include #include diff --git a/tests/platformio/mbed/manip/test/test_main.cpp b/tests/platformio/mbed/manip/test/test_main.cpp index 0274223d8..23560601e 100644 --- a/tests/platformio/mbed/manip/test/test_main.cpp +++ b/tests/platformio/mbed/manip/test/test_main.cpp @@ -42,8 +42,8 @@ #include "nmtools/testing/data/array/where.hpp" #include "nmtools/testing/data/array/zeros.hpp" -#include "nmtools/utils/isequal.hpp" -#include "nmtools/utils/isclose.hpp" +#include "nmtools/utility/isequal.hpp" +#include "nmtools/utility/isclose.hpp" // by default mbed declare using namespace std and mbed; #define MBED_NO_GLOBAL_USING_DIRECTIVE diff --git a/tests/platformio/mbed/ufuncs/test/test_main.cpp b/tests/platformio/mbed/ufuncs/test/test_main.cpp index de7fdadf9..5fcc8592d 100644 --- a/tests/platformio/mbed/ufuncs/test/test_main.cpp +++ b/tests/platformio/mbed/ufuncs/test/test_main.cpp @@ -186,9 +186,9 @@ #include "nmtools/testing/data/array/elu.hpp" #include "nmtools/testing/data/array/mish.hpp" -#include "nmtools/utils/isequal.hpp" -#include "nmtools/utils/isclose.hpp" -#include "nmtools/utils/to_string.hpp" +#include "nmtools/utility/isequal.hpp" +#include "nmtools/utility/isclose.hpp" +#include "nmtools/utility/to_string.hpp" namespace nm = nmtools; namespace na = nm::array; diff --git a/tests/sycl/array/slice.cpp b/tests/sycl/array/slice.cpp index fdb694a58..de01277b2 100644 --- a/tests/sycl/array/slice.cpp +++ b/tests/sycl/array/slice.cpp @@ -18,7 +18,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #include "nmtools/array/array/slice.hpp" #include "nmtools/testing/doctest.hpp" #include "nmtools/array/eval/sycl.hpp" -#include "nmtools/utils/apply_isclose.hpp" +#include "nmtools/utility/apply_isclose.hpp" #if not(defined(__CUDA__) && defined(__CUDA_ARCH__)) #include "nmtools/testing/data/array/slice.hpp" diff --git a/tests/sycl/composition/subtract_exp.cpp b/tests/sycl/composition/subtract_exp.cpp index a0d1d978d..a4bb5003a 100644 --- a/tests/sycl/composition/subtract_exp.cpp +++ b/tests/sycl/composition/subtract_exp.cpp @@ -1,4 +1,4 @@ -#define NMTOOLS_TESTING_OUTPUT_PRECISION (1e-2) +#define NMTOOLS_TESTING_PRECISION (1e-2) #include "nmtools/array/array/ufuncs/exp.hpp" #include "nmtools/array/array/ufuncs/subtract.hpp" diff --git a/tests/view/src/activations/celu.cpp b/tests/view/src/activations/celu.cpp index a109af890..61d1d2df2 100644 --- a/tests/view/src/activations/celu.cpp +++ b/tests/view/src/activations/celu.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::celu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs celu fn to callable lambda diff --git a/tests/view/src/activations/elu.cpp b/tests/view/src/activations/elu.cpp index 4f44f62e6..659f09965 100644 --- a/tests/view/src/activations/elu.cpp +++ b/tests/view/src/activations/elu.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::elu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs elu fn to callable lambda diff --git a/tests/view/src/activations/hardshrink.cpp b/tests/view/src/activations/hardshrink.cpp index eb8d0e957..a56c2f64f 100644 --- a/tests/view/src/activations/hardshrink.cpp +++ b/tests/view/src/activations/hardshrink.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::hardshrink(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs hardshrink fn to callable lambda diff --git a/tests/view/src/activations/hardswish.cpp b/tests/view/src/activations/hardswish.cpp index fbebda394..5b02101fb 100644 --- a/tests/view/src/activations/hardswish.cpp +++ b/tests/view/src/activations/hardswish.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::hardswish(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs hardswish fn to callable lambda diff --git a/tests/view/src/activations/hardtanh.cpp b/tests/view/src/activations/hardtanh.cpp index 54a038cfd..f6e60beb7 100644 --- a/tests/view/src/activations/hardtanh.cpp +++ b/tests/view/src/activations/hardtanh.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::hardtanh(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs hardtanh fn to callable lambda diff --git a/tests/view/src/activations/leaky_relu.cpp b/tests/view/src/activations/leaky_relu.cpp index cec5663af..a79fdadd4 100644 --- a/tests/view/src/activations/leaky_relu.cpp +++ b/tests/view/src/activations/leaky_relu.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::leaky_relu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs leaky_relu fn to callable lambda diff --git a/tests/view/src/activations/log_sigmoid.cpp b/tests/view/src/activations/log_sigmoid.cpp index c1035e78e..b4d657e00 100644 --- a/tests/view/src/activations/log_sigmoid.cpp +++ b/tests/view/src/activations/log_sigmoid.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::log_sigmoid(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs log_sigmoid fn to callable lambda diff --git a/tests/view/src/activations/mish.cpp b/tests/view/src/activations/mish.cpp index e5d46e5f6..c6e70ef5e 100644 --- a/tests/view/src/activations/mish.cpp +++ b/tests/view/src/activations/mish.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::mish(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs mish fn to callable lambda diff --git a/tests/view/src/activations/prelu.cpp b/tests/view/src/activations/prelu.cpp index c6de5f907..65ddf4f87 100644 --- a/tests/view/src/activations/prelu.cpp +++ b/tests/view/src/activations/prelu.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::prelu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs prelu fn to callable lambda diff --git a/tests/view/src/activations/relu.cpp b/tests/view/src/activations/relu.cpp index 2c2209138..d79d97f51 100644 --- a/tests/view/src/activations/relu.cpp +++ b/tests/view/src/activations/relu.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::relu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs relu fn to callable lambda diff --git a/tests/view/src/activations/relu6.cpp b/tests/view/src/activations/relu6.cpp index d2f0ee733..f6abf74b2 100644 --- a/tests/view/src/activations/relu6.cpp +++ b/tests/view/src/activations/relu6.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::relu6(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs relu6 fn to callable lambda diff --git a/tests/view/src/activations/selu.cpp b/tests/view/src/activations/selu.cpp index 58bdfe9a1..0967371a9 100644 --- a/tests/view/src/activations/selu.cpp +++ b/tests/view/src/activations/selu.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::selu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs selu fn to callable lambda diff --git a/tests/view/src/activations/sigmoid.cpp b/tests/view/src/activations/sigmoid.cpp index 8ddf479de..38c76c6bc 100644 --- a/tests/view/src/activations/sigmoid.cpp +++ b/tests/view/src/activations/sigmoid.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::sigmoid(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs sigmoid fn to callable lambda diff --git a/tests/view/src/activations/silu.cpp b/tests/view/src/activations/silu.cpp index 4f8235653..36bfb8da1 100644 --- a/tests/view/src/activations/silu.cpp +++ b/tests/view/src/activations/silu.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::silu(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs silu fn to callable lambda diff --git a/tests/view/src/activations/softplus.cpp b/tests/view/src/activations/softplus.cpp index c46a9738e..ab0441ce3 100644 --- a/tests/view/src/activations/softplus.cpp +++ b/tests/view/src/activations/softplus.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::softplus(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs softplus fn to callable lambda diff --git a/tests/view/src/activations/softshrink.cpp b/tests/view/src/activations/softshrink.cpp index ae848bc93..dbab88856 100644 --- a/tests/view/src/activations/softshrink.cpp +++ b/tests/view/src/activations/softshrink.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::softshrink(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs softshrink fn to callable lambda diff --git a/tests/view/src/activations/softsign.cpp b/tests/view/src/activations/softsign.cpp index af2618f47..29c0dab86 100644 --- a/tests/view/src/activations/softsign.cpp +++ b/tests/view/src/activations/softsign.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::softsign(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs softsign fn to callable lambda diff --git a/tests/view/src/activations/tanhshrink.cpp b/tests/view/src/activations/tanhshrink.cpp index 5b2411735..c7bb25943 100644 --- a/tests/view/src/activations/tanhshrink.cpp +++ b/tests/view/src/activations/tanhshrink.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; nm::view::tanhshrink(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs tanhshrink fn to callable lambda diff --git a/tests/view/src/argsort.cpp b/tests/view/src/argsort.cpp index 917c7e42c..702df5603 100644 --- a/tests/view/src/argsort.cpp +++ b/tests/view/src/argsort.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; nm::view::argsort(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs argsort fn to callable lambda diff --git a/tests/view/src/atleast_1d.cpp b/tests/view/src/atleast_1d.cpp index a0c7b6bc3..b3631c80a 100644 --- a/tests/view/src/atleast_1d.cpp +++ b/tests/view/src/atleast_1d.cpp @@ -25,7 +25,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ nmtools::view::atleast_1d(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nmtools::benchmarks::TrackedBench; // create immediately invoked lambda // that packs atleast_1d fn to callable lambda diff --git a/tests/view/src/atleast_2d.cpp b/tests/view/src/atleast_2d.cpp index 3b5cad43b..19c4a9dd2 100644 --- a/tests/view/src/atleast_2d.cpp +++ b/tests/view/src/atleast_2d.cpp @@ -25,7 +25,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ nmtools::view::atleast_2d(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nmtools::benchmarks::TrackedBench; // create immediately invoked lambda // that packs atleast_2d fn to callable lambda diff --git a/tests/view/src/batch_norm.cpp b/tests/view/src/batch_norm.cpp index 2419ed974..560b9584a 100644 --- a/tests/view/src/batch_norm.cpp +++ b/tests/view/src/batch_norm.cpp @@ -19,14 +19,14 @@ inline auto name##_ds_db = nmtools::cast(name, nmtools::array::kind::ndarray_ds_ #include "nmtools/testing/doctest.hpp" // TODO: improve precision -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION (1e-4) +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION (1e-4) #define RUN_batch_norm_impl(...) \ nmtools::view::batch_norm(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nmtools::benchmarks::TrackedBench; // create immediately invoked lambda // that packs batch_norm fn to callable lambda diff --git a/tests/view/src/composition/mean_subtract.cpp b/tests/view/src/composition/mean_subtract.cpp index 91694d3ee..bf9e9f68e 100644 --- a/tests/view/src/composition/mean_subtract.cpp +++ b/tests/view/src/composition/mean_subtract.cpp @@ -165,7 +165,7 @@ NMTOOLS_TESTING_DECLARE_CASE(composition, mean_subtract) composition::mean_subtract(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs mean_subtract fn to callable lambda diff --git a/tests/view/src/composition/square_sum_divide.cpp b/tests/view/src/composition/square_sum_divide.cpp index 946adbfe6..135f0a826 100644 --- a/tests/view/src/composition/square_sum_divide.cpp +++ b/tests/view/src/composition/square_sum_divide.cpp @@ -79,7 +79,7 @@ NMTOOLS_TESTING_DECLARE_CASE(composition, square_sum) composition::square_sum(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs square_sum fn to callable lambda @@ -322,7 +322,7 @@ NMTOOLS_TESTING_DECLARE_CASE(composition, square_sum_divide) composition::square_sum_divide(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs square_sum_divide fn to callable lambda diff --git a/tests/view/src/composition/subtract_fabs_square.cpp b/tests/view/src/composition/subtract_fabs_square.cpp index f5177ab48..1804c3477 100644 --- a/tests/view/src/composition/subtract_fabs_square.cpp +++ b/tests/view/src/composition/subtract_fabs_square.cpp @@ -99,7 +99,7 @@ NMTOOLS_TESTING_DECLARE_CASE(composition, subtract_fabs_square) composition::subtract_fabs_square(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs subtract_fabs_square fn to callable lambda diff --git a/tests/view/src/compress.cpp b/tests/view/src/compress.cpp index a9a09b87b..b02fca1b5 100644 --- a/tests/view/src/compress.cpp +++ b/tests/view/src/compress.cpp @@ -28,7 +28,7 @@ namespace na = nm::array; nm::view::compress(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs compress fn to callable lambda diff --git a/tests/view/src/conv1d-5.cpp b/tests/view/src/conv1d-5.cpp index 93b3a6ed2..43b35a61b 100644 --- a/tests/view/src/conv1d-5.cpp +++ b/tests/view/src/conv1d-5.cpp @@ -19,7 +19,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ // TODO: improve precision on utl build #ifdef NMTOOLS_DISABLE_STL -#define NMTOOLS_TESTING_OUTPUT_PRECISION (1e-3) +#define NMTOOLS_TESTING_PRECISION (1e-3) #endif #include "nmtools/array/view/conv1d.hpp" diff --git a/tests/view/src/cumprod.cpp b/tests/view/src/cumprod.cpp index a378efead..16c905b8f 100644 --- a/tests/view/src/cumprod.cpp +++ b/tests/view/src/cumprod.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::view::cumprod(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs cumprod fn to callable lambda diff --git a/tests/view/src/cumsum.cpp b/tests/view/src/cumsum.cpp index 7dd6ac50c..25b11aa14 100644 --- a/tests/view/src/cumsum.cpp +++ b/tests/view/src/cumsum.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::view::cumsum(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs cumsum fn to callable lambda diff --git a/tests/view/src/full.cpp b/tests/view/src/full.cpp index b1929658c..3021fa052 100644 --- a/tests/view/src/full.cpp +++ b/tests/view/src/full.cpp @@ -10,7 +10,7 @@ nm::view::full(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs full fn to callable lambda diff --git a/tests/view/src/linspace.cpp b/tests/view/src/linspace.cpp index aab118747..6fddf3da1 100644 --- a/tests/view/src/linspace.cpp +++ b/tests/view/src/linspace.cpp @@ -1,6 +1,6 @@ #include "nmtools/array/view/linspace.hpp" #include "nmtools/testing/data/array/linspace.hpp" -#include "nmtools/utils/apply_isclose.hpp" +#include "nmtools/utility/apply_isclose.hpp" #include "nmtools/testing/doctest.hpp" #define LINSPACE_SUBCASE(case_name, ...) \ diff --git a/tests/view/src/moveaxis.cpp b/tests/view/src/moveaxis.cpp index 828ab5067..cbc828365 100644 --- a/tests/view/src/moveaxis.cpp +++ b/tests/view/src/moveaxis.cpp @@ -28,7 +28,7 @@ namespace na = nm::array; nm::view::moveaxis(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs moveaxis fn to callable lambda diff --git a/tests/view/src/mutable_ref.cpp b/tests/view/src/mutable_ref.cpp index b4995d543..e4c89fd8c 100644 --- a/tests/view/src/mutable_ref.cpp +++ b/tests/view/src/mutable_ref.cpp @@ -9,10 +9,10 @@ */ #include "nmtools/array/view.hpp" -#include "nmtools/array/fixed.hpp" -#include "nmtools/array/dynamic.hpp" -#include "nmtools/utils/isclose.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/array/ndarray/fixed.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" +#include "nmtools/utility/isclose.hpp" +#include "nmtools/utility/isequal.hpp" #include "nmtools/testing/doctest.hpp" #include diff --git a/tests/view/src/mutable_slice.cpp b/tests/view/src/mutable_slice.cpp index 9568672ba..9153dcdaa 100644 --- a/tests/view/src/mutable_slice.cpp +++ b/tests/view/src/mutable_slice.cpp @@ -919,7 +919,7 @@ nm::view::mutable_slice(__VA_ARGS__); nm::view::apply_mutable_slice(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs mutable_slice fn to callable lambda diff --git a/tests/view/src/ones.cpp b/tests/view/src/ones.cpp index e863bdb66..e1cde89b2 100644 --- a/tests/view/src/ones.cpp +++ b/tests/view/src/ones.cpp @@ -10,7 +10,7 @@ nm::view::ones(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs ones fn to callable lambda diff --git a/tests/view/src/pad.cpp b/tests/view/src/pad.cpp index 881dfadc5..c4b9189aa 100644 --- a/tests/view/src/pad.cpp +++ b/tests/view/src/pad.cpp @@ -25,7 +25,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ nmtools::view::pad(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs pad fn to callable lambda diff --git a/tests/view/src/pooling.cpp b/tests/view/src/pooling.cpp index 3cba1eee8..1df80de5c 100644 --- a/tests/view/src/pooling.cpp +++ b/tests/view/src/pooling.cpp @@ -28,7 +28,7 @@ namespace na = nm::array; nm::view::max_pool2d(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs max_pool2d fn to callable lambda @@ -370,7 +370,7 @@ TEST_CASE("max_pool2d(case10)" * doctest::test_suite("view::max_pool2d")) nm::view::avg_pool2d(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs avg_pool2d fn to callable lambda diff --git a/tests/view/src/prod.cpp b/tests/view/src/prod.cpp index 3983e2d8d..5e799e056 100644 --- a/tests/view/src/prod.cpp +++ b/tests/view/src/prod.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::view::prod(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs prod fn to callable lambda diff --git a/tests/view/src/ref.cpp b/tests/view/src/ref.cpp index fb3097c78..ba250c06c 100644 --- a/tests/view/src/ref.cpp +++ b/tests/view/src/ref.cpp @@ -9,11 +9,11 @@ */ // @note need to includ array impl first to make sure overaload/specialization is visible -#include "nmtools/array/fixed.hpp" -#include "nmtools/array/dynamic.hpp" +#include "nmtools/array/ndarray/fixed.hpp" +#include "nmtools/array/ndarray/dynamic.hpp" #include "nmtools/array/view.hpp" -#include "nmtools/utils/isclose.hpp" -#include "nmtools/utils/isequal.hpp" +#include "nmtools/utility/isclose.hpp" +#include "nmtools/utility/isequal.hpp" #include "nmtools/testing/testing.hpp" #if __has_include("doctest/doctest.h") diff --git a/tests/view/src/repeat.cpp b/tests/view/src/repeat.cpp index 6b2d9bbaa..da95651e2 100644 --- a/tests/view/src/repeat.cpp +++ b/tests/view/src/repeat.cpp @@ -34,7 +34,7 @@ namespace view = nm::view; nm::view::repeat(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs repeat fn to callable lambda diff --git a/tests/view/src/resize.cpp b/tests/view/src/resize.cpp index a748bc454..fc8e70e36 100644 --- a/tests/view/src/resize.cpp +++ b/tests/view/src/resize.cpp @@ -27,7 +27,7 @@ namespace nm = nmtools; nm::view::resize(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs resize fn to callable lambda diff --git a/tests/view/src/slice.cpp b/tests/view/src/slice.cpp index 742b8469b..a7346a08a 100644 --- a/tests/view/src/slice.cpp +++ b/tests/view/src/slice.cpp @@ -28,7 +28,7 @@ namespace na = nmtools::array; nm::view::slice(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs slice fn to callable lambda @@ -1443,7 +1443,7 @@ TEST_CASE("slice" * doctest::test_suite("view::slice")) nm::view::apply_slice(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs apply_slice fn to callable lambda diff --git a/tests/view/src/softmax.cpp b/tests/view/src/softmax.cpp index 4495da262..fe1057628 100644 --- a/tests/view/src/softmax.cpp +++ b/tests/view/src/softmax.cpp @@ -6,7 +6,7 @@ nmtools::view::softmax(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nmtools::benchmarks::TrackedBench; // create immediately invoked lambda // that packs softmax fn to callable lambda diff --git a/tests/view/src/softmin.cpp b/tests/view/src/softmin.cpp index 5e9e6015b..8ad9e9713 100644 --- a/tests/view/src/softmin.cpp +++ b/tests/view/src/softmin.cpp @@ -6,7 +6,7 @@ nmtools::view::softmin(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nmtools::benchmarks::TrackedBench; // create immediately invoked lambda // that packs softmin fn to callable lambda diff --git a/tests/view/src/split.cpp b/tests/view/src/split.cpp index 6d134c18e..262ecd37c 100644 --- a/tests/view/src/split.cpp +++ b/tests/view/src/split.cpp @@ -21,15 +21,15 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #include "nmtools/testing/doctest.hpp" #include "nmtools/testing/data/array/split.hpp" -#include "nmtools/utils/apply_to_string.hpp" -#include "nmtools/utils/apply_isequal.hpp" +#include "nmtools/utility/apply_to_string.hpp" +#include "nmtools/utility/apply_isequal.hpp" #define RUN_split_args_impl(...) \ nm::view::detail::split_args(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs split_args fn to callable lambda @@ -174,7 +174,7 @@ TEST_CASE("split_args(case12)" * doctest::test_suite("index::split_args")) nm::view::split(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs split fn to callable lambda diff --git a/tests/view/src/stddev.cpp b/tests/view/src/stddev.cpp index 8734e19f8..cdb38580b 100644 --- a/tests/view/src/stddev.cpp +++ b/tests/view/src/stddev.cpp @@ -6,7 +6,7 @@ nmtools::view::stddev(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs stddev fn to callable lambda diff --git a/tests/view/src/take.cpp b/tests/view/src/take.cpp index a1a536ae1..af081c03a 100644 --- a/tests/view/src/take.cpp +++ b/tests/view/src/take.cpp @@ -29,7 +29,7 @@ namespace na = nm::array; nm::view::take(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs take fn to callable lambda diff --git a/tests/view/src/take_along_axis.cpp b/tests/view/src/take_along_axis.cpp index 8e34dda6c..78156d7c1 100644 --- a/tests/view/src/take_along_axis.cpp +++ b/tests/view/src/take_along_axis.cpp @@ -25,7 +25,7 @@ namespace na = nm::array; nm::view::take_along_axis(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs take_along_axis fn to callable lambda diff --git a/tests/view/src/tile.cpp b/tests/view/src/tile.cpp index 360994013..027bf3ebd 100644 --- a/tests/view/src/tile.cpp +++ b/tests/view/src/tile.cpp @@ -32,7 +32,7 @@ namespace na = nm::array; nm::view::tile(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs tile fn to callable lambda diff --git a/tests/view/src/ufuncs/amax.cpp b/tests/view/src/ufuncs/amax.cpp index d7eec335a..aee2a322d 100644 --- a/tests/view/src/ufuncs/amax.cpp +++ b/tests/view/src/ufuncs/amax.cpp @@ -10,7 +10,7 @@ namespace view = nm::view; nm::view::amax(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs amax fn to callable lambda diff --git a/tests/view/src/ufuncs/amin.cpp b/tests/view/src/ufuncs/amin.cpp index c2df05f50..92689eeba 100644 --- a/tests/view/src/ufuncs/amin.cpp +++ b/tests/view/src/ufuncs/amin.cpp @@ -10,7 +10,7 @@ namespace view = nm::view; nm::view::amin(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs amin fn to callable lambda diff --git a/tests/view/src/ufuncs/arccos.cpp b/tests/view/src/ufuncs/arccos.cpp index d7d3a9e00..f2cb79423 100644 --- a/tests/view/src/ufuncs/arccos.cpp +++ b/tests/view/src/ufuncs/arccos.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::view::arccos(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arccos fn to callable lambda diff --git a/tests/view/src/ufuncs/arccosh.cpp b/tests/view/src/ufuncs/arccosh.cpp index a5bfb0d7a..48b6bc358 100644 --- a/tests/view/src/ufuncs/arccosh.cpp +++ b/tests/view/src/ufuncs/arccosh.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::view::arccosh(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arccosh fn to callable lambda diff --git a/tests/view/src/ufuncs/arcsin.cpp b/tests/view/src/ufuncs/arcsin.cpp index a7ddaae55..c93628893 100644 --- a/tests/view/src/ufuncs/arcsin.cpp +++ b/tests/view/src/ufuncs/arcsin.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::view::arcsin(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arcsin fn to callable lambda diff --git a/tests/view/src/ufuncs/arcsinh.cpp b/tests/view/src/ufuncs/arcsinh.cpp index ae9a94b4b..889275f0f 100644 --- a/tests/view/src/ufuncs/arcsinh.cpp +++ b/tests/view/src/ufuncs/arcsinh.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::view::arcsinh(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arcsinh fn to callable lambda diff --git a/tests/view/src/ufuncs/arctan.cpp b/tests/view/src/ufuncs/arctan.cpp index 3cad54ba8..57f4bc345 100644 --- a/tests/view/src/ufuncs/arctan.cpp +++ b/tests/view/src/ufuncs/arctan.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::view::arctan(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arctan fn to callable lambda diff --git a/tests/view/src/ufuncs/arctanh.cpp b/tests/view/src/ufuncs/arctanh.cpp index 7e97a53df..6c6141bd0 100644 --- a/tests/view/src/ufuncs/arctanh.cpp +++ b/tests/view/src/ufuncs/arctanh.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; nm::view::arctanh(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs arctanh fn to callable lambda diff --git a/tests/view/src/ufuncs/cosh.cpp b/tests/view/src/ufuncs/cosh.cpp index 48df43190..307eff93a 100644 --- a/tests/view/src/ufuncs/cosh.cpp +++ b/tests/view/src/ufuncs/cosh.cpp @@ -3,8 +3,8 @@ #include "nmtools/testing/doctest.hpp" // lower testing precision for cosh -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-5 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-5 namespace nm = nmtools; namespace na = nm::array; diff --git a/tests/view/src/ufuncs/degrees.cpp b/tests/view/src/ufuncs/degrees.cpp index fb71efff0..f16a2ea01 100644 --- a/tests/view/src/ufuncs/degrees.cpp +++ b/tests/view/src/ufuncs/degrees.cpp @@ -14,7 +14,7 @@ inline auto name##_ds_hb = nmtools::cast(name, nmtools::array::kind::ndarray_cs_ inline auto name##_ds_db = nmtools::cast(name, nmtools::array::kind::ndarray_cs_db); #endif -#define NMTOOLS_TESTING_OUTPUT_PRECISION (1e-3) +#define NMTOOLS_TESTING_PRECISION (1e-3) #include "nmtools/array/view/ufuncs/degrees.hpp" #include "nmtools/testing/data/array/degrees.hpp" diff --git a/tests/view/src/ufuncs/expm1.cpp b/tests/view/src/ufuncs/expm1.cpp index cfb2b2772..68c0cab2f 100644 --- a/tests/view/src/ufuncs/expm1.cpp +++ b/tests/view/src/ufuncs/expm1.cpp @@ -3,8 +3,8 @@ #include "nmtools/testing/doctest.hpp" // lower testing precision for expm1 -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 1e-5 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 1e-5 namespace nm = nmtools; namespace na = nm::array; diff --git a/tests/view/src/ufuncs/rad2deg.cpp b/tests/view/src/ufuncs/rad2deg.cpp index f4bbc2950..9ba89ed39 100644 --- a/tests/view/src/ufuncs/rad2deg.cpp +++ b/tests/view/src/ufuncs/rad2deg.cpp @@ -14,7 +14,7 @@ inline auto name##_ds_hb = nmtools::cast(name, nmtools::array::kind::ndarray_cs_ inline auto name##_ds_db = nmtools::cast(name, nmtools::array::kind::ndarray_cs_db); #endif -#define NMTOOLS_TESTING_OUTPUT_PRECISION (1e-3) +#define NMTOOLS_TESTING_PRECISION (1e-3) #include "nmtools/array/view/ufuncs/rad2deg.hpp" #include "nmtools/testing/data/array/rad2deg.hpp" diff --git a/tests/view/src/ufuncs/sinh.cpp b/tests/view/src/ufuncs/sinh.cpp index fc6f624e4..94e33aa1c 100644 --- a/tests/view/src/ufuncs/sinh.cpp +++ b/tests/view/src/ufuncs/sinh.cpp @@ -3,8 +3,8 @@ #include "nmtools/testing/doctest.hpp" // lower testing precision for sinh -#undef NMTOOLS_TESTING_OUTPUT_PRECISION -#define NMTOOLS_TESTING_OUTPUT_PRECISION 7e-5 +#undef NMTOOLS_TESTING_PRECISION +#define NMTOOLS_TESTING_PRECISION 7e-5 namespace nm = nmtools; namespace na = nm::array; diff --git a/tests/view/src/zeros.cpp b/tests/view/src/zeros.cpp index baba2bd5f..d9059d07e 100644 --- a/tests/view/src/zeros.cpp +++ b/tests/view/src/zeros.cpp @@ -10,7 +10,7 @@ nm::view::zeros(__VA_ARGS__); #ifdef NMTOOLS_TESTING_ENABLE_BENCHMARKS -#include "nmtools/benchmarks/bench.hpp" +#include "nmtools/testing/benchmarks/bench.hpp" using nm::benchmarks::TrackedBench; // create immediately invoked lambda // that packs zeros fn to callable lambda