From a86fb6d1e2efa017f069ef051d9b2b8032f1774a Mon Sep 17 00:00:00 2001 From: Fahri Ali Rahman Date: Sat, 1 Jun 2024 20:05:28 +0700 Subject: [PATCH] rename testing macro NMTOOLS_TESTING_DECLARE_NS to NMTOOLS_TESTING_USE_CASE --- include/nmtools/testing/testing.hpp | 10 +- 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 | 4 +- tests/array/array/activations/relu6.cpp | 4 +- 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/atleast_1d.cpp | 2 +- tests/array/array/atleast_2d.cpp | 2 +- tests/array/array/atleast_3d.cpp | 2 +- tests/array/array/batch_norm.cpp | 2 +- tests/array/array/broadcast_arrays.cpp | 2 +- tests/array/array/broadcast_to.cpp | 2 +- tests/array/array/compress.cpp | 2 +- tests/array/array/concatenate.cpp | 2 +- tests/array/array/conv-1.cpp | 4 +- tests/array/array/conv-2.cpp | 4 +- tests/array/array/conv-3.cpp | 4 +- tests/array/array/conv-4.cpp | 4 +- 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/flip.cpp | 6 +- tests/array/array/full.cpp | 2 +- tests/array/array/hstack.cpp | 2 +- tests/array/array/matmul-1.cpp | 2 +- tests/array/array/matmul-2.cpp | 2 +- tests/array/array/matmul-3.cpp | 2 +- tests/array/array/matmul.cpp | 2 +- tests/array/array/mean.cpp | 4 +- tests/array/array/moveaxis.cpp | 2 +- tests/array/array/ones.cpp | 2 +- tests/array/array/pad.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/roll.cpp | 2 +- tests/array/array/slice.cpp | 2 +- tests/array/array/sliding_window.cpp | 2 +- tests/array/array/softmax.cpp | 2 +- tests/array/array/softmin.cpp | 2 +- tests/array/array/split.cpp | 2 +- tests/array/array/squeeze.cpp | 2 +- tests/array/array/stack.cpp | 2 +- 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/transpose.cpp | 2 +- tests/array/array/ufuncs/add.cpp | 16 +- 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 | 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 | 2 +- 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/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 | 2 +- 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/vstack.cpp | 2 +- tests/array/array/where.cpp | 2 +- tests/array/array/zeros.cpp | 2 +- tests/constexpr/src/atleast_1d.cpp | 4 +- tests/constexpr/src/atleast_2d.cpp | 2 +- tests/constexpr/src/atleast_3d.cpp | 2 +- tests/constexpr/src/broadcast_arrays.cpp | 2 +- tests/constexpr/src/broadcast_to.cpp | 2 +- tests/constexpr/src/matmul.cpp | 2 +- tests/constexpr/src/moveaxis.cpp | 2 +- tests/constexpr/src/pad.cpp | 2 +- tests/constexpr/src/roll.cpp | 2 +- tests/constexpr/src/transpose.cpp | 2 +- tests/cuda/array/accumulations/add.cpp | 2 +- tests/cuda/array/accumulations/multiply.cpp | 2 +- tests/cuda/array/activations/celu.cpp | 2 +- tests/cuda/array/activations/elu.cpp | 2 +- tests/cuda/array/activations/hardshrink.cpp | 2 +- tests/cuda/array/activations/hardswish.cpp | 2 +- tests/cuda/array/activations/hardtanh.cpp | 2 +- tests/cuda/array/activations/leaky_relu.cpp | 2 +- tests/cuda/array/activations/log_sigmoid.cpp | 2 +- tests/cuda/array/activations/mish.cpp | 2 +- tests/cuda/array/activations/prelu.cpp | 2 +- tests/cuda/array/activations/relu.cpp | 2 +- tests/cuda/array/activations/relu6.cpp | 2 +- tests/cuda/array/activations/selu.cpp | 2 +- tests/cuda/array/activations/sigmoid.cpp | 2 +- tests/cuda/array/activations/silu.cpp | 2 +- tests/cuda/array/activations/softplus.cpp | 2 +- tests/cuda/array/activations/softshrink.cpp | 2 +- tests/cuda/array/activations/softsign.cpp | 2 +- tests/cuda/array/activations/tanhshrink.cpp | 2 +- tests/cuda/array/arange.cpp | 2 +- tests/cuda/array/atleast_1d.cpp | 2 +- tests/cuda/array/atleast_2d.cpp | 2 +- tests/cuda/array/atleast_3d.cpp | 2 +- tests/cuda/array/broadcast_to.cpp | 2 +- tests/cuda/array/concatenate.cpp | 2 +- tests/cuda/array/cumprod.cpp | 2 +- tests/cuda/array/cumsum.cpp | 2 +- tests/cuda/array/expand_dims.cpp | 2 +- tests/cuda/array/flatten.cpp | 2 +- tests/cuda/array/flip.cpp | 6 +- tests/cuda/array/full.cpp | 2 +- tests/cuda/array/hstack.cpp | 2 +- tests/cuda/array/mean.cpp | 2 +- tests/cuda/array/moveaxis.cpp | 2 +- tests/cuda/array/ones.cpp | 2 +- tests/cuda/array/outer/add.cpp | 2 +- tests/cuda/array/outer/multiply.cpp | 2 +- tests/cuda/array/pad.cpp | 2 +- tests/cuda/array/pooling.cpp | 4 +- tests/cuda/array/prod.cpp | 2 +- tests/cuda/array/reductions/add.cpp | 2 +- tests/cuda/array/reductions/multiply.cpp | 2 +- tests/cuda/array/repeat.cpp | 2 +- tests/cuda/array/reshape.cpp | 2 +- tests/cuda/array/resize.cpp | 2 +- tests/cuda/array/slice.cpp | 2 +- tests/cuda/array/squeeze.cpp | 2 +- tests/cuda/array/stack.cpp | 2 +- tests/cuda/array/sum.cpp | 2 +- tests/cuda/array/tile.cpp | 2 +- tests/cuda/array/transpose.cpp | 2 +- tests/cuda/array/ufuncs/add.cpp | 2 +- tests/cuda/array/ufuncs/arccos.cpp | 2 +- tests/cuda/array/ufuncs/arccosh.cpp | 2 +- tests/cuda/array/ufuncs/arcsin.cpp | 2 +- tests/cuda/array/ufuncs/arcsinh.cpp | 2 +- tests/cuda/array/ufuncs/arctan.cpp | 2 +- tests/cuda/array/ufuncs/arctanh.cpp | 2 +- tests/cuda/array/ufuncs/cbrt.cpp | 2 +- tests/cuda/array/ufuncs/ceil.cpp | 2 +- tests/cuda/array/ufuncs/cos.cpp | 2 +- tests/cuda/array/ufuncs/cosh.cpp | 2 +- tests/cuda/array/ufuncs/exp.cpp | 2 +- tests/cuda/array/ufuncs/exp2.cpp | 2 +- tests/cuda/array/ufuncs/expm1.cpp | 2 +- tests/cuda/array/ufuncs/fabs.cpp | 2 +- tests/cuda/array/ufuncs/floor.cpp | 2 +- tests/cuda/array/ufuncs/invert.cpp | 2 +- tests/cuda/array/ufuncs/isfinite.cpp | 2 +- tests/cuda/array/ufuncs/isinf.cpp | 2 +- tests/cuda/array/ufuncs/isnan.cpp | 2 +- tests/cuda/array/ufuncs/log.cpp | 2 +- tests/cuda/array/ufuncs/log10.cpp | 2 +- tests/cuda/array/ufuncs/log1p.cpp | 2 +- tests/cuda/array/ufuncs/log2.cpp | 2 +- tests/cuda/array/ufuncs/multiply.cpp | 2 +- tests/cuda/array/ufuncs/negative.cpp | 2 +- tests/cuda/array/ufuncs/positive.cpp | 2 +- tests/cuda/array/ufuncs/reciprocal.cpp | 2 +- tests/cuda/array/ufuncs/rint.cpp | 2 +- tests/cuda/array/ufuncs/signbit.cpp | 2 +- tests/cuda/array/ufuncs/sin.cpp | 2 +- tests/cuda/array/ufuncs/sinh.cpp | 2 +- tests/cuda/array/ufuncs/sqrt.cpp | 2 +- tests/cuda/array/ufuncs/tan.cpp | 2 +- tests/cuda/array/ufuncs/tanh.cpp | 2 +- tests/cuda/array/vstack.cpp | 2 +- tests/cuda/array/where.cpp | 2 +- tests/cuda/array/zeros.cpp | 2 +- tests/functional/src/activations/celu.cpp | 10 +- tests/functional/src/activations/elu.cpp | 18 +- .../functional/src/activations/hardshrink.cpp | 10 +- .../functional/src/activations/hardswish.cpp | 6 +- tests/functional/src/activations/hardtanh.cpp | 8 +- .../functional/src/activations/leaky_relu.cpp | 8 +- .../src/activations/log_sigmoid.cpp | 6 +- tests/functional/src/activations/mish.cpp | 6 +- tests/functional/src/activations/prelu.cpp | 8 +- tests/functional/src/activations/relu.cpp | 6 +- tests/functional/src/activations/relu6.cpp | 6 +- tests/functional/src/activations/selu.cpp | 6 +- tests/functional/src/activations/sigmoid.cpp | 6 +- tests/functional/src/activations/silu.cpp | 6 +- tests/functional/src/activations/softplus.cpp | 8 +- .../functional/src/activations/softshrink.cpp | 8 +- tests/functional/src/activations/softsign.cpp | 6 +- .../functional/src/activations/tanhshrink.cpp | 6 +- tests/functional/src/atleast_1d.cpp | 8 +- tests/functional/src/atleast_2d.cpp | 8 +- tests/functional/src/atleast_3d.cpp | 8 +- tests/functional/src/atleast_nd.cpp | 24 +-- tests/functional/src/broadcast_to.cpp | 12 +- tests/functional/src/composition/add_add.cpp | 2 +- .../src/composition/add_flatten.cpp | 2 +- tests/functional/src/composition/add_tanh.cpp | 6 +- .../src/composition/divide_subtract.cpp | 8 +- .../src/composition/fabs_square.cpp | 6 +- .../src/composition/fabs_square_sum.cpp | 6 +- .../src/composition/flatten_add.cpp | 18 +- .../src/composition/multiply_add.cpp | 6 +- .../src/composition/multiply_add_tanh.cpp | 6 +- .../src/composition/multiply_tanh.cpp | 6 +- .../src/composition/reduce_add_divide.cpp | 6 +- .../src/composition/reduce_add_tanh.cpp | 6 +- .../composition/reduce_maximum_subtract.cpp | 6 +- .../reduce_maximum_subtract_exp.cpp | 6 +- .../functional/src/composition/square_sum.cpp | 6 +- .../src/composition/square_sum_divide.cpp | 8 +- .../src/composition/subtract_exp.cpp | 6 +- .../src/composition/subtract_fabs.cpp | 6 +- .../src/composition/subtract_fabs_square.cpp | 6 +- .../functional/src/composition/sum_divide.cpp | 6 +- tests/functional/src/compress.cpp | 6 +- tests/functional/src/concatenate.cpp | 6 +- tests/functional/src/conv.cpp | 24 +-- tests/functional/src/cumprod.cpp | 2 +- tests/functional/src/cumsum.cpp | 2 +- tests/functional/src/expand_dims.cpp | 8 +- tests/functional/src/flatten.cpp | 14 +- tests/functional/src/flip.cpp | 18 +- tests/functional/src/hstack.cpp | 4 +- tests/functional/src/matmul.cpp | 14 +- tests/functional/src/mean.cpp | 14 +- tests/functional/src/moveaxis.cpp | 8 +- tests/functional/src/pad.cpp | 4 +- tests/functional/src/pooling.cpp | 42 ++--- tests/functional/src/prod.cpp | 6 +- tests/functional/src/repeat.cpp | 6 +- tests/functional/src/reshape.cpp | 6 +- tests/functional/src/resize.cpp | 6 +- tests/functional/src/roll.cpp | 6 +- tests/functional/src/slice.cpp | 4 +- tests/functional/src/softmax.cpp | 10 +- tests/functional/src/softmin.cpp | 2 +- tests/functional/src/squeeze.cpp | 6 +- tests/functional/src/stack.cpp | 4 +- tests/functional/src/stddev.cpp | 2 +- tests/functional/src/sum.cpp | 6 +- tests/functional/src/take.cpp | 2 +- tests/functional/src/tile.cpp | 6 +- tests/functional/src/transpose.cpp | 6 +- tests/functional/src/ufuncs/add.cpp | 12 +- tests/functional/src/ufuncs/arccos.cpp | 6 +- tests/functional/src/ufuncs/arccosh.cpp | 6 +- tests/functional/src/ufuncs/arcsin.cpp | 6 +- tests/functional/src/ufuncs/arcsinh.cpp | 6 +- tests/functional/src/ufuncs/arctan.cpp | 6 +- tests/functional/src/ufuncs/arctan2.cpp | 2 +- tests/functional/src/ufuncs/arctanh.cpp | 6 +- tests/functional/src/ufuncs/cbrt.cpp | 6 +- tests/functional/src/ufuncs/ceil.cpp | 6 +- tests/functional/src/ufuncs/clip.cpp | 6 +- tests/functional/src/ufuncs/cos.cpp | 6 +- tests/functional/src/ufuncs/cosh.cpp | 6 +- tests/functional/src/ufuncs/exp.cpp | 6 +- tests/functional/src/ufuncs/exp2.cpp | 6 +- tests/functional/src/ufuncs/expm1.cpp | 6 +- tests/functional/src/ufuncs/fabs.cpp | 6 +- tests/functional/src/ufuncs/floor.cpp | 6 +- tests/functional/src/ufuncs/invert.cpp | 6 +- tests/functional/src/ufuncs/isfinite.cpp | 6 +- tests/functional/src/ufuncs/isinf.cpp | 6 +- tests/functional/src/ufuncs/isnan.cpp | 6 +- tests/functional/src/ufuncs/log.cpp | 6 +- tests/functional/src/ufuncs/log10.cpp | 6 +- tests/functional/src/ufuncs/log1p.cpp | 6 +- tests/functional/src/ufuncs/log2.cpp | 6 +- tests/functional/src/ufuncs/multiply.cpp | 36 ++-- tests/functional/src/ufuncs/negative.cpp | 6 +- tests/functional/src/ufuncs/positive.cpp | 6 +- tests/functional/src/ufuncs/reciprocal.cpp | 6 +- tests/functional/src/ufuncs/rint.cpp | 6 +- tests/functional/src/ufuncs/signbit.cpp | 6 +- tests/functional/src/ufuncs/sin.cpp | 6 +- tests/functional/src/ufuncs/sinh.cpp | 6 +- tests/functional/src/ufuncs/sqrt.cpp | 6 +- tests/functional/src/ufuncs/tan.cpp | 6 +- tests/functional/src/ufuncs/tanh.cpp | 6 +- tests/functional/src/var.cpp | 4 +- tests/functional/src/vstack.cpp | 4 +- tests/functional/src/where.cpp | 2 +- tests/index/src/argsort.cpp | 4 +- tests/index/src/array_slice.cpp | 2 +- tests/index/src/broadcast_shape.cpp | 2 +- tests/index/src/broadcast_to.cpp | 2 +- tests/index/src/choose.cpp | 2 +- tests/index/src/compress.cpp | 4 +- tests/index/src/compute_indices.cpp | 2 +- tests/index/src/compute_offset.cpp | 2 +- tests/index/src/compute_strides.cpp | 2 +- tests/index/src/concatenate.cpp | 8 +- tests/index/src/conv.cpp | 4 +- tests/index/src/expand_dims.cpp | 2 +- tests/index/src/free_axes.cpp | 2 +- tests/index/src/gather.cpp | 4 +- tests/index/src/insert_index.cpp | 2 +- tests/index/src/logical_not.cpp | 2 +- tests/index/src/matmul.cpp | 8 +- tests/index/src/moveaxis.cpp | 6 +- tests/index/src/nonzero.cpp | 2 +- tests/index/src/normalize_axis.cpp | 4 +- tests/index/src/outer.cpp | 4 +- tests/index/src/pad.cpp | 6 +- tests/index/src/pooling.cpp | 6 +- tests/index/src/remove_dims.cpp | 2 +- tests/index/src/remove_single_dims.cpp | 2 +- tests/index/src/repeat.cpp | 6 +- tests/index/src/reshape.cpp | 4 +- tests/index/src/resize.cpp | 4 +- tests/index/src/roll.cpp | 4 +- tests/index/src/slice.cpp | 10 +- tests/index/src/sliding_window.cpp | 4 +- tests/index/src/take.cpp | 6 +- tests/index/src/take_along_axis.cpp | 2 +- tests/index/src/tile.cpp | 6 +- tests/opencl/index/broadcast_shape.cpp | 2 +- tests/opencl/index/broadcast_to.cpp | 2 +- tests/opencl/index/compute_indices.cpp | 2 +- tests/opencl/index/compute_strides.cpp | 2 +- tests/opencl/index/gather.cpp | 2 +- tests/opencl/index/logical_not.cpp | 2 +- tests/opencl/index/nonzero.cpp | 2 +- tests/opencl/index/pooling.cpp | 2 +- tests/opencl/index/repeat.cpp | 4 +- tests/opencl/index/resize.cpp | 14 +- tests/opencl/index/transpose.cpp | 10 +- .../arduino/constexpr/test/test_main.cpp | 64 +++---- .../arduino/manip/test/test_main.cpp | 146 +++++++-------- .../arduino/ufuncs/test/test_main.cpp | 108 +++++------ .../platformio/mbed/manip/test/test_main.cpp | 44 ++--- .../platformio/mbed/ufuncs/test/test_main.cpp | 172 +++++++++--------- tests/sycl/array/accumulations/add.cpp | 2 +- tests/sycl/array/accumulations/multiply.cpp | 2 +- tests/sycl/array/activations/celu.cpp | 2 +- tests/sycl/array/activations/elu.cpp | 2 +- tests/sycl/array/activations/hardshrink.cpp | 2 +- tests/sycl/array/activations/hardswish.cpp | 2 +- tests/sycl/array/activations/hardtanh.cpp | 2 +- tests/sycl/array/activations/leaky_relu.cpp | 2 +- tests/sycl/array/activations/log_sigmoid.cpp | 2 +- tests/sycl/array/activations/mish.cpp | 2 +- tests/sycl/array/activations/prelu.cpp | 2 +- tests/sycl/array/activations/relu.cpp | 2 +- tests/sycl/array/activations/relu6.cpp | 2 +- tests/sycl/array/activations/selu.cpp | 2 +- tests/sycl/array/activations/sigmoid.cpp | 2 +- tests/sycl/array/activations/silu.cpp | 2 +- tests/sycl/array/activations/softplus.cpp | 2 +- tests/sycl/array/activations/softshrink.cpp | 2 +- tests/sycl/array/activations/softsign.cpp | 2 +- tests/sycl/array/activations/tanhshrink.cpp | 2 +- tests/sycl/array/arange.cpp | 2 +- tests/sycl/array/atleast_1d.cpp | 2 +- tests/sycl/array/atleast_2d.cpp | 2 +- tests/sycl/array/atleast_3d.cpp | 2 +- tests/sycl/array/broadcast_to.cpp | 2 +- tests/sycl/array/concatenate.cpp | 2 +- tests/sycl/array/cumprod.cpp | 2 +- tests/sycl/array/cumsum.cpp | 2 +- tests/sycl/array/expand_dims.cpp | 2 +- tests/sycl/array/flatten.cpp | 2 +- tests/sycl/array/flip.cpp | 6 +- tests/sycl/array/full.cpp | 2 +- tests/sycl/array/hstack.cpp | 2 +- tests/sycl/array/mean.cpp | 2 +- tests/sycl/array/moveaxis.cpp | 2 +- tests/sycl/array/ones.cpp | 2 +- tests/sycl/array/outer/add.cpp | 2 +- tests/sycl/array/outer/multiply.cpp | 2 +- tests/sycl/array/pad.cpp | 2 +- tests/sycl/array/pooling.cpp | 4 +- tests/sycl/array/prod.cpp | 2 +- tests/sycl/array/reductions/add.cpp | 2 +- tests/sycl/array/reductions/multiply.cpp | 2 +- tests/sycl/array/repeat.cpp | 2 +- tests/sycl/array/reshape.cpp | 2 +- tests/sycl/array/resize.cpp | 2 +- tests/sycl/array/slice.cpp | 2 +- tests/sycl/array/squeeze.cpp | 2 +- tests/sycl/array/stack.cpp | 2 +- tests/sycl/array/sum.cpp | 2 +- tests/sycl/array/tile.cpp | 2 +- tests/sycl/array/transpose.cpp | 2 +- tests/sycl/array/ufuncs/add.cpp | 2 +- tests/sycl/array/ufuncs/multiply.cpp | 2 +- tests/sycl/array/vstack.cpp | 2 +- tests/sycl/array/where.cpp | 2 +- tests/sycl/array/zeros.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/arange.cpp | 2 +- tests/view/src/argsort.cpp | 2 +- tests/view/src/array_slice.cpp | 2 +- tests/view/src/atleast_1d.cpp | 2 +- tests/view/src/atleast_2d.cpp | 2 +- tests/view/src/atleast_3d.cpp | 2 +- tests/view/src/atleast_nd.cpp | 6 +- tests/view/src/batch_norm.cpp | 2 +- tests/view/src/broadcast_arrays.cpp | 2 +- tests/view/src/broadcast_to.cpp | 2 +- tests/view/src/composition/mean_subtract.cpp | 6 +- .../src/composition/square_sum_divide.cpp | 8 +- .../src/composition/subtract_fabs_square.cpp | 2 +- tests/view/src/compress.cpp | 2 +- tests/view/src/concatenate.cpp | 2 +- tests/view/src/conv-1.cpp | 4 +- tests/view/src/conv-2.cpp | 2 +- tests/view/src/conv-3.cpp | 2 +- tests/view/src/conv-4.cpp | 2 +- tests/view/src/cumprod.cpp | 2 +- tests/view/src/cumsum.cpp | 2 +- tests/view/src/expand_dims.cpp | 2 +- tests/view/src/flatten.cpp | 2 +- tests/view/src/flip.cpp | 6 +- tests/view/src/full.cpp | 2 +- tests/view/src/hstack.cpp | 2 +- tests/view/src/matmul-1.cpp | 2 +- tests/view/src/matmul-2.cpp | 2 +- tests/view/src/matmul-3.cpp | 2 +- tests/view/src/matmul.cpp | 2 +- tests/view/src/mean.cpp | 2 +- tests/view/src/moveaxis.cpp | 2 +- tests/view/src/mutable_flatten.cpp | 2 +- tests/view/src/mutable_reshape.cpp | 2 +- tests/view/src/mutable_slice.cpp | 4 +- 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/repeat.cpp | 2 +- tests/view/src/reshape.cpp | 2 +- tests/view/src/resize.cpp | 2 +- tests/view/src/roll.cpp | 2 +- tests/view/src/slice.cpp | 4 +- tests/view/src/sliding_window.cpp | 2 +- tests/view/src/softmax.cpp | 2 +- tests/view/src/softmin.cpp | 2 +- tests/view/src/split.cpp | 4 +- tests/view/src/squeeze.cpp | 2 +- tests/view/src/stack.cpp | 2 +- tests/view/src/stddev.cpp | 2 +- tests/view/src/sum.cpp | 2 +- tests/view/src/take.cpp | 2 +- tests/view/src/take_along_axis.cpp | 4 +- tests/view/src/tile.cpp | 2 +- tests/view/src/transpose.cpp | 2 +- tests/view/src/ufuncs/add.cpp | 8 +- 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/arctan2.cpp | 2 +- tests/view/src/ufuncs/arctanh.cpp | 2 +- tests/view/src/ufuncs/bitwise_and.cpp | 2 +- tests/view/src/ufuncs/bitwise_or.cpp | 2 +- tests/view/src/ufuncs/bitwise_xor.cpp | 2 +- tests/view/src/ufuncs/cbrt.cpp | 2 +- tests/view/src/ufuncs/ceil.cpp | 2 +- tests/view/src/ufuncs/clip.cpp | 2 +- tests/view/src/ufuncs/cos.cpp | 2 +- tests/view/src/ufuncs/cosh.cpp | 2 +- tests/view/src/ufuncs/divide.cpp | 2 +- tests/view/src/ufuncs/equal.cpp | 2 +- tests/view/src/ufuncs/exp.cpp | 2 +- tests/view/src/ufuncs/exp2.cpp | 2 +- tests/view/src/ufuncs/expm1.cpp | 2 +- tests/view/src/ufuncs/fabs.cpp | 2 +- tests/view/src/ufuncs/floor.cpp | 2 +- tests/view/src/ufuncs/fmax.cpp | 8 +- tests/view/src/ufuncs/fmin.cpp | 8 +- tests/view/src/ufuncs/fmod.cpp | 8 +- tests/view/src/ufuncs/greater.cpp | 2 +- tests/view/src/ufuncs/greater_equal.cpp | 2 +- tests/view/src/ufuncs/hypot.cpp | 2 +- tests/view/src/ufuncs/invert.cpp | 2 +- tests/view/src/ufuncs/isfinite.cpp | 2 +- tests/view/src/ufuncs/isinf.cpp | 2 +- tests/view/src/ufuncs/isnan.cpp | 2 +- tests/view/src/ufuncs/ldexp.cpp | 2 +- tests/view/src/ufuncs/left_shift.cpp | 8 +- tests/view/src/ufuncs/less.cpp | 2 +- tests/view/src/ufuncs/less_equal.cpp | 2 +- tests/view/src/ufuncs/log.cpp | 2 +- tests/view/src/ufuncs/log10.cpp | 2 +- tests/view/src/ufuncs/log1p.cpp | 2 +- tests/view/src/ufuncs/log2.cpp | 2 +- tests/view/src/ufuncs/logical_and.cpp | 4 +- tests/view/src/ufuncs/logical_not.cpp | 2 +- tests/view/src/ufuncs/logical_or.cpp | 4 +- tests/view/src/ufuncs/logical_xor.cpp | 4 +- tests/view/src/ufuncs/maximum.cpp | 8 +- tests/view/src/ufuncs/minimum.cpp | 8 +- tests/view/src/ufuncs/multiply.cpp | 8 +- tests/view/src/ufuncs/negative.cpp | 2 +- tests/view/src/ufuncs/not_equal.cpp | 2 +- tests/view/src/ufuncs/positive.cpp | 2 +- tests/view/src/ufuncs/power.cpp | 8 +- tests/view/src/ufuncs/reciprocal.cpp | 2 +- tests/view/src/ufuncs/right_shift.cpp | 8 +- tests/view/src/ufuncs/rint.cpp | 2 +- tests/view/src/ufuncs/signbit.cpp | 2 +- tests/view/src/ufuncs/sin.cpp | 2 +- tests/view/src/ufuncs/sinh.cpp | 2 +- tests/view/src/ufuncs/sqrt.cpp | 2 +- tests/view/src/ufuncs/square.cpp | 2 +- tests/view/src/ufuncs/subtract.cpp | 8 +- tests/view/src/ufuncs/tan.cpp | 2 +- tests/view/src/ufuncs/tanh.cpp | 2 +- tests/view/src/ufuncs/trunc.cpp | 2 +- tests/view/src/var.cpp | 4 +- tests/view/src/vstack.cpp | 2 +- tests/view/src/where.cpp | 2 +- tests/view/src/zeros.cpp | 2 +- 598 files changed, 1318 insertions(+), 1318 deletions(-) diff --git a/include/nmtools/testing/testing.hpp b/include/nmtools/testing/testing.hpp index efff092ee..4d7af0abd 100644 --- a/include/nmtools/testing/testing.hpp +++ b/include/nmtools/testing/testing.hpp @@ -307,17 +307,17 @@ namespace nmtools::testing::data::function #define NMTOOLS_GET_TESTING_DECLARE_CASE_MACRO(_1,_2,NAME,...) NAME #define NMTOOLS_TESTING_DECLARE_CASE(...) NMTOOLS_GET_TESTING_DECLARE_CASE_MACRO(__VA_ARGS__, NMTOOLS_TESTING_DECLARE_CASE2, NMTOOLS_TESTING_DECLARE_CASE1)(__VA_ARGS__) -#define NMTOOLS_TESTING_DECLARE_NS1(ns) \ +#define NMTOOLS_TESTING_USE_CASE1(ns) \ using namespace nmtools::testing::data::ns; -#define NMTOOLS_TESTING_DECLARE_NS2(ns1, ns2) \ +#define NMTOOLS_TESTING_USE_CASE2(ns1, ns2) \ using namespace nmtools::testing::data::ns1::ns2; -#define NMTOOLS_TESTING_DECLARE_NS3(ns1, ns2, ns3) \ +#define NMTOOLS_TESTING_USE_CASE3(ns1, ns2, ns3) \ using namespace nmtools::testing::data::ns1::ns2::ns3; -#define NMTOOLS_TESTING_DECLARE_NS_MACRO(_1,_2,_3,NAME,...) NAME -#define NMTOOLS_TESTING_DECLARE_NS(...) NMTOOLS_TESTING_DECLARE_NS_MACRO(__VA_ARGS__, NMTOOLS_TESTING_DECLARE_NS3, NMTOOLS_TESTING_DECLARE_NS2, NMTOOLS_TESTING_DECLARE_NS1)(__VA_ARGS__) +#define NMTOOLS_TESTING_USE_CASE_MACRO(_1,_2,_3,NAME,...) NAME +#define NMTOOLS_TESTING_USE_CASE(...) NMTOOLS_TESTING_USE_CASE_MACRO(__VA_ARGS__, NMTOOLS_TESTING_USE_CASE3, NMTOOLS_TESTING_USE_CASE2, NMTOOLS_TESTING_USE_CASE1)(__VA_ARGS__) /** * @brief helper macro to declare actual test data, diff --git a/tests/array/array/activations/celu.cpp b/tests/array/array/activations/celu.cpp index 3661a3dbc..98d9c441d 100644 --- a/tests/array/array/activations/celu.cpp +++ b/tests/array/array/activations/celu.cpp @@ -49,7 +49,7 @@ RUN_celu_impl(__VA_ARGS__); #define CELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, celu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, celu, case_name); \ using namespace args; \ auto result = RUN_celu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/elu.cpp b/tests/array/array/activations/elu.cpp index e0c17aef3..c570d5bf3 100644 --- a/tests/array/array/activations/elu.cpp +++ b/tests/array/array/activations/elu.cpp @@ -49,7 +49,7 @@ RUN_elu_impl(__VA_ARGS__); #define ELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, elu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, elu, case_name); \ using namespace args; \ auto result = RUN_elu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/hardshrink.cpp b/tests/array/array/activations/hardshrink.cpp index 5f75de982..b1c0bb68b 100644 --- a/tests/array/array/activations/hardshrink.cpp +++ b/tests/array/array/activations/hardshrink.cpp @@ -49,7 +49,7 @@ RUN_hardshrink_impl(__VA_ARGS__); #define HARDSHRINK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, hardshrink, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, hardshrink, case_name); \ using namespace args; \ auto result = RUN_hardshrink(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/hardswish.cpp b/tests/array/array/activations/hardswish.cpp index 6caf9973a..303b937e7 100644 --- a/tests/array/array/activations/hardswish.cpp +++ b/tests/array/array/activations/hardswish.cpp @@ -49,7 +49,7 @@ RUN_hardswish_impl(__VA_ARGS__); #define HARDSWISH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, hardswish, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, hardswish, case_name); \ using namespace args; \ auto result = RUN_hardswish(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/hardtanh.cpp b/tests/array/array/activations/hardtanh.cpp index b1a5dbcce..e89089549 100644 --- a/tests/array/array/activations/hardtanh.cpp +++ b/tests/array/array/activations/hardtanh.cpp @@ -49,7 +49,7 @@ RUN_hardtanh_impl(__VA_ARGS__); #define HARDTANH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, hardtanh, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, hardtanh, case_name); \ using namespace args; \ auto result = RUN_hardtanh(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/leaky_relu.cpp b/tests/array/array/activations/leaky_relu.cpp index 1efed0a4f..15a58722a 100644 --- a/tests/array/array/activations/leaky_relu.cpp +++ b/tests/array/array/activations/leaky_relu.cpp @@ -49,7 +49,7 @@ RUN_leaky_relu_impl(__VA_ARGS__); #define LEAKY_RELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, leaky_relu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, leaky_relu, case_name); \ using namespace args; \ auto result = RUN_leaky_relu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/log_sigmoid.cpp b/tests/array/array/activations/log_sigmoid.cpp index 1b2385f31..508119ade 100644 --- a/tests/array/array/activations/log_sigmoid.cpp +++ b/tests/array/array/activations/log_sigmoid.cpp @@ -49,7 +49,7 @@ RUN_log_sigmoid_impl(__VA_ARGS__); #define LOG_SIGMOID_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, log_sigmoid, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, log_sigmoid, case_name); \ using namespace args; \ auto result = RUN_log_sigmoid(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/mish.cpp b/tests/array/array/activations/mish.cpp index 2f052a9f7..654fb7047 100644 --- a/tests/array/array/activations/mish.cpp +++ b/tests/array/array/activations/mish.cpp @@ -49,7 +49,7 @@ RUN_mish_impl(__VA_ARGS__); #define MISH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, mish, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, mish, case_name); \ using namespace args; \ auto result = RUN_mish(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/prelu.cpp b/tests/array/array/activations/prelu.cpp index 148d5d42a..623d27196 100644 --- a/tests/array/array/activations/prelu.cpp +++ b/tests/array/array/activations/prelu.cpp @@ -49,7 +49,7 @@ RUN_prelu_impl(__VA_ARGS__); #define PRELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, prelu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, prelu, case_name); \ using namespace args; \ auto result = RUN_prelu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/relu.cpp b/tests/array/array/activations/relu.cpp index 42217caaf..d219475bc 100644 --- a/tests/array/array/activations/relu.cpp +++ b/tests/array/array/activations/relu.cpp @@ -61,7 +61,7 @@ RUN_relu_impl(__VA_ARGS__); #define RELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, relu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, relu, case_name); \ using namespace args; \ auto result = RUN_relu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -70,7 +70,7 @@ SUBCASE(#case_name) \ #define CONSTEXPR_RELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, constexpr_relu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, constexpr_relu, case_name); \ using namespace args; \ constexpr auto result = RUN_relu(case_name, __VA_ARGS__); \ NMTOOLS_STATIC_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/relu6.cpp b/tests/array/array/activations/relu6.cpp index f6386ce54..a9ea92b75 100644 --- a/tests/array/array/activations/relu6.cpp +++ b/tests/array/array/activations/relu6.cpp @@ -61,7 +61,7 @@ RUN_relu6_impl(__VA_ARGS__); #define RELU6_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, relu6, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, relu6, case_name); \ using namespace args; \ auto result = RUN_relu6(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -70,7 +70,7 @@ SUBCASE(#case_name) \ #define CONSTEXPR_RELU6_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, constexpr_relu6, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, constexpr_relu6, case_name); \ using namespace args; \ constexpr auto result = RUN_relu6(case_name, __VA_ARGS__); \ NMTOOLS_STATIC_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/selu.cpp b/tests/array/array/activations/selu.cpp index 18a496def..821381666 100644 --- a/tests/array/array/activations/selu.cpp +++ b/tests/array/array/activations/selu.cpp @@ -49,7 +49,7 @@ RUN_selu_impl(__VA_ARGS__); #define SELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, selu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, selu, case_name); \ using namespace args; \ auto result = RUN_selu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/sigmoid.cpp b/tests/array/array/activations/sigmoid.cpp index 9ec42c4f7..0a90a33e8 100644 --- a/tests/array/array/activations/sigmoid.cpp +++ b/tests/array/array/activations/sigmoid.cpp @@ -49,7 +49,7 @@ RUN_sigmoid_impl(__VA_ARGS__); #define SIGMOID_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, sigmoid, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, sigmoid, case_name); \ using namespace args; \ auto result = RUN_sigmoid(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/silu.cpp b/tests/array/array/activations/silu.cpp index 0f54aecd7..9bdccb645 100644 --- a/tests/array/array/activations/silu.cpp +++ b/tests/array/array/activations/silu.cpp @@ -49,7 +49,7 @@ RUN_silu_impl(__VA_ARGS__); #define SILU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, silu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, silu, case_name); \ using namespace args; \ auto result = RUN_silu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/softplus.cpp b/tests/array/array/activations/softplus.cpp index 3d6d955cd..f50b1cc7d 100644 --- a/tests/array/array/activations/softplus.cpp +++ b/tests/array/array/activations/softplus.cpp @@ -49,7 +49,7 @@ RUN_softplus_impl(__VA_ARGS__); #define SOFTPLUS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, softplus, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, softplus, case_name); \ using namespace args; \ auto result = RUN_softplus(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/softshrink.cpp b/tests/array/array/activations/softshrink.cpp index f1ded956b..1930f9b27 100644 --- a/tests/array/array/activations/softshrink.cpp +++ b/tests/array/array/activations/softshrink.cpp @@ -50,7 +50,7 @@ RUN_softshrink_impl(__VA_ARGS__); #define SOFTSHRINK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, softshrink, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, softshrink, case_name); \ using namespace args; \ auto result = RUN_softshrink(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/softsign.cpp b/tests/array/array/activations/softsign.cpp index 07daffefe..fdf8fc532 100644 --- a/tests/array/array/activations/softsign.cpp +++ b/tests/array/array/activations/softsign.cpp @@ -50,7 +50,7 @@ RUN_softsign_impl(__VA_ARGS__); #define SOFTSIGN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, softsign, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, softsign, case_name); \ using namespace args; \ auto result = RUN_softsign(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/activations/tanhshrink.cpp b/tests/array/array/activations/tanhshrink.cpp index 6bd0d8ab0..0ce2f7c65 100644 --- a/tests/array/array/activations/tanhshrink.cpp +++ b/tests/array/array/activations/tanhshrink.cpp @@ -49,7 +49,7 @@ RUN_tanhshrink_impl(__VA_ARGS__); #define TANHSHRINK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, tanhshrink, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, tanhshrink, case_name); \ using namespace args; \ auto result = RUN_tanhshrink(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/arange.cpp b/tests/array/array/arange.cpp index 5cbdb21c6..b13d6dab1 100644 --- a/tests/array/array/arange.cpp +++ b/tests/array/array/arange.cpp @@ -32,7 +32,7 @@ RUN_arange_impl(__VA_ARGS__); #define ARANGE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, arange, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, arange, case_name); \ using namespace args; \ auto result = RUN_arange(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/atleast_1d.cpp b/tests/array/array/atleast_1d.cpp index 4f60fcdb8..60a8b355c 100644 --- a/tests/array/array/atleast_1d.cpp +++ b/tests/array/array/atleast_1d.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define ATLEAST_1D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_1d, case_name); \ using namespace args; \ auto result = nmtools::array::atleast_1d(__VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/atleast_2d.cpp b/tests/array/array/atleast_2d.cpp index 2e00b3d31..7ffeb6df9 100644 --- a/tests/array/array/atleast_2d.cpp +++ b/tests/array/array/atleast_2d.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define ATLEAST_2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_2d, case_name); \ using namespace args; \ auto result = nmtools::array::atleast_2d(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), expect::shape ); \ diff --git a/tests/array/array/atleast_3d.cpp b/tests/array/array/atleast_3d.cpp index b961596de..54bfe8975 100644 --- a/tests/array/array/atleast_3d.cpp +++ b/tests/array/array/atleast_3d.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define ATLEAST_3D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_3d, case_name); \ using namespace args; \ auto result = nmtools::array::atleast_3d(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::dim(result), expect::dim ); \ diff --git a/tests/array/array/batch_norm.cpp b/tests/array/array/batch_norm.cpp index f9365f5c2..0982fe5e7 100644 --- a/tests/array/array/batch_norm.cpp +++ b/tests/array/array/batch_norm.cpp @@ -32,7 +32,7 @@ RUN_batch_norm_impl(__VA_ARGS__); #define BATCH_NORM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, batch_norm, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, batch_norm, case_name); \ using namespace args; \ auto result = RUN_batch_norm(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/broadcast_arrays.cpp b/tests/array/array/broadcast_arrays.cpp index 98a60b514..d26b7880d 100644 --- a/tests/array/array/broadcast_arrays.cpp +++ b/tests/array/array/broadcast_arrays.cpp @@ -29,7 +29,7 @@ namespace view = nm::view; #define BROADCAST_ARRAYS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(broadcast_arrays, case_name); \ + NMTOOLS_TESTING_USE_CASE(broadcast_arrays, case_name); \ using namespace args; \ const auto results = nmtools::array::broadcast_arrays(__VA_ARGS__); \ constexpr auto N = std::tuple_size_v; \ diff --git a/tests/array/array/broadcast_to.cpp b/tests/array/array/broadcast_to.cpp index d1dd95d6e..970e99237 100644 --- a/tests/array/array/broadcast_to.cpp +++ b/tests/array/array/broadcast_to.cpp @@ -27,7 +27,7 @@ namespace na = nm::array; #define BROADCAST_TO_SUBCASE(case_name, expected, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(broadcast_to, case_name); \ + NMTOOLS_TESTING_USE_CASE(broadcast_to, case_name); \ using namespace args; \ auto result = nmtools::array::broadcast_to(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), args::shape ); \ diff --git a/tests/array/array/compress.cpp b/tests/array/array/compress.cpp index e021f1bb3..7ff135d40 100644 --- a/tests/array/array/compress.cpp +++ b/tests/array/array/compress.cpp @@ -50,7 +50,7 @@ RUN_compress_impl(__VA_ARGS__); #define COMPRESS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, compress, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, compress, case_name); \ using namespace args; \ auto result = RUN_compress(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::dim(result), nmtools::dim(expect::result) ); \ diff --git a/tests/array/array/concatenate.cpp b/tests/array/array/concatenate.cpp index 6c98da150..9cf4735cb 100644 --- a/tests/array/array/concatenate.cpp +++ b/tests/array/array/concatenate.cpp @@ -56,7 +56,7 @@ RUN_impl(__VA_ARGS__); #define CONCATENATE_SUBCASE(case_name, lhs, rhs, axis) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, concatenate, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, concatenate, case_name); \ auto array_ref = RUN_concatenate(case_name, args::lhs, args::rhs, args::axis); \ NMTOOLS_ASSERT_EQUAL( nm::shape(array_ref), expect::shape ); \ NMTOOLS_ASSERT_CLOSE( array_ref, expect::expected ); \ diff --git a/tests/array/array/conv-1.cpp b/tests/array/array/conv-1.cpp index f3e3d367b..01f1d8783 100644 --- a/tests/array/array/conv-1.cpp +++ b/tests/array/array/conv-1.cpp @@ -38,7 +38,7 @@ constexpr inline auto name##_ls_hb = nmtools::cast(name, nmtools::array::kind::n #define CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, conv2d, case_name); \ using namespace args; \ auto result = nmtools::array::conv2d(__VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -49,7 +49,7 @@ using nmtools::None; #define CONSTEXPR_CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_conv2d, case_name); \ using namespace args; \ constexpr auto result = nmtools::view::conv2d( __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/array/array/conv-2.cpp b/tests/array/array/conv-2.cpp index 59d92f2cb..2d0a58557 100644 --- a/tests/array/array/conv-2.cpp +++ b/tests/array/array/conv-2.cpp @@ -38,7 +38,7 @@ constexpr inline auto name##_ls_hb = nmtools::cast(name, nmtools::array::kind::n #define CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, conv2d, case_name); \ using namespace args; \ auto result = nmtools::view::conv2d(__VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -49,7 +49,7 @@ using nmtools::None; #define CONSTEXPR_CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_conv2d, case_name); \ using namespace args; \ constexpr auto result = RUN_conv2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/array/array/conv-3.cpp b/tests/array/array/conv-3.cpp index 5b8b4b175..d0cbb3af1 100644 --- a/tests/array/array/conv-3.cpp +++ b/tests/array/array/conv-3.cpp @@ -38,7 +38,7 @@ constexpr inline auto name##_ls_hb = nmtools::cast(name, nmtools::array::kind::n #define CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, conv2d, case_name); \ using namespace args; \ auto result = nmtools::view::conv2d(__VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -49,7 +49,7 @@ using nmtools::None; #define CONSTEXPR_CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_conv2d, case_name); \ using namespace args; \ constexpr auto result = RUN_conv2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/array/array/conv-4.cpp b/tests/array/array/conv-4.cpp index a2f5f28c2..2b4b47098 100644 --- a/tests/array/array/conv-4.cpp +++ b/tests/array/array/conv-4.cpp @@ -38,7 +38,7 @@ constexpr inline auto name##_ls_hb = nmtools::cast(name, nmtools::array::kind::n #define CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, conv2d, case_name); \ using namespace args; \ auto result = nmtools::view::conv2d(__VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -49,7 +49,7 @@ using nmtools::None; #define CONSTEXPR_CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_conv2d, case_name); \ using namespace args; \ constexpr auto result = RUN_conv2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/array/array/cumprod.cpp b/tests/array/array/cumprod.cpp index e66df2bc7..df070cf5d 100644 --- a/tests/array/array/cumprod.cpp +++ b/tests/array/array/cumprod.cpp @@ -36,7 +36,7 @@ RUN_cumprod_impl(__VA_ARGS__); SUBCASE(#case_name) \ { \ /* using test case from accumulate_add since they're basically the same */ \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_multiply, case_name); \ using namespace args; \ auto result = RUN_cumprod(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/cumsum.cpp b/tests/array/array/cumsum.cpp index 04037149f..074dbbc56 100644 --- a/tests/array/array/cumsum.cpp +++ b/tests/array/array/cumsum.cpp @@ -36,7 +36,7 @@ RUN_cumsum_impl(__VA_ARGS__); SUBCASE(#case_name) \ { \ /* using test case from accumulate_add since they're basically the same */ \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_add, case_name); \ using namespace args; \ auto result = RUN_cumsum(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/expand_dims.cpp b/tests/array/array/expand_dims.cpp index 877855608..ff6fd07d5 100644 --- a/tests/array/array/expand_dims.cpp +++ b/tests/array/array/expand_dims.cpp @@ -55,7 +55,7 @@ RUN_impl(__VA_ARGS__); #define EXPAND_DIMS_SUBCASE(case_name, array, axis) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(expand_dims, case_name); \ + NMTOOLS_TESTING_USE_CASE(expand_dims, case_name); \ auto array_ref = RUN_expand_dims(case_name, args::array, args::axis); \ NMTOOLS_ASSERT_EQUAL( nm::shape(array_ref), expect::shape ); \ NMTOOLS_ASSERT_CLOSE( array_ref, expect::expected ); \ diff --git a/tests/array/array/flatten.cpp b/tests/array/array/flatten.cpp index 80f9555a5..e7d71e686 100644 --- a/tests/array/array/flatten.cpp +++ b/tests/array/array/flatten.cpp @@ -51,7 +51,7 @@ RUN_impl(__VA_ARGS__); #define FLATTEN_SUBCASE(case_name, array) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(flatten,case_name); \ + NMTOOLS_TESTING_USE_CASE(flatten,case_name); \ auto array_ref = RUN_flatten(case_name, args::array); \ NMTOOLS_ASSERT_EQUAL( nm::shape(array_ref), expect::shape ); \ NMTOOLS_ASSERT_CLOSE( array_ref, expect::expected ); \ diff --git a/tests/array/array/flip.cpp b/tests/array/array/flip.cpp index ea9533fdd..f6a99b937 100644 --- a/tests/array/array/flip.cpp +++ b/tests/array/array/flip.cpp @@ -9,7 +9,7 @@ namespace nm = nmtools; #define FLIP_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(flip, case_name); \ + NMTOOLS_TESTING_USE_CASE(flip, case_name); \ using namespace args; \ auto result = nmtools::array::flip(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -18,7 +18,7 @@ SUBCASE(#case_name) \ #define FLIPLR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(fliplr, case_name); \ + NMTOOLS_TESTING_USE_CASE(fliplr, case_name); \ using namespace args; \ auto result = nmtools::array::fliplr(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -27,7 +27,7 @@ SUBCASE(#case_name) \ #define FLIPUD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(flipud, case_name); \ + NMTOOLS_TESTING_USE_CASE(flipud, case_name); \ using namespace args; \ auto result = nmtools::array::flipud(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/array/array/full.cpp b/tests/array/array/full.cpp index fdc15a88e..bfcf16fc6 100644 --- a/tests/array/array/full.cpp +++ b/tests/array/array/full.cpp @@ -32,7 +32,7 @@ RUN_full_impl(__VA_ARGS__); #define FULL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, full, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, full, case_name); \ using namespace args; \ auto result = RUN_full(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/hstack.cpp b/tests/array/array/hstack.cpp index d9d6d5d17..2cd0279ee 100644 --- a/tests/array/array/hstack.cpp +++ b/tests/array/array/hstack.cpp @@ -28,7 +28,7 @@ namespace meta = nm::meta; #define HSTACK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( hstack, case_name ) \ + NMTOOLS_TESTING_USE_CASE( hstack, case_name ) \ using namespace args; \ auto result = nmtools::array::hstack(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/array/array/matmul-1.cpp b/tests/array/array/matmul-1.cpp index b550cf7fc..7785f103d 100644 --- a/tests/array/array/matmul-1.cpp +++ b/tests/array/array/matmul-1.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define MATMUL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, matmul, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, matmul, case_name); \ using namespace args; \ auto result = nmtools::array::matmul(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/array/array/matmul-2.cpp b/tests/array/array/matmul-2.cpp index f9934bca7..f4364340a 100644 --- a/tests/array/array/matmul-2.cpp +++ b/tests/array/array/matmul-2.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define MATMUL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, matmul, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, matmul, case_name); \ using namespace args; \ auto result = nmtools::array::matmul(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/array/array/matmul-3.cpp b/tests/array/array/matmul-3.cpp index 2dd0b2a7b..9c1d51c0c 100644 --- a/tests/array/array/matmul-3.cpp +++ b/tests/array/array/matmul-3.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define MATMUL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, matmul, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, matmul, case_name); \ using namespace args; \ auto result = nmtools::array::matmul(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/array/array/matmul.cpp b/tests/array/array/matmul.cpp index 4b65db63f..6161ca0dc 100644 --- a/tests/array/array/matmul.cpp +++ b/tests/array/array/matmul.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define MATMUL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, matmul, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, matmul, case_name); \ using namespace args; \ auto result = nmtools::array::matmul(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/array/array/mean.cpp b/tests/array/array/mean.cpp index 04c2cd7ff..1508f9e6a 100644 --- a/tests/array/array/mean.cpp +++ b/tests/array/array/mean.cpp @@ -47,7 +47,7 @@ RUN_mean_impl(__VA_ARGS__); #define MEAN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, mean, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, mean, case_name); \ using namespace args; \ auto result = RUN_mean(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -230,7 +230,7 @@ TEST_CASE("mean(case7)" * doctest::test_suite("array::mean")) auto dtype = nm::None; #if !defined(NMTOOLS_TESTING_GENERIC_NDARRAY) { - NMTOOLS_TESTING_DECLARE_NS(array, mean, case7); + NMTOOLS_TESTING_USE_CASE(array, mean, case7); using namespace args; auto result = na::mean(a, axis, dtype, keepdims); using result_t = decltype(result); diff --git a/tests/array/array/moveaxis.cpp b/tests/array/array/moveaxis.cpp index f706fd496..a696007db 100644 --- a/tests/array/array/moveaxis.cpp +++ b/tests/array/array/moveaxis.cpp @@ -27,7 +27,7 @@ namespace na = nm::array; #define MOVEAXIS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, moveaxis, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, moveaxis, case_name); \ using namespace args; \ auto result = nmtools::array::moveaxis(__VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/ones.cpp b/tests/array/array/ones.cpp index 967fb5f89..bf6a47ef7 100644 --- a/tests/array/array/ones.cpp +++ b/tests/array/array/ones.cpp @@ -32,7 +32,7 @@ RUN_ones_impl(__VA_ARGS__); #define ONES_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, ones, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, ones, case_name); \ using namespace args; \ auto result = RUN_ones(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/pad.cpp b/tests/array/array/pad.cpp index cb3ec86cc..fe3a53caa 100644 --- a/tests/array/array/pad.cpp +++ b/tests/array/array/pad.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define PAD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, pad, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, pad, case_name); \ using namespace args; \ auto result = nmtools::array::pad(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/array/array/pooling.cpp b/tests/array/array/pooling.cpp index 163587c30..af7ce8d3b 100644 --- a/tests/array/array/pooling.cpp +++ b/tests/array/array/pooling.cpp @@ -50,7 +50,7 @@ RUN_max_pool2d_impl(__VA_ARGS__); #define MAX_POOL2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, max_pool2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, max_pool2d, case_name); \ using namespace args; \ auto result = RUN_max_pool2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -392,7 +392,7 @@ RUN_avg_pool2d_impl(__VA_ARGS__); #define AVG_POOL2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, avg_pool2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, avg_pool2d, case_name); \ using namespace args; \ auto result = RUN_avg_pool2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/prod.cpp b/tests/array/array/prod.cpp index 96217de01..eb66f4acf 100644 --- a/tests/array/array/prod.cpp +++ b/tests/array/array/prod.cpp @@ -36,7 +36,7 @@ RUN_prod_impl(__VA_ARGS__); SUBCASE(#case_name) \ { \ /* using test case from reduce_multiply since they're basically the same */ \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_multiply, case_name); \ using namespace args; \ auto result = RUN_prod(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/repeat.cpp b/tests/array/array/repeat.cpp index 099509f38..b5b47b333 100644 --- a/tests/array/array/repeat.cpp +++ b/tests/array/array/repeat.cpp @@ -51,7 +51,7 @@ RUN_impl(__VA_ARGS__); #define REPEAT_SUBCASE(case_name, array_input, repeats, axis) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, repeat, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, repeat, case_name); \ auto array_array = RUN_repeat(case_name, args::array_input, args::repeats, args::axis); \ NMTOOLS_ASSERT_EQUAL( nm::shape(array_array), expect::shape ); \ NMTOOLS_ASSERT_EQUAL( nm::dim(array_array), expect::dim ); \ diff --git a/tests/array/array/reshape.cpp b/tests/array/array/reshape.cpp index 61f07f613..6a8c9753f 100644 --- a/tests/array/array/reshape.cpp +++ b/tests/array/array/reshape.cpp @@ -51,7 +51,7 @@ RUN_impl(__VA_ARGS__); #define RESHAPE_SUBCASE(case_name, array, newshape) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(reshape, case_name) \ + NMTOOLS_TESTING_USE_CASE(reshape, case_name) \ auto array_ref = RUN_reshape(case_name, args::array, args::newshape); \ NMTOOLS_ASSERT_CLOSE( array_ref, expect::expected ); \ } diff --git a/tests/array/array/resize.cpp b/tests/array/array/resize.cpp index 572b19451..be297f9f6 100644 --- a/tests/array/array/resize.cpp +++ b/tests/array/array/resize.cpp @@ -49,7 +49,7 @@ RUN_resize_impl(__VA_ARGS__); #define RESIZE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(resize, case_name); \ + NMTOOLS_TESTING_USE_CASE(resize, case_name); \ using namespace args; \ auto result = RUN_resize(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::expected ); \ diff --git a/tests/array/array/roll.cpp b/tests/array/array/roll.cpp index b21956948..6f6bba33e 100644 --- a/tests/array/array/roll.cpp +++ b/tests/array/array/roll.cpp @@ -29,7 +29,7 @@ namespace meta = nm::meta; #define ROLL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(roll, case_name) \ + NMTOOLS_TESTING_USE_CASE(roll, case_name) \ using namespace args; \ auto result = na::roll(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/array/array/slice.cpp b/tests/array/array/slice.cpp index fa0c7567d..c171739b5 100644 --- a/tests/array/array/slice.cpp +++ b/tests/array/array/slice.cpp @@ -27,7 +27,7 @@ namespace na = nm::array; #define SLICE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, slice, case_name); \ using namespace args; \ auto result = nmtools::array::slice(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/array/array/sliding_window.cpp b/tests/array/array/sliding_window.cpp index 79639ab06..7d07b35eb 100644 --- a/tests/array/array/sliding_window.cpp +++ b/tests/array/array/sliding_window.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define SLIDING_WINDOW_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, sliding_window, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, sliding_window, case_name); \ using namespace args; \ auto result = nmtools::array::sliding_window(__VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::expected ); \ diff --git a/tests/array/array/softmax.cpp b/tests/array/array/softmax.cpp index d4268da4a..cf1107ed3 100644 --- a/tests/array/array/softmax.cpp +++ b/tests/array/array/softmax.cpp @@ -28,7 +28,7 @@ RUN_softmax_impl(__VA_ARGS__); #define SOFTMAX_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, softmax, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, softmax, case_name); \ using namespace args; \ auto result = RUN_softmax(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/softmin.cpp b/tests/array/array/softmin.cpp index ab92c0c0b..b3dac2935 100644 --- a/tests/array/array/softmin.cpp +++ b/tests/array/array/softmin.cpp @@ -28,7 +28,7 @@ RUN_softmin_impl(__VA_ARGS__); #define SOFTMIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, softmin, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, softmin, case_name); \ using namespace args; \ auto result = RUN_softmin(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/split.cpp b/tests/array/array/split.cpp index 46766c9f1..85786627a 100644 --- a/tests/array/array/split.cpp +++ b/tests/array/array/split.cpp @@ -50,7 +50,7 @@ RUN_split_impl(__VA_ARGS__); #define SPLIT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, split, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, split, case_name); \ using namespace args; \ auto result = RUN_split(case_name, __VA_ARGS__); \ auto msg1 = std::string("Expected:\n") + nm::utils::apply_to_string(expect::result); \ diff --git a/tests/array/array/squeeze.cpp b/tests/array/array/squeeze.cpp index 73ec43c32..3f9762431 100644 --- a/tests/array/array/squeeze.cpp +++ b/tests/array/array/squeeze.cpp @@ -32,7 +32,7 @@ namespace meta = nm::meta; #define SQUEEZE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(squeeze, case_name) \ + NMTOOLS_TESTING_USE_CASE(squeeze, case_name) \ using namespace args; \ auto result = nmtools::array::squeeze(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/stack.cpp b/tests/array/array/stack.cpp index 9abf30ea0..e4688584c 100644 --- a/tests/array/array/stack.cpp +++ b/tests/array/array/stack.cpp @@ -28,7 +28,7 @@ namespace meta = nm::meta; #define STACK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( stack, case_name ) \ + NMTOOLS_TESTING_USE_CASE( stack, case_name ) \ using namespace args; \ auto result = nmtools::array::stack(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/array/array/stddev.cpp b/tests/array/array/stddev.cpp index a3d0357ee..2039aceef 100644 --- a/tests/array/array/stddev.cpp +++ b/tests/array/array/stddev.cpp @@ -28,7 +28,7 @@ RUN_stddev_impl(__VA_ARGS__); #define STDDEV_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, stddev, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, stddev, case_name); \ using namespace args; \ auto result = RUN_stddev(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/sum.cpp b/tests/array/array/sum.cpp index 2b5430e14..aee165a54 100644 --- a/tests/array/array/sum.cpp +++ b/tests/array/array/sum.cpp @@ -36,7 +36,7 @@ RUN_sum_impl(__VA_ARGS__); SUBCASE(#case_name) \ { \ /* using test case from reduce_add since they're basically the same */ \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_add, case_name); \ using namespace args; \ auto result = RUN_sum(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/take.cpp b/tests/array/array/take.cpp index bd70d2a5f..b58fa5859 100644 --- a/tests/array/array/take.cpp +++ b/tests/array/array/take.cpp @@ -51,7 +51,7 @@ RUN_take_impl(__VA_ARGS__); #define TAKE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, take, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, take, case_name); \ using namespace args; \ auto result = RUN_take(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/array/array/tile.cpp b/tests/array/array/tile.cpp index f793b314a..854bafc6a 100644 --- a/tests/array/array/tile.cpp +++ b/tests/array/array/tile.cpp @@ -51,7 +51,7 @@ RUN_impl(__VA_ARGS__); #define TILE_ARRAY_SUBCASE(case_name,array,reps) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( view, tile, case_name ); \ + NMTOOLS_TESTING_USE_CASE( view, tile, case_name ); \ auto array_array = RUN_tile( case_name, args::array, args::reps ); \ NMTOOLS_ASSERT_EQUAL( nm::dim(array_array), expect::dim ); \ NMTOOLS_ASSERT_EQUAL( nm::shape(array_array), expect::shape ); \ diff --git a/tests/array/array/transpose.cpp b/tests/array/array/transpose.cpp index c7e867a31..320833d39 100644 --- a/tests/array/array/transpose.cpp +++ b/tests/array/array/transpose.cpp @@ -28,7 +28,7 @@ namespace na = nm::array; #define TRANSPOSE_SUBCASE(case_name, array, axes) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( transpose, case_name ); \ + NMTOOLS_TESTING_USE_CASE( transpose, case_name ); \ auto array = na::transpose(args::array, args::axes); \ NMTOOLS_ASSERT_CLOSE( array, expect::expected ); \ } diff --git a/tests/array/array/ufuncs/add.cpp b/tests/array/array/ufuncs/add.cpp index ca0565f3c..446405743 100644 --- a/tests/array/array/ufuncs/add.cpp +++ b/tests/array/array/ufuncs/add.cpp @@ -70,7 +70,7 @@ RUN_add_impl(__VA_ARGS__); #define ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, add, case_name); \ using namespace args; \ auto result = RUN_add(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -80,7 +80,7 @@ SUBCASE(#case_name) \ #define CONSTEXPR_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_add, case_name); \ using namespace args; \ constexpr auto result = RUN_add(case_name, __VA_ARGS__); \ NMTOOLS_STATIC_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -113,7 +113,7 @@ RUN_reduce_add_impl(__VA_ARGS__); #define REDUCE_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_add, case_name); \ using namespace args; \ auto result = RUN_reduce_add(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -123,7 +123,7 @@ SUBCASE(#case_name) \ #define CONSTEXPR_REDUCE_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_reduce_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_reduce_add, case_name); \ using namespace args; \ constexpr auto result = RUN_reduce_add(case_name, __VA_ARGS__); \ NMTOOLS_STATIC_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -156,7 +156,7 @@ RUN_accumulate_add_impl(__VA_ARGS__); #define ACCUMULATE_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_add, case_name); \ using namespace args; \ auto result = RUN_accumulate_add(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -166,7 +166,7 @@ SUBCASE(#case_name) \ #define CONSTEXPR_ACCUMULATE_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_accumulate_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_accumulate_add, case_name); \ using namespace args; \ constexpr auto result = RUN_accumulate_add(case_name, __VA_ARGS__); \ NMTOOLS_STATIC_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -199,7 +199,7 @@ RUN_outer_add_impl(__VA_ARGS__); #define OUTER_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_add, case_name); \ using namespace args; \ auto result = RUN_outer_add(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -209,7 +209,7 @@ SUBCASE(#case_name) \ #define CONSTEXPR_OUTER_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_outer_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_outer_add, case_name); \ using namespace args; \ constexpr auto result = RUN_outer_add(case_name, __VA_ARGS__); \ NMTOOLS_STATIC_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/amax.cpp b/tests/array/array/ufuncs/amax.cpp index 6906a0619..46e2765f9 100644 --- a/tests/array/array/ufuncs/amax.cpp +++ b/tests/array/array/ufuncs/amax.cpp @@ -31,7 +31,7 @@ RUN_amax_impl(__VA_ARGS__); #define AMAX_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_maximum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_maximum, case_name); \ using namespace args; \ auto result = RUN_amax(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/amin.cpp b/tests/array/array/ufuncs/amin.cpp index c8c7106fd..2ac0eb7ec 100644 --- a/tests/array/array/ufuncs/amin.cpp +++ b/tests/array/array/ufuncs/amin.cpp @@ -31,7 +31,7 @@ RUN_amin_impl(__VA_ARGS__); #define AMIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_minimum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_minimum, case_name); \ using namespace args; \ auto result = RUN_amin(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/arccos.cpp b/tests/array/array/ufuncs/arccos.cpp index 650fae505..59d3caf9e 100644 --- a/tests/array/array/ufuncs/arccos.cpp +++ b/tests/array/array/ufuncs/arccos.cpp @@ -35,7 +35,7 @@ RUN_arccos_impl(__VA_ARGS__); #define ARCCOS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arccos, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arccos, case_name); \ using namespace args; \ auto result = RUN_arccos(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/arccosh.cpp b/tests/array/array/ufuncs/arccosh.cpp index 044106304..ccee69a9b 100644 --- a/tests/array/array/ufuncs/arccosh.cpp +++ b/tests/array/array/ufuncs/arccosh.cpp @@ -35,7 +35,7 @@ RUN_arccosh_impl(__VA_ARGS__); #define ARCCOSH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arccosh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arccosh, case_name); \ using namespace args; \ auto result = RUN_arccosh(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/arcsin.cpp b/tests/array/array/ufuncs/arcsin.cpp index 95802f631..7e2255148 100644 --- a/tests/array/array/ufuncs/arcsin.cpp +++ b/tests/array/array/ufuncs/arcsin.cpp @@ -35,7 +35,7 @@ RUN_arcsin_impl(__VA_ARGS__); #define ARCSIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arcsin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arcsin, case_name); \ using namespace args; \ auto result = RUN_arcsin(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/arcsinh.cpp b/tests/array/array/ufuncs/arcsinh.cpp index f46d4243b..3982f97b0 100644 --- a/tests/array/array/ufuncs/arcsinh.cpp +++ b/tests/array/array/ufuncs/arcsinh.cpp @@ -35,7 +35,7 @@ RUN_arcsinh_impl(__VA_ARGS__); #define ARCSINH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arcsinh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arcsinh, case_name); \ using namespace args; \ auto result = RUN_arcsinh(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/arctan.cpp b/tests/array/array/ufuncs/arctan.cpp index 3fd7f8967..2cb7bee89 100644 --- a/tests/array/array/ufuncs/arctan.cpp +++ b/tests/array/array/ufuncs/arctan.cpp @@ -35,7 +35,7 @@ RUN_arctan_impl(__VA_ARGS__); #define ARCTAN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arctan, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arctan, case_name); \ using namespace args; \ auto result = RUN_arctan(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/arctan2.cpp b/tests/array/array/ufuncs/arctan2.cpp index 6cabcfeeb..ed78823fb 100644 --- a/tests/array/array/ufuncs/arctan2.cpp +++ b/tests/array/array/ufuncs/arctan2.cpp @@ -35,7 +35,7 @@ RUN_arctan2_impl(__VA_ARGS__); #define ARCTAN2_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arctan2, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arctan2, case_name); \ using namespace args; \ auto result = RUN_arctan2(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/arctanh.cpp b/tests/array/array/ufuncs/arctanh.cpp index cf458c463..b42999f34 100644 --- a/tests/array/array/ufuncs/arctanh.cpp +++ b/tests/array/array/ufuncs/arctanh.cpp @@ -35,7 +35,7 @@ RUN_arctanh_impl(__VA_ARGS__); #define ARCTANH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arctanh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arctanh, case_name); \ using namespace args; \ auto result = RUN_arctanh(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/bitwise_and.cpp b/tests/array/array/ufuncs/bitwise_and.cpp index c761e4f76..cb52b2b84 100644 --- a/tests/array/array/ufuncs/bitwise_and.cpp +++ b/tests/array/array/ufuncs/bitwise_and.cpp @@ -35,7 +35,7 @@ RUN_bitwise_and_impl(__VA_ARGS__); #define BITWISE_AND_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, bitwise_and, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, bitwise_and, case_name); \ using namespace args; \ auto result = RUN_bitwise_and(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/bitwise_or.cpp b/tests/array/array/ufuncs/bitwise_or.cpp index 65a43148d..93b5ee990 100644 --- a/tests/array/array/ufuncs/bitwise_or.cpp +++ b/tests/array/array/ufuncs/bitwise_or.cpp @@ -35,7 +35,7 @@ RUN_bitwise_or_impl(__VA_ARGS__); #define BITWISE_OR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, bitwise_or, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, bitwise_or, case_name); \ using namespace args; \ auto result = RUN_bitwise_or(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/bitwise_xor.cpp b/tests/array/array/ufuncs/bitwise_xor.cpp index 624c51ac2..342a646d0 100644 --- a/tests/array/array/ufuncs/bitwise_xor.cpp +++ b/tests/array/array/ufuncs/bitwise_xor.cpp @@ -34,7 +34,7 @@ RUN_bitwise_xor_impl(__VA_ARGS__); #define BITWISE_XOR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, bitwise_xor, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, bitwise_xor, case_name); \ using namespace args; \ auto result = RUN_bitwise_xor(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/cbrt.cpp b/tests/array/array/ufuncs/cbrt.cpp index a0286f8ed..d13b26c1e 100644 --- a/tests/array/array/ufuncs/cbrt.cpp +++ b/tests/array/array/ufuncs/cbrt.cpp @@ -34,7 +34,7 @@ RUN_cbrt_impl(__VA_ARGS__); #define CBRT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, cbrt, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, cbrt, case_name); \ using namespace args; \ auto result = RUN_cbrt(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/ceil.cpp b/tests/array/array/ufuncs/ceil.cpp index 07f7c1144..d07d112eb 100644 --- a/tests/array/array/ufuncs/ceil.cpp +++ b/tests/array/array/ufuncs/ceil.cpp @@ -34,7 +34,7 @@ RUN_ceil_impl(__VA_ARGS__); #define CEIL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, ceil, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, ceil, case_name); \ using namespace args; \ auto result = RUN_ceil(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/clip.cpp b/tests/array/array/ufuncs/clip.cpp index 474c3c05a..c902135eb 100644 --- a/tests/array/array/ufuncs/clip.cpp +++ b/tests/array/array/ufuncs/clip.cpp @@ -50,7 +50,7 @@ RUN_clip_impl(__VA_ARGS__); #define CLIP_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, clip, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, clip, case_name); \ using namespace args; \ auto result = RUN_clip(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/cos.cpp b/tests/array/array/ufuncs/cos.cpp index ad8a89be4..9d0fbc5c2 100644 --- a/tests/array/array/ufuncs/cos.cpp +++ b/tests/array/array/ufuncs/cos.cpp @@ -50,7 +50,7 @@ RUN_cos_impl(__VA_ARGS__); #define COS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, cos, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, cos, case_name); \ using namespace args; \ auto result = RUN_cos(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/array/array/ufuncs/cosh.cpp b/tests/array/array/ufuncs/cosh.cpp index e68177980..0373f59c4 100644 --- a/tests/array/array/ufuncs/cosh.cpp +++ b/tests/array/array/ufuncs/cosh.cpp @@ -38,7 +38,7 @@ RUN_cosh_impl(__VA_ARGS__); #define COSH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, cosh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, cosh, case_name); \ using namespace args; \ auto result = RUN_cosh(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/divide.cpp b/tests/array/array/ufuncs/divide.cpp index b02e79797..586f13c7f 100644 --- a/tests/array/array/ufuncs/divide.cpp +++ b/tests/array/array/ufuncs/divide.cpp @@ -35,7 +35,7 @@ RUN_divide_impl(__VA_ARGS__); #define DIVIDE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, divide, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, divide, case_name); \ using namespace args; \ auto result = RUN_divide(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/equal.cpp b/tests/array/array/ufuncs/equal.cpp index 662c8ccb5..e5cbfdca7 100644 --- a/tests/array/array/ufuncs/equal.cpp +++ b/tests/array/array/ufuncs/equal.cpp @@ -36,7 +36,7 @@ RUN_equal_impl(__VA_ARGS__); #define EQUAL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, equal, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, equal, case_name); \ using namespace args; \ auto result = RUN_equal(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/exp.cpp b/tests/array/array/ufuncs/exp.cpp index 6d68c6c40..d01827474 100644 --- a/tests/array/array/ufuncs/exp.cpp +++ b/tests/array/array/ufuncs/exp.cpp @@ -34,7 +34,7 @@ RUN_exp_impl(__VA_ARGS__); #define EXP_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, exp, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, exp, case_name); \ using namespace args; \ auto result = RUN_exp(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/exp2.cpp b/tests/array/array/ufuncs/exp2.cpp index e35fe91ff..50b9fd57f 100644 --- a/tests/array/array/ufuncs/exp2.cpp +++ b/tests/array/array/ufuncs/exp2.cpp @@ -35,7 +35,7 @@ RUN_exp2_impl(__VA_ARGS__); #define EXP2_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, exp2, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, exp2, case_name); \ using namespace args; \ auto result = RUN_exp2(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/expm1.cpp b/tests/array/array/ufuncs/expm1.cpp index 117c59389..4cb030893 100644 --- a/tests/array/array/ufuncs/expm1.cpp +++ b/tests/array/array/ufuncs/expm1.cpp @@ -38,7 +38,7 @@ RUN_expm1_impl(__VA_ARGS__); #define EXPM1_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, expm1, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, expm1, case_name); \ using namespace args; \ auto result = RUN_expm1(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/fabs.cpp b/tests/array/array/ufuncs/fabs.cpp index 01a1568f7..91755a405 100644 --- a/tests/array/array/ufuncs/fabs.cpp +++ b/tests/array/array/ufuncs/fabs.cpp @@ -35,7 +35,7 @@ RUN_fabs_impl(__VA_ARGS__); #define FABS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, fabs, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, fabs, case_name); \ using namespace args; \ auto result = RUN_fabs(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/floor.cpp b/tests/array/array/ufuncs/floor.cpp index 46763f7db..d6d60c814 100644 --- a/tests/array/array/ufuncs/floor.cpp +++ b/tests/array/array/ufuncs/floor.cpp @@ -34,7 +34,7 @@ RUN_floor_impl(__VA_ARGS__); #define FLOOR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, floor, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, floor, case_name); \ using namespace args; \ auto result = RUN_floor(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/fmax.cpp b/tests/array/array/ufuncs/fmax.cpp index c10a6092c..850c8dd10 100644 --- a/tests/array/array/ufuncs/fmax.cpp +++ b/tests/array/array/ufuncs/fmax.cpp @@ -34,7 +34,7 @@ RUN_fmax_impl(__VA_ARGS__); #define FMAX_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, fmax, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, fmax, case_name); \ using namespace args; \ auto result = RUN_fmax(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -85,7 +85,7 @@ RUN_reduce_fmax_impl(__VA_ARGS__); #define REDUCE_FMAX_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_fmax, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_fmax, case_name); \ using namespace args; \ auto result = RUN_reduce_fmax(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -234,7 +234,7 @@ RUN_accumulate_fmax_impl(__VA_ARGS__); #define ACCUMULATE_FMAX_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_fmax, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_fmax, case_name); \ using namespace args; \ auto result = RUN_accumulate_fmax(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -297,7 +297,7 @@ RUN_outer_fmax_impl(__VA_ARGS__); #define OUTER_FMAX_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_fmax, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_fmax, case_name); \ using namespace args; \ auto result = RUN_outer_fmax(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/fmin.cpp b/tests/array/array/ufuncs/fmin.cpp index 7cf9993ee..60e1f1513 100644 --- a/tests/array/array/ufuncs/fmin.cpp +++ b/tests/array/array/ufuncs/fmin.cpp @@ -34,7 +34,7 @@ RUN_fmin_impl(__VA_ARGS__); #define FMIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, fmin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, fmin, case_name); \ using namespace args; \ auto result = RUN_fmin(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -85,7 +85,7 @@ RUN_reduce_fmin_impl(__VA_ARGS__); #define REDUCE_FMIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_fmin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_fmin, case_name); \ using namespace args; \ auto result = RUN_reduce_fmin(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -226,7 +226,7 @@ RUN_accumulate_fmin_impl(__VA_ARGS__); #define ACCUMULATE_FMIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_fmin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_fmin, case_name); \ using namespace args; \ auto result = RUN_accumulate_fmin(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -289,7 +289,7 @@ RUN_outer_fmin_impl(__VA_ARGS__); #define OUTER_FMIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_fmin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_fmin, case_name); \ using namespace args; \ auto result = RUN_outer_fmin(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/fmod.cpp b/tests/array/array/ufuncs/fmod.cpp index 9ff3bd32b..ff0fef92d 100644 --- a/tests/array/array/ufuncs/fmod.cpp +++ b/tests/array/array/ufuncs/fmod.cpp @@ -34,7 +34,7 @@ RUN_fmod_impl(__VA_ARGS__); #define FMOD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, fmod, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, fmod, case_name); \ using namespace args; \ auto result = RUN_fmod(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -85,7 +85,7 @@ RUN_reduce_fmod_impl(__VA_ARGS__); #define REDUCE_FMOD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_fmod, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_fmod, case_name); \ using namespace args; \ auto result = RUN_reduce_fmod(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -188,7 +188,7 @@ RUN_accumulate_fmod_impl(__VA_ARGS__); #define ACCUMULATE_FMOD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_fmod, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_fmod, case_name); \ using namespace args; \ auto result = RUN_accumulate_fmod(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -251,7 +251,7 @@ RUN_outer_fmod_impl(__VA_ARGS__); #define OUTER_FMOD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_fmod, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_fmod, case_name); \ using namespace args; \ auto result = RUN_outer_fmod(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/greater.cpp b/tests/array/array/ufuncs/greater.cpp index 7161dc4f0..147ea41fb 100644 --- a/tests/array/array/ufuncs/greater.cpp +++ b/tests/array/array/ufuncs/greater.cpp @@ -35,7 +35,7 @@ RUN_greater_impl(__VA_ARGS__); #define GREATER_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, greater, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, greater, case_name); \ using namespace args; \ auto result = RUN_greater(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/greater_equal.cpp b/tests/array/array/ufuncs/greater_equal.cpp index 5a2f7b90e..f06773e4c 100644 --- a/tests/array/array/ufuncs/greater_equal.cpp +++ b/tests/array/array/ufuncs/greater_equal.cpp @@ -35,7 +35,7 @@ RUN_greater_equal_impl(__VA_ARGS__); #define GREATER_EQUAL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, greater_equal, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, greater_equal, case_name); \ using namespace args; \ auto result = RUN_greater_equal(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/hypot.cpp b/tests/array/array/ufuncs/hypot.cpp index e30085c7a..182d1934b 100644 --- a/tests/array/array/ufuncs/hypot.cpp +++ b/tests/array/array/ufuncs/hypot.cpp @@ -35,7 +35,7 @@ RUN_hypot_impl(__VA_ARGS__); #define HYPOT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, hypot, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, hypot, case_name); \ using namespace args; \ auto result = RUN_hypot(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/invert.cpp b/tests/array/array/ufuncs/invert.cpp index 741c71760..3d0011f6d 100644 --- a/tests/array/array/ufuncs/invert.cpp +++ b/tests/array/array/ufuncs/invert.cpp @@ -35,7 +35,7 @@ RUN_invert_impl(__VA_ARGS__); #define INVERT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, invert, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, invert, case_name); \ using namespace args; \ auto result = RUN_invert(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/isfinite.cpp b/tests/array/array/ufuncs/isfinite.cpp index 01e498706..2e5d812e2 100644 --- a/tests/array/array/ufuncs/isfinite.cpp +++ b/tests/array/array/ufuncs/isfinite.cpp @@ -35,7 +35,7 @@ RUN_isfinite_impl(__VA_ARGS__); #define ISFINITE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, isfinite, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, isfinite, case_name); \ using namespace args; \ auto result = RUN_isfinite(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/isinf.cpp b/tests/array/array/ufuncs/isinf.cpp index d85720054..b9f28587f 100644 --- a/tests/array/array/ufuncs/isinf.cpp +++ b/tests/array/array/ufuncs/isinf.cpp @@ -35,7 +35,7 @@ RUN_isinf_impl(__VA_ARGS__); #define ISINF_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, isinf, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, isinf, case_name); \ using namespace args; \ auto result = RUN_isinf(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/isnan.cpp b/tests/array/array/ufuncs/isnan.cpp index 2a40ab56e..3c2612d4b 100644 --- a/tests/array/array/ufuncs/isnan.cpp +++ b/tests/array/array/ufuncs/isnan.cpp @@ -36,7 +36,7 @@ RUN_isnan_impl(__VA_ARGS__); #define ISNAN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, isnan, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, isnan, case_name); \ using namespace args; \ auto result = RUN_isnan(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/ldexp.cpp b/tests/array/array/ufuncs/ldexp.cpp index 5cdbd8e30..0d4d24bd7 100644 --- a/tests/array/array/ufuncs/ldexp.cpp +++ b/tests/array/array/ufuncs/ldexp.cpp @@ -35,7 +35,7 @@ RUN_ldexp_impl(__VA_ARGS__); #define LDEXP_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, ldexp, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, ldexp, case_name); \ using namespace args; \ auto result = RUN_ldexp(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/left_shift.cpp b/tests/array/array/ufuncs/left_shift.cpp index d012b41d7..ee59eef44 100644 --- a/tests/array/array/ufuncs/left_shift.cpp +++ b/tests/array/array/ufuncs/left_shift.cpp @@ -34,7 +34,7 @@ RUN_left_shift_impl(__VA_ARGS__); #define LEFT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, left_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, left_shift, case_name); \ using namespace args; \ auto result = RUN_left_shift(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -85,7 +85,7 @@ RUN_reduce_left_shift_impl(__VA_ARGS__); #define REDUCE_LEFT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_left_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_left_shift, case_name); \ using namespace args; \ auto result = RUN_reduce_left_shift(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -196,7 +196,7 @@ RUN_accumulate_left_shift_impl(__VA_ARGS__); #define ACCUMULATE_LEFT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_left_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_left_shift, case_name); \ using namespace args; \ auto result = RUN_accumulate_left_shift(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -259,7 +259,7 @@ RUN_outer_left_shift_impl(__VA_ARGS__); #define OUTER_LEFT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_left_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_left_shift, case_name); \ using namespace args; \ auto result = RUN_outer_left_shift(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/less.cpp b/tests/array/array/ufuncs/less.cpp index 5e857e2e4..eb684c192 100644 --- a/tests/array/array/ufuncs/less.cpp +++ b/tests/array/array/ufuncs/less.cpp @@ -35,7 +35,7 @@ RUN_less_impl(__VA_ARGS__); #define LESS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, less, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, less, case_name); \ using namespace args; \ auto result = RUN_less(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/less_equal.cpp b/tests/array/array/ufuncs/less_equal.cpp index 961924125..ad116afa7 100644 --- a/tests/array/array/ufuncs/less_equal.cpp +++ b/tests/array/array/ufuncs/less_equal.cpp @@ -35,7 +35,7 @@ RUN_less_equal_impl(__VA_ARGS__); #define LESS_EQUAL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, less_equal, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, less_equal, case_name); \ using namespace args; \ auto result = RUN_less_equal(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/log.cpp b/tests/array/array/ufuncs/log.cpp index 1ac8631bb..ec53a4cb9 100644 --- a/tests/array/array/ufuncs/log.cpp +++ b/tests/array/array/ufuncs/log.cpp @@ -34,7 +34,7 @@ RUN_log_impl(__VA_ARGS__); #define LOG_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, log, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, log, case_name); \ using namespace args; \ auto result = RUN_log(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/log10.cpp b/tests/array/array/ufuncs/log10.cpp index 456ce5cc1..f672dbd58 100644 --- a/tests/array/array/ufuncs/log10.cpp +++ b/tests/array/array/ufuncs/log10.cpp @@ -34,7 +34,7 @@ RUN_log10_impl(__VA_ARGS__); #define LOG10_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, log10, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, log10, case_name); \ using namespace args; \ auto result = RUN_log10(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/log1p.cpp b/tests/array/array/ufuncs/log1p.cpp index b1ad90e33..5066a38f2 100644 --- a/tests/array/array/ufuncs/log1p.cpp +++ b/tests/array/array/ufuncs/log1p.cpp @@ -34,7 +34,7 @@ RUN_log1p_impl(__VA_ARGS__); #define LOG1P_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, log1p, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, log1p, case_name); \ using namespace args; \ auto result = RUN_log1p(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/log2.cpp b/tests/array/array/ufuncs/log2.cpp index 7890d6fce..8c4fa68a9 100644 --- a/tests/array/array/ufuncs/log2.cpp +++ b/tests/array/array/ufuncs/log2.cpp @@ -34,7 +34,7 @@ RUN_log2_impl(__VA_ARGS__); #define LOG2_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, log2, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, log2, case_name); \ using namespace args; \ auto result = RUN_log2(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/logical_and.cpp b/tests/array/array/ufuncs/logical_and.cpp index 2b3dd7472..b163727c7 100644 --- a/tests/array/array/ufuncs/logical_and.cpp +++ b/tests/array/array/ufuncs/logical_and.cpp @@ -35,7 +35,7 @@ RUN_logical_and_impl(__VA_ARGS__); #define LOGICAL_AND_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, logical_and, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, logical_and, case_name); \ using namespace args; \ auto result = RUN_logical_and(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/logical_not.cpp b/tests/array/array/ufuncs/logical_not.cpp index 0c8c0c816..c9b48635d 100644 --- a/tests/array/array/ufuncs/logical_not.cpp +++ b/tests/array/array/ufuncs/logical_not.cpp @@ -35,7 +35,7 @@ RUN_logical_not_impl(__VA_ARGS__); #define LOGICAL_NOT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, logical_not, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, logical_not, case_name); \ using namespace args; \ auto result = RUN_logical_not(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/logical_or.cpp b/tests/array/array/ufuncs/logical_or.cpp index ede936e2f..de0e3bb8c 100644 --- a/tests/array/array/ufuncs/logical_or.cpp +++ b/tests/array/array/ufuncs/logical_or.cpp @@ -35,7 +35,7 @@ RUN_logical_or_impl(__VA_ARGS__); #define LOGICAL_OR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, logical_or, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, logical_or, case_name); \ using namespace args; \ auto result = RUN_logical_or(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/logical_xor.cpp b/tests/array/array/ufuncs/logical_xor.cpp index d764aefa8..0fe66f206 100644 --- a/tests/array/array/ufuncs/logical_xor.cpp +++ b/tests/array/array/ufuncs/logical_xor.cpp @@ -35,7 +35,7 @@ RUN_logical_xor_impl(__VA_ARGS__); #define LOGICAL_XOR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, logical_xor, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, logical_xor, case_name); \ using namespace args; \ auto result = RUN_logical_xor(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/maximum.cpp b/tests/array/array/ufuncs/maximum.cpp index c6fbed98a..3fc3b52b1 100644 --- a/tests/array/array/ufuncs/maximum.cpp +++ b/tests/array/array/ufuncs/maximum.cpp @@ -35,7 +35,7 @@ RUN_maximum_impl(__VA_ARGS__); #define MAXIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, maximum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, maximum, case_name); \ using namespace args; \ auto result = RUN_maximum(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -86,7 +86,7 @@ RUN_reduce_maximum_impl(__VA_ARGS__); #define REDUCE_MAXIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_maximum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_maximum, case_name); \ using namespace args; \ auto result = RUN_reduce_maximum(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -227,7 +227,7 @@ RUN_accumulate_maximum_impl(__VA_ARGS__); #define ACCUMULATE_MAXIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_maximum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_maximum, case_name); \ using namespace args; \ auto result = RUN_accumulate_maximum(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -290,7 +290,7 @@ RUN_outer_maximum_impl(__VA_ARGS__); #define OUTER_MAXIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_maximum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_maximum, case_name); \ using namespace args; \ auto result = RUN_outer_maximum(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/minimum.cpp b/tests/array/array/ufuncs/minimum.cpp index d3416585c..0da42e52b 100644 --- a/tests/array/array/ufuncs/minimum.cpp +++ b/tests/array/array/ufuncs/minimum.cpp @@ -35,7 +35,7 @@ RUN_minimum_impl(__VA_ARGS__); #define MINIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, minimum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, minimum, case_name); \ using namespace args; \ auto result = RUN_minimum(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -86,7 +86,7 @@ RUN_reduce_minimum_impl(__VA_ARGS__); #define REDUCE_MINIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_minimum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_minimum, case_name); \ using namespace args; \ auto result = RUN_reduce_minimum(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -227,7 +227,7 @@ RUN_accumulate_minimum_impl(__VA_ARGS__); #define ACCUMULATE_MINIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_minimum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_minimum, case_name); \ using namespace args; \ auto result = RUN_accumulate_minimum(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -290,7 +290,7 @@ RUN_outer_minimum_impl(__VA_ARGS__); #define OUTER_MINIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_minimum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_minimum, case_name); \ using namespace args; \ auto result = RUN_outer_minimum(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/multiply.cpp b/tests/array/array/ufuncs/multiply.cpp index 5a0477a06..1c760cffc 100644 --- a/tests/array/array/ufuncs/multiply.cpp +++ b/tests/array/array/ufuncs/multiply.cpp @@ -34,7 +34,7 @@ RUN_multiply_impl(__VA_ARGS__); #define MULTIPLY_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, multiply, case_name); \ using namespace args; \ auto result = RUN_multiply(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -85,7 +85,7 @@ RUN_reduce_multiply_impl(__VA_ARGS__); #define REDUCE_MULTIPLY_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_multiply, case_name); \ using namespace args; \ auto result = RUN_reduce_multiply(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -224,7 +224,7 @@ RUN_accumulate_multiply_impl(__VA_ARGS__); #define ACCUMULATE_MULTIPLY_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_multiply, case_name); \ using namespace args; \ auto result = RUN_accumulate_multiply(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -287,7 +287,7 @@ RUN_outer_multiply_impl(__VA_ARGS__); #define OUTER_MULTIPLY_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_multiply, case_name); \ using namespace args; \ auto result = RUN_outer_multiply(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/negative.cpp b/tests/array/array/ufuncs/negative.cpp index 7b3563a40..ac5ebc20e 100644 --- a/tests/array/array/ufuncs/negative.cpp +++ b/tests/array/array/ufuncs/negative.cpp @@ -34,7 +34,7 @@ RUN_negative_impl(__VA_ARGS__); #define NEGATIVE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, negative, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, negative, case_name); \ using namespace args; \ auto result = RUN_negative(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/not_equal.cpp b/tests/array/array/ufuncs/not_equal.cpp index d34faa8d9..251b089ed 100644 --- a/tests/array/array/ufuncs/not_equal.cpp +++ b/tests/array/array/ufuncs/not_equal.cpp @@ -35,7 +35,7 @@ RUN_not_equal_impl(__VA_ARGS__); #define NOT_EQUAL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, not_equal, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, not_equal, case_name); \ using namespace args; \ auto result = RUN_not_equal(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/positive.cpp b/tests/array/array/ufuncs/positive.cpp index 985167cab..3a8a173f4 100644 --- a/tests/array/array/ufuncs/positive.cpp +++ b/tests/array/array/ufuncs/positive.cpp @@ -34,7 +34,7 @@ RUN_positive_impl(__VA_ARGS__); #define POSITIVE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, positive, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, positive, case_name); \ using namespace args; \ auto result = RUN_positive(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/power.cpp b/tests/array/array/ufuncs/power.cpp index 6133b6dd2..9c6fae1ac 100644 --- a/tests/array/array/ufuncs/power.cpp +++ b/tests/array/array/ufuncs/power.cpp @@ -36,7 +36,7 @@ RUN_power_impl(__VA_ARGS__); #define POWER_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, power, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, power, case_name); \ using namespace args; \ auto result = RUN_power(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -87,7 +87,7 @@ RUN_reduce_power_impl(__VA_ARGS__); #define REDUCE_POWER_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_power, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_power, case_name); \ using namespace args; \ auto result = RUN_reduce_power(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -201,7 +201,7 @@ RUN_accumulate_power_impl(__VA_ARGS__); #define ACCUMULATE_POWER_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_power, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_power, case_name); \ using namespace args; \ auto result = RUN_accumulate_power(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -256,7 +256,7 @@ RUN_outer_power_impl(__VA_ARGS__); #define OUTER_POWER_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_power, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_power, case_name); \ using namespace args; \ auto result = RUN_outer_power(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/reciprocal.cpp b/tests/array/array/ufuncs/reciprocal.cpp index 8775fd14d..fe8c01794 100644 --- a/tests/array/array/ufuncs/reciprocal.cpp +++ b/tests/array/array/ufuncs/reciprocal.cpp @@ -34,7 +34,7 @@ RUN_reciprocal_impl(__VA_ARGS__); #define RECIPROCAL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reciprocal, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reciprocal, case_name); \ using namespace args; \ auto result = RUN_reciprocal(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/right_shift.cpp b/tests/array/array/ufuncs/right_shift.cpp index 82078a16a..5149b91bb 100644 --- a/tests/array/array/ufuncs/right_shift.cpp +++ b/tests/array/array/ufuncs/right_shift.cpp @@ -34,7 +34,7 @@ RUN_right_shift_impl(__VA_ARGS__); #define RIGHT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, right_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, right_shift, case_name); \ using namespace args; \ auto result = RUN_right_shift(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -85,7 +85,7 @@ RUN_reduce_right_shift_impl(__VA_ARGS__); #define REDUCE_RIGHT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_right_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_right_shift, case_name); \ using namespace args; \ auto result = RUN_reduce_right_shift(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -188,7 +188,7 @@ RUN_accumulate_right_shift_impl(__VA_ARGS__); #define ACCUMULATE_RIGHT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_right_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_right_shift, case_name); \ using namespace args; \ auto result = RUN_accumulate_right_shift(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -251,7 +251,7 @@ RUN_outer_right_shift_impl(__VA_ARGS__); #define OUTER_RIGHT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_right_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_right_shift, case_name); \ using namespace args; \ auto result = RUN_outer_right_shift(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/rint.cpp b/tests/array/array/ufuncs/rint.cpp index f604528ae..c98a8b262 100644 --- a/tests/array/array/ufuncs/rint.cpp +++ b/tests/array/array/ufuncs/rint.cpp @@ -34,7 +34,7 @@ RUN_rint_impl(__VA_ARGS__); #define RINT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, rint, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, rint, case_name); \ using namespace args; \ auto result = RUN_rint(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/signbit.cpp b/tests/array/array/ufuncs/signbit.cpp index a90c633f4..eee205bd7 100644 --- a/tests/array/array/ufuncs/signbit.cpp +++ b/tests/array/array/ufuncs/signbit.cpp @@ -35,7 +35,7 @@ RUN_signbit_impl(__VA_ARGS__); #define SIGNBIT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, signbit, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, signbit, case_name); \ using namespace args; \ auto result = RUN_signbit(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/sin.cpp b/tests/array/array/ufuncs/sin.cpp index a54f9f77b..4aff1d48b 100644 --- a/tests/array/array/ufuncs/sin.cpp +++ b/tests/array/array/ufuncs/sin.cpp @@ -34,7 +34,7 @@ RUN_sin_impl(__VA_ARGS__); #define SIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, sin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, sin, case_name); \ using namespace args; \ auto result = RUN_sin(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/sinh.cpp b/tests/array/array/ufuncs/sinh.cpp index 0d37ef87b..0ee86b252 100644 --- a/tests/array/array/ufuncs/sinh.cpp +++ b/tests/array/array/ufuncs/sinh.cpp @@ -38,7 +38,7 @@ RUN_sinh_impl(__VA_ARGS__); #define SINH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, sinh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, sinh, case_name); \ using namespace args; \ auto result = RUN_sinh(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/sqrt.cpp b/tests/array/array/ufuncs/sqrt.cpp index b921c9ae6..fc019e9f9 100644 --- a/tests/array/array/ufuncs/sqrt.cpp +++ b/tests/array/array/ufuncs/sqrt.cpp @@ -34,7 +34,7 @@ RUN_sqrt_impl(__VA_ARGS__); #define SQRT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, sqrt, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, sqrt, case_name); \ using namespace args; \ auto result = RUN_sqrt(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/square.cpp b/tests/array/array/ufuncs/square.cpp index 1bb076761..a78f04999 100644 --- a/tests/array/array/ufuncs/square.cpp +++ b/tests/array/array/ufuncs/square.cpp @@ -34,7 +34,7 @@ RUN_square_impl(__VA_ARGS__); #define SQUARE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, square, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, square, case_name); \ using namespace args; \ auto result = RUN_square(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/subtract.cpp b/tests/array/array/ufuncs/subtract.cpp index 33460f159..6d52975b0 100644 --- a/tests/array/array/ufuncs/subtract.cpp +++ b/tests/array/array/ufuncs/subtract.cpp @@ -34,7 +34,7 @@ RUN_subtract_impl(__VA_ARGS__); #define SUBTRACT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, subtract, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, subtract, case_name); \ using namespace args; \ auto result = RUN_subtract(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -85,7 +85,7 @@ RUN_reduce_subtract_impl(__VA_ARGS__); #define REDUCE_SUBTRACT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_subtract, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_subtract, case_name); \ using namespace args; \ auto result = RUN_reduce_subtract(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -188,7 +188,7 @@ RUN_accumulate_subtract_impl(__VA_ARGS__); #define ACCUMULATE_SUBTRACT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_subtract, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_subtract, case_name); \ using namespace args; \ auto result = RUN_accumulate_subtract(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ @@ -251,7 +251,7 @@ RUN_outer_subtract_impl(__VA_ARGS__); #define OUTER_SUBTRACT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_subtract, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_subtract, case_name); \ using namespace args; \ auto result = RUN_outer_subtract(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/tan.cpp b/tests/array/array/ufuncs/tan.cpp index 49ea65917..23a966370 100644 --- a/tests/array/array/ufuncs/tan.cpp +++ b/tests/array/array/ufuncs/tan.cpp @@ -34,7 +34,7 @@ RUN_tan_impl(__VA_ARGS__); #define TAN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, tan, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, tan, case_name); \ using namespace args; \ auto result = RUN_tan(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/tanh.cpp b/tests/array/array/ufuncs/tanh.cpp index 3366d2cc2..c1e2fac87 100644 --- a/tests/array/array/ufuncs/tanh.cpp +++ b/tests/array/array/ufuncs/tanh.cpp @@ -34,7 +34,7 @@ RUN_tanh_impl(__VA_ARGS__); #define TANH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, tanh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, tanh, case_name); \ using namespace args; \ auto result = RUN_tanh(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/ufuncs/trunc.cpp b/tests/array/array/ufuncs/trunc.cpp index ea242d839..966104b70 100644 --- a/tests/array/array/ufuncs/trunc.cpp +++ b/tests/array/array/ufuncs/trunc.cpp @@ -34,7 +34,7 @@ RUN_trunc_impl(__VA_ARGS__); #define TRUNC_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, trunc, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, trunc, case_name); \ using namespace args; \ auto result = RUN_trunc(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( ::nm::shape(result), expect::shape ); \ diff --git a/tests/array/array/var.cpp b/tests/array/array/var.cpp index b885f64a9..51f989919 100644 --- a/tests/array/array/var.cpp +++ b/tests/array/array/var.cpp @@ -30,7 +30,7 @@ RUN_var_impl(__VA_ARGS__); #define VAR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, var, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, var, case_name); \ using namespace args; \ auto result = RUN_var(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/array/array/vstack.cpp b/tests/array/array/vstack.cpp index c63c19427..6b74ce80b 100644 --- a/tests/array/array/vstack.cpp +++ b/tests/array/array/vstack.cpp @@ -28,7 +28,7 @@ namespace meta = nm::meta; #define VSTACK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( vstack, case_name ) \ + NMTOOLS_TESTING_USE_CASE( vstack, case_name ) \ using namespace args; \ auto result = nmtools::array::vstack(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/array/array/where.cpp b/tests/array/array/where.cpp index 5f389551d..bea1c8ba4 100644 --- a/tests/array/array/where.cpp +++ b/tests/array/array/where.cpp @@ -47,7 +47,7 @@ RUN_impl(__VA_ARGS__); #define WHERE_SUBCASE(case_name,condition,x,y) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( view, where, case_name ); \ + NMTOOLS_TESTING_USE_CASE( view, where, case_name ); \ auto array_array = RUN_where( case_name, args::condition, args::x, args::y ); \ NMTOOLS_ASSERT_EQUAL( nm::dim(array_array), expect::dim ); \ NMTOOLS_ASSERT_EQUAL( nm::shape(array_array), expect::shape ); \ diff --git a/tests/array/array/zeros.cpp b/tests/array/array/zeros.cpp index 7f28583d6..f73d97b8e 100644 --- a/tests/array/array/zeros.cpp +++ b/tests/array/array/zeros.cpp @@ -32,7 +32,7 @@ RUN_zeros_impl(__VA_ARGS__); #define ZEROS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, zeros, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, zeros, case_name); \ using namespace args; \ auto result = RUN_zeros(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/constexpr/src/atleast_1d.cpp b/tests/constexpr/src/atleast_1d.cpp index f2213416b..5b4d96c6a 100644 --- a/tests/constexpr/src/atleast_1d.cpp +++ b/tests/constexpr/src/atleast_1d.cpp @@ -20,7 +20,7 @@ namespace meta = nmtools::meta; #define CONSTEXPR_ATLEAST_1D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_atleast_1d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_atleast_1d, case_name); \ using namespace args; \ constexpr auto result = nmtools::array::atleast_1d(__VA_ARGS__); \ NMTOOLS_STATIC_ASSERT_CLOSE( result, expect::result ); \ @@ -52,7 +52,7 @@ TEST_CASE("atleast_1d(case2)" * doctest::test_suite("array::constexpr_atleast_1d CONSTEXPR_ATLEAST_1D_SUBCASE( case2, a_ls_hb ); { - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_atleast_1d, case2); + NMTOOLS_TESTING_USE_CASE(array, constexpr_atleast_1d, case2); using namespace args; static_assert( meta::is_fixed_size_v ); diff --git a/tests/constexpr/src/atleast_2d.cpp b/tests/constexpr/src/atleast_2d.cpp index cacb203e5..cf800f5bc 100644 --- a/tests/constexpr/src/atleast_2d.cpp +++ b/tests/constexpr/src/atleast_2d.cpp @@ -17,7 +17,7 @@ constexpr inline auto name##_ls_hb = nmtools::cast(name, nmtools::array::kind::n #define CONSTEXPR_ATLEAST_2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_atleast_2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_atleast_2d, case_name); \ using namespace args; \ constexpr auto result = nmtools::array::atleast_2d(__VA_ARGS__); \ NMTOOLS_STATIC_ASSERT_EQUAL( nmtools::shape(result), expect::shape ); \ diff --git a/tests/constexpr/src/atleast_3d.cpp b/tests/constexpr/src/atleast_3d.cpp index ddfa37fae..a3186ded9 100644 --- a/tests/constexpr/src/atleast_3d.cpp +++ b/tests/constexpr/src/atleast_3d.cpp @@ -17,7 +17,7 @@ constexpr inline auto name##_ls_hb = nmtools::cast(name, nmtools::array::kind::n #define CONSTEXPR_ATLEAST_3D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_atleast_3d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_atleast_3d, case_name); \ using namespace args; \ constexpr auto result = nmtools::array::atleast_3d(__VA_ARGS__); \ NMTOOLS_STATIC_ASSERT_EQUAL( nmtools::shape(result), expect::shape ); \ diff --git a/tests/constexpr/src/broadcast_arrays.cpp b/tests/constexpr/src/broadcast_arrays.cpp index 4fbfe4db8..d12f38773 100644 --- a/tests/constexpr/src/broadcast_arrays.cpp +++ b/tests/constexpr/src/broadcast_arrays.cpp @@ -21,7 +21,7 @@ namespace meta = nm::meta; #define CONSTEXPR_BROADCAST_ARRAYS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(constexpr_broadcast_arrays, case_name); \ + NMTOOLS_TESTING_USE_CASE(constexpr_broadcast_arrays, case_name); \ using namespace args; \ constexpr auto results = nmtools::array::broadcast_arrays(__VA_ARGS__); \ constexpr auto N = meta::len_v; \ diff --git a/tests/constexpr/src/broadcast_to.cpp b/tests/constexpr/src/broadcast_to.cpp index 6ba46664f..b048c7e3b 100644 --- a/tests/constexpr/src/broadcast_to.cpp +++ b/tests/constexpr/src/broadcast_to.cpp @@ -18,7 +18,7 @@ namespace na = nm::array; #define CONSTEXPR_BROADCAST_TO_SUBCASE(case_name, expected, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(constexpr_broadcast_to, case_name); \ + NMTOOLS_TESTING_USE_CASE(constexpr_broadcast_to, case_name); \ using namespace args; \ constexpr auto result = nmtools::array::broadcast_to(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::expected) ); \ diff --git a/tests/constexpr/src/matmul.cpp b/tests/constexpr/src/matmul.cpp index 1ef67b6dd..bbdb94094 100644 --- a/tests/constexpr/src/matmul.cpp +++ b/tests/constexpr/src/matmul.cpp @@ -15,7 +15,7 @@ constexpr inline auto name##_ls_hb = nmtools::cast(name, nmtools::array::kind::n #define CONSTEXPR_MATMUL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_matmul, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_matmul, case_name); \ using namespace args; \ constexpr auto result = nmtools::array::matmul(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/constexpr/src/moveaxis.cpp b/tests/constexpr/src/moveaxis.cpp index a3a7c5d71..33279880e 100644 --- a/tests/constexpr/src/moveaxis.cpp +++ b/tests/constexpr/src/moveaxis.cpp @@ -16,7 +16,7 @@ namespace na = nm::array; #define CONSTEXPR_MOVEAXIS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_moveaxis, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_moveaxis, case_name); \ using namespace args; \ constexpr auto result = nmtools::array::moveaxis(__VA_ARGS__); \ NMTOOLS_STATIC_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/constexpr/src/pad.cpp b/tests/constexpr/src/pad.cpp index 3b547f41d..103509613 100644 --- a/tests/constexpr/src/pad.cpp +++ b/tests/constexpr/src/pad.cpp @@ -15,7 +15,7 @@ constexpr inline auto name##_ls_hb = nmtools::cast(name, nmtools::array::kind::n #define CONSTEXPR_PAD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_pad, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, constexpr_pad, case_name); \ using namespace args; \ constexpr auto result = nmtools::array::pad(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/constexpr/src/roll.cpp b/tests/constexpr/src/roll.cpp index 2062cfd90..f260c3648 100644 --- a/tests/constexpr/src/roll.cpp +++ b/tests/constexpr/src/roll.cpp @@ -20,7 +20,7 @@ namespace meta = nm::meta; #define CONSTEXPR_ROLL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(constexpr_roll, case_name) \ + NMTOOLS_TESTING_USE_CASE(constexpr_roll, case_name) \ using namespace args; \ constexpr auto result = na::roll(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/constexpr/src/transpose.cpp b/tests/constexpr/src/transpose.cpp index 21c405c2b..330cd978a 100644 --- a/tests/constexpr/src/transpose.cpp +++ b/tests/constexpr/src/transpose.cpp @@ -17,7 +17,7 @@ namespace na = nm::array; #define CONSTEXPR_TRANSPOSE_SUBCASE(case_name, array, axes) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case_name ); \ + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case_name ); \ constexpr auto array = na::transpose(args::array, args::axes); \ NMTOOLS_STATIC_ASSERT_CLOSE( array, expect::expected ); \ } diff --git a/tests/cuda/array/accumulations/add.cpp b/tests/cuda/array/accumulations/add.cpp index 736a0078d..81162ffeb 100644 --- a/tests/cuda/array/accumulations/add.cpp +++ b/tests/cuda/array/accumulations/add.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ACCUMULATE_ADD(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_add, case_name); \ using namespace args; \ auto result = na::add.accumulate(__VA_ARGS__, cuda::default_context()); \ auto expect = na::add.accumulate(__VA_ARGS__); \ diff --git a/tests/cuda/array/accumulations/multiply.cpp b/tests/cuda/array/accumulations/multiply.cpp index 6f40e59cb..2eb406bcb 100644 --- a/tests/cuda/array/accumulations/multiply.cpp +++ b/tests/cuda/array/accumulations/multiply.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ACCUMULATE_MULTIPLY(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_multiply, case_name); \ using namespace args; \ auto result = na::multiply.accumulate(__VA_ARGS__, cuda::default_context()); \ auto expect = na::multiply.accumulate(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/celu.cpp b/tests/cuda/array/activations/celu.cpp index 7d1adb8d2..952678915 100644 --- a/tests/cuda/array/activations/celu.cpp +++ b/tests/cuda/array/activations/celu.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define CELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, celu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, celu, case_name); \ using namespace args; \ auto result = na::celu(__VA_ARGS__, cuda::default_context()); \ auto expect = na::celu(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/elu.cpp b/tests/cuda/array/activations/elu.cpp index fc4ec39bc..5d6185ca6 100644 --- a/tests/cuda/array/activations/elu.cpp +++ b/tests/cuda/array/activations/elu.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, elu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, elu, case_name); \ using namespace args; \ auto result = na::elu(__VA_ARGS__, cuda::default_context()); \ auto expect = na::elu(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/hardshrink.cpp b/tests/cuda/array/activations/hardshrink.cpp index 732892f7b..c21786f16 100644 --- a/tests/cuda/array/activations/hardshrink.cpp +++ b/tests/cuda/array/activations/hardshrink.cpp @@ -26,7 +26,7 @@ namespace cuda = na::cuda; #define HARDSHRINK_SUBCASE(case_name, ...) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, hardshrink, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, hardshrink, case_name); \ using namespace args; \ auto result = na::hardshrink(__VA_ARGS__, cuda::default_context()); \ auto expect = na::hardshrink(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/hardswish.cpp b/tests/cuda/array/activations/hardswish.cpp index 56dcf4881..4815d62a7 100644 --- a/tests/cuda/array/activations/hardswish.cpp +++ b/tests/cuda/array/activations/hardswish.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define HARDSWISH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, hardswish, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, hardswish, case_name); \ using namespace args; \ auto result = na::hardswish(__VA_ARGS__, cuda::default_context()); \ auto expect = na::hardswish(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/hardtanh.cpp b/tests/cuda/array/activations/hardtanh.cpp index 9d488a408..2237c7334 100644 --- a/tests/cuda/array/activations/hardtanh.cpp +++ b/tests/cuda/array/activations/hardtanh.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define HARDTANH_SUBCASE(case_name,...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, hardtanh, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, hardtanh, case_name); \ using namespace args; \ auto result = na::hardtanh(__VA_ARGS__, cuda::default_context()); \ auto expect = na::hardtanh(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/leaky_relu.cpp b/tests/cuda/array/activations/leaky_relu.cpp index de992debb..6cccb6b9d 100644 --- a/tests/cuda/array/activations/leaky_relu.cpp +++ b/tests/cuda/array/activations/leaky_relu.cpp @@ -26,7 +26,7 @@ namespace cuda = na::cuda; #define LEAKY_RELU_SUBCASE(case_name, ...) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, leaky_relu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, leaky_relu, case_name); \ using namespace args; \ auto result = na::leaky_relu(__VA_ARGS__, cuda::default_context()); \ auto expect = na::leaky_relu(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/log_sigmoid.cpp b/tests/cuda/array/activations/log_sigmoid.cpp index 3024e5b6f..7d158c5fd 100644 --- a/tests/cuda/array/activations/log_sigmoid.cpp +++ b/tests/cuda/array/activations/log_sigmoid.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define LOG_SIGMOID_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, log_sigmoid, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, log_sigmoid, case_name); \ using namespace args; \ auto result = na::log_sigmoid(__VA_ARGS__, cuda::default_context()); \ auto expect = na::log_sigmoid(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/mish.cpp b/tests/cuda/array/activations/mish.cpp index 3c36bed81..c3cdf6621 100644 --- a/tests/cuda/array/activations/mish.cpp +++ b/tests/cuda/array/activations/mish.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define MISH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, mish, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, mish, case_name); \ using namespace args; \ auto result = na::mish(__VA_ARGS__, cuda::default_context()); \ auto expect = na::mish(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/prelu.cpp b/tests/cuda/array/activations/prelu.cpp index 147656edc..10d07faa7 100644 --- a/tests/cuda/array/activations/prelu.cpp +++ b/tests/cuda/array/activations/prelu.cpp @@ -26,7 +26,7 @@ namespace cuda = na::cuda; #define PRELU_SUBCASE(case_name, ...) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, prelu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, prelu, case_name); \ using namespace args; \ auto result = na::prelu(__VA_ARGS__, cuda::default_context()); \ auto expect = na::prelu(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/relu.cpp b/tests/cuda/array/activations/relu.cpp index d0541c623..0c745d09a 100644 --- a/tests/cuda/array/activations/relu.cpp +++ b/tests/cuda/array/activations/relu.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define RELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, relu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, relu, case_name); \ using namespace args; \ auto result = na::relu(__VA_ARGS__, cuda::default_context()); \ auto expect = na::relu(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/relu6.cpp b/tests/cuda/array/activations/relu6.cpp index 288cd601c..a540a20b6 100644 --- a/tests/cuda/array/activations/relu6.cpp +++ b/tests/cuda/array/activations/relu6.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define RELU6_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, relu6, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, relu6, case_name); \ using namespace args; \ auto result = na::relu6(__VA_ARGS__, cuda::default_context()); \ auto expect = na::relu6(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/selu.cpp b/tests/cuda/array/activations/selu.cpp index 88b4325e6..ba4080bd5 100644 --- a/tests/cuda/array/activations/selu.cpp +++ b/tests/cuda/array/activations/selu.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define SELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, selu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, selu, case_name); \ using namespace args; \ auto result = na::selu(__VA_ARGS__, cuda::default_context()); \ auto expect = na::selu(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/sigmoid.cpp b/tests/cuda/array/activations/sigmoid.cpp index 3404307df..1b6d9f835 100644 --- a/tests/cuda/array/activations/sigmoid.cpp +++ b/tests/cuda/array/activations/sigmoid.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define SIGMOID_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, sigmoid, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, sigmoid, case_name); \ using namespace args; \ auto result = na::sigmoid(__VA_ARGS__, cuda::default_context()); \ auto expect = na::sigmoid(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/silu.cpp b/tests/cuda/array/activations/silu.cpp index 08b8c0ddb..add649acf 100644 --- a/tests/cuda/array/activations/silu.cpp +++ b/tests/cuda/array/activations/silu.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define SILU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, silu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, silu, case_name); \ using namespace args; \ auto result = na::silu(__VA_ARGS__, cuda::default_context()); \ auto expect = na::silu(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/softplus.cpp b/tests/cuda/array/activations/softplus.cpp index 3e150cb9e..c8652eeef 100644 --- a/tests/cuda/array/activations/softplus.cpp +++ b/tests/cuda/array/activations/softplus.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define SOFTPLUS_SUBCASE(case_name,...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, softplus, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, softplus, case_name); \ using namespace args; \ auto result = na::softplus(__VA_ARGS__, cuda::default_context()); \ auto expect = na::softplus(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/softshrink.cpp b/tests/cuda/array/activations/softshrink.cpp index ae17e615c..2eb1ef747 100644 --- a/tests/cuda/array/activations/softshrink.cpp +++ b/tests/cuda/array/activations/softshrink.cpp @@ -26,7 +26,7 @@ namespace cuda = na::cuda; #define SOFTSHRINK_SUBCASE(case_name, ...) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, softshrink, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, softshrink, case_name); \ using namespace args; \ auto result = na::softshrink(__VA_ARGS__, cuda::default_context()); \ auto expect = na::softshrink(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/softsign.cpp b/tests/cuda/array/activations/softsign.cpp index 0391a7bfd..19b38e965 100644 --- a/tests/cuda/array/activations/softsign.cpp +++ b/tests/cuda/array/activations/softsign.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define SOFTSIGN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, softsign, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, softsign, case_name); \ using namespace args; \ auto result = na::softsign(__VA_ARGS__, cuda::default_context()); \ auto expect = na::softsign(__VA_ARGS__); \ diff --git a/tests/cuda/array/activations/tanhshrink.cpp b/tests/cuda/array/activations/tanhshrink.cpp index ec215fb2f..b6d0804ea 100644 --- a/tests/cuda/array/activations/tanhshrink.cpp +++ b/tests/cuda/array/activations/tanhshrink.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define TANHSHRINK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, tanhshrink, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, tanhshrink, case_name); \ using namespace args; \ auto result = na::tanhshrink(__VA_ARGS__, cuda::default_context()); \ auto expect = na::tanhshrink(__VA_ARGS__); \ diff --git a/tests/cuda/array/arange.cpp b/tests/cuda/array/arange.cpp index ea6109929..6a9690521 100644 --- a/tests/cuda/array/arange.cpp +++ b/tests/cuda/array/arange.cpp @@ -17,7 +17,7 @@ namespace na = nm::array; #define ARANGE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, arange, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, arange, case_name); \ using namespace args; \ CUDA_ARANGE_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/cuda/array/atleast_1d.cpp b/tests/cuda/array/atleast_1d.cpp index 31ee90c7b..ab608f4a9 100644 --- a/tests/cuda/array/atleast_1d.cpp +++ b/tests/cuda/array/atleast_1d.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ATLEAST_1D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_1d, case_name); \ using namespace args; \ auto result = na::atleast_1d(__VA_ARGS__, cuda::default_context()); \ auto expect = na::atleast_1d(__VA_ARGS__); \ diff --git a/tests/cuda/array/atleast_2d.cpp b/tests/cuda/array/atleast_2d.cpp index efc2b5334..fecd38caa 100644 --- a/tests/cuda/array/atleast_2d.cpp +++ b/tests/cuda/array/atleast_2d.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ATLEAST_2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_2d, case_name); \ using namespace args; \ auto result = na::atleast_2d(__VA_ARGS__, cuda::default_context()); \ auto expect = na::atleast_2d(__VA_ARGS__); \ diff --git a/tests/cuda/array/atleast_3d.cpp b/tests/cuda/array/atleast_3d.cpp index 0e1b9251c..aee9d0291 100644 --- a/tests/cuda/array/atleast_3d.cpp +++ b/tests/cuda/array/atleast_3d.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ATLEAST_3D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_3d, case_name); \ using namespace args; \ auto result = na::atleast_3d(__VA_ARGS__, cuda::default_context()); \ auto expect = na::atleast_3d(__VA_ARGS__); \ diff --git a/tests/cuda/array/broadcast_to.cpp b/tests/cuda/array/broadcast_to.cpp index 9b70644b5..b9eabf111 100644 --- a/tests/cuda/array/broadcast_to.cpp +++ b/tests/cuda/array/broadcast_to.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define BROADCAST_TO_SUBCASE(case_name, array, shape) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(broadcast_to, case_name); \ + NMTOOLS_TESTING_USE_CASE(broadcast_to, case_name); \ auto result = na::broadcast_to(args::array, args::shape, cuda::default_context()); \ auto expect = na::broadcast_to(args::array, args::shape); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect) ); \ diff --git a/tests/cuda/array/concatenate.cpp b/tests/cuda/array/concatenate.cpp index 5d3944bc5..b4c19a5d8 100644 --- a/tests/cuda/array/concatenate.cpp +++ b/tests/cuda/array/concatenate.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define CONCATENATE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, concatenate, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, concatenate, case_name); \ using namespace args; \ auto result = na::concatenate(__VA_ARGS__, cuda::default_context()); \ auto expect = na::concatenate(__VA_ARGS__); \ diff --git a/tests/cuda/array/cumprod.cpp b/tests/cuda/array/cumprod.cpp index 5dd6b26ea..d6c6756de 100644 --- a/tests/cuda/array/cumprod.cpp +++ b/tests/cuda/array/cumprod.cpp @@ -19,7 +19,7 @@ namespace ix = nm::index; #define CUMPROD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, cumprod, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, cumprod, case_name); \ using namespace args; \ CUDA_CUMPROD_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/cuda/array/cumsum.cpp b/tests/cuda/array/cumsum.cpp index baa3cc025..c04945b6e 100644 --- a/tests/cuda/array/cumsum.cpp +++ b/tests/cuda/array/cumsum.cpp @@ -19,7 +19,7 @@ namespace ix = nm::index; #define CUMSUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, cumsum, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, cumsum, case_name); \ using namespace args; \ CUDA_CUMSUM_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/cuda/array/expand_dims.cpp b/tests/cuda/array/expand_dims.cpp index e3eae1f36..25125be30 100644 --- a/tests/cuda/array/expand_dims.cpp +++ b/tests/cuda/array/expand_dims.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define EXPAND_DIMS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(expand_dims, case_name); \ + NMTOOLS_TESTING_USE_CASE(expand_dims, case_name); \ using namespace args; \ auto result = na::expand_dims(__VA_ARGS__, cuda::default_context()); \ auto expect = na::expand_dims(__VA_ARGS__); \ diff --git a/tests/cuda/array/flatten.cpp b/tests/cuda/array/flatten.cpp index 89d079056..514d0ca12 100644 --- a/tests/cuda/array/flatten.cpp +++ b/tests/cuda/array/flatten.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define FLATTEN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(flatten, case_name); \ + NMTOOLS_TESTING_USE_CASE(flatten, case_name); \ using namespace args; \ auto result = na::flatten(__VA_ARGS__, cuda::default_context()); \ auto expect = na::flatten(__VA_ARGS__); \ diff --git a/tests/cuda/array/flip.cpp b/tests/cuda/array/flip.cpp index 115f03021..c4e3d9c86 100644 --- a/tests/cuda/array/flip.cpp +++ b/tests/cuda/array/flip.cpp @@ -28,7 +28,7 @@ namespace na = nm::array; #define FLIP_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(flip, case_name); \ + NMTOOLS_TESTING_USE_CASE(flip, case_name); \ using namespace args; \ auto result = na::flip(__VA_ARGS__, na::cuda::default_context()); \ auto expect = na::flip(__VA_ARGS__); \ @@ -39,7 +39,7 @@ SUBCASE(#case_name) \ #define FLIPLR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(fliplr, case_name); \ + NMTOOLS_TESTING_USE_CASE(fliplr, case_name); \ using namespace args; \ auto result = na::fliplr(__VA_ARGS__, na::cuda::default_context()); \ auto expect = na::fliplr(__VA_ARGS__); \ @@ -50,7 +50,7 @@ SUBCASE(#case_name) \ #define FLIPUD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(flipud, case_name); \ + NMTOOLS_TESTING_USE_CASE(flipud, case_name); \ using namespace args; \ auto result = na::flipud(__VA_ARGS__, na::cuda::default_context()); \ auto expect = na::flipud(__VA_ARGS__); \ diff --git a/tests/cuda/array/full.cpp b/tests/cuda/array/full.cpp index b8bed44a3..3dae3b0da 100644 --- a/tests/cuda/array/full.cpp +++ b/tests/cuda/array/full.cpp @@ -17,7 +17,7 @@ namespace na = nm::array; #define FULL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, full, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, full, case_name); \ using namespace args; \ CUDA_FULL_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/cuda/array/hstack.cpp b/tests/cuda/array/hstack.cpp index eb545e5ab..b3e19d665 100644 --- a/tests/cuda/array/hstack.cpp +++ b/tests/cuda/array/hstack.cpp @@ -27,7 +27,7 @@ namespace meta = nm::meta; #define HSTACK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( hstack, case_name ) \ + NMTOOLS_TESTING_USE_CASE( hstack, case_name ) \ using namespace args; \ auto result = nmtools::array::hstack(__VA_ARGS__, na::cuda::default_context()); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/cuda/array/mean.cpp b/tests/cuda/array/mean.cpp index d6e9d34f5..172a3f91c 100644 --- a/tests/cuda/array/mean.cpp +++ b/tests/cuda/array/mean.cpp @@ -22,7 +22,7 @@ using nmtools::unwrap; #define MEAN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, mean, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, mean, case_name); \ using namespace args; \ CUDA_MEAN_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/cuda/array/moveaxis.cpp b/tests/cuda/array/moveaxis.cpp index e34b756d9..3db535cce 100644 --- a/tests/cuda/array/moveaxis.cpp +++ b/tests/cuda/array/moveaxis.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define MOVEAXIS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, moveaxis, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, moveaxis, case_name); \ using namespace args; \ auto expect = na::moveaxis(__VA_ARGS__); \ auto result = na::moveaxis(__VA_ARGS__, na::cuda::default_context()); \ diff --git a/tests/cuda/array/ones.cpp b/tests/cuda/array/ones.cpp index 3f0314dd5..95d3b054b 100644 --- a/tests/cuda/array/ones.cpp +++ b/tests/cuda/array/ones.cpp @@ -17,7 +17,7 @@ namespace na = nm::array; #define ONES_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, ones, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, ones, case_name); \ using namespace args; \ CUDA_ONES_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/cuda/array/outer/add.cpp b/tests/cuda/array/outer/add.cpp index 1090f3038..c97505868 100644 --- a/tests/cuda/array/outer/add.cpp +++ b/tests/cuda/array/outer/add.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define OUTER_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_add, case_name); \ using namespace args; \ auto result = na::add.outer(__VA_ARGS__, cuda::default_context()); \ auto expect = na::add.outer(__VA_ARGS__); \ diff --git a/tests/cuda/array/outer/multiply.cpp b/tests/cuda/array/outer/multiply.cpp index 1d14a1fa8..8cbd74569 100644 --- a/tests/cuda/array/outer/multiply.cpp +++ b/tests/cuda/array/outer/multiply.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define OUTER_MULTIPLY_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_multiply, case_name); \ using namespace args; \ auto result = na::multiply.outer(__VA_ARGS__, cuda::default_context()); \ auto expect = na::multiply.outer(__VA_ARGS__); \ diff --git a/tests/cuda/array/pad.cpp b/tests/cuda/array/pad.cpp index 7adc899d6..d945f4a07 100644 --- a/tests/cuda/array/pad.cpp +++ b/tests/cuda/array/pad.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define PAD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, pad, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, pad, case_name); \ using namespace args; \ auto result = na::pad(__VA_ARGS__, cuda::default_context()); \ auto expect = na::pad(__VA_ARGS__); \ diff --git a/tests/cuda/array/pooling.cpp b/tests/cuda/array/pooling.cpp index 053ef52c3..0d4e5cd20 100644 --- a/tests/cuda/array/pooling.cpp +++ b/tests/cuda/array/pooling.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define MAX_POOL2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, max_pool2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, max_pool2d, case_name); \ using namespace args; \ auto result = na::max_pool2d(__VA_ARGS__, cuda::default_context()); \ auto expect = na::max_pool2d(__VA_ARGS__); \ @@ -38,7 +38,7 @@ SUBCASE(#case_name) \ #define AVG_POOL2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, avg_pool2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, avg_pool2d, case_name); \ using namespace args; \ auto result = na::avg_pool2d(__VA_ARGS__, cuda::default_context()); \ auto expect = na::avg_pool2d(__VA_ARGS__); \ diff --git a/tests/cuda/array/prod.cpp b/tests/cuda/array/prod.cpp index d049e6121..bd6c3e279 100644 --- a/tests/cuda/array/prod.cpp +++ b/tests/cuda/array/prod.cpp @@ -19,7 +19,7 @@ namespace ix = nm::index; #define PROD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, prod, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, prod, case_name); \ using namespace args; \ CUDA_PROD_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/cuda/array/reductions/add.cpp b/tests/cuda/array/reductions/add.cpp index abe683541..ac5a0e504 100644 --- a/tests/cuda/array/reductions/add.cpp +++ b/tests/cuda/array/reductions/add.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define REDUCE_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_add, case_name); \ using namespace args; \ auto result = na::add.reduce(__VA_ARGS__, cuda::default_context()); \ auto expect = na::add.reduce(__VA_ARGS__); \ diff --git a/tests/cuda/array/reductions/multiply.cpp b/tests/cuda/array/reductions/multiply.cpp index 86cc8859e..191a2b200 100644 --- a/tests/cuda/array/reductions/multiply.cpp +++ b/tests/cuda/array/reductions/multiply.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define REDUCE_MULTIPLY_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_multiply, case_name); \ using namespace args; \ auto result = na::multiply.reduce(__VA_ARGS__, cuda::default_context()); \ auto expect = na::multiply.reduce(__VA_ARGS__); \ diff --git a/tests/cuda/array/repeat.cpp b/tests/cuda/array/repeat.cpp index 08fa44786..141b0d89a 100644 --- a/tests/cuda/array/repeat.cpp +++ b/tests/cuda/array/repeat.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define REPEAT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, repeat, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, repeat, case_name); \ using namespace args; \ auto result = na::repeat(__VA_ARGS__, cuda::default_context()); \ auto expect = na::repeat(__VA_ARGS__); \ diff --git a/tests/cuda/array/reshape.cpp b/tests/cuda/array/reshape.cpp index bbf17e2d1..3c96f76ae 100644 --- a/tests/cuda/array/reshape.cpp +++ b/tests/cuda/array/reshape.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define RESHAPE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(reshape, case_name); \ + NMTOOLS_TESTING_USE_CASE(reshape, case_name); \ using namespace args; \ auto result = na::reshape(__VA_ARGS__, cuda::default_context()); \ auto expect = na::reshape(__VA_ARGS__); \ diff --git a/tests/cuda/array/resize.cpp b/tests/cuda/array/resize.cpp index bc14f9658..ea6ede2bf 100644 --- a/tests/cuda/array/resize.cpp +++ b/tests/cuda/array/resize.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define RESIZE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(resize, case_name); \ + NMTOOLS_TESTING_USE_CASE(resize, case_name); \ using namespace args; \ auto result = na::resize(__VA_ARGS__, cuda::default_context()); \ auto expect = na::resize(__VA_ARGS__); \ diff --git a/tests/cuda/array/slice.cpp b/tests/cuda/array/slice.cpp index f273fab98..c216579e9 100644 --- a/tests/cuda/array/slice.cpp +++ b/tests/cuda/array/slice.cpp @@ -40,7 +40,7 @@ CHECK_MESSAGE(nmtools::utils::apply_isclose(result,expect), \ #define SLICE_SUBCASE(case_name, a, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, slice, case_name); \ using namespace args; \ auto result = na::apply_slice(a, nmtools_tuple{__VA_ARGS__}, cuda::default_context()); \ auto expect = na::apply_slice(a, nmtools_tuple{__VA_ARGS__}); \ diff --git a/tests/cuda/array/squeeze.cpp b/tests/cuda/array/squeeze.cpp index 650faa1a0..c19e5b178 100644 --- a/tests/cuda/array/squeeze.cpp +++ b/tests/cuda/array/squeeze.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define SQUEEZE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(squeeze, case_name); \ + NMTOOLS_TESTING_USE_CASE(squeeze, case_name); \ using namespace args; \ auto result = na::squeeze(__VA_ARGS__, cuda::default_context()); \ auto expect = na::squeeze(__VA_ARGS__); \ diff --git a/tests/cuda/array/stack.cpp b/tests/cuda/array/stack.cpp index 1c3d5be13..798a78eba 100644 --- a/tests/cuda/array/stack.cpp +++ b/tests/cuda/array/stack.cpp @@ -27,7 +27,7 @@ namespace meta = nm::meta; #define STACK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( stack, case_name ) \ + NMTOOLS_TESTING_USE_CASE( stack, case_name ) \ using namespace args; \ auto result = nmtools::array::stack(__VA_ARGS__,na::cuda::default_context()); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/cuda/array/sum.cpp b/tests/cuda/array/sum.cpp index 26c021d4c..c8160d9c5 100644 --- a/tests/cuda/array/sum.cpp +++ b/tests/cuda/array/sum.cpp @@ -19,7 +19,7 @@ namespace ix = nm::index; #define SUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, sum, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, sum, case_name); \ using namespace args; \ CUDA_SUM_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/cuda/array/tile.cpp b/tests/cuda/array/tile.cpp index fa671dc58..4220f8eba 100644 --- a/tests/cuda/array/tile.cpp +++ b/tests/cuda/array/tile.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define TILE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, tile, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, tile, case_name); \ using namespace args; \ auto result = na::tile(__VA_ARGS__, cuda::default_context()); \ auto expect = na::tile(__VA_ARGS__); \ diff --git a/tests/cuda/array/transpose.cpp b/tests/cuda/array/transpose.cpp index db64b23a6..d978c58fc 100644 --- a/tests/cuda/array/transpose.cpp +++ b/tests/cuda/array/transpose.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define TRANSPOSE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(transpose, case_name); \ + NMTOOLS_TESTING_USE_CASE(transpose, case_name); \ using namespace args; \ auto result = na::transpose(__VA_ARGS__, cuda::default_context()); \ auto expect = na::transpose(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/add.cpp b/tests/cuda/array/ufuncs/add.cpp index e4dc4acee..b273e7f96 100644 --- a/tests/cuda/array/ufuncs/add.cpp +++ b/tests/cuda/array/ufuncs/add.cpp @@ -29,7 +29,7 @@ namespace na = nm::array; #define ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, add, case_name); \ using namespace args; \ auto result = na::add(__VA_ARGS__, na::cuda::default_context()); \ auto expect = na::add(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/arccos.cpp b/tests/cuda/array/ufuncs/arccos.cpp index 252a228c5..b77a2432f 100644 --- a/tests/cuda/array/ufuncs/arccos.cpp +++ b/tests/cuda/array/ufuncs/arccos.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ARCCOS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arccos, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arccos, case_name); \ using namespace args; \ auto result = na::arccos(__VA_ARGS__, cuda::default_context()); \ auto expect = na::arccos(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/arccosh.cpp b/tests/cuda/array/ufuncs/arccosh.cpp index 897fd6f98..ef9bbe2a2 100644 --- a/tests/cuda/array/ufuncs/arccosh.cpp +++ b/tests/cuda/array/ufuncs/arccosh.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ARCCOSH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arccosh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arccosh, case_name); \ using namespace args; \ auto result = na::arccosh(__VA_ARGS__, cuda::default_context()); \ auto expect = na::arccosh(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/arcsin.cpp b/tests/cuda/array/ufuncs/arcsin.cpp index 4628884e7..046ded4e8 100644 --- a/tests/cuda/array/ufuncs/arcsin.cpp +++ b/tests/cuda/array/ufuncs/arcsin.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ARCSIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arcsin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arcsin, case_name); \ using namespace args; \ auto result = na::arcsin(__VA_ARGS__, cuda::default_context()); \ auto expect = na::arcsin(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/arcsinh.cpp b/tests/cuda/array/ufuncs/arcsinh.cpp index 7d37ae41b..94c355c54 100644 --- a/tests/cuda/array/ufuncs/arcsinh.cpp +++ b/tests/cuda/array/ufuncs/arcsinh.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ARCSINH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arcsinh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arcsinh, case_name); \ using namespace args; \ auto result = na::arcsinh(__VA_ARGS__, cuda::default_context()); \ auto expect = na::arcsinh(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/arctan.cpp b/tests/cuda/array/ufuncs/arctan.cpp index 96e9454ee..4ad2b2065 100644 --- a/tests/cuda/array/ufuncs/arctan.cpp +++ b/tests/cuda/array/ufuncs/arctan.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ARCTAN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arctan, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arctan, case_name); \ using namespace args; \ auto result = na::arctan(__VA_ARGS__, cuda::default_context()); \ auto expect = na::arctan(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/arctanh.cpp b/tests/cuda/array/ufuncs/arctanh.cpp index 3df165870..be5ce1818 100644 --- a/tests/cuda/array/ufuncs/arctanh.cpp +++ b/tests/cuda/array/ufuncs/arctanh.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ARCTANH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arctanh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arctanh, case_name); \ using namespace args; \ auto result = na::arctanh(__VA_ARGS__, cuda::default_context()); \ auto expect = na::arctanh(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/cbrt.cpp b/tests/cuda/array/ufuncs/cbrt.cpp index 019859f2d..75c02e4c9 100644 --- a/tests/cuda/array/ufuncs/cbrt.cpp +++ b/tests/cuda/array/ufuncs/cbrt.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define CBRT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, cbrt, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, cbrt, case_name); \ using namespace args; \ auto result = na::cbrt(__VA_ARGS__, cuda::default_context()); \ auto expect = na::cbrt(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/ceil.cpp b/tests/cuda/array/ufuncs/ceil.cpp index 259316bd5..c06de716a 100644 --- a/tests/cuda/array/ufuncs/ceil.cpp +++ b/tests/cuda/array/ufuncs/ceil.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define CEIL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, ceil, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, ceil, case_name); \ using namespace args; \ auto result = na::ceil(__VA_ARGS__, cuda::default_context()); \ auto expect = na::ceil(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/cos.cpp b/tests/cuda/array/ufuncs/cos.cpp index f873c5c41..91514e54b 100644 --- a/tests/cuda/array/ufuncs/cos.cpp +++ b/tests/cuda/array/ufuncs/cos.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define COS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, cos, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, cos, case_name); \ using namespace args; \ auto result = na::cos(__VA_ARGS__, cuda::default_context()); \ auto expect = na::cos(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/cosh.cpp b/tests/cuda/array/ufuncs/cosh.cpp index 3914e70e8..0491ef6d9 100644 --- a/tests/cuda/array/ufuncs/cosh.cpp +++ b/tests/cuda/array/ufuncs/cosh.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define COSH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, cosh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, cosh, case_name); \ using namespace args; \ auto result = na::cosh(__VA_ARGS__, cuda::default_context()); \ auto expect = na::cosh(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/exp.cpp b/tests/cuda/array/ufuncs/exp.cpp index 2ace18636..5f5c774f6 100644 --- a/tests/cuda/array/ufuncs/exp.cpp +++ b/tests/cuda/array/ufuncs/exp.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define EXP_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, exp, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, exp, case_name); \ using namespace args; \ auto result = na::exp(__VA_ARGS__, cuda::default_context()); \ auto expect = na::exp(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/exp2.cpp b/tests/cuda/array/ufuncs/exp2.cpp index 1e43b3850..a23380d41 100644 --- a/tests/cuda/array/ufuncs/exp2.cpp +++ b/tests/cuda/array/ufuncs/exp2.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define EXP2_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, exp2, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, exp2, case_name); \ using namespace args; \ auto result = na::exp2(__VA_ARGS__, cuda::default_context()); \ auto expect = na::exp2(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/expm1.cpp b/tests/cuda/array/ufuncs/expm1.cpp index 6f028f055..cf0b76adf 100644 --- a/tests/cuda/array/ufuncs/expm1.cpp +++ b/tests/cuda/array/ufuncs/expm1.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define EXPM1_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, expm1, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, expm1, case_name); \ using namespace args; \ auto result = na::expm1(__VA_ARGS__, cuda::default_context()); \ auto expect = na::expm1(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/fabs.cpp b/tests/cuda/array/ufuncs/fabs.cpp index 8865aa757..7cb7d7e8f 100644 --- a/tests/cuda/array/ufuncs/fabs.cpp +++ b/tests/cuda/array/ufuncs/fabs.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define FABS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, fabs, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, fabs, case_name); \ using namespace args; \ auto result = na::fabs(__VA_ARGS__, cuda::default_context()); \ auto expect = na::fabs(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/floor.cpp b/tests/cuda/array/ufuncs/floor.cpp index 7df492061..24f4e2670 100644 --- a/tests/cuda/array/ufuncs/floor.cpp +++ b/tests/cuda/array/ufuncs/floor.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define FLOOR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, floor, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, floor, case_name); \ using namespace args; \ auto result = na::floor(__VA_ARGS__, cuda::default_context()); \ auto expect = na::floor(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/invert.cpp b/tests/cuda/array/ufuncs/invert.cpp index 000cfdf7f..78255b1b6 100644 --- a/tests/cuda/array/ufuncs/invert.cpp +++ b/tests/cuda/array/ufuncs/invert.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define INVERT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, invert, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, invert, case_name); \ using namespace args; \ auto result = na::invert(__VA_ARGS__, cuda::default_context()); \ auto expect = na::invert(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/isfinite.cpp b/tests/cuda/array/ufuncs/isfinite.cpp index 47a50bac0..e6ac80239 100644 --- a/tests/cuda/array/ufuncs/isfinite.cpp +++ b/tests/cuda/array/ufuncs/isfinite.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ISFINITE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, isfinite, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, isfinite, case_name); \ using namespace args; \ auto result = na::isfinite(__VA_ARGS__, cuda::default_context()); \ auto expect = na::isfinite(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/isinf.cpp b/tests/cuda/array/ufuncs/isinf.cpp index 8ede093b3..e81f63693 100644 --- a/tests/cuda/array/ufuncs/isinf.cpp +++ b/tests/cuda/array/ufuncs/isinf.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ISINF_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, isinf, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, isinf, case_name); \ using namespace args; \ auto result = na::isinf(__VA_ARGS__, cuda::default_context()); \ auto expect = na::isinf(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/isnan.cpp b/tests/cuda/array/ufuncs/isnan.cpp index 34710f86c..f74ad47ba 100644 --- a/tests/cuda/array/ufuncs/isnan.cpp +++ b/tests/cuda/array/ufuncs/isnan.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define ISNAN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, isnan, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, isnan, case_name); \ using namespace args; \ auto result = na::isnan(__VA_ARGS__, cuda::default_context()); \ auto expect = na::isnan(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/log.cpp b/tests/cuda/array/ufuncs/log.cpp index 7d9fc5aef..f3f7b7cfa 100644 --- a/tests/cuda/array/ufuncs/log.cpp +++ b/tests/cuda/array/ufuncs/log.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define LOG_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, log, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, log, case_name); \ using namespace args; \ auto result = na::log(__VA_ARGS__, cuda::default_context()); \ auto expect = na::log(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/log10.cpp b/tests/cuda/array/ufuncs/log10.cpp index 7d19fc6fe..10fac20e7 100644 --- a/tests/cuda/array/ufuncs/log10.cpp +++ b/tests/cuda/array/ufuncs/log10.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define LOG10_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, log10, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, log10, case_name); \ using namespace args; \ auto result = na::log10(__VA_ARGS__, cuda::default_context()); \ auto expect = na::log10(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/log1p.cpp b/tests/cuda/array/ufuncs/log1p.cpp index 208c40960..e8238d1fe 100644 --- a/tests/cuda/array/ufuncs/log1p.cpp +++ b/tests/cuda/array/ufuncs/log1p.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define LOG1P_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, log1p, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, log1p, case_name); \ using namespace args; \ auto result = na::log1p(__VA_ARGS__, cuda::default_context()); \ auto expect = na::log1p(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/log2.cpp b/tests/cuda/array/ufuncs/log2.cpp index e1d2cddf5..85b237096 100644 --- a/tests/cuda/array/ufuncs/log2.cpp +++ b/tests/cuda/array/ufuncs/log2.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define LOG2_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, log2, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, log2, case_name); \ using namespace args; \ auto result = na::log2(__VA_ARGS__, cuda::default_context()); \ auto expect = na::log2(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/multiply.cpp b/tests/cuda/array/ufuncs/multiply.cpp index fc78d4464..95f805d65 100644 --- a/tests/cuda/array/ufuncs/multiply.cpp +++ b/tests/cuda/array/ufuncs/multiply.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define MULTIPLY_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, multiply, case_name); \ using namespace args; \ auto result = na::multiply(__VA_ARGS__, cuda::default_context()); \ auto expect = na::multiply(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/negative.cpp b/tests/cuda/array/ufuncs/negative.cpp index 4a257664e..0dbbcc6a6 100644 --- a/tests/cuda/array/ufuncs/negative.cpp +++ b/tests/cuda/array/ufuncs/negative.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define NEGATIVE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, negative, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, negative, case_name); \ using namespace args; \ auto result = na::negative(__VA_ARGS__, cuda::default_context()); \ auto expect = na::negative(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/positive.cpp b/tests/cuda/array/ufuncs/positive.cpp index deeed2e5e..611b5c613 100644 --- a/tests/cuda/array/ufuncs/positive.cpp +++ b/tests/cuda/array/ufuncs/positive.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define POSITIVE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, positive, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, positive, case_name); \ using namespace args; \ auto result = na::positive(__VA_ARGS__, cuda::default_context()); \ auto expect = na::positive(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/reciprocal.cpp b/tests/cuda/array/ufuncs/reciprocal.cpp index 9811b036b..d14e89617 100644 --- a/tests/cuda/array/ufuncs/reciprocal.cpp +++ b/tests/cuda/array/ufuncs/reciprocal.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define RECIPROCAL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reciprocal, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reciprocal, case_name); \ using namespace args; \ auto result = na::reciprocal(__VA_ARGS__, cuda::default_context()); \ auto expect = na::reciprocal(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/rint.cpp b/tests/cuda/array/ufuncs/rint.cpp index d12e644ac..bc5d7ca8a 100644 --- a/tests/cuda/array/ufuncs/rint.cpp +++ b/tests/cuda/array/ufuncs/rint.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define RINT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, rint, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, rint, case_name); \ using namespace args; \ auto result = na::rint(__VA_ARGS__, cuda::default_context()); \ auto expect = na::rint(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/signbit.cpp b/tests/cuda/array/ufuncs/signbit.cpp index d9fc7545e..b06cb2f5b 100644 --- a/tests/cuda/array/ufuncs/signbit.cpp +++ b/tests/cuda/array/ufuncs/signbit.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define SIGNBIT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, signbit, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, signbit, case_name); \ using namespace args; \ auto result = na::signbit(__VA_ARGS__, cuda::default_context()); \ auto expect = na::signbit(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/sin.cpp b/tests/cuda/array/ufuncs/sin.cpp index 0617b583c..bcc5ca62d 100644 --- a/tests/cuda/array/ufuncs/sin.cpp +++ b/tests/cuda/array/ufuncs/sin.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define SIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, sin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, sin, case_name); \ using namespace args; \ auto result = na::sin(__VA_ARGS__, cuda::default_context()); \ auto expect = na::sin(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/sinh.cpp b/tests/cuda/array/ufuncs/sinh.cpp index 1e0d2b846..70c40c6fd 100644 --- a/tests/cuda/array/ufuncs/sinh.cpp +++ b/tests/cuda/array/ufuncs/sinh.cpp @@ -30,7 +30,7 @@ namespace cuda = na::cuda; #define SINH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, sinh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, sinh, case_name); \ using namespace args; \ auto result = na::sinh(__VA_ARGS__, cuda::default_context()); \ auto expect = na::sinh(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/sqrt.cpp b/tests/cuda/array/ufuncs/sqrt.cpp index 0e21392db..9435ecc0c 100644 --- a/tests/cuda/array/ufuncs/sqrt.cpp +++ b/tests/cuda/array/ufuncs/sqrt.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define SQRT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, sqrt, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, sqrt, case_name); \ using namespace args; \ auto result = na::sqrt(__VA_ARGS__, cuda::default_context()); \ auto expect = na::sqrt(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/tan.cpp b/tests/cuda/array/ufuncs/tan.cpp index d4cdfb773..e3fa1c699 100644 --- a/tests/cuda/array/ufuncs/tan.cpp +++ b/tests/cuda/array/ufuncs/tan.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define TAN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, tan, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, tan, case_name); \ using namespace args; \ auto result = na::tan(__VA_ARGS__, cuda::default_context()); \ auto expect = na::tan(__VA_ARGS__); \ diff --git a/tests/cuda/array/ufuncs/tanh.cpp b/tests/cuda/array/ufuncs/tanh.cpp index 4c87703bd..f3cab6490 100644 --- a/tests/cuda/array/ufuncs/tanh.cpp +++ b/tests/cuda/array/ufuncs/tanh.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define TANH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, tanh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, tanh, case_name); \ using namespace args; \ auto result = na::tanh(__VA_ARGS__, cuda::default_context()); \ auto expect = na::tanh(__VA_ARGS__); \ diff --git a/tests/cuda/array/vstack.cpp b/tests/cuda/array/vstack.cpp index de15d974a..d14160481 100644 --- a/tests/cuda/array/vstack.cpp +++ b/tests/cuda/array/vstack.cpp @@ -27,7 +27,7 @@ namespace meta = nm::meta; #define VSTACK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( vstack, case_name ) \ + NMTOOLS_TESTING_USE_CASE( vstack, case_name ) \ using namespace args; \ auto result = nmtools::array::vstack(__VA_ARGS__,na::cuda::default_context()); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/cuda/array/where.cpp b/tests/cuda/array/where.cpp index 8bd34dd3d..655d1b48a 100644 --- a/tests/cuda/array/where.cpp +++ b/tests/cuda/array/where.cpp @@ -27,7 +27,7 @@ namespace cuda = na::cuda; #define WHERE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, where, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, where, case_name); \ using namespace args; \ auto result = na::where(__VA_ARGS__, cuda::default_context()); \ auto expect = na::where(__VA_ARGS__); \ diff --git a/tests/cuda/array/zeros.cpp b/tests/cuda/array/zeros.cpp index 0dc348c6b..c2ba9102b 100644 --- a/tests/cuda/array/zeros.cpp +++ b/tests/cuda/array/zeros.cpp @@ -17,7 +17,7 @@ namespace na = nm::array; #define ZEROS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, zeros, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, zeros, case_name); \ using namespace args; \ CUDA_ZEROS_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/functional/src/activations/celu.cpp b/tests/functional/src/activations/celu.cpp index 23baf03d2..61b9046e3 100644 --- a/tests/functional/src/activations/celu.cpp +++ b/tests/functional/src/activations/celu.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("celu(case1)" * doctest::test_suite("functional::celu")) { - NMTOOLS_TESTING_DECLARE_NS(activations,celu,case1); + NMTOOLS_TESTING_USE_CASE(activations,celu,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::celu, a ); @@ -27,7 +27,7 @@ TEST_CASE("celu(case1)" * doctest::test_suite("functional::celu")) TEST_CASE("celu(case2)" * doctest::test_suite("functional::celu")) { - NMTOOLS_TESTING_DECLARE_NS(activations,celu,case2); + NMTOOLS_TESTING_USE_CASE(activations,celu,case2); using namespace args; ACTIVATIONS_SUBCASE( "case2", fn::celu[alpha], a ); @@ -41,7 +41,7 @@ namespace view = nmtools::view; TEST_CASE("celu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,celu,case2); + NMTOOLS_TESTING_USE_CASE(activations,celu,case2); using namespace args; auto array = view::celu(a,alpha); @@ -55,7 +55,7 @@ TEST_CASE("celu" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("celu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,celu,case2); + NMTOOLS_TESTING_USE_CASE(activations,celu,case2); using namespace args; auto array = view::celu(a,alpha); @@ -75,7 +75,7 @@ namespace fun = view::fun; TEST_CASE("celu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,celu,case2); + NMTOOLS_TESTING_USE_CASE(activations,celu,case2); using namespace args; auto array = view::celu(a,{.alpha=alpha}); diff --git a/tests/functional/src/activations/elu.cpp b/tests/functional/src/activations/elu.cpp index 9b12bbcbd..a9be6ebed 100644 --- a/tests/functional/src/activations/elu.cpp +++ b/tests/functional/src/activations/elu.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("elu(case1)" * doctest::test_suite("functional::elu")) { - NMTOOLS_TESTING_DECLARE_NS(activations,elu,case1); + NMTOOLS_TESTING_USE_CASE(activations,elu,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::elu, a ); @@ -27,7 +27,7 @@ TEST_CASE("elu(case1)" * doctest::test_suite("functional::elu")) TEST_CASE("elu(case2)" * doctest::test_suite("functional::elu")) { - NMTOOLS_TESTING_DECLARE_NS(activations,elu,case2); + NMTOOLS_TESTING_USE_CASE(activations,elu,case2); using namespace args; ACTIVATIONS_SUBCASE( "case2", fn::elu[alpha], a ); @@ -44,7 +44,7 @@ namespace fun = view::fun; TEST_CASE("elu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,elu,case2); + NMTOOLS_TESTING_USE_CASE(activations,elu,case2); using namespace args; auto array = view::elu(a); @@ -59,7 +59,7 @@ TEST_CASE("elu" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("elu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,elu,case2); + NMTOOLS_TESTING_USE_CASE(activations,elu,case2); using namespace args; auto array = view::elu(a,alpha); @@ -74,7 +74,7 @@ TEST_CASE("elu" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("elu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,elu,case2); + NMTOOLS_TESTING_USE_CASE(activations,elu,case2); using namespace args; auto array = view::elu(a,alpha); @@ -92,7 +92,7 @@ TEST_CASE("elu" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("elu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,elu,case2); + NMTOOLS_TESTING_USE_CASE(activations,elu,case2); using namespace args; auto array = view::elu(a,{.alpha=alpha}); @@ -118,7 +118,7 @@ TEST_CASE("elu" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("elu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,elu,case2); + NMTOOLS_TESTING_USE_CASE(activations,elu,case2); using namespace args; auto array = view::elu(a,{.alpha=0.1f}); @@ -135,7 +135,7 @@ TEST_CASE("elu" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("elu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,elu,case2); + NMTOOLS_TESTING_USE_CASE(activations,elu,case2); using namespace args; auto array = view::elu(a,{.alpha=0.1f}); @@ -153,7 +153,7 @@ TEST_CASE("elu" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("elu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,elu,case2); + NMTOOLS_TESTING_USE_CASE(activations,elu,case2); using namespace args; auto array = view::elu(a,{.alpha=0.1f}); diff --git a/tests/functional/src/activations/hardshrink.cpp b/tests/functional/src/activations/hardshrink.cpp index 372d50990..b30042e28 100644 --- a/tests/functional/src/activations/hardshrink.cpp +++ b/tests/functional/src/activations/hardshrink.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("hardshrink(case1)" * doctest::test_suite("functional::hardshrink")) { - NMTOOLS_TESTING_DECLARE_NS(activations,hardshrink,case1); + NMTOOLS_TESTING_USE_CASE(activations,hardshrink,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::hardshrink, a ); @@ -27,7 +27,7 @@ TEST_CASE("hardshrink(case1)" * doctest::test_suite("functional::hardshrink")) TEST_CASE("hardshrink(case2)" * doctest::test_suite("functional::hardshrink")) { - NMTOOLS_TESTING_DECLARE_NS(activations,hardshrink,case2); + NMTOOLS_TESTING_USE_CASE(activations,hardshrink,case2); using namespace args; ACTIVATIONS_SUBCASE( "case2", fn::hardshrink[lambda], a ); @@ -41,7 +41,7 @@ namespace view = nmtools::view; TEST_CASE("hardshrink" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,hardshrink,case2); + NMTOOLS_TESTING_USE_CASE(activations,hardshrink,case2); using namespace args; auto array = view::hardshrink(a,lambda); @@ -55,7 +55,7 @@ TEST_CASE("hardshrink" * doctest::test_suite("functional::get_function_compositi TEST_CASE("hardshrink" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,hardshrink,case2); + NMTOOLS_TESTING_USE_CASE(activations,hardshrink,case2); using namespace args; auto array = view::hardshrink(a,lambda); @@ -77,7 +77,7 @@ namespace fun = view::fun; TEST_CASE("hardshrink" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,hardshrink,case2); + NMTOOLS_TESTING_USE_CASE(activations,hardshrink,case2); using namespace args; auto array = view::hardshrink(a,{.lambda=lambda}); diff --git a/tests/functional/src/activations/hardswish.cpp b/tests/functional/src/activations/hardswish.cpp index 267af3a4d..31335d8ed 100644 --- a/tests/functional/src/activations/hardswish.cpp +++ b/tests/functional/src/activations/hardswish.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("hardswish(case1)" * doctest::test_suite("functional::hardswish")) { - NMTOOLS_TESTING_DECLARE_NS(activations,hardswish,case1); + NMTOOLS_TESTING_USE_CASE(activations,hardswish,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::hardswish, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("hardswish" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,hardswish,case1); + NMTOOLS_TESTING_USE_CASE(activations,hardswish,case1); using namespace args; auto array = view::hardswish(a); @@ -43,7 +43,7 @@ TEST_CASE("hardswish" * doctest::test_suite("functional::get_function_compositio TEST_CASE("hardswish" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,hardswish,case1); + NMTOOLS_TESTING_USE_CASE(activations,hardswish,case1); using namespace args; auto array = view::hardswish(a); diff --git a/tests/functional/src/activations/hardtanh.cpp b/tests/functional/src/activations/hardtanh.cpp index 58296b113..66a7d86e1 100644 --- a/tests/functional/src/activations/hardtanh.cpp +++ b/tests/functional/src/activations/hardtanh.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("hardtanh(case1)" * doctest::test_suite("functional::hardtanh")) { - NMTOOLS_TESTING_DECLARE_NS(activations,hardtanh,case1); + NMTOOLS_TESTING_USE_CASE(activations,hardtanh,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::hardtanh, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("hardtanh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,hardtanh,case1); + NMTOOLS_TESTING_USE_CASE(activations,hardtanh,case1); using namespace args; auto array = view::hardtanh(a); @@ -43,7 +43,7 @@ TEST_CASE("hardtanh" * doctest::test_suite("functional::get_function_composition TEST_CASE("hardtanh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,hardtanh,case1); + NMTOOLS_TESTING_USE_CASE(activations,hardtanh,case1); using namespace args; auto array = view::hardtanh(a); @@ -65,7 +65,7 @@ namespace fun = view::fun; TEST_CASE("hardtanh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,hardtanh,case1); + NMTOOLS_TESTING_USE_CASE(activations,hardtanh,case1); using namespace args; auto array = view::hardtanh(a,{.min_val=-1.,.max_val=1.}); diff --git a/tests/functional/src/activations/leaky_relu.cpp b/tests/functional/src/activations/leaky_relu.cpp index 7ae8657b0..f45d1a454 100644 --- a/tests/functional/src/activations/leaky_relu.cpp +++ b/tests/functional/src/activations/leaky_relu.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("leaky_relu(case1)" * doctest::test_suite("functional::leaky_relu")) { - NMTOOLS_TESTING_DECLARE_NS(activations,leaky_relu,case1); + NMTOOLS_TESTING_USE_CASE(activations,leaky_relu,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::leaky_relu, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("leaky_relu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,leaky_relu,case1); + NMTOOLS_TESTING_USE_CASE(activations,leaky_relu,case1); using namespace args; auto array = view::leaky_relu(a); @@ -43,7 +43,7 @@ TEST_CASE("leaky_relu" * doctest::test_suite("functional::get_function_compositi TEST_CASE("leaky_relu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,leaky_relu,case1); + NMTOOLS_TESTING_USE_CASE(activations,leaky_relu,case1); using namespace args; auto array = view::leaky_relu(a); @@ -65,7 +65,7 @@ namespace fun = view::fun; TEST_CASE("leaky_relu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,leaky_relu,case1); + NMTOOLS_TESTING_USE_CASE(activations,leaky_relu,case1); using namespace args; auto array = view::leaky_relu(a,{.negative_slope=0.01}); diff --git a/tests/functional/src/activations/log_sigmoid.cpp b/tests/functional/src/activations/log_sigmoid.cpp index 6794fb457..cc3bc67e6 100644 --- a/tests/functional/src/activations/log_sigmoid.cpp +++ b/tests/functional/src/activations/log_sigmoid.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("log_sigmoid(case1)" * doctest::test_suite("functional::log_sigmoid")) { - NMTOOLS_TESTING_DECLARE_NS(activations,log_sigmoid,case1); + NMTOOLS_TESTING_USE_CASE(activations,log_sigmoid,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::log_sigmoid, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("log_sigmoid" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,log_sigmoid,case1); + NMTOOLS_TESTING_USE_CASE(activations,log_sigmoid,case1); using namespace args; auto array = view::log_sigmoid(a); @@ -43,7 +43,7 @@ TEST_CASE("log_sigmoid" * doctest::test_suite("functional::get_function_composit TEST_CASE("log_sigmoid" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,log_sigmoid,case1); + NMTOOLS_TESTING_USE_CASE(activations,log_sigmoid,case1); using namespace args; auto array = view::log_sigmoid(a); diff --git a/tests/functional/src/activations/mish.cpp b/tests/functional/src/activations/mish.cpp index f7eb75a90..c3101d278 100644 --- a/tests/functional/src/activations/mish.cpp +++ b/tests/functional/src/activations/mish.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("mish(case1)" * doctest::test_suite("functional::mish")) { - NMTOOLS_TESTING_DECLARE_NS(activations,mish,case1); + NMTOOLS_TESTING_USE_CASE(activations,mish,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::mish, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("mish" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,mish,case1); + NMTOOLS_TESTING_USE_CASE(activations,mish,case1); using namespace args; auto array = view::mish(a); @@ -43,7 +43,7 @@ TEST_CASE("mish" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("mish" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,mish,case1); + NMTOOLS_TESTING_USE_CASE(activations,mish,case1); using namespace args; auto array = view::mish(a); diff --git a/tests/functional/src/activations/prelu.cpp b/tests/functional/src/activations/prelu.cpp index 867a59791..1dc9712f2 100644 --- a/tests/functional/src/activations/prelu.cpp +++ b/tests/functional/src/activations/prelu.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("prelu(case1)" * doctest::test_suite("functional::prelu")) { - NMTOOLS_TESTING_DECLARE_NS(activations,prelu,case1); + NMTOOLS_TESTING_USE_CASE(activations,prelu,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::prelu, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("prelu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,prelu,case1); + NMTOOLS_TESTING_USE_CASE(activations,prelu,case1); using namespace args; auto array = view::prelu(a); @@ -43,7 +43,7 @@ TEST_CASE("prelu" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("prelu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,prelu,case1); + NMTOOLS_TESTING_USE_CASE(activations,prelu,case1); using namespace args; auto array = view::prelu(a); @@ -65,7 +65,7 @@ namespace fun = view::fun; TEST_CASE("prelu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,prelu,case1); + NMTOOLS_TESTING_USE_CASE(activations,prelu,case1); using namespace args; auto array = view::prelu(a,{.alpha=0.25}); diff --git a/tests/functional/src/activations/relu.cpp b/tests/functional/src/activations/relu.cpp index c267bdf72..0fd68cf90 100644 --- a/tests/functional/src/activations/relu.cpp +++ b/tests/functional/src/activations/relu.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("relu(case1)" * doctest::test_suite("functional::relu")) { - NMTOOLS_TESTING_DECLARE_NS(activations,relu,case1); + NMTOOLS_TESTING_USE_CASE(activations,relu,case1); using namespace args; RELU_SUBCASE("case1", fn::relu, a); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("relu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,relu,case1); + NMTOOLS_TESTING_USE_CASE(activations,relu,case1); using namespace args; auto array = view::relu(a); @@ -43,7 +43,7 @@ TEST_CASE("relu" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("relu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,relu,case1); + NMTOOLS_TESTING_USE_CASE(activations,relu,case1); using namespace args; auto array = view::relu(a); diff --git a/tests/functional/src/activations/relu6.cpp b/tests/functional/src/activations/relu6.cpp index fe801414c..f13615369 100644 --- a/tests/functional/src/activations/relu6.cpp +++ b/tests/functional/src/activations/relu6.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("relu6(case1)" * doctest::test_suite("functional::relu6")) { - NMTOOLS_TESTING_DECLARE_NS(activations,relu6,case1); + NMTOOLS_TESTING_USE_CASE(activations,relu6,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::relu6, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("relu6" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,relu6,case1); + NMTOOLS_TESTING_USE_CASE(activations,relu6,case1); using namespace args; auto array = view::relu6(a); @@ -44,7 +44,7 @@ TEST_CASE("relu6" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("relu6" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,relu6,case1); + NMTOOLS_TESTING_USE_CASE(activations,relu6,case1); using namespace args; auto array = view::relu6(a); diff --git a/tests/functional/src/activations/selu.cpp b/tests/functional/src/activations/selu.cpp index c1b495a8a..2dacd8e4d 100644 --- a/tests/functional/src/activations/selu.cpp +++ b/tests/functional/src/activations/selu.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("selu(case1)" * doctest::test_suite("functional::selu")) { - NMTOOLS_TESTING_DECLARE_NS(activations,selu,case1); + NMTOOLS_TESTING_USE_CASE(activations,selu,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::selu, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("selu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,selu,case1); + NMTOOLS_TESTING_USE_CASE(activations,selu,case1); using namespace args; auto array = view::selu(a); @@ -43,7 +43,7 @@ TEST_CASE("selu" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("selu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,selu,case1); + NMTOOLS_TESTING_USE_CASE(activations,selu,case1); using namespace args; auto array = view::selu(a); diff --git a/tests/functional/src/activations/sigmoid.cpp b/tests/functional/src/activations/sigmoid.cpp index 5a6add9ec..a7c7359a8 100644 --- a/tests/functional/src/activations/sigmoid.cpp +++ b/tests/functional/src/activations/sigmoid.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("sigmoid(case1)" * doctest::test_suite("functional::sigmoid")) { - NMTOOLS_TESTING_DECLARE_NS(activations,sigmoid,case1); + NMTOOLS_TESTING_USE_CASE(activations,sigmoid,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::sigmoid, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("sigmoid" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,sigmoid,case1); + NMTOOLS_TESTING_USE_CASE(activations,sigmoid,case1); using namespace args; auto array = view::sigmoid(a); @@ -43,7 +43,7 @@ TEST_CASE("sigmoid" * doctest::test_suite("functional::get_function_composition" TEST_CASE("sigmoid" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,sigmoid,case1); + NMTOOLS_TESTING_USE_CASE(activations,sigmoid,case1); using namespace args; auto array = view::sigmoid(a); diff --git a/tests/functional/src/activations/silu.cpp b/tests/functional/src/activations/silu.cpp index 30fc11519..e5a61058f 100644 --- a/tests/functional/src/activations/silu.cpp +++ b/tests/functional/src/activations/silu.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("silu(case1)" * doctest::test_suite("functional::silu")) { - NMTOOLS_TESTING_DECLARE_NS(activations,silu,case1); + NMTOOLS_TESTING_USE_CASE(activations,silu,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::silu, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("silu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,silu,case1); + NMTOOLS_TESTING_USE_CASE(activations,silu,case1); using namespace args; auto array = view::silu(a); @@ -43,7 +43,7 @@ TEST_CASE("silu" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("silu" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,silu,case1); + NMTOOLS_TESTING_USE_CASE(activations,silu,case1); using namespace args; auto array = view::silu(a); diff --git a/tests/functional/src/activations/softplus.cpp b/tests/functional/src/activations/softplus.cpp index c6c1b2b14..624697757 100644 --- a/tests/functional/src/activations/softplus.cpp +++ b/tests/functional/src/activations/softplus.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("softplus(case1)" * doctest::test_suite("functional::softplus")) { - NMTOOLS_TESTING_DECLARE_NS(activations,softplus,case1); + NMTOOLS_TESTING_USE_CASE(activations,softplus,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::softplus, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("softplus" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,softplus,case1); + NMTOOLS_TESTING_USE_CASE(activations,softplus,case1); using namespace args; auto array = view::softplus(a); @@ -44,7 +44,7 @@ TEST_CASE("softplus" * doctest::test_suite("functional::get_function_composition TEST_CASE("softplus" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,softplus,case1); + NMTOOLS_TESTING_USE_CASE(activations,softplus,case1); using namespace args; auto array = view::softplus(a); @@ -66,7 +66,7 @@ namespace fun = view::fun; TEST_CASE("softplus" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,softplus,case1); + NMTOOLS_TESTING_USE_CASE(activations,softplus,case1); using namespace args; auto array = view::softplus(a,{.beta=1.,.threshold=20.}); diff --git a/tests/functional/src/activations/softshrink.cpp b/tests/functional/src/activations/softshrink.cpp index eb968727c..a4d7f58a2 100644 --- a/tests/functional/src/activations/softshrink.cpp +++ b/tests/functional/src/activations/softshrink.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("softshrink(case1)" * doctest::test_suite("functional::softshrink")) { - NMTOOLS_TESTING_DECLARE_NS(activations,softshrink,case1); + NMTOOLS_TESTING_USE_CASE(activations,softshrink,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::softshrink, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("softshrink" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,softshrink,case1); + NMTOOLS_TESTING_USE_CASE(activations,softshrink,case1); using namespace args; auto array = view::softshrink(a); @@ -43,7 +43,7 @@ TEST_CASE("softshrink" * doctest::test_suite("functional::get_function_compositi TEST_CASE("softshrink" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,softshrink,case1); + NMTOOLS_TESTING_USE_CASE(activations,softshrink,case1); using namespace args; auto array = view::softshrink(a); @@ -65,7 +65,7 @@ namespace fun = view::fun; TEST_CASE("softshrink" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,softshrink,case1); + NMTOOLS_TESTING_USE_CASE(activations,softshrink,case1); using namespace args; // NOTE: the following lambda deduced as double diff --git a/tests/functional/src/activations/softsign.cpp b/tests/functional/src/activations/softsign.cpp index 5082473fd..10b90da29 100644 --- a/tests/functional/src/activations/softsign.cpp +++ b/tests/functional/src/activations/softsign.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("softsign(case1)" * doctest::test_suite("functional::softsign")) { - NMTOOLS_TESTING_DECLARE_NS(activations,softsign,case1); + NMTOOLS_TESTING_USE_CASE(activations,softsign,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::softsign, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("softsign" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,softsign,case1); + NMTOOLS_TESTING_USE_CASE(activations,softsign,case1); using namespace args; auto array = view::softsign(a); @@ -43,7 +43,7 @@ TEST_CASE("softsign" * doctest::test_suite("functional::get_function_composition TEST_CASE("softsign" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,softsign,case1); + NMTOOLS_TESTING_USE_CASE(activations,softsign,case1); using namespace args; auto array = view::softsign(a); diff --git a/tests/functional/src/activations/tanhshrink.cpp b/tests/functional/src/activations/tanhshrink.cpp index f571b2162..5a1b25500 100644 --- a/tests/functional/src/activations/tanhshrink.cpp +++ b/tests/functional/src/activations/tanhshrink.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("tanhshrink(case1)" * doctest::test_suite("functional::tanhshrink")) { - NMTOOLS_TESTING_DECLARE_NS(activations,tanhshrink,case1); + NMTOOLS_TESTING_USE_CASE(activations,tanhshrink,case1); using namespace args; ACTIVATIONS_SUBCASE( "case1", fn::tanhshrink, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("tanhshrink" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,tanhshrink,case1); + NMTOOLS_TESTING_USE_CASE(activations,tanhshrink,case1); using namespace args; auto array = view::tanhshrink(a); @@ -43,7 +43,7 @@ TEST_CASE("tanhshrink" * doctest::test_suite("functional::get_function_compositi TEST_CASE("tanhshrink" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(activations,tanhshrink,case1); + NMTOOLS_TESTING_USE_CASE(activations,tanhshrink,case1); using namespace args; auto array = view::tanhshrink(a); diff --git a/tests/functional/src/atleast_1d.cpp b/tests/functional/src/atleast_1d.cpp index 9962f5987..56df68871 100644 --- a/tests/functional/src/atleast_1d.cpp +++ b/tests/functional/src/atleast_1d.cpp @@ -19,7 +19,7 @@ SUBCASE(subcase_name) \ TEST_CASE("atleast_1d(case1)" * doctest::test_suite("functional::atleast_1d")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d, case1); + NMTOOLS_TESTING_USE_CASE(array, atleast_1d, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::atleast_1d, a ); @@ -27,7 +27,7 @@ TEST_CASE("atleast_1d(case1)" * doctest::test_suite("functional::atleast_1d")) TEST_CASE("atleast_1d(case2)" * doctest::test_suite("functional::atleast_1d")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d, case2); + NMTOOLS_TESTING_USE_CASE(array, atleast_1d, case2); using namespace args; FUNCTIONAL_SUBCASE( "case2", fn::atleast_1d, a ); @@ -39,7 +39,7 @@ TEST_CASE("atleast_1d(case2)" * doctest::test_suite("functional::atleast_1d")) TEST_CASE("atleast_1d(case3)" * doctest::test_suite("functional::atleast_1d")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d, case3); + NMTOOLS_TESTING_USE_CASE(array, atleast_1d, case3); using namespace args; FUNCTIONAL_SUBCASE( "case3", fn::atleast_1d, a ); @@ -51,7 +51,7 @@ TEST_CASE("atleast_1d(case3)" * doctest::test_suite("functional::atleast_1d")) TEST_CASE("atleast_1d(case4)" * doctest::test_suite("functional::atleast_1d")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d, case4); + NMTOOLS_TESTING_USE_CASE(array, atleast_1d, case4); using namespace args; FUNCTIONAL_SUBCASE( "case4", fn::atleast_1d, a ); diff --git a/tests/functional/src/atleast_2d.cpp b/tests/functional/src/atleast_2d.cpp index 137fb8530..45ef9a27a 100644 --- a/tests/functional/src/atleast_2d.cpp +++ b/tests/functional/src/atleast_2d.cpp @@ -19,7 +19,7 @@ SUBCASE(subcase_name) \ TEST_CASE("atleast_2d(case1)" * doctest::test_suite("functional::atleast_2d")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d, case1); + NMTOOLS_TESTING_USE_CASE(array, atleast_2d, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::atleast_2d, a ); @@ -27,7 +27,7 @@ TEST_CASE("atleast_2d(case1)" * doctest::test_suite("functional::atleast_2d")) TEST_CASE("atleast_2d(case2)" * doctest::test_suite("functional::atleast_2d")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d, case2); + NMTOOLS_TESTING_USE_CASE(array, atleast_2d, case2); using namespace args; FUNCTIONAL_SUBCASE( "case2", fn::atleast_2d, a ); @@ -39,7 +39,7 @@ TEST_CASE("atleast_2d(case2)" * doctest::test_suite("functional::atleast_2d")) TEST_CASE("atleast_2d(case3)" * doctest::test_suite("functional::atleast_2d")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d, case3); + NMTOOLS_TESTING_USE_CASE(array, atleast_2d, case3); using namespace args; FUNCTIONAL_SUBCASE( "case3", fn::atleast_2d, a ); @@ -51,7 +51,7 @@ TEST_CASE("atleast_2d(case3)" * doctest::test_suite("functional::atleast_2d")) TEST_CASE("atleast_2d(case4)" * doctest::test_suite("functional::atleast_2d")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d, case4); + NMTOOLS_TESTING_USE_CASE(array, atleast_2d, case4); using namespace args; FUNCTIONAL_SUBCASE( "case4", fn::atleast_2d, a ); diff --git a/tests/functional/src/atleast_3d.cpp b/tests/functional/src/atleast_3d.cpp index 740e9a55f..7c5997933 100644 --- a/tests/functional/src/atleast_3d.cpp +++ b/tests/functional/src/atleast_3d.cpp @@ -19,7 +19,7 @@ SUBCASE(subcase_name) \ TEST_CASE("atleast_3d(case1)" * doctest::test_suite("functional::atleast_3d")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d, case1); + NMTOOLS_TESTING_USE_CASE(array, atleast_3d, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::atleast_3d, a ); @@ -27,7 +27,7 @@ TEST_CASE("atleast_3d(case1)" * doctest::test_suite("functional::atleast_3d")) TEST_CASE("atleast_3d(case2)" * doctest::test_suite("functional::atleast_3d")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d, case2); + NMTOOLS_TESTING_USE_CASE(array, atleast_3d, case2); using namespace args; FUNCTIONAL_SUBCASE( "case2", fn::atleast_3d, a ); @@ -39,7 +39,7 @@ TEST_CASE("atleast_3d(case2)" * doctest::test_suite("functional::atleast_3d")) TEST_CASE("atleast_3d(case3)" * doctest::test_suite("functional::atleast_3d")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d, case3); + NMTOOLS_TESTING_USE_CASE(array, atleast_3d, case3); using namespace args; FUNCTIONAL_SUBCASE( "case3", fn::atleast_3d, a ); @@ -51,7 +51,7 @@ TEST_CASE("atleast_3d(case3)" * doctest::test_suite("functional::atleast_3d")) TEST_CASE("atleast_3d(case4)" * doctest::test_suite("functional::atleast_3d")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d, case4); + NMTOOLS_TESTING_USE_CASE(array, atleast_3d, case4); using namespace args; FUNCTIONAL_SUBCASE( "case4", fn::atleast_3d, a ); diff --git a/tests/functional/src/atleast_nd.cpp b/tests/functional/src/atleast_nd.cpp index 4aa9489a6..f7c6debbd 100644 --- a/tests/functional/src/atleast_nd.cpp +++ b/tests/functional/src/atleast_nd.cpp @@ -22,7 +22,7 @@ SUBCASE(subcase_name) \ TEST_CASE("atleast_1d(case1)" * doctest::test_suite("functional::atleast_nd")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d, case1); + NMTOOLS_TESTING_USE_CASE(array, atleast_1d, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::atleast_nd[1_ct], a ); @@ -30,7 +30,7 @@ TEST_CASE("atleast_1d(case1)" * doctest::test_suite("functional::atleast_nd")) TEST_CASE("atleast_1d(case2)" * doctest::test_suite("functional::atleast_nd")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d, case2); + NMTOOLS_TESTING_USE_CASE(array, atleast_1d, case2); using namespace args; FUNCTIONAL_SUBCASE( "case2", fn::atleast_nd[1_ct], a ); @@ -42,7 +42,7 @@ TEST_CASE("atleast_1d(case2)" * doctest::test_suite("functional::atleast_nd")) TEST_CASE("atleast_1d(case3)" * doctest::test_suite("functional::atleast_nd")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d, case3); + NMTOOLS_TESTING_USE_CASE(array, atleast_1d, case3); using namespace args; FUNCTIONAL_SUBCASE( "case3", fn::atleast_nd[1_ct], a ); @@ -54,7 +54,7 @@ TEST_CASE("atleast_1d(case3)" * doctest::test_suite("functional::atleast_nd")) TEST_CASE("atleast_1d(case4)" * doctest::test_suite("functional::atleast_nd")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d, case4); + NMTOOLS_TESTING_USE_CASE(array, atleast_1d, case4); using namespace args; FUNCTIONAL_SUBCASE( "case4", fn::atleast_nd[1_ct], a ); @@ -66,7 +66,7 @@ TEST_CASE("atleast_1d(case4)" * doctest::test_suite("functional::atleast_nd")) TEST_CASE("atleast_2d(case1)" * doctest::test_suite("functional::atleast_nd")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d, case1); + NMTOOLS_TESTING_USE_CASE(array, atleast_2d, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::atleast_nd[2_ct], a ); @@ -74,7 +74,7 @@ TEST_CASE("atleast_2d(case1)" * doctest::test_suite("functional::atleast_nd")) TEST_CASE("atleast_2d(case2)" * doctest::test_suite("functional::atleast_nd")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d, case2); + NMTOOLS_TESTING_USE_CASE(array, atleast_2d, case2); using namespace args; FUNCTIONAL_SUBCASE( "case2", fn::atleast_nd[2_ct], a ); @@ -86,7 +86,7 @@ TEST_CASE("atleast_2d(case2)" * doctest::test_suite("functional::atleast_nd")) TEST_CASE("atleast_2d(case3)" * doctest::test_suite("functional::atleast_nd")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d, case3); + NMTOOLS_TESTING_USE_CASE(array, atleast_2d, case3); using namespace args; FUNCTIONAL_SUBCASE( "case3", fn::atleast_nd[2_ct], a ); @@ -98,7 +98,7 @@ TEST_CASE("atleast_2d(case3)" * doctest::test_suite("functional::atleast_nd")) TEST_CASE("atleast_2d(case4)" * doctest::test_suite("functional::atleast_nd")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d, case4); + NMTOOLS_TESTING_USE_CASE(array, atleast_2d, case4); using namespace args; FUNCTIONAL_SUBCASE( "case4", fn::atleast_nd[2_ct], a ); @@ -110,7 +110,7 @@ TEST_CASE("atleast_2d(case4)" * doctest::test_suite("functional::atleast_nd")) TEST_CASE("atleast_3d(case1)" * doctest::test_suite("functional::atleast_nd")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d, case1); + NMTOOLS_TESTING_USE_CASE(array, atleast_3d, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::atleast_nd[3_ct], a ); @@ -118,7 +118,7 @@ TEST_CASE("atleast_3d(case1)" * doctest::test_suite("functional::atleast_nd")) TEST_CASE("atleast_3d(case2)" * doctest::test_suite("functional::atleast_nd")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d, case2); + NMTOOLS_TESTING_USE_CASE(array, atleast_3d, case2); using namespace args; FUNCTIONAL_SUBCASE( "case2", fn::atleast_nd[3_ct], a ); @@ -130,7 +130,7 @@ TEST_CASE("atleast_3d(case2)" * doctest::test_suite("functional::atleast_nd")) TEST_CASE("atleast_3d(case3)" * doctest::test_suite("functional::atleast_nd")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d, case3); + NMTOOLS_TESTING_USE_CASE(array, atleast_3d, case3); using namespace args; FUNCTIONAL_SUBCASE( "case3", fn::atleast_nd[3_ct], a ); @@ -142,7 +142,7 @@ TEST_CASE("atleast_3d(case3)" * doctest::test_suite("functional::atleast_nd")) TEST_CASE("atleast_3d(case4)" * doctest::test_suite("functional::atleast_nd")) { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d, case4); + NMTOOLS_TESTING_USE_CASE(array, atleast_3d, case4); using namespace args; FUNCTIONAL_SUBCASE( "case4", fn::atleast_nd[3_ct], a ); diff --git a/tests/functional/src/broadcast_to.cpp b/tests/functional/src/broadcast_to.cpp index fd443bad1..d1c590631 100644 --- a/tests/functional/src/broadcast_to.cpp +++ b/tests/functional/src/broadcast_to.cpp @@ -27,7 +27,7 @@ SUBCASE(subcase_name) \ TEST_CASE("broadcast_to(case1)" * doctest::test_suite("functional::broadcast_to")) { - NMTOOLS_TESTING_DECLARE_NS(broadcast_to, case1); + NMTOOLS_TESTING_USE_CASE(broadcast_to, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::broadcast_to[shape], x ); @@ -48,7 +48,7 @@ TEST_CASE("broadcast_to(case1)" * doctest::test_suite("functional::broadcast_to" TEST_CASE("broadcast_to(case7)" * doctest::test_suite("functional::broadcast_to")) { - NMTOOLS_TESTING_DECLARE_NS(broadcast_to, case7); + NMTOOLS_TESTING_USE_CASE(broadcast_to, case7); using namespace args; FUNCTIONAL_SUBCASE( "case7", fn::broadcast_to[shape], x ); @@ -60,7 +60,7 @@ TEST_CASE("broadcast_to(case7)" * doctest::test_suite("functional::broadcast_to" TEST_CASE("broadcast_to(case10)" * doctest::test_suite("functional::broadcast_to")) { - NMTOOLS_TESTING_DECLARE_NS(broadcast_to, case10); + NMTOOLS_TESTING_USE_CASE(broadcast_to, case10); using namespace args; FUNCTIONAL_SUBCASE( "case10", fn::broadcast_to[shape], x ); @@ -69,7 +69,7 @@ TEST_CASE("broadcast_to(case10)" * doctest::test_suite("functional::broadcast_to #if 0 TEST_CASE("constexpr_broadcast_to(case1)" * doctest::test_suite("functional::broadcast_to")) { - NMTOOLS_TESTING_DECLARE_NS(constexpr_broadcast_to, case1); + NMTOOLS_TESTING_USE_CASE(constexpr_broadcast_to, case1); using namespace args; CONSTEXPR_FUNCTIONAL_SUBCASE( "case1", fn::broadcast_to[shape], x ); @@ -88,7 +88,7 @@ TEST_CASE("constexpr_broadcast_to(case1)" * doctest::test_suite("functional::bro TEST_CASE("constexpr_broadcast_to(case7)" * doctest::test_suite("functional::broadcast_to")) { - NMTOOLS_TESTING_DECLARE_NS(constexpr_broadcast_to, case7); + NMTOOLS_TESTING_USE_CASE(constexpr_broadcast_to, case7); using namespace args; CONSTEXPR_FUNCTIONAL_SUBCASE( "case7", fn::broadcast_to[shape], x ); @@ -107,7 +107,7 @@ TEST_CASE("constexpr_broadcast_to(case7)" * doctest::test_suite("functional::bro TEST_CASE("constexpr_broadcast_to(case10)" * doctest::test_suite("functional::broadcast_to")) { - NMTOOLS_TESTING_DECLARE_NS(constexpr_broadcast_to, case10); + NMTOOLS_TESTING_USE_CASE(constexpr_broadcast_to, case10); using namespace args; CONSTEXPR_FUNCTIONAL_SUBCASE( "case10", fn::broadcast_to[shape], x ); diff --git a/tests/functional/src/composition/add_add.cpp b/tests/functional/src/composition/add_add.cpp index 4989fa706..ee6963ed5 100644 --- a/tests/functional/src/composition/add_add.cpp +++ b/tests/functional/src/composition/add_add.cpp @@ -68,7 +68,7 @@ SUBCASE(subcase_name) \ TEST_CASE("add_flatten(case1)" * doctest::test_suite("functional::composition")) { - NMTOOLS_TESTING_DECLARE_NS(functional,add_add,case1); + NMTOOLS_TESTING_USE_CASE(functional,add_add,case1); using namespace args; using namespace expect; diff --git a/tests/functional/src/composition/add_flatten.cpp b/tests/functional/src/composition/add_flatten.cpp index 1ddfedbcb..efdfeb2f6 100644 --- a/tests/functional/src/composition/add_flatten.cpp +++ b/tests/functional/src/composition/add_flatten.cpp @@ -66,7 +66,7 @@ NMTOOLS_TESTING_DECLARE_CASE(functional, add_flatten) TEST_CASE("add_flatten(case1)" * doctest::test_suite("functional::composition")) { - NMTOOLS_TESTING_DECLARE_NS(functional,add_flatten,case1); + NMTOOLS_TESTING_USE_CASE(functional,add_flatten,case1); using namespace args; using namespace expect; diff --git a/tests/functional/src/composition/add_tanh.cpp b/tests/functional/src/composition/add_tanh.cpp index 8654a7024..97476c878 100644 --- a/tests/functional/src/composition/add_tanh.cpp +++ b/tests/functional/src/composition/add_tanh.cpp @@ -11,7 +11,7 @@ namespace meta = nmtools::meta; TEST_CASE("add_tanh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,multiply,case1); + NMTOOLS_TESTING_USE_CASE(view,multiply,case1); using namespace args; auto y = view::add(a,b); @@ -32,7 +32,7 @@ using namespace nmtools::literals; TEST_CASE("add_tanh" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,multiply,case1); + NMTOOLS_TESTING_USE_CASE(view,multiply,case1); using namespace args; auto y = view::add(a,b); @@ -47,7 +47,7 @@ TEST_CASE("add_tanh" * doctest::test_suite("functional::get_function_operands")) TEST_CASE("add_tanh" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,multiply,case1); + NMTOOLS_TESTING_USE_CASE(view,multiply,case1); using namespace args; auto y = view::add(a,b); diff --git a/tests/functional/src/composition/divide_subtract.cpp b/tests/functional/src/composition/divide_subtract.cpp index ba0a866fd..b4f2459a9 100644 --- a/tests/functional/src/composition/divide_subtract.cpp +++ b/tests/functional/src/composition/divide_subtract.cpp @@ -13,7 +13,7 @@ using namespace nmtools::literals; // TODO: fix, reorder result from divide to subtract rhs TEST_CASE("divide_subtract" * doctest::test_suite("functional::get_function_composition") * doctest::skip()) { - NMTOOLS_TESTING_DECLARE_NS(view,subtract,case1); + NMTOOLS_TESTING_USE_CASE(view,subtract,case1); using namespace args; auto x = view::divide(a,3); @@ -32,7 +32,7 @@ TEST_CASE("divide_subtract" * doctest::test_suite("functional::get_function_comp TEST_CASE("divide_subtract" * doctest::test_suite("functional::get_function_composition") ) { - NMTOOLS_TESTING_DECLARE_NS(view,subtract,case1); + NMTOOLS_TESTING_USE_CASE(view,subtract,case1); using namespace args; auto x = view::divide(a,3); @@ -50,7 +50,7 @@ TEST_CASE("divide_subtract" * doctest::test_suite("functional::get_function_comp TEST_CASE("divide_subtract" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,subtract,case1); + NMTOOLS_TESTING_USE_CASE(view,subtract,case1); using namespace args; auto x = view::divide(a,3); @@ -68,7 +68,7 @@ TEST_CASE("divide_subtract" * doctest::test_suite("functional::get_function_oper TEST_CASE("divide_subtract" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,subtract,case1); + NMTOOLS_TESTING_USE_CASE(view,subtract,case1); using namespace args; auto x = view::divide(a,3); diff --git a/tests/functional/src/composition/fabs_square.cpp b/tests/functional/src/composition/fabs_square.cpp index 44ea278e5..81c1d84f1 100644 --- a/tests/functional/src/composition/fabs_square.cpp +++ b/tests/functional/src/composition/fabs_square.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; TEST_CASE("fabs_square" * doctest::test_suite("functional::get_function_composition") ) { - NMTOOLS_TESTING_DECLARE_NS(view,square,case1); + NMTOOLS_TESTING_USE_CASE(view,square,case1); using namespace args; auto x = view::fabs(a); @@ -29,7 +29,7 @@ using namespace nmtools::literals; TEST_CASE("fabs_square" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,square,case1); + NMTOOLS_TESTING_USE_CASE(view,square,case1); using namespace args; auto x = view::fabs(a); @@ -43,7 +43,7 @@ TEST_CASE("fabs_square" * doctest::test_suite("functional::get_function_operands TEST_CASE("fabs_square" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,square,case1); + NMTOOLS_TESTING_USE_CASE(view,square,case1); using namespace args; auto x = view::fabs(a); diff --git a/tests/functional/src/composition/fabs_square_sum.cpp b/tests/functional/src/composition/fabs_square_sum.cpp index c699cae16..8ccb084e4 100644 --- a/tests/functional/src/composition/fabs_square_sum.cpp +++ b/tests/functional/src/composition/fabs_square_sum.cpp @@ -12,7 +12,7 @@ namespace view = nmtools::view; TEST_CASE("fabs_square_sum" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,fabs,case1); + NMTOOLS_TESTING_USE_CASE(view,fabs,case1); using namespace args; auto axis = 0; @@ -35,7 +35,7 @@ using namespace nmtools::literals; TEST_CASE("fabs_square_sum" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,fabs,case1); + NMTOOLS_TESTING_USE_CASE(view,fabs,case1); using namespace args; // auto dtype = nm::None; @@ -53,7 +53,7 @@ TEST_CASE("fabs_square_sum" * doctest::test_suite("functional::get_function_oper TEST_CASE("fabs_square_sum" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,fabs,case1); + NMTOOLS_TESTING_USE_CASE(view,fabs,case1); using namespace args; // auto dtype = nm::None; diff --git a/tests/functional/src/composition/flatten_add.cpp b/tests/functional/src/composition/flatten_add.cpp index fdb184d10..31a75ee30 100644 --- a/tests/functional/src/composition/flatten_add.cpp +++ b/tests/functional/src/composition/flatten_add.cpp @@ -50,7 +50,7 @@ TEST_CASE("flatten_add(case1)" * doctest::test_suite("functional::composition")) { // TODO: rename test case to array::add instead of view::add - NMTOOLS_TESTING_DECLARE_NS(view,add,case1); + NMTOOLS_TESTING_USE_CASE(view,add,case1); using namespace args; auto flattened = na::flatten(expect::result); @@ -82,7 +82,7 @@ TEST_CASE("flatten_add(case2)" * doctest::test_suite("functional::composition")) { // TODO: rename test case to array::add instead of view::add - NMTOOLS_TESTING_DECLARE_NS(view,add,case2); + NMTOOLS_TESTING_USE_CASE(view,add,case2); using namespace args; auto flattened = na::flatten(expect::result); @@ -116,7 +116,7 @@ TEST_CASE("flatten_add(case3)" * doctest::test_suite("functional::composition")) { // TODO: rename test case to array::add instead of view::add - NMTOOLS_TESTING_DECLARE_NS(view,add,case3); + NMTOOLS_TESTING_USE_CASE(view,add,case3); using namespace args; auto flattened = na::flatten(expect::result); @@ -137,7 +137,7 @@ TEST_CASE("flatten_add(case4)" * doctest::test_suite("functional::composition")) { // TODO: rename test case to array::add instead of view::add - NMTOOLS_TESTING_DECLARE_NS(view,add,case4); + NMTOOLS_TESTING_USE_CASE(view,add,case4); using namespace args; auto flattened = na::flatten(expect::result); @@ -171,7 +171,7 @@ TEST_CASE("constexpr_flatten_add(case1)" * doctest::test_suite("functional::comp { // TODO: rename test case to array::add instead of view::add - NMTOOLS_TESTING_DECLARE_NS(array,constexpr_add,case1); + NMTOOLS_TESTING_USE_CASE(array,constexpr_add,case1); using namespace args; constexpr auto flattened = na::flatten(expect::result); @@ -201,7 +201,7 @@ TEST_CASE("flatten_reduce_add(case1)" * doctest::test_suite("functional::composi { // TODO: rename test case to array::add instead of view::add - NMTOOLS_TESTING_DECLARE_NS(view,reduce_add,case1); + NMTOOLS_TESTING_USE_CASE(view,reduce_add,case1); using namespace args; auto flattened = na::flatten(expect::result); @@ -220,7 +220,7 @@ TEST_CASE("flatten_reduce_add(case4)" * doctest::test_suite("functional::composi { // TODO: rename test case to array::add instead of view::add - NMTOOLS_TESTING_DECLARE_NS(view,reduce_add,case4); + NMTOOLS_TESTING_USE_CASE(view,reduce_add,case4); using namespace args; auto flattened = na::flatten(expect::result); @@ -246,7 +246,7 @@ TEST_CASE("flatten_reduce_add(case9)" * doctest::test_suite("functional::composi { // TODO: rename test case to array::add instead of view::add - NMTOOLS_TESTING_DECLARE_NS(view,reduce_add,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_add,case9); using namespace args; auto flattened = na::flatten(expect::result); @@ -265,7 +265,7 @@ TEST_CASE("flatten_reduce_add(case14)" * doctest::test_suite("functional::compos { // TODO: rename test case to array::add instead of view::add - NMTOOLS_TESTING_DECLARE_NS(view,reduce_add,case14); + NMTOOLS_TESTING_USE_CASE(view,reduce_add,case14); using namespace args; auto flattened = na::flatten(expect::result); diff --git a/tests/functional/src/composition/multiply_add.cpp b/tests/functional/src/composition/multiply_add.cpp index 5c6c31aa2..3ca6ef284 100644 --- a/tests/functional/src/composition/multiply_add.cpp +++ b/tests/functional/src/composition/multiply_add.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; TEST_CASE("multiply_add" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,multiply,case1); + NMTOOLS_TESTING_USE_CASE(view,multiply,case1); using namespace args; auto x = view::multiply(a,b); @@ -31,7 +31,7 @@ using namespace nmtools::literals; TEST_CASE("multiply_add" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,multiply,case1); + NMTOOLS_TESTING_USE_CASE(view,multiply,case1); using namespace args; auto x = view::multiply(a,b); @@ -47,7 +47,7 @@ TEST_CASE("multiply_add" * doctest::test_suite("functional::get_function_operand TEST_CASE("multiply_add" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,multiply,case1); + NMTOOLS_TESTING_USE_CASE(view,multiply,case1); using namespace args; auto x = view::multiply(a,b); diff --git a/tests/functional/src/composition/multiply_add_tanh.cpp b/tests/functional/src/composition/multiply_add_tanh.cpp index f423b15e5..a4908a653 100644 --- a/tests/functional/src/composition/multiply_add_tanh.cpp +++ b/tests/functional/src/composition/multiply_add_tanh.cpp @@ -13,7 +13,7 @@ using namespace nmtools::literals; TEST_CASE("multiply_add_tanh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,multiply,case1); + NMTOOLS_TESTING_USE_CASE(view,multiply,case1); using namespace args; auto x = view::multiply(a,b); @@ -38,7 +38,7 @@ TEST_CASE("multiply_add_tanh" * doctest::test_suite("functional::get_function_co TEST_CASE("multiply_add_tanh" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,multiply,case1); + NMTOOLS_TESTING_USE_CASE(view,multiply,case1); using namespace args; auto x = view::multiply(a,b); @@ -55,7 +55,7 @@ TEST_CASE("multiply_add_tanh" * doctest::test_suite("functional::get_function_op TEST_CASE("multiply_add_tanh" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,multiply,case1); + NMTOOLS_TESTING_USE_CASE(view,multiply,case1); using namespace args; auto x = view::multiply(a,b); diff --git a/tests/functional/src/composition/multiply_tanh.cpp b/tests/functional/src/composition/multiply_tanh.cpp index 15e344523..aa913b6a3 100644 --- a/tests/functional/src/composition/multiply_tanh.cpp +++ b/tests/functional/src/composition/multiply_tanh.cpp @@ -10,7 +10,7 @@ namespace view = nmtools::view; TEST_CASE("multiply_tanh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,multiply,case1); + NMTOOLS_TESTING_USE_CASE(view,multiply,case1); using namespace args; auto x = view::multiply(a,b); @@ -30,7 +30,7 @@ using namespace nmtools::literals; TEST_CASE("multiply_tanh" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,multiply,case1); + NMTOOLS_TESTING_USE_CASE(view,multiply,case1); using namespace args; auto x = view::multiply(a,b); @@ -46,7 +46,7 @@ TEST_CASE("multiply_tanh" * doctest::test_suite("functional::get_function_operan TEST_CASE("multiply_tanh" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,multiply,case1); + NMTOOLS_TESTING_USE_CASE(view,multiply,case1); using namespace args; auto x = view::multiply(a,b); diff --git a/tests/functional/src/composition/reduce_add_divide.cpp b/tests/functional/src/composition/reduce_add_divide.cpp index 5b1ac24a5..26a259d66 100644 --- a/tests/functional/src/composition/reduce_add_divide.cpp +++ b/tests/functional/src/composition/reduce_add_divide.cpp @@ -11,7 +11,7 @@ using nmtools::unwrap; TEST_CASE("reduce_add_divide" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_add,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_add,case9); using namespace args; auto b = 3; @@ -32,7 +32,7 @@ using namespace nmtools::literals; TEST_CASE("reduce_add_divide" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_add,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_add,case9); using namespace args; auto b = 3; @@ -48,7 +48,7 @@ TEST_CASE("reduce_add_divide" * doctest::test_suite("functional::get_function_op TEST_CASE("reduce_add_divide" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_add,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_add,case9); using namespace args; auto b = 3; diff --git a/tests/functional/src/composition/reduce_add_tanh.cpp b/tests/functional/src/composition/reduce_add_tanh.cpp index 11b722add..7eacfa688 100644 --- a/tests/functional/src/composition/reduce_add_tanh.cpp +++ b/tests/functional/src/composition/reduce_add_tanh.cpp @@ -10,7 +10,7 @@ using nmtools::unwrap; TEST_CASE("reduce_add_tanh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_add,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_add,case9); using namespace args; auto x = view::reduce_add(a,axis,dtype,initial,keepdims); @@ -32,7 +32,7 @@ using namespace nmtools::literals; TEST_CASE("reduce_add_tanh" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_add,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_add,case9); using namespace args; auto x = view::reduce_add(a,axis,dtype,initial,keepdims); @@ -46,7 +46,7 @@ TEST_CASE("reduce_add_tanh" * doctest::test_suite("functional::get_function_oper TEST_CASE("reduce_add_tanh" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_add,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_add,case9); using namespace args; auto x = view::reduce_add(a,axis,dtype,initial,keepdims); diff --git a/tests/functional/src/composition/reduce_maximum_subtract.cpp b/tests/functional/src/composition/reduce_maximum_subtract.cpp index a67169375..a545531d5 100644 --- a/tests/functional/src/composition/reduce_maximum_subtract.cpp +++ b/tests/functional/src/composition/reduce_maximum_subtract.cpp @@ -11,7 +11,7 @@ using nmtools::unwrap; TEST_CASE("reduce_maximum_subtract" * doctest::test_suite("functional::get_function_composition") ) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_maximum,case1); + NMTOOLS_TESTING_USE_CASE(view,reduce_maximum,case1); using namespace args; auto dtype = nm::None; @@ -36,7 +36,7 @@ using namespace nmtools::literals; TEST_CASE("reduce_maximum_subtract" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_maximum,case1); + NMTOOLS_TESTING_USE_CASE(view,reduce_maximum,case1); using namespace args; auto dtype = nm::None; @@ -56,7 +56,7 @@ TEST_CASE("reduce_maximum_subtract" * doctest::test_suite("functional::get_funct TEST_CASE("reduce_maximum_subtract" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_maximum,case1); + NMTOOLS_TESTING_USE_CASE(view,reduce_maximum,case1); using namespace args; auto dtype = nm::None; diff --git a/tests/functional/src/composition/reduce_maximum_subtract_exp.cpp b/tests/functional/src/composition/reduce_maximum_subtract_exp.cpp index fa66485b6..53e426142 100644 --- a/tests/functional/src/composition/reduce_maximum_subtract_exp.cpp +++ b/tests/functional/src/composition/reduce_maximum_subtract_exp.cpp @@ -12,7 +12,7 @@ using nmtools::unwrap; TEST_CASE("reduce_maximum_subtract_exp" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_maximum,case1); + NMTOOLS_TESTING_USE_CASE(view,reduce_maximum,case1); using namespace args; auto dtype = nm::None; @@ -39,7 +39,7 @@ using namespace nmtools::literals; TEST_CASE("reduce_maximum_subtract_exp" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_maximum,case1); + NMTOOLS_TESTING_USE_CASE(view,reduce_maximum,case1); using namespace args; auto dtype = nm::None; @@ -60,7 +60,7 @@ TEST_CASE("reduce_maximum_subtract_exp" * doctest::test_suite("functional::get_f TEST_CASE("reduce_maximum_subtract_exp" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_maximum,case1); + NMTOOLS_TESTING_USE_CASE(view,reduce_maximum,case1); using namespace args; auto dtype = nm::None; diff --git a/tests/functional/src/composition/square_sum.cpp b/tests/functional/src/composition/square_sum.cpp index c0bbed01d..7edea88c7 100644 --- a/tests/functional/src/composition/square_sum.cpp +++ b/tests/functional/src/composition/square_sum.cpp @@ -12,7 +12,7 @@ using nmtools::unwrap; TEST_CASE("square_sum" * doctest::test_suite("functional::get_function_composition") ) { - NMTOOLS_TESTING_DECLARE_NS(view,square,case1); + NMTOOLS_TESTING_USE_CASE(view,square,case1); using namespace args; auto axis = 0; @@ -34,7 +34,7 @@ using namespace nmtools::literals; TEST_CASE("square_sum" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,square,case1); + NMTOOLS_TESTING_USE_CASE(view,square,case1); using namespace args; auto axis = 0; @@ -50,7 +50,7 @@ TEST_CASE("square_sum" * doctest::test_suite("functional::get_function_operands" TEST_CASE("square_sum" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,square,case1); + NMTOOLS_TESTING_USE_CASE(view,square,case1); using namespace args; auto axis = 0; diff --git a/tests/functional/src/composition/square_sum_divide.cpp b/tests/functional/src/composition/square_sum_divide.cpp index 4cf8dfeae..8fb910db4 100644 --- a/tests/functional/src/composition/square_sum_divide.cpp +++ b/tests/functional/src/composition/square_sum_divide.cpp @@ -13,7 +13,7 @@ using nmtools::unwrap; TEST_CASE("square_sum_divide" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,square,case1); + NMTOOLS_TESTING_USE_CASE(view,square,case1); using namespace args; auto dtype = nm::None; @@ -37,7 +37,7 @@ TEST_CASE("square_sum_divide" * doctest::test_suite("functional::get_function_co TEST_CASE("square_sum_divide" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,square,case1); + NMTOOLS_TESTING_USE_CASE(view,square,case1); using namespace args; auto dtype = nm::None; @@ -64,7 +64,7 @@ using namespace nmtools::literals; TEST_CASE("square_sum_divide" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,square,case1); + NMTOOLS_TESTING_USE_CASE(view,square,case1); using namespace args; auto dtype = nm::None; @@ -85,7 +85,7 @@ TEST_CASE("square_sum_divide" * doctest::test_suite("functional::get_function_op TEST_CASE("square_sum_divide" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,square,case1); + NMTOOLS_TESTING_USE_CASE(view,square,case1); using namespace args; auto dtype = nm::None; diff --git a/tests/functional/src/composition/subtract_exp.cpp b/tests/functional/src/composition/subtract_exp.cpp index 642b0094a..b1befc840 100644 --- a/tests/functional/src/composition/subtract_exp.cpp +++ b/tests/functional/src/composition/subtract_exp.cpp @@ -11,7 +11,7 @@ using nmtools::unwrap; TEST_CASE("subtract_exp" * doctest::test_suite("functional::get_function_composition") ) { - NMTOOLS_TESTING_DECLARE_NS(view,subtract,case1); + NMTOOLS_TESTING_USE_CASE(view,subtract,case1); using namespace args; auto x = view::subtract(a,b); @@ -31,7 +31,7 @@ using namespace nmtools::literals; TEST_CASE("subtract_exp" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,subtract,case1); + NMTOOLS_TESTING_USE_CASE(view,subtract,case1); using namespace args; auto x = view::subtract(a,b); @@ -46,7 +46,7 @@ TEST_CASE("subtract_exp" * doctest::test_suite("functional::get_function_operand TEST_CASE("subtract_exp" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,subtract,case1); + NMTOOLS_TESTING_USE_CASE(view,subtract,case1); using namespace args; auto x = view::subtract(a,b); diff --git a/tests/functional/src/composition/subtract_fabs.cpp b/tests/functional/src/composition/subtract_fabs.cpp index 26546fd40..ae0c64895 100644 --- a/tests/functional/src/composition/subtract_fabs.cpp +++ b/tests/functional/src/composition/subtract_fabs.cpp @@ -13,7 +13,7 @@ using nmtools::unwrap; TEST_CASE("subtract_fabs" * doctest::test_suite("functional::get_function_composition") ) { - NMTOOLS_TESTING_DECLARE_NS(view,subtract,case1); + NMTOOLS_TESTING_USE_CASE(view,subtract,case1); using namespace args; auto x = view::subtract(a,b); @@ -33,7 +33,7 @@ using namespace nmtools::literals; TEST_CASE("subtract_fabs" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,subtract,case1); + NMTOOLS_TESTING_USE_CASE(view,subtract,case1); using namespace args; auto x = view::subtract(a,b); @@ -48,7 +48,7 @@ TEST_CASE("subtract_fabs" * doctest::test_suite("functional::get_function_operan TEST_CASE("subtract_fabs" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,subtract,case1); + NMTOOLS_TESTING_USE_CASE(view,subtract,case1); using namespace args; auto x = view::subtract(a,b); diff --git a/tests/functional/src/composition/subtract_fabs_square.cpp b/tests/functional/src/composition/subtract_fabs_square.cpp index 9f4ccf0f2..a8a714b5e 100644 --- a/tests/functional/src/composition/subtract_fabs_square.cpp +++ b/tests/functional/src/composition/subtract_fabs_square.cpp @@ -12,7 +12,7 @@ using nmtools::unwrap; TEST_CASE("subtract_fabs_square" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,subtract,case1); + NMTOOLS_TESTING_USE_CASE(view,subtract,case1); using namespace args; auto x = view::subtract(a,b); @@ -34,7 +34,7 @@ using namespace nmtools::literals; TEST_CASE("subtract_fabs_square" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,subtract,case1); + NMTOOLS_TESTING_USE_CASE(view,subtract,case1); using namespace args; auto x = view::subtract(a,b); @@ -50,7 +50,7 @@ TEST_CASE("subtract_fabs_square" * doctest::test_suite("functional::get_function TEST_CASE("subtract_fabs_square" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,subtract,case1); + NMTOOLS_TESTING_USE_CASE(view,subtract,case1); using namespace args; auto x = view::subtract(a,b); diff --git a/tests/functional/src/composition/sum_divide.cpp b/tests/functional/src/composition/sum_divide.cpp index 823392ea4..2fcd1d171 100644 --- a/tests/functional/src/composition/sum_divide.cpp +++ b/tests/functional/src/composition/sum_divide.cpp @@ -13,7 +13,7 @@ using nmtools::unwrap; TEST_CASE("sum_divide" * doctest::test_suite("functional::get_function_composition") ) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_add,case1); + NMTOOLS_TESTING_USE_CASE(view,reduce_add,case1); using namespace args; auto dtype = nm::None; @@ -37,7 +37,7 @@ using namespace nmtools::literals; TEST_CASE("sum_divide" * doctest::test_suite("functional::get_function_operands")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_add,case1); + NMTOOLS_TESTING_USE_CASE(view,reduce_add,case1); using namespace args; auto dtype = nm::None; @@ -56,7 +56,7 @@ TEST_CASE("sum_divide" * doctest::test_suite("functional::get_function_operands" TEST_CASE("sum_divide" * doctest::test_suite("functional::apply")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_add,case1); + NMTOOLS_TESTING_USE_CASE(view,reduce_add,case1); using namespace args; auto dtype = nm::None; diff --git a/tests/functional/src/compress.cpp b/tests/functional/src/compress.cpp index d5e6bfc3c..4f240d234 100644 --- a/tests/functional/src/compress.cpp +++ b/tests/functional/src/compress.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("compress(case1)" * doctest::test_suite("functional::compress")) { - NMTOOLS_TESTING_DECLARE_NS(array, compress, case1); + NMTOOLS_TESTING_USE_CASE(array, compress, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::compress[condition][axis], array ); @@ -28,7 +28,7 @@ TEST_CASE("compress(case1)" * doctest::test_suite("functional::compress")) #if 1 TEST_CASE("compress(case3)" * doctest::test_suite("functional::compress")) { - NMTOOLS_TESTING_DECLARE_NS(array, compress, case3); + NMTOOLS_TESTING_USE_CASE(array, compress, case3); using namespace args; FUNCTIONAL_SUBCASE( "case3", fn::compress[condition][axis], array ); @@ -44,7 +44,7 @@ TEST_CASE("compress(case3)" * doctest::test_suite("functional::compress")) #if 0 TEST_CASE("compress(case5)" * doctest::test_suite("functional::compress")) { - NMTOOLS_TESTING_DECLARE_NS(array, compress, case5); + NMTOOLS_TESTING_USE_CASE(array, compress, case5); using namespace args; FUNCTIONAL_SUBCASE( "case5", fn::compress[condition][axis], array ); diff --git a/tests/functional/src/concatenate.cpp b/tests/functional/src/concatenate.cpp index 66d13685e..5b0eaf510 100644 --- a/tests/functional/src/concatenate.cpp +++ b/tests/functional/src/concatenate.cpp @@ -42,7 +42,7 @@ SUBCASE(subcase_name) \ TEST_CASE("concatenate(case1)" * doctest::test_suite("functional::concatenate")) { - NMTOOLS_TESTING_DECLARE_NS(view, concatenate, case1); + NMTOOLS_TESTING_USE_CASE(view, concatenate, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::concatenate[axis], lhs, rhs ); @@ -60,7 +60,7 @@ TEST_CASE("concatenate(case1)" * doctest::test_suite("functional::concatenate")) TEST_CASE("constexpr_concatenate(case1)" * doctest::test_suite("functional::concatenate")) { - NMTOOLS_TESTING_DECLARE_NS(array, constexpr_concatenate, case3); + NMTOOLS_TESTING_USE_CASE(array, constexpr_concatenate, case3); using namespace args; CONSTEXPR_FUNCTIONAL_SUBCASE( "case1", fn::concatenate[axis], lhs, rhs ); @@ -76,7 +76,7 @@ TEST_CASE("constexpr_concatenate(case1)" * doctest::test_suite("functional::conc TEST_CASE("concatenate" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view, concatenate, case1); + NMTOOLS_TESTING_USE_CASE(view, concatenate, case1); using namespace args; auto a = view::concatenate(lhs,rhs,axis); diff --git a/tests/functional/src/conv.cpp b/tests/functional/src/conv.cpp index 4c6046b9c..df9c93c17 100644 --- a/tests/functional/src/conv.cpp +++ b/tests/functional/src/conv.cpp @@ -39,7 +39,7 @@ SUBCASE(subcase_name) \ TEST_CASE("conv2d(case1)" * doctest::test_suite("functional::conv2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,conv2d,case1); + NMTOOLS_TESTING_USE_CASE(array,conv2d,case1); using namespace args; CONV2D_SUBCASE( "case1", fn::conv2d, input, weight ); @@ -57,7 +57,7 @@ TEST_CASE("conv2d(case1)" * doctest::test_suite("functional::conv2d")) TEST_CASE("conv2d(case2)" * doctest::test_suite("functional::conv2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,conv2d,case2); + NMTOOLS_TESTING_USE_CASE(array,conv2d,case2); using namespace args; CONV2D_SUBCASE( "case2", fn::conv2d, input, weight ); @@ -75,7 +75,7 @@ TEST_CASE("conv2d(case2)" * doctest::test_suite("functional::conv2d")) TEST_CASE("conv2d(case3)" * doctest::test_suite("functional::conv2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,conv2d,case3); + NMTOOLS_TESTING_USE_CASE(array,conv2d,case3); using namespace args; CONV2D_SUBCASE( "case3", fn::conv2d, input, weight ); @@ -95,7 +95,7 @@ using nmtools::None; TEST_CASE("conv2d(case4)" * doctest::test_suite("functional::conv2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,conv2d,case4); + NMTOOLS_TESTING_USE_CASE(array,conv2d,case4); using namespace args; CONV2D_SUBCASE( "case4", fn::conv2d, input, weight ); @@ -125,7 +125,7 @@ TEST_CASE("conv2d(case4)" * doctest::test_suite("functional::conv2d")) TEST_CASE("conv2d(case5)" * doctest::test_suite("functional::conv2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,conv2d,case5); + NMTOOLS_TESTING_USE_CASE(array,conv2d,case5); using namespace args; CONV2D_SUBCASE( "case5", fn::conv2d[stride], input, weight ); @@ -143,7 +143,7 @@ TEST_CASE("conv2d(case5)" * doctest::test_suite("functional::conv2d")) TEST_CASE("conv2d(case6)" * doctest::test_suite("functional::conv2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,conv2d,case6); + NMTOOLS_TESTING_USE_CASE(array,conv2d,case6); using namespace args; CONV2D_SUBCASE( "case6", fn::conv2d[stride], input, weight ); @@ -161,7 +161,7 @@ TEST_CASE("conv2d(case6)" * doctest::test_suite("functional::conv2d")) TEST_CASE("conv2d(case7)" * doctest::test_suite("functional::conv2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,conv2d,case7); + NMTOOLS_TESTING_USE_CASE(array,conv2d,case7); using namespace args; CONV2D_SUBCASE( "case7", fn::conv2d[stride], input, weight ); @@ -179,7 +179,7 @@ TEST_CASE("conv2d(case7)" * doctest::test_suite("functional::conv2d")) TEST_CASE("conv2d(case8)" * doctest::test_suite("functional::conv2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,conv2d,case8); + NMTOOLS_TESTING_USE_CASE(array,conv2d,case8); using namespace args; CONV2D_SUBCASE( "case8", fn::conv2d[stride], input, weight ); @@ -197,7 +197,7 @@ TEST_CASE("conv2d(case8)" * doctest::test_suite("functional::conv2d")) TEST_CASE("conv2d(case9)" * doctest::test_suite("functional::conv2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,conv2d,case9); + NMTOOLS_TESTING_USE_CASE(array,conv2d,case9); using namespace args; CONV2D_SUBCASE( "case9", fn::conv2d[stride], input, weight ); @@ -215,7 +215,7 @@ TEST_CASE("conv2d(case9)" * doctest::test_suite("functional::conv2d")) TEST_CASE("conv2d(case10)" * doctest::test_suite("functional::conv2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,conv2d,case10); + NMTOOLS_TESTING_USE_CASE(array,conv2d,case10); using namespace args; CONV2D_SUBCASE( "case10", fn::conv2d[stride], input, weight ); @@ -233,7 +233,7 @@ TEST_CASE("conv2d(case10)" * doctest::test_suite("functional::conv2d")) TEST_CASE("conv2d(case11)" * doctest::test_suite("functional::conv2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,conv2d,case11); + NMTOOLS_TESTING_USE_CASE(array,conv2d,case11); using namespace args; CONV2D_SUBCASE( "case11", fn::conv2d[stride][padding], input, weight ); @@ -257,7 +257,7 @@ TEST_CASE("conv2d(case11)" * doctest::test_suite("functional::conv2d")) TEST_CASE("conv2d(case16)" * doctest::test_suite("functional::conv2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,conv2d,case16); + NMTOOLS_TESTING_USE_CASE(array,conv2d,case16); using namespace args; CONV2D_BIAS_SUBCASE( "case16", fn::conv2d_bias[stride][padding], input, weight, bias ); diff --git a/tests/functional/src/cumprod.cpp b/tests/functional/src/cumprod.cpp index bc70bef72..b702e01e2 100644 --- a/tests/functional/src/cumprod.cpp +++ b/tests/functional/src/cumprod.cpp @@ -16,7 +16,7 @@ SUBCASE(subcase_name) \ TEST_CASE("cumprod(case1)" * doctest::test_suite("functional::cumprod")) { - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_multiply, case1); + NMTOOLS_TESTING_USE_CASE(view, accumulate_multiply, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::cumprod[axis], a ); diff --git a/tests/functional/src/cumsum.cpp b/tests/functional/src/cumsum.cpp index 392c38e6f..ab483c322 100644 --- a/tests/functional/src/cumsum.cpp +++ b/tests/functional/src/cumsum.cpp @@ -16,7 +16,7 @@ SUBCASE(subcase_name) \ TEST_CASE("cumsum(case1)" * doctest::test_suite("functional::cumsum")) { - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_add, case1); + NMTOOLS_TESTING_USE_CASE(view, accumulate_add, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::cumsum[axis], a ); diff --git a/tests/functional/src/expand_dims.cpp b/tests/functional/src/expand_dims.cpp index bf6fc4aeb..d3c66e8c4 100644 --- a/tests/functional/src/expand_dims.cpp +++ b/tests/functional/src/expand_dims.cpp @@ -18,7 +18,7 @@ SUBCASE(subcase_name) \ TEST_CASE("expand_dims(case1)" * doctest::test_suite("functional::expand_dims")) { - NMTOOLS_TESTING_DECLARE_NS(expand_dims, case1); + NMTOOLS_TESTING_USE_CASE(expand_dims, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::expand_dims[axis], array ); @@ -30,7 +30,7 @@ TEST_CASE("expand_dims(case1)" * doctest::test_suite("functional::expand_dims")) TEST_CASE("expand_dims(case2)" * doctest::test_suite("functional::expand_dims")) { - NMTOOLS_TESTING_DECLARE_NS(expand_dims, case2); + NMTOOLS_TESTING_USE_CASE(expand_dims, case2); using namespace args; FUNCTIONAL_SUBCASE( "case2", fn::expand_dims[axis], array ); @@ -44,7 +44,7 @@ namespace view = nmtools::view; TEST_CASE("expand_dims" * doctest::test_suite("functional::get_function_composition") * doctest::may_fail()) { - NMTOOLS_TESTING_DECLARE_NS(expand_dims, case2); + NMTOOLS_TESTING_USE_CASE(expand_dims, case2); using namespace args; auto a = view::expand_dims(array,axis); @@ -57,7 +57,7 @@ TEST_CASE("expand_dims" * doctest::test_suite("functional::get_function_composit TEST_CASE("expand_dims" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(expand_dims, case2); + NMTOOLS_TESTING_USE_CASE(expand_dims, case2); using namespace args; auto a = view::expand_dims(array,axis); diff --git a/tests/functional/src/flatten.cpp b/tests/functional/src/flatten.cpp index 495c0bae5..3aea47c7e 100644 --- a/tests/functional/src/flatten.cpp +++ b/tests/functional/src/flatten.cpp @@ -23,7 +23,7 @@ SUBCASE(subcase_name) \ TEST_CASE("flatten(case1)" * doctest::test_suite("functional::reshape")) { - NMTOOLS_TESTING_DECLARE_NS(flatten,case1); + NMTOOLS_TESTING_USE_CASE(flatten,case1); using namespace args; FLATTEN_SUBCASE( "case1", fn::flatten, array ); @@ -35,7 +35,7 @@ TEST_CASE("flatten(case1)" * doctest::test_suite("functional::reshape")) TEST_CASE("flatten(case2)" * doctest::test_suite("functional::reshape")) { - NMTOOLS_TESTING_DECLARE_NS(flatten,case2); + NMTOOLS_TESTING_USE_CASE(flatten,case2); using namespace args; FLATTEN_SUBCASE( "case2", fn::flatten, array ); @@ -47,7 +47,7 @@ TEST_CASE("flatten(case2)" * doctest::test_suite("functional::reshape")) TEST_CASE("flatten(case3)" * doctest::test_suite("functional::reshape")) { - NMTOOLS_TESTING_DECLARE_NS(flatten,case3); + NMTOOLS_TESTING_USE_CASE(flatten,case3); using namespace args; FLATTEN_SUBCASE( "case3", fn::flatten, array ); @@ -59,7 +59,7 @@ TEST_CASE("flatten(case3)" * doctest::test_suite("functional::reshape")) TEST_CASE("flatten(case4)" * doctest::test_suite("functional::reshape")) { - NMTOOLS_TESTING_DECLARE_NS(flatten,case4); + NMTOOLS_TESTING_USE_CASE(flatten,case4); using namespace args; FLATTEN_SUBCASE( "case4", fn::flatten, array ); @@ -71,7 +71,7 @@ TEST_CASE("flatten(case4)" * doctest::test_suite("functional::reshape")) TEST_CASE("constexpr_flatten(case4)" * doctest::test_suite("functional::reshape")) { - NMTOOLS_TESTING_DECLARE_NS(constexpr_flatten,case4); + NMTOOLS_TESTING_USE_CASE(constexpr_flatten,case4); using namespace args; FLATTEN_SUBCASE( "case4", fn::flatten, array ); @@ -85,7 +85,7 @@ using nmtools::unwrap; TEST_CASE("flatten" * doctest::test_suite("functional::get_function_composition") * doctest::may_fail()) { - NMTOOLS_TESTING_DECLARE_NS(flatten,case4); + NMTOOLS_TESTING_USE_CASE(flatten,case4); using namespace args; auto a = view::flatten(array); @@ -98,7 +98,7 @@ TEST_CASE("flatten" * doctest::test_suite("functional::get_function_composition" TEST_CASE("flatten" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(flatten,case4); + NMTOOLS_TESTING_USE_CASE(flatten,case4); using namespace args; auto a = view::flatten(array); diff --git a/tests/functional/src/flip.cpp b/tests/functional/src/flip.cpp index 6853ee2d2..bef966a83 100644 --- a/tests/functional/src/flip.cpp +++ b/tests/functional/src/flip.cpp @@ -20,7 +20,7 @@ SUBCASE(subcase_name) \ TEST_CASE("flip(case1)" * doctest::test_suite("functional::flip")) { - NMTOOLS_TESTING_DECLARE_NS(flip, case1); + NMTOOLS_TESTING_USE_CASE(flip, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::flip[axis], array ); @@ -32,7 +32,7 @@ TEST_CASE("flip(case1)" * doctest::test_suite("functional::flip")) TEST_CASE("flip(case2)" * doctest::test_suite("functional::flip")) { - NMTOOLS_TESTING_DECLARE_NS(flip, case2); + NMTOOLS_TESTING_USE_CASE(flip, case2); using namespace args; FUNCTIONAL_SUBCASE( "case2", fn::flip[axis], array ); @@ -44,7 +44,7 @@ TEST_CASE("flip(case2)" * doctest::test_suite("functional::flip")) TEST_CASE("flip(case4)" * doctest::test_suite("functional::flip")) { - NMTOOLS_TESTING_DECLARE_NS(flip, case4); + NMTOOLS_TESTING_USE_CASE(flip, case4); using namespace args; FUNCTIONAL_SUBCASE( "case4", fn::flip[axis], array ); @@ -56,7 +56,7 @@ TEST_CASE("flip(case4)" * doctest::test_suite("functional::flip")) TEST_CASE("fliplr(case1)" * doctest::test_suite("functional::fliplr")) { - NMTOOLS_TESTING_DECLARE_NS(fliplr, case1); + NMTOOLS_TESTING_USE_CASE(fliplr, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::fliplr, array ); @@ -68,7 +68,7 @@ TEST_CASE("fliplr(case1)" * doctest::test_suite("functional::fliplr")) TEST_CASE("fliplr(case2)" * doctest::test_suite("functional::fliplr")) { - NMTOOLS_TESTING_DECLARE_NS(fliplr, case2); + NMTOOLS_TESTING_USE_CASE(fliplr, case2); using namespace args; FUNCTIONAL_SUBCASE( "case2", fn::fliplr, array ); @@ -80,7 +80,7 @@ TEST_CASE("fliplr(case2)" * doctest::test_suite("functional::fliplr")) TEST_CASE("flipud(case1)" * doctest::test_suite("functional::flipud")) { - NMTOOLS_TESTING_DECLARE_NS(flipud, case1); + NMTOOLS_TESTING_USE_CASE(flipud, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::flipud, array ); @@ -92,7 +92,7 @@ TEST_CASE("flipud(case1)" * doctest::test_suite("functional::flipud")) TEST_CASE("flipud(case2)" * doctest::test_suite("functional::flipud")) { - NMTOOLS_TESTING_DECLARE_NS(flipud, case2); + NMTOOLS_TESTING_USE_CASE(flipud, case2); using namespace args; FUNCTIONAL_SUBCASE( "case2", fn::flipud, array ); @@ -106,7 +106,7 @@ namespace view = nmtools::view; TEST_CASE("flip" * doctest::test_suite("functional::get_function_composition") * doctest::may_fail()) { - NMTOOLS_TESTING_DECLARE_NS(flip,case4); + NMTOOLS_TESTING_USE_CASE(flip,case4); using namespace args; auto a = view::flip(array,axis); @@ -119,7 +119,7 @@ TEST_CASE("flip" * doctest::test_suite("functional::get_function_composition") * TEST_CASE("flip" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(flip,case4); + NMTOOLS_TESTING_USE_CASE(flip,case4); using namespace args; auto a = view::flip(array,axis); diff --git a/tests/functional/src/hstack.cpp b/tests/functional/src/hstack.cpp index b62cfaec3..5f5601fda 100644 --- a/tests/functional/src/hstack.cpp +++ b/tests/functional/src/hstack.cpp @@ -29,7 +29,7 @@ namespace fn = nmtools::functional; #define FUNCTIONAL_SUBCASE(subcase_name, function, ...) \ SUBCASE(#subcase_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( TESTING_NAMESPACE, subcase_name ); \ + NMTOOLS_TESTING_USE_CASE( TESTING_NAMESPACE, subcase_name ); \ using namespace args; \ auto result = function (__VA_ARGS__); \ NMTOOLS_REQUIRE_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ @@ -39,7 +39,7 @@ SUBCASE(#subcase_name) \ #define BINARY_FUNCTIONAL_SUBCASE(subcase_name, function, a, b) \ SUBCASE(#subcase_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( TESTING_NAMESPACE, subcase_name ); \ + NMTOOLS_TESTING_USE_CASE( TESTING_NAMESPACE, subcase_name ); \ using namespace args; \ auto result = function (a) (b); \ NMTOOLS_REQUIRE_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/functional/src/matmul.cpp b/tests/functional/src/matmul.cpp index 25607b6fd..67653a775 100644 --- a/tests/functional/src/matmul.cpp +++ b/tests/functional/src/matmul.cpp @@ -39,7 +39,7 @@ SUBCASE(subcase_name) \ TEST_CASE("matmul(case1)" * doctest::test_suite("functional::matmul")) { - NMTOOLS_TESTING_DECLARE_NS(array,matmul,case1); + NMTOOLS_TESTING_USE_CASE(array,matmul,case1); using namespace args; MATMUL_SUBCASE("case1", fn::matmul, lhs, rhs); @@ -57,7 +57,7 @@ TEST_CASE("matmul(case1)" * doctest::test_suite("functional::matmul")) TEST_CASE("matmul(case2)" * doctest::test_suite("functional::matmul")) { - NMTOOLS_TESTING_DECLARE_NS(array,matmul,case2); + NMTOOLS_TESTING_USE_CASE(array,matmul,case2); using namespace args; MATMUL_SUBCASE("case2", fn::matmul, lhs, rhs); @@ -75,7 +75,7 @@ TEST_CASE("matmul(case2)" * doctest::test_suite("functional::matmul")) TEST_CASE("matmul(case3)" * doctest::test_suite("functional::matmul")) { - NMTOOLS_TESTING_DECLARE_NS(array,matmul,case3); + NMTOOLS_TESTING_USE_CASE(array,matmul,case3); using namespace args; MATMUL_SUBCASE("case3", fn::matmul, lhs, rhs); @@ -93,7 +93,7 @@ TEST_CASE("matmul(case3)" * doctest::test_suite("functional::matmul")) TEST_CASE("matmul(case4)" * doctest::test_suite("functional::matmul")) { - NMTOOLS_TESTING_DECLARE_NS(array,matmul,case4); + NMTOOLS_TESTING_USE_CASE(array,matmul,case4); using namespace args; MATMUL_SUBCASE("case4", fn::matmul, lhs, rhs); @@ -111,7 +111,7 @@ TEST_CASE("matmul(case4)" * doctest::test_suite("functional::matmul")) TEST_CASE("matmul(case5)" * doctest::test_suite("functional::matmul")) { - NMTOOLS_TESTING_DECLARE_NS(array,matmul,case5); + NMTOOLS_TESTING_USE_CASE(array,matmul,case5); using namespace args; MATMUL_SUBCASE("case5", fn::matmul, lhs, rhs); @@ -129,7 +129,7 @@ TEST_CASE("matmul(case5)" * doctest::test_suite("functional::matmul")) TEST_CASE("matmul(case6)" * doctest::test_suite("functional::matmul")) { - NMTOOLS_TESTING_DECLARE_NS(array,matmul,case6); + NMTOOLS_TESTING_USE_CASE(array,matmul,case6); using namespace args; MATMUL_SUBCASE("case6", fn::matmul, lhs, rhs); @@ -149,7 +149,7 @@ namespace view = nmtools::view; TEST_CASE("matmul" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(array,matmul,case4); + NMTOOLS_TESTING_USE_CASE(array,matmul,case4); using namespace args; auto a = view::matmul(lhs,rhs); diff --git a/tests/functional/src/mean.cpp b/tests/functional/src/mean.cpp index 7a022dacd..6e3cc0e47 100644 --- a/tests/functional/src/mean.cpp +++ b/tests/functional/src/mean.cpp @@ -16,7 +16,7 @@ SUBCASE(subcase_name) \ TEST_CASE("mean(case1)" * doctest::test_suite("functional::mean")) { - NMTOOLS_TESTING_DECLARE_NS(array, mean, case1); + NMTOOLS_TESTING_USE_CASE(array, mean, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::mean[axis], a ); @@ -28,7 +28,7 @@ TEST_CASE("mean(case1)" * doctest::test_suite("functional::mean")) TEST_CASE("mean(case2)" * doctest::test_suite("functional::mean")) { - NMTOOLS_TESTING_DECLARE_NS(array, mean, case2); + NMTOOLS_TESTING_USE_CASE(array, mean, case2); using namespace args; FUNCTIONAL_SUBCASE( "case2", fn::mean[axis], a ); @@ -40,7 +40,7 @@ TEST_CASE("mean(case2)" * doctest::test_suite("functional::mean")) TEST_CASE("mean(case6)" * doctest::test_suite("functional::mean")) { - NMTOOLS_TESTING_DECLARE_NS(array, mean, case6); + NMTOOLS_TESTING_USE_CASE(array, mean, case6); using namespace args; FUNCTIONAL_SUBCASE( "case6", fn::mean[axis][nm::None][keepdims], a ); @@ -54,7 +54,7 @@ TEST_CASE("mean(case6)" * doctest::test_suite("functional::mean")) #if 0 TEST_CASE("mean(case7)" * doctest::test_suite("functional::mean")) { - NMTOOLS_TESTING_DECLARE_NS(array, mean, case7); + NMTOOLS_TESTING_USE_CASE(array, mean, case7); using namespace args; FUNCTIONAL_SUBCASE( "case7", fn::mean[axis][nm::None][keepdims], a ); @@ -73,7 +73,7 @@ TEST_CASE("mean(case7)" * doctest::test_suite("functional::mean")) TEST_CASE("mean(case9)" * doctest::test_suite("functional::mean")) { - NMTOOLS_TESTING_DECLARE_NS(array, mean, case9); + NMTOOLS_TESTING_USE_CASE(array, mean, case9); using namespace args; FUNCTIONAL_SUBCASE( "case9", fn::mean[axis][nm::None][keepdims], a ); @@ -85,7 +85,7 @@ TEST_CASE("mean(case9)" * doctest::test_suite("functional::mean")) TEST_CASE("mean(case12)" * doctest::test_suite("functional::mean")) { - NMTOOLS_TESTING_DECLARE_NS(array, mean, case12); + NMTOOLS_TESTING_USE_CASE(array, mean, case12); using namespace args; FUNCTIONAL_SUBCASE( "case12", fn::mean[axis][nm::None][keepdims], a ); @@ -97,7 +97,7 @@ TEST_CASE("mean(case12)" * doctest::test_suite("functional::mean")) TEST_CASE("mean(case21)" * doctest::test_suite("functional::mean")) { - NMTOOLS_TESTING_DECLARE_NS(array, mean, case21); + NMTOOLS_TESTING_USE_CASE(array, mean, case21); using namespace args; FUNCTIONAL_SUBCASE( "case21", fn::mean[axis][nm::None][keepdims], a ); diff --git a/tests/functional/src/moveaxis.cpp b/tests/functional/src/moveaxis.cpp index 9fb5878d9..70cbaad84 100644 --- a/tests/functional/src/moveaxis.cpp +++ b/tests/functional/src/moveaxis.cpp @@ -16,7 +16,7 @@ SUBCASE(subcase_name) \ TEST_CASE("moveaxis(case1)" * doctest::test_suite("functional::moveaxis")) { - NMTOOLS_TESTING_DECLARE_NS(array, moveaxis, case1); + NMTOOLS_TESTING_USE_CASE(array, moveaxis, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::moveaxis[source][destination], a ); @@ -28,7 +28,7 @@ TEST_CASE("moveaxis(case1)" * doctest::test_suite("functional::moveaxis")) TEST_CASE("moveaxis(case2)" * doctest::test_suite("functional::moveaxis")) { - NMTOOLS_TESTING_DECLARE_NS(array, moveaxis, case2); + NMTOOLS_TESTING_USE_CASE(array, moveaxis, case2); using namespace args; FUNCTIONAL_SUBCASE( "case2", fn::moveaxis[source][destination], a ); @@ -40,7 +40,7 @@ TEST_CASE("moveaxis(case2)" * doctest::test_suite("functional::moveaxis")) TEST_CASE("moveaxis(case3)" * doctest::test_suite("functional::moveaxis")) { - NMTOOLS_TESTING_DECLARE_NS(array, moveaxis, case3); + NMTOOLS_TESTING_USE_CASE(array, moveaxis, case3); using namespace args; FUNCTIONAL_SUBCASE( "case3", fn::moveaxis[source][destination], a ); @@ -52,7 +52,7 @@ TEST_CASE("moveaxis(case3)" * doctest::test_suite("functional::moveaxis")) TEST_CASE("moveaxis(case8)" * doctest::test_suite("functional::moveaxis")) { - NMTOOLS_TESTING_DECLARE_NS(array, moveaxis, case8); + NMTOOLS_TESTING_USE_CASE(array, moveaxis, case8); using namespace args; FUNCTIONAL_SUBCASE( "case8", fn::moveaxis[source][destination], a ); diff --git a/tests/functional/src/pad.cpp b/tests/functional/src/pad.cpp index 9bb2d1262..90014c792 100644 --- a/tests/functional/src/pad.cpp +++ b/tests/functional/src/pad.cpp @@ -16,7 +16,7 @@ SUBCASE(subcase_name) \ TEST_CASE("pad(case1)" * doctest::test_suite("functional::pad")) { - NMTOOLS_TESTING_DECLARE_NS(array, pad, case1); + NMTOOLS_TESTING_USE_CASE(array, pad, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::pad[pad_width], array ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("pad" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(array,pad,case1); + NMTOOLS_TESTING_USE_CASE(array,pad,case1); using namespace args; auto pad_value = 0.0f; diff --git a/tests/functional/src/pooling.cpp b/tests/functional/src/pooling.cpp index 46971c793..46aaa2341 100644 --- a/tests/functional/src/pooling.cpp +++ b/tests/functional/src/pooling.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("avg_pool2d(case1)" * doctest::test_suite("functional::avg_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,avg_pool2d,case1); + NMTOOLS_TESTING_USE_CASE(array,avg_pool2d,case1); using namespace args; POOL2D_SUBCASE( "case1", fn::avg_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -28,7 +28,7 @@ TEST_CASE("avg_pool2d(case1)" * doctest::test_suite("functional::avg_pool2d")) TEST_CASE("avg_pool2d(case2)" * doctest::test_suite("functional::avg_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,avg_pool2d,case2); + NMTOOLS_TESTING_USE_CASE(array,avg_pool2d,case2); using namespace args; POOL2D_SUBCASE( "case2", fn::avg_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -41,7 +41,7 @@ TEST_CASE("avg_pool2d(case2)" * doctest::test_suite("functional::avg_pool2d")) TEST_CASE("avg_pool2d(case3)" * doctest::test_suite("functional::avg_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,avg_pool2d,case3); + NMTOOLS_TESTING_USE_CASE(array,avg_pool2d,case3); using namespace args; POOL2D_SUBCASE( "case3", fn::avg_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -54,7 +54,7 @@ TEST_CASE("avg_pool2d(case3)" * doctest::test_suite("functional::avg_pool2d")) TEST_CASE("avg_pool2d(case4)" * doctest::test_suite("functional::avg_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,avg_pool2d,case4); + NMTOOLS_TESTING_USE_CASE(array,avg_pool2d,case4); using namespace args; POOL2D_SUBCASE( "case4", fn::avg_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -67,7 +67,7 @@ TEST_CASE("avg_pool2d(case4)" * doctest::test_suite("functional::avg_pool2d")) TEST_CASE("avg_pool2d(case5)" * doctest::test_suite("functional::avg_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,avg_pool2d,case5); + NMTOOLS_TESTING_USE_CASE(array,avg_pool2d,case5); using namespace args; POOL2D_SUBCASE( "case5", fn::avg_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -80,7 +80,7 @@ TEST_CASE("avg_pool2d(case5)" * doctest::test_suite("functional::avg_pool2d")) TEST_CASE("avg_pool2d(case6)" * doctest::test_suite("functional::avg_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,avg_pool2d,case6); + NMTOOLS_TESTING_USE_CASE(array,avg_pool2d,case6); using namespace args; POOL2D_SUBCASE( "case6", fn::avg_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -93,7 +93,7 @@ TEST_CASE("avg_pool2d(case6)" * doctest::test_suite("functional::avg_pool2d")) TEST_CASE("avg_pool2d(case7)" * doctest::test_suite("functional::avg_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,avg_pool2d,case7); + NMTOOLS_TESTING_USE_CASE(array,avg_pool2d,case7); using namespace args; POOL2D_SUBCASE( "case7", fn::avg_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -106,7 +106,7 @@ TEST_CASE("avg_pool2d(case7)" * doctest::test_suite("functional::avg_pool2d")) TEST_CASE("avg_pool2d(case8)" * doctest::test_suite("functional::avg_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,avg_pool2d,case8); + NMTOOLS_TESTING_USE_CASE(array,avg_pool2d,case8); using namespace args; POOL2D_SUBCASE( "case8", fn::avg_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -119,7 +119,7 @@ TEST_CASE("avg_pool2d(case8)" * doctest::test_suite("functional::avg_pool2d")) TEST_CASE("avg_pool2d(case9)" * doctest::test_suite("functional::avg_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,avg_pool2d,case9); + NMTOOLS_TESTING_USE_CASE(array,avg_pool2d,case9); using namespace args; POOL2D_SUBCASE( "case9", fn::avg_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -132,7 +132,7 @@ TEST_CASE("avg_pool2d(case9)" * doctest::test_suite("functional::avg_pool2d")) TEST_CASE("avg_pool2d(case10)" * doctest::test_suite("functional::avg_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,avg_pool2d,case10); + NMTOOLS_TESTING_USE_CASE(array,avg_pool2d,case10); using namespace args; POOL2D_SUBCASE( "case10", fn::avg_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -144,7 +144,7 @@ TEST_CASE("avg_pool2d(case10)" * doctest::test_suite("functional::avg_pool2d")) TEST_CASE("max_pool2d(case1)" * doctest::test_suite("functional::max_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,max_pool2d,case1); + NMTOOLS_TESTING_USE_CASE(array,max_pool2d,case1); using namespace args; POOL2D_SUBCASE( "case1", fn::max_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -157,7 +157,7 @@ TEST_CASE("max_pool2d(case1)" * doctest::test_suite("functional::max_pool2d")) TEST_CASE("max_pool2d(case2)" * doctest::test_suite("functional::max_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,max_pool2d,case2); + NMTOOLS_TESTING_USE_CASE(array,max_pool2d,case2); using namespace args; POOL2D_SUBCASE( "case2", fn::max_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -170,7 +170,7 @@ TEST_CASE("max_pool2d(case2)" * doctest::test_suite("functional::max_pool2d")) TEST_CASE("max_pool2d(case3)" * doctest::test_suite("functional::max_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,max_pool2d,case3); + NMTOOLS_TESTING_USE_CASE(array,max_pool2d,case3); using namespace args; POOL2D_SUBCASE( "case3", fn::max_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -183,7 +183,7 @@ TEST_CASE("max_pool2d(case3)" * doctest::test_suite("functional::max_pool2d")) TEST_CASE("max_pool2d(case4)" * doctest::test_suite("functional::max_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,max_pool2d,case4); + NMTOOLS_TESTING_USE_CASE(array,max_pool2d,case4); using namespace args; POOL2D_SUBCASE( "case4", fn::max_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -196,7 +196,7 @@ TEST_CASE("max_pool2d(case4)" * doctest::test_suite("functional::max_pool2d")) TEST_CASE("max_pool2d(case5)" * doctest::test_suite("functional::max_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,max_pool2d,case5); + NMTOOLS_TESTING_USE_CASE(array,max_pool2d,case5); using namespace args; POOL2D_SUBCASE( "case5", fn::max_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -209,7 +209,7 @@ TEST_CASE("max_pool2d(case5)" * doctest::test_suite("functional::max_pool2d")) TEST_CASE("max_pool2d(case6)" * doctest::test_suite("functional::max_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,max_pool2d,case6); + NMTOOLS_TESTING_USE_CASE(array,max_pool2d,case6); using namespace args; POOL2D_SUBCASE( "case6", fn::max_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -222,7 +222,7 @@ TEST_CASE("max_pool2d(case6)" * doctest::test_suite("functional::max_pool2d")) TEST_CASE("max_pool2d(case7)" * doctest::test_suite("functional::max_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,max_pool2d,case7); + NMTOOLS_TESTING_USE_CASE(array,max_pool2d,case7); using namespace args; POOL2D_SUBCASE( "case7", fn::max_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -235,7 +235,7 @@ TEST_CASE("max_pool2d(case7)" * doctest::test_suite("functional::max_pool2d")) TEST_CASE("max_pool2d(case8)" * doctest::test_suite("functional::max_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,max_pool2d,case8); + NMTOOLS_TESTING_USE_CASE(array,max_pool2d,case8); using namespace args; POOL2D_SUBCASE( "case8", fn::max_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -248,7 +248,7 @@ TEST_CASE("max_pool2d(case8)" * doctest::test_suite("functional::max_pool2d")) TEST_CASE("max_pool2d(case9)" * doctest::test_suite("functional::max_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,max_pool2d,case9); + NMTOOLS_TESTING_USE_CASE(array,max_pool2d,case9); using namespace args; POOL2D_SUBCASE( "case9", fn::max_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -261,7 +261,7 @@ TEST_CASE("max_pool2d(case9)" * doctest::test_suite("functional::max_pool2d")) TEST_CASE("max_pool2d(case10)" * doctest::test_suite("functional::max_pool2d")) { - NMTOOLS_TESTING_DECLARE_NS(array,max_pool2d,case10); + NMTOOLS_TESTING_USE_CASE(array,max_pool2d,case10); using namespace args; POOL2D_SUBCASE( "case10", fn::max_pool2d [kernel_size] [stride] [ceil_mode], array ); @@ -275,7 +275,7 @@ namespace view = nmtools::view; TEST_CASE("max_pool2d" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(array,max_pool2d,case10); + NMTOOLS_TESTING_USE_CASE(array,max_pool2d,case10); using namespace args; auto a = view::max_pool2d(array,kernel_size,stride,ceil_mode); diff --git a/tests/functional/src/prod.cpp b/tests/functional/src/prod.cpp index 413f3b604..fe0e7b888 100644 --- a/tests/functional/src/prod.cpp +++ b/tests/functional/src/prod.cpp @@ -16,7 +16,7 @@ SUBCASE(subcase_name) \ TEST_CASE("prod(case1)" * doctest::test_suite("functional::prod")) { - NMTOOLS_TESTING_DECLARE_NS(view, reduce_multiply, case1); + NMTOOLS_TESTING_USE_CASE(view, reduce_multiply, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::prod[axis], a ); @@ -28,7 +28,7 @@ TEST_CASE("prod(case1)" * doctest::test_suite("functional::prod")) TEST_CASE("prod(case8)" * doctest::test_suite("functional::prod")) { - NMTOOLS_TESTING_DECLARE_NS(view, reduce_multiply, case8); + NMTOOLS_TESTING_USE_CASE(view, reduce_multiply, case8); using namespace args; FUNCTIONAL_SUBCASE( "case8", fn::prod[axis][dtype][initial], a ); @@ -40,7 +40,7 @@ TEST_CASE("prod(case8)" * doctest::test_suite("functional::prod")) TEST_CASE("prod(case9)" * doctest::test_suite("functional::prod")) { - NMTOOLS_TESTING_DECLARE_NS(view, reduce_multiply, case9); + NMTOOLS_TESTING_USE_CASE(view, reduce_multiply, case9); using namespace args; FUNCTIONAL_SUBCASE( "case9", fn::prod[axis][dtype][initial][keepdims], a ); diff --git a/tests/functional/src/repeat.cpp b/tests/functional/src/repeat.cpp index bd4e34f32..19544dbbd 100644 --- a/tests/functional/src/repeat.cpp +++ b/tests/functional/src/repeat.cpp @@ -18,7 +18,7 @@ SUBCASE(subcase_name) \ TEST_CASE("repeat(case1)" * doctest::test_suite("functional::repeat")) { - NMTOOLS_TESTING_DECLARE_NS(array, repeat, case1); + NMTOOLS_TESTING_USE_CASE(array, repeat, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::repeat[repeats][axis], array ); @@ -32,7 +32,7 @@ namespace view = nmtools::view; TEST_CASE("repeat" * doctest::test_suite("functional::get_function_composition") * doctest::may_fail()) { - NMTOOLS_TESTING_DECLARE_NS(array,repeat,case1); + NMTOOLS_TESTING_USE_CASE(array,repeat,case1); using namespace args; auto a = view::repeat(array,repeats,axis); @@ -45,7 +45,7 @@ TEST_CASE("repeat" * doctest::test_suite("functional::get_function_composition") TEST_CASE("repeat" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(array,repeat,case1); + NMTOOLS_TESTING_USE_CASE(array,repeat,case1); using namespace args; auto a = view::repeat(array,repeats,axis); diff --git a/tests/functional/src/reshape.cpp b/tests/functional/src/reshape.cpp index cf5e8ddcd..d94ed64b6 100644 --- a/tests/functional/src/reshape.cpp +++ b/tests/functional/src/reshape.cpp @@ -8,7 +8,7 @@ namespace fn = nm::functional; #if 1 TEST_CASE("reshape(case1)" * doctest::test_suite("functional::reshape")) { - NMTOOLS_TESTING_DECLARE_NS(reshape,case1); + NMTOOLS_TESTING_USE_CASE(reshape,case1); using namespace args; { @@ -48,7 +48,7 @@ using nmtools::unwrap; TEST_CASE("reshape" * doctest::test_suite("functional::get_function_composition") * doctest::may_fail()) { - NMTOOLS_TESTING_DECLARE_NS(reshape,case1); + NMTOOLS_TESTING_USE_CASE(reshape,case1); using namespace args; auto a = view::reshape(array,newshape); @@ -61,7 +61,7 @@ TEST_CASE("reshape" * doctest::test_suite("functional::get_function_composition" TEST_CASE("reshape" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(reshape,case1); + NMTOOLS_TESTING_USE_CASE(reshape,case1); using namespace args; auto a = view::reshape(array,newshape); diff --git a/tests/functional/src/resize.cpp b/tests/functional/src/resize.cpp index 8fce65dba..2d74bc23c 100644 --- a/tests/functional/src/resize.cpp +++ b/tests/functional/src/resize.cpp @@ -36,7 +36,7 @@ SUBCASE(subcase_name) \ #if defined(__clang__) || defined(NMTOOLS_DISABLE_STL) TEST_CASE("resize(case1)" * doctest::test_suite("functional::resize")) { - NMTOOLS_TESTING_DECLARE_NS(resize, case1); + NMTOOLS_TESTING_USE_CASE(resize, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::resize[dst_shape_ct], array ); @@ -51,7 +51,7 @@ namespace view = nmtools::view; TEST_CASE("resize" * doctest::test_suite("functional::get_function_composition") * doctest::may_fail()) { - NMTOOLS_TESTING_DECLARE_NS(resize,case1); + NMTOOLS_TESTING_USE_CASE(resize,case1); using namespace args; auto a = view::resize(array,dst_shape); @@ -72,7 +72,7 @@ TEST_CASE("resize" * doctest::test_suite("functional::get_function_composition") #if defined(__clang__) || defined(NMTOOLS_DISABLE_STL) TEST_CASE("resize" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(resize,case1); + NMTOOLS_TESTING_USE_CASE(resize,case1); using namespace args; auto a = view::resize(array,dst_shape); diff --git a/tests/functional/src/roll.cpp b/tests/functional/src/roll.cpp index 070041a28..0d98e6fa4 100644 --- a/tests/functional/src/roll.cpp +++ b/tests/functional/src/roll.cpp @@ -12,7 +12,7 @@ using namespace nmtools::literals; #define FUNCTIONAL_ROLL_SUBCASE(subcase_name, function, ...) \ SUBCASE(#subcase_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(roll, subcase_name); \ + NMTOOLS_TESTING_USE_CASE(roll, subcase_name); \ using namespace args; \ auto result = function (__VA_ARGS__); \ NMTOOLS_REQUIRE_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ @@ -93,7 +93,7 @@ TEST_CASE("roll(case2e)" * doctest::test_suite("functional::roll")) TEST_CASE("roll" * doctest::test_suite("functional::get_function_composition") * doctest::may_fail()) { - NMTOOLS_TESTING_DECLARE_NS(roll,case1a); + NMTOOLS_TESTING_USE_CASE(roll,case1a); using namespace args; auto a = view::roll(array,shift); @@ -106,7 +106,7 @@ TEST_CASE("roll" * doctest::test_suite("functional::get_function_composition") * TEST_CASE("roll" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(roll,case2c); + NMTOOLS_TESTING_USE_CASE(roll,case2c); using namespace args; auto a = view::roll(array,shift,axis); diff --git a/tests/functional/src/slice.cpp b/tests/functional/src/slice.cpp index c4946dc13..362eecd43 100644 --- a/tests/functional/src/slice.cpp +++ b/tests/functional/src/slice.cpp @@ -18,7 +18,7 @@ SUBCASE(subcase_name) \ #if not __GLIBCXX__ TEST_CASE("slice(case1)" * doctest::test_suite("functional::slice")) { - NMTOOLS_TESTING_DECLARE_NS(array, slice, case1); + NMTOOLS_TESTING_USE_CASE(array, slice, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::slice[slice0][slice1][slice2], array ); @@ -32,7 +32,7 @@ TEST_CASE("slice(case1)" * doctest::test_suite("functional::slice")) TEST_CASE("apply_slice(case1)" * doctest::test_suite("functional::apply_slice")) { - NMTOOLS_TESTING_DECLARE_NS(array, slice, case1); + NMTOOLS_TESTING_USE_CASE(array, slice, case1); using namespace args; FUNCTIONAL_SUBCASE("case1", fn::apply_slice[dslices], array_d ); diff --git a/tests/functional/src/softmax.cpp b/tests/functional/src/softmax.cpp index 1dbe19d5b..ede297315 100644 --- a/tests/functional/src/softmax.cpp +++ b/tests/functional/src/softmax.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("softmax(case1)" * doctest::test_suite("functional::softmax")) { - NMTOOLS_TESTING_DECLARE_NS(array,softmax,case1); + NMTOOLS_TESTING_USE_CASE(array,softmax,case1); using namespace args; SOFTMAX_SUBCASE("case1", fn::softmax, dim, input ); @@ -27,7 +27,7 @@ TEST_CASE("softmax(case1)" * doctest::test_suite("functional::softmax")) TEST_CASE("softmax(case2)" * doctest::test_suite("functional::softmax")) { - NMTOOLS_TESTING_DECLARE_NS(array,softmax,case2); + NMTOOLS_TESTING_USE_CASE(array,softmax,case2); using namespace args; SOFTMAX_SUBCASE("case2", fn::softmax, dim, input ); @@ -39,7 +39,7 @@ TEST_CASE("softmax(case2)" * doctest::test_suite("functional::softmax")) TEST_CASE("softmax(case3)" * doctest::test_suite("functional::softmax")) { - NMTOOLS_TESTING_DECLARE_NS(array,softmax,case3); + NMTOOLS_TESTING_USE_CASE(array,softmax,case3); using namespace args; SOFTMAX_SUBCASE("case3", fn::softmax, dim, input ); @@ -51,7 +51,7 @@ TEST_CASE("softmax(case3)" * doctest::test_suite("functional::softmax")) TEST_CASE("softmax(case4)" * doctest::test_suite("functional::softmax")) { - NMTOOLS_TESTING_DECLARE_NS(array,softmax,case4); + NMTOOLS_TESTING_USE_CASE(array,softmax,case4); using namespace args; SOFTMAX_SUBCASE("case4", fn::softmax, dim, input ); @@ -63,7 +63,7 @@ TEST_CASE("softmax(case4)" * doctest::test_suite("functional::softmax")) TEST_CASE("softmax(case5)" * doctest::test_suite("functional::softmax")) { - NMTOOLS_TESTING_DECLARE_NS(array,softmax,case5); + NMTOOLS_TESTING_USE_CASE(array,softmax,case5); using namespace args; SOFTMAX_SUBCASE("case5", fn::softmax, dim, input ); diff --git a/tests/functional/src/softmin.cpp b/tests/functional/src/softmin.cpp index 710c843c0..9b7004466 100644 --- a/tests/functional/src/softmin.cpp +++ b/tests/functional/src/softmin.cpp @@ -16,7 +16,7 @@ SUBCASE(subcase_name) \ TEST_CASE("softmin(case1)" * doctest::test_suite("functional::softmin")) { - NMTOOLS_TESTING_DECLARE_NS(array, softmin, case1); + NMTOOLS_TESTING_USE_CASE(array, softmin, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::softmin[dim], input ); diff --git a/tests/functional/src/squeeze.cpp b/tests/functional/src/squeeze.cpp index 31efdbc0b..5fd760f3c 100644 --- a/tests/functional/src/squeeze.cpp +++ b/tests/functional/src/squeeze.cpp @@ -18,7 +18,7 @@ SUBCASE(subcase_name) \ TEST_CASE("squeeze(case1)" * doctest::test_suite("functional::squeeze")) { - NMTOOLS_TESTING_DECLARE_NS(squeeze, case1); + NMTOOLS_TESTING_USE_CASE(squeeze, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::squeeze, array ); @@ -32,7 +32,7 @@ namespace view = nmtools::view; TEST_CASE("squeeze" * doctest::test_suite("functional::get_function_composition") * doctest::may_fail()) { - NMTOOLS_TESTING_DECLARE_NS(squeeze,case1); + NMTOOLS_TESTING_USE_CASE(squeeze,case1); using namespace args; auto a = view::squeeze(array); @@ -45,7 +45,7 @@ TEST_CASE("squeeze" * doctest::test_suite("functional::get_function_composition" TEST_CASE("squeeze" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(squeeze,case1); + NMTOOLS_TESTING_USE_CASE(squeeze,case1); using namespace args; auto a = view::squeeze(array); diff --git a/tests/functional/src/stack.cpp b/tests/functional/src/stack.cpp index 7e00837e2..f523dbf6f 100644 --- a/tests/functional/src/stack.cpp +++ b/tests/functional/src/stack.cpp @@ -29,7 +29,7 @@ namespace fn = nmtools::functional; #define FUNCTIONAL_SUBCASE(subcase_name, function, ...) \ SUBCASE(#subcase_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( TESTING_NAMESPACE, subcase_name ); \ + NMTOOLS_TESTING_USE_CASE( TESTING_NAMESPACE, subcase_name ); \ using namespace args; \ auto result = function (__VA_ARGS__); \ NMTOOLS_REQUIRE_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ @@ -39,7 +39,7 @@ SUBCASE(#subcase_name) \ #define BINARY_FUNCTIONAL_SUBCASE(subcase_name, function, a, b) \ SUBCASE(#subcase_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( TESTING_NAMESPACE, subcase_name ); \ + NMTOOLS_TESTING_USE_CASE( TESTING_NAMESPACE, subcase_name ); \ using namespace args; \ auto result = function (a) (b); \ NMTOOLS_REQUIRE_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/functional/src/stddev.cpp b/tests/functional/src/stddev.cpp index af228f513..d09d92343 100644 --- a/tests/functional/src/stddev.cpp +++ b/tests/functional/src/stddev.cpp @@ -16,7 +16,7 @@ SUBCASE(subcase_name) \ TEST_CASE("stddev(case1)" * doctest::test_suite("functional::stddev")) { - NMTOOLS_TESTING_DECLARE_NS(array, stddev, case1); + NMTOOLS_TESTING_USE_CASE(array, stddev, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::stddev[axis][nm::None][ddof][keepdims], array ); diff --git a/tests/functional/src/sum.cpp b/tests/functional/src/sum.cpp index 36b175a31..abc5b96bc 100644 --- a/tests/functional/src/sum.cpp +++ b/tests/functional/src/sum.cpp @@ -16,7 +16,7 @@ SUBCASE(subcase_name) \ TEST_CASE("sum(case1)" * doctest::test_suite("functional::sum")) { - NMTOOLS_TESTING_DECLARE_NS(view, reduce_add, case1); + NMTOOLS_TESTING_USE_CASE(view, reduce_add, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::sum[axis], a ); @@ -28,7 +28,7 @@ TEST_CASE("sum(case1)" * doctest::test_suite("functional::sum")) TEST_CASE("sum(case8)" * doctest::test_suite("functional::sum")) { - NMTOOLS_TESTING_DECLARE_NS(view, reduce_add, case8); + NMTOOLS_TESTING_USE_CASE(view, reduce_add, case8); using namespace args; FUNCTIONAL_SUBCASE( "case8", fn::sum[axis][dtype][initial], a ); @@ -40,7 +40,7 @@ TEST_CASE("sum(case8)" * doctest::test_suite("functional::sum")) TEST_CASE("sum(case9)" * doctest::test_suite("functional::sum")) { - NMTOOLS_TESTING_DECLARE_NS(view, reduce_add, case9); + NMTOOLS_TESTING_USE_CASE(view, reduce_add, case9); using namespace args; FUNCTIONAL_SUBCASE( "case9", fn::sum[axis][dtype][initial][keepdims], a ); diff --git a/tests/functional/src/take.cpp b/tests/functional/src/take.cpp index e53fdb8c7..deaf37886 100644 --- a/tests/functional/src/take.cpp +++ b/tests/functional/src/take.cpp @@ -17,7 +17,7 @@ SUBCASE(subcase_name) \ // TODO: fix runtime TEST_CASE("take(case1)" * doctest::test_suite("functional::take") * doctest::skip()) { - NMTOOLS_TESTING_DECLARE_NS(view, take, case1); + NMTOOLS_TESTING_USE_CASE(view, take, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::take[indices][axis], array ); diff --git a/tests/functional/src/tile.cpp b/tests/functional/src/tile.cpp index 7c1216092..03a1fb7e5 100644 --- a/tests/functional/src/tile.cpp +++ b/tests/functional/src/tile.cpp @@ -16,7 +16,7 @@ SUBCASE(subcase_name) \ TEST_CASE("tile(case1)" * doctest::test_suite("functional::tile")) { - NMTOOLS_TESTING_DECLARE_NS(view, tile, case1); + NMTOOLS_TESTING_USE_CASE(view, tile, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::tile[reps], array ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("tile" * doctest::test_suite("functional::get_function_composition") * doctest::may_fail()) { - NMTOOLS_TESTING_DECLARE_NS(view,tile,case1); + NMTOOLS_TESTING_USE_CASE(view,tile,case1); using namespace args; auto a = view::tile(array,reps); @@ -43,7 +43,7 @@ TEST_CASE("tile" * doctest::test_suite("functional::get_function_composition") * TEST_CASE("tile" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,tile,case1); + NMTOOLS_TESTING_USE_CASE(view,tile,case1); using namespace args; auto a = view::tile(array,reps); diff --git a/tests/functional/src/transpose.cpp b/tests/functional/src/transpose.cpp index 269201c31..9fc1262ef 100644 --- a/tests/functional/src/transpose.cpp +++ b/tests/functional/src/transpose.cpp @@ -16,7 +16,7 @@ SUBCASE(subcase_name) \ TEST_CASE("transpose(case1)" * doctest::test_suite("functional::transpose")) { - NMTOOLS_TESTING_DECLARE_NS(transpose, case1); + NMTOOLS_TESTING_USE_CASE(transpose, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::transpose[axes_a], array ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("transpose" * doctest::test_suite("functional::get_function_composition") * doctest::may_fail()) { - NMTOOLS_TESTING_DECLARE_NS(transpose,case1); + NMTOOLS_TESTING_USE_CASE(transpose,case1); using namespace args; auto a = view::transpose(array,axes_a); @@ -43,7 +43,7 @@ TEST_CASE("transpose" * doctest::test_suite("functional::get_function_compositio TEST_CASE("transpose" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(transpose,case1); + NMTOOLS_TESTING_USE_CASE(transpose,case1); using namespace args; auto a = view::transpose(array,axes_a); diff --git a/tests/functional/src/ufuncs/add.cpp b/tests/functional/src/ufuncs/add.cpp index 1c8963719..7f59a9af8 100644 --- a/tests/functional/src/ufuncs/add.cpp +++ b/tests/functional/src/ufuncs/add.cpp @@ -40,7 +40,7 @@ SUBCASE(subcase_name) \ TEST_CASE("add(case1)" * doctest::test_suite("functional::add")) { - NMTOOLS_TESTING_DECLARE_NS(view,add,case1); + NMTOOLS_TESTING_USE_CASE(view,add,case1); using namespace args; ADD_SUBCASE("case1", fn::add, a, b); @@ -58,7 +58,7 @@ TEST_CASE("add(case1)" * doctest::test_suite("functional::add")) TEST_CASE("add(case2)" * doctest::test_suite("functional::add")) { - NMTOOLS_TESTING_DECLARE_NS(view,add,case2); + NMTOOLS_TESTING_USE_CASE(view,add,case2); using namespace args; ADD_SUBCASE("case2", fn::add, a, b); @@ -76,7 +76,7 @@ TEST_CASE("add(case2)" * doctest::test_suite("functional::add")) TEST_CASE("add(case3)" * doctest::test_suite("functional::add")) { - NMTOOLS_TESTING_DECLARE_NS(view,add,case3); + NMTOOLS_TESTING_USE_CASE(view,add,case3); using namespace args; ADD_SUBCASE("case3", fn::add, a, b); @@ -85,7 +85,7 @@ TEST_CASE("add(case3)" * doctest::test_suite("functional::add")) TEST_CASE("add(case4)" * doctest::test_suite("functional::add")) { - NMTOOLS_TESTING_DECLARE_NS(view,add,case4); + NMTOOLS_TESTING_USE_CASE(view,add,case4); using namespace args; ADD_SUBCASE("case4", fn::add, a, b); @@ -105,7 +105,7 @@ TEST_CASE("add(case4)" * doctest::test_suite("functional::add")) #if 0 TEST_CASE("constexpr_add(case1)" * doctest::test_suite("functional::add")) { - NMTOOLS_TESTING_DECLARE_NS(array,constexpr_add,case1); + NMTOOLS_TESTING_USE_CASE(array,constexpr_add,case1); using namespace args; CONSTEXPR_ADD_SUBCASE("case1", fn::add, a, b); @@ -124,7 +124,7 @@ namespace view = nmtools::view; TEST_CASE("add" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,add,case1); + NMTOOLS_TESTING_USE_CASE(view,add,case1); using namespace args; auto array = view::add(a,b); diff --git a/tests/functional/src/ufuncs/arccos.cpp b/tests/functional/src/ufuncs/arccos.cpp index f5a1a3d9b..831f6d875 100644 --- a/tests/functional/src/ufuncs/arccos.cpp +++ b/tests/functional/src/ufuncs/arccos.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("arccos(case1)" * doctest::test_suite("functional::arccos")) { - NMTOOLS_TESTING_DECLARE_NS(view, arccos, case1); + NMTOOLS_TESTING_USE_CASE(view, arccos, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::arccos, a ); @@ -32,7 +32,7 @@ using nmtools::args::ufunc; TEST_CASE("arccos" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,arccos,case1); + NMTOOLS_TESTING_USE_CASE(view,arccos,case1); using namespace args; auto array = view::arccos(a); @@ -45,7 +45,7 @@ TEST_CASE("arccos" * doctest::test_suite("functional::get_function_composition") TEST_CASE("arccos" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,arccos,case1); + NMTOOLS_TESTING_USE_CASE(view,arccos,case1); using namespace args; auto array = view::arccos(a); diff --git a/tests/functional/src/ufuncs/arccosh.cpp b/tests/functional/src/ufuncs/arccosh.cpp index 367d9f2a1..f5c45712e 100644 --- a/tests/functional/src/ufuncs/arccosh.cpp +++ b/tests/functional/src/ufuncs/arccosh.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("arccosh(case1)" * doctest::test_suite("functional::arccosh")) { - NMTOOLS_TESTING_DECLARE_NS(view, arccosh, case1); + NMTOOLS_TESTING_USE_CASE(view, arccosh, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::arccosh, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("arccosh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,arccosh,case1); + NMTOOLS_TESTING_USE_CASE(view,arccosh,case1); using namespace args; auto array = view::arccosh(a); @@ -42,7 +42,7 @@ TEST_CASE("arccosh" * doctest::test_suite("functional::get_function_composition" TEST_CASE("arccosh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,arccosh,case1); + NMTOOLS_TESTING_USE_CASE(view,arccosh,case1); using namespace args; auto array = view::arccosh(a); diff --git a/tests/functional/src/ufuncs/arcsin.cpp b/tests/functional/src/ufuncs/arcsin.cpp index 3b7fb39fc..7f5947640 100644 --- a/tests/functional/src/ufuncs/arcsin.cpp +++ b/tests/functional/src/ufuncs/arcsin.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("arcsin(case1)" * doctest::test_suite("functional::arcsin")) { - NMTOOLS_TESTING_DECLARE_NS(view, arcsin, case1); + NMTOOLS_TESTING_USE_CASE(view, arcsin, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::arcsin, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("arcsin" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,arcsin,case1); + NMTOOLS_TESTING_USE_CASE(view,arcsin,case1); using namespace args; auto array = view::arcsin(a); @@ -43,7 +43,7 @@ TEST_CASE("arcsin" * doctest::test_suite("functional::get_function_composition") TEST_CASE("arcsin" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,arcsin,case1); + NMTOOLS_TESTING_USE_CASE(view,arcsin,case1); using namespace args; auto array = view::arcsin(a); diff --git a/tests/functional/src/ufuncs/arcsinh.cpp b/tests/functional/src/ufuncs/arcsinh.cpp index b3abd7ecb..31fc5ca64 100644 --- a/tests/functional/src/ufuncs/arcsinh.cpp +++ b/tests/functional/src/ufuncs/arcsinh.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("arcsinh(case1)" * doctest::test_suite("functional::arcsinh")) { - NMTOOLS_TESTING_DECLARE_NS(view, arcsinh, case1); + NMTOOLS_TESTING_USE_CASE(view, arcsinh, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::arcsinh, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("arcsinh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,arcsinh,case1); + NMTOOLS_TESTING_USE_CASE(view,arcsinh,case1); using namespace args; auto array = view::arcsinh(a); @@ -43,7 +43,7 @@ TEST_CASE("arcsinh" * doctest::test_suite("functional::get_function_composition" TEST_CASE("arcsinh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,arcsinh,case1); + NMTOOLS_TESTING_USE_CASE(view,arcsinh,case1); using namespace args; auto array = view::arcsinh(a); diff --git a/tests/functional/src/ufuncs/arctan.cpp b/tests/functional/src/ufuncs/arctan.cpp index 492f0b060..43112cf6b 100644 --- a/tests/functional/src/ufuncs/arctan.cpp +++ b/tests/functional/src/ufuncs/arctan.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("arctan(case1)" * doctest::test_suite("functional::arctan")) { - NMTOOLS_TESTING_DECLARE_NS(view, arctan, case1); + NMTOOLS_TESTING_USE_CASE(view, arctan, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::arctan, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("arctan" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,arctan,case1); + NMTOOLS_TESTING_USE_CASE(view,arctan,case1); using namespace args; auto array = view::arctan(a); @@ -43,7 +43,7 @@ TEST_CASE("arctan" * doctest::test_suite("functional::get_function_composition") TEST_CASE("arctan" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,arctan,case1); + NMTOOLS_TESTING_USE_CASE(view,arctan,case1); using namespace args; auto array = view::arctan(a); diff --git a/tests/functional/src/ufuncs/arctan2.cpp b/tests/functional/src/ufuncs/arctan2.cpp index 97f49371b..30604c505 100644 --- a/tests/functional/src/ufuncs/arctan2.cpp +++ b/tests/functional/src/ufuncs/arctan2.cpp @@ -23,7 +23,7 @@ SUBCASE(subcase_name) \ TEST_CASE("arctan2(case1)" * doctest::test_suite("functional::arctan2")) { - NMTOOLS_TESTING_DECLARE_NS(view, arctan2, case1); + NMTOOLS_TESTING_USE_CASE(view, arctan2, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::arctan2, a, b ); diff --git a/tests/functional/src/ufuncs/arctanh.cpp b/tests/functional/src/ufuncs/arctanh.cpp index 004aafd5d..d0c94e20b 100644 --- a/tests/functional/src/ufuncs/arctanh.cpp +++ b/tests/functional/src/ufuncs/arctanh.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("arctanh(case1)" * doctest::test_suite("functional::arctanh")) { - NMTOOLS_TESTING_DECLARE_NS(view, arctanh, case1); + NMTOOLS_TESTING_USE_CASE(view, arctanh, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::arctanh, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("arctanh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,arctanh,case1); + NMTOOLS_TESTING_USE_CASE(view,arctanh,case1); using namespace args; auto array = view::arctanh(a); @@ -43,7 +43,7 @@ TEST_CASE("arctanh" * doctest::test_suite("functional::get_function_composition" TEST_CASE("arctanh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,arctanh,case1); + NMTOOLS_TESTING_USE_CASE(view,arctanh,case1); using namespace args; auto array = view::arctanh(a); diff --git a/tests/functional/src/ufuncs/cbrt.cpp b/tests/functional/src/ufuncs/cbrt.cpp index 79365d464..4dbfcefb4 100644 --- a/tests/functional/src/ufuncs/cbrt.cpp +++ b/tests/functional/src/ufuncs/cbrt.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("cbrt(case1)" * doctest::test_suite("functional::cbrt")) { - NMTOOLS_TESTING_DECLARE_NS(view, cbrt, case1); + NMTOOLS_TESTING_USE_CASE(view, cbrt, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::cbrt, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("cbrt" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,cbrt,case1); + NMTOOLS_TESTING_USE_CASE(view,cbrt,case1); using namespace args; auto array = view::cbrt(a); @@ -43,7 +43,7 @@ TEST_CASE("cbrt" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("cbrt" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,cbrt,case1); + NMTOOLS_TESTING_USE_CASE(view,cbrt,case1); using namespace args; auto array = view::cbrt(a); diff --git a/tests/functional/src/ufuncs/ceil.cpp b/tests/functional/src/ufuncs/ceil.cpp index aeb2e2a6e..66e289560 100644 --- a/tests/functional/src/ufuncs/ceil.cpp +++ b/tests/functional/src/ufuncs/ceil.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("ceil(case1)" * doctest::test_suite("functional::ceil")) { - NMTOOLS_TESTING_DECLARE_NS(view, ceil, case1); + NMTOOLS_TESTING_USE_CASE(view, ceil, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::ceil, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("ceil" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,ceil,case1); + NMTOOLS_TESTING_USE_CASE(view,ceil,case1); using namespace args; auto array = view::ceil(a); @@ -43,7 +43,7 @@ TEST_CASE("ceil" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("ceil" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,ceil,case1); + NMTOOLS_TESTING_USE_CASE(view,ceil,case1); using namespace args; auto array = view::ceil(a); diff --git a/tests/functional/src/ufuncs/clip.cpp b/tests/functional/src/ufuncs/clip.cpp index 91c17f1b0..b8a52c2f7 100644 --- a/tests/functional/src/ufuncs/clip.cpp +++ b/tests/functional/src/ufuncs/clip.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("clip(case1)" * doctest::test_suite("functional::clip")) { - NMTOOLS_TESTING_DECLARE_NS(array, clip, case1); + NMTOOLS_TESTING_USE_CASE(array, clip, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::clip, a, amin, amax ); @@ -27,7 +27,7 @@ TEST_CASE("clip(case1)" * doctest::test_suite("functional::clip")) TEST_CASE("clip(case2)" * doctest::test_suite("functional::clip")) { - NMTOOLS_TESTING_DECLARE_NS(array, clip, case2); + NMTOOLS_TESTING_USE_CASE(array, clip, case2); using namespace args; FUNCTIONAL_SUBCASE( "case2", fn::clip, a, amin, amax ); @@ -39,7 +39,7 @@ TEST_CASE("clip(case2)" * doctest::test_suite("functional::clip")) TEST_CASE("clip(case3)" * doctest::test_suite("functional::clip")) { - NMTOOLS_TESTING_DECLARE_NS(array, clip, case3); + NMTOOLS_TESTING_USE_CASE(array, clip, case3); using namespace args; FUNCTIONAL_SUBCASE( "case3", fn::clip, a, amin, amax ); diff --git a/tests/functional/src/ufuncs/cos.cpp b/tests/functional/src/ufuncs/cos.cpp index 71f16899e..f99150206 100644 --- a/tests/functional/src/ufuncs/cos.cpp +++ b/tests/functional/src/ufuncs/cos.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("cos(case1)" * doctest::test_suite("functional::cos")) { - NMTOOLS_TESTING_DECLARE_NS(view, cos, case1); + NMTOOLS_TESTING_USE_CASE(view, cos, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::cos, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("cos" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,cos,case1); + NMTOOLS_TESTING_USE_CASE(view,cos,case1); using namespace args; auto array = view::cos(a); @@ -43,7 +43,7 @@ TEST_CASE("cos" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("cos" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,cos,case1); + NMTOOLS_TESTING_USE_CASE(view,cos,case1); using namespace args; auto array = view::cos(a); diff --git a/tests/functional/src/ufuncs/cosh.cpp b/tests/functional/src/ufuncs/cosh.cpp index 1ebfefa46..f89a6c2fe 100644 --- a/tests/functional/src/ufuncs/cosh.cpp +++ b/tests/functional/src/ufuncs/cosh.cpp @@ -19,7 +19,7 @@ SUBCASE(subcase_name) \ TEST_CASE("cosh(case1)" * doctest::test_suite("functional::cosh")) { - NMTOOLS_TESTING_DECLARE_NS(view, cosh, case1); + NMTOOLS_TESTING_USE_CASE(view, cosh, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::cosh, a ); @@ -33,7 +33,7 @@ namespace view = nmtools::view; TEST_CASE("cosh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,cosh,case1); + NMTOOLS_TESTING_USE_CASE(view,cosh,case1); using namespace args; auto array = view::cosh(a); @@ -46,7 +46,7 @@ TEST_CASE("cosh" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("cosh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,cosh,case1); + NMTOOLS_TESTING_USE_CASE(view,cosh,case1); using namespace args; auto array = view::cosh(a); diff --git a/tests/functional/src/ufuncs/exp.cpp b/tests/functional/src/ufuncs/exp.cpp index 178e1dcae..ae10a127d 100644 --- a/tests/functional/src/ufuncs/exp.cpp +++ b/tests/functional/src/ufuncs/exp.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("exp(case1)" * doctest::test_suite("functional::exp")) { - NMTOOLS_TESTING_DECLARE_NS(view, exp, case1); + NMTOOLS_TESTING_USE_CASE(view, exp, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::exp, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("exp" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,exp,case1); + NMTOOLS_TESTING_USE_CASE(view,exp,case1); using namespace args; auto array = view::exp(a); @@ -43,7 +43,7 @@ TEST_CASE("exp" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("exp" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,exp,case1); + NMTOOLS_TESTING_USE_CASE(view,exp,case1); using namespace args; auto array = view::exp(a); diff --git a/tests/functional/src/ufuncs/exp2.cpp b/tests/functional/src/ufuncs/exp2.cpp index b73dd004e..2b3f91807 100644 --- a/tests/functional/src/ufuncs/exp2.cpp +++ b/tests/functional/src/ufuncs/exp2.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("exp2(case1)" * doctest::test_suite("functional::exp2")) { - NMTOOLS_TESTING_DECLARE_NS(view, exp2, case1); + NMTOOLS_TESTING_USE_CASE(view, exp2, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::exp2, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("exp2" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,exp2,case1); + NMTOOLS_TESTING_USE_CASE(view,exp2,case1); using namespace args; auto array = view::exp2(a); @@ -43,7 +43,7 @@ TEST_CASE("exp2" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("exp2" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,exp2,case1); + NMTOOLS_TESTING_USE_CASE(view,exp2,case1); using namespace args; auto array = view::exp2(a); diff --git a/tests/functional/src/ufuncs/expm1.cpp b/tests/functional/src/ufuncs/expm1.cpp index cc7f5414c..2fd430b43 100644 --- a/tests/functional/src/ufuncs/expm1.cpp +++ b/tests/functional/src/ufuncs/expm1.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("expm1(case1)" * doctest::test_suite("functional::expm1")) { - NMTOOLS_TESTING_DECLARE_NS(view, expm1, case1); + NMTOOLS_TESTING_USE_CASE(view, expm1, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::expm1, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("expm1" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,expm1,case1); + NMTOOLS_TESTING_USE_CASE(view,expm1,case1); using namespace args; auto array = view::expm1(a); @@ -43,7 +43,7 @@ TEST_CASE("expm1" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("expm1" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,expm1,case1); + NMTOOLS_TESTING_USE_CASE(view,expm1,case1); using namespace args; auto array = view::expm1(a); diff --git a/tests/functional/src/ufuncs/fabs.cpp b/tests/functional/src/ufuncs/fabs.cpp index 1d59914bc..347094fea 100644 --- a/tests/functional/src/ufuncs/fabs.cpp +++ b/tests/functional/src/ufuncs/fabs.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("fabs(case1)" * doctest::test_suite("functional::fabs")) { - NMTOOLS_TESTING_DECLARE_NS(view, fabs, case1); + NMTOOLS_TESTING_USE_CASE(view, fabs, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::fabs, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("fabs" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,fabs,case1); + NMTOOLS_TESTING_USE_CASE(view,fabs,case1); using namespace args; auto array = view::fabs(a); @@ -43,7 +43,7 @@ TEST_CASE("fabs" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("fabs" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,fabs,case1); + NMTOOLS_TESTING_USE_CASE(view,fabs,case1); using namespace args; auto array = view::fabs(a); diff --git a/tests/functional/src/ufuncs/floor.cpp b/tests/functional/src/ufuncs/floor.cpp index a9799ce9a..12f87e7ea 100644 --- a/tests/functional/src/ufuncs/floor.cpp +++ b/tests/functional/src/ufuncs/floor.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("floor(case1)" * doctest::test_suite("functional::floor")) { - NMTOOLS_TESTING_DECLARE_NS(view, floor, case1); + NMTOOLS_TESTING_USE_CASE(view, floor, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::floor, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("floor" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,floor,case1); + NMTOOLS_TESTING_USE_CASE(view,floor,case1); using namespace args; auto array = view::floor(a); @@ -43,7 +43,7 @@ TEST_CASE("floor" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("floor" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,floor,case1); + NMTOOLS_TESTING_USE_CASE(view,floor,case1); using namespace args; auto array = view::floor(a); diff --git a/tests/functional/src/ufuncs/invert.cpp b/tests/functional/src/ufuncs/invert.cpp index be74f283c..e41f843d5 100644 --- a/tests/functional/src/ufuncs/invert.cpp +++ b/tests/functional/src/ufuncs/invert.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("invert(case1)" * doctest::test_suite("functional::invert")) { - NMTOOLS_TESTING_DECLARE_NS(view, invert, case1); + NMTOOLS_TESTING_USE_CASE(view, invert, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::invert, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("invert" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,invert,case1); + NMTOOLS_TESTING_USE_CASE(view,invert,case1); using namespace args; auto array = view::invert(a); @@ -44,7 +44,7 @@ TEST_CASE("invert" * doctest::test_suite("functional::get_function_composition") TEST_CASE("invert" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,invert,case1); + NMTOOLS_TESTING_USE_CASE(view,invert,case1); using namespace args; auto array = view::invert(a); diff --git a/tests/functional/src/ufuncs/isfinite.cpp b/tests/functional/src/ufuncs/isfinite.cpp index dadaf7c3c..8820a76f4 100644 --- a/tests/functional/src/ufuncs/isfinite.cpp +++ b/tests/functional/src/ufuncs/isfinite.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("isfinite(case1)" * doctest::test_suite("functional::isfinite")) { - NMTOOLS_TESTING_DECLARE_NS(view, isfinite, case1); + NMTOOLS_TESTING_USE_CASE(view, isfinite, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::isfinite, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("isfinite" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,isfinite,case1); + NMTOOLS_TESTING_USE_CASE(view,isfinite,case1); using namespace args; auto array = view::isfinite(a); @@ -42,7 +42,7 @@ TEST_CASE("isfinite" * doctest::test_suite("functional::get_function_composition TEST_CASE("isfinite" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,isfinite,case1); + NMTOOLS_TESTING_USE_CASE(view,isfinite,case1); using namespace args; auto array = view::isfinite(a); diff --git a/tests/functional/src/ufuncs/isinf.cpp b/tests/functional/src/ufuncs/isinf.cpp index e51c8f20d..7982656ef 100644 --- a/tests/functional/src/ufuncs/isinf.cpp +++ b/tests/functional/src/ufuncs/isinf.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("isinf(case1)" * doctest::test_suite("functional::isinf")) { - NMTOOLS_TESTING_DECLARE_NS(view, isinf, case1); + NMTOOLS_TESTING_USE_CASE(view, isinf, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::isinf, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("isinf" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,isinf,case1); + NMTOOLS_TESTING_USE_CASE(view,isinf,case1); using namespace args; auto array = view::isinf(a); @@ -42,7 +42,7 @@ TEST_CASE("isinf" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("isinf" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,isinf,case1); + NMTOOLS_TESTING_USE_CASE(view,isinf,case1); using namespace args; auto array = view::isinf(a); diff --git a/tests/functional/src/ufuncs/isnan.cpp b/tests/functional/src/ufuncs/isnan.cpp index fe5a74f27..45a478fc1 100644 --- a/tests/functional/src/ufuncs/isnan.cpp +++ b/tests/functional/src/ufuncs/isnan.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("isnan(case1)" * doctest::test_suite("functional::isnan")) { - NMTOOLS_TESTING_DECLARE_NS(view, isnan, case1); + NMTOOLS_TESTING_USE_CASE(view, isnan, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::isnan, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("isnan" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,isnan,case1); + NMTOOLS_TESTING_USE_CASE(view,isnan,case1); using namespace args; auto array = view::isnan(a); @@ -42,7 +42,7 @@ TEST_CASE("isnan" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("isnan" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,isnan,case1); + NMTOOLS_TESTING_USE_CASE(view,isnan,case1); using namespace args; auto array = view::isnan(a); diff --git a/tests/functional/src/ufuncs/log.cpp b/tests/functional/src/ufuncs/log.cpp index 9f5a28641..41bc0319a 100644 --- a/tests/functional/src/ufuncs/log.cpp +++ b/tests/functional/src/ufuncs/log.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("log(case1)" * doctest::test_suite("functional::log")) { - NMTOOLS_TESTING_DECLARE_NS(view, log, case1); + NMTOOLS_TESTING_USE_CASE(view, log, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::log, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("log" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,log,case1); + NMTOOLS_TESTING_USE_CASE(view,log,case1); using namespace args; auto array = view::log(a); @@ -42,7 +42,7 @@ TEST_CASE("log" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("log" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,log,case1); + NMTOOLS_TESTING_USE_CASE(view,log,case1); using namespace args; auto array = view::log(a); diff --git a/tests/functional/src/ufuncs/log10.cpp b/tests/functional/src/ufuncs/log10.cpp index ec9246305..f5db0b6e2 100644 --- a/tests/functional/src/ufuncs/log10.cpp +++ b/tests/functional/src/ufuncs/log10.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("log10(case1)" * doctest::test_suite("functional::log10")) { - NMTOOLS_TESTING_DECLARE_NS(view, log10, case1); + NMTOOLS_TESTING_USE_CASE(view, log10, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::log10, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("log10" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,log10,case1); + NMTOOLS_TESTING_USE_CASE(view,log10,case1); using namespace args; auto array = view::log10(a); @@ -42,7 +42,7 @@ TEST_CASE("log10" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("log10" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,log10,case1); + NMTOOLS_TESTING_USE_CASE(view,log10,case1); using namespace args; auto array = view::log10(a); diff --git a/tests/functional/src/ufuncs/log1p.cpp b/tests/functional/src/ufuncs/log1p.cpp index c7bad284e..9f6f56e5c 100644 --- a/tests/functional/src/ufuncs/log1p.cpp +++ b/tests/functional/src/ufuncs/log1p.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("log1p(case1)" * doctest::test_suite("functional::log1p")) { - NMTOOLS_TESTING_DECLARE_NS(view, log1p, case1); + NMTOOLS_TESTING_USE_CASE(view, log1p, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::log1p, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("log1p" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,log1p,case1); + NMTOOLS_TESTING_USE_CASE(view,log1p,case1); using namespace args; auto array = view::log1p(a); @@ -42,7 +42,7 @@ TEST_CASE("log1p" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("log1p" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,log1p,case1); + NMTOOLS_TESTING_USE_CASE(view,log1p,case1); using namespace args; auto array = view::log1p(a); diff --git a/tests/functional/src/ufuncs/log2.cpp b/tests/functional/src/ufuncs/log2.cpp index ae79df9dc..578232176 100644 --- a/tests/functional/src/ufuncs/log2.cpp +++ b/tests/functional/src/ufuncs/log2.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("log2(case1)" * doctest::test_suite("functional::log2")) { - NMTOOLS_TESTING_DECLARE_NS(view, log2, case1); + NMTOOLS_TESTING_USE_CASE(view, log2, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::log2, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("log2" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,log2,case1); + NMTOOLS_TESTING_USE_CASE(view,log2,case1); using namespace args; auto array = view::log2(a); @@ -42,7 +42,7 @@ TEST_CASE("log2" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("log2" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,log2,case1); + NMTOOLS_TESTING_USE_CASE(view,log2,case1); using namespace args; auto array = view::log2(a); diff --git a/tests/functional/src/ufuncs/multiply.cpp b/tests/functional/src/ufuncs/multiply.cpp index 9c513d7b7..85bf35315 100644 --- a/tests/functional/src/ufuncs/multiply.cpp +++ b/tests/functional/src/ufuncs/multiply.cpp @@ -24,7 +24,7 @@ SUBCASE(subcase_name) \ TEST_CASE("multiply(case1)" * doctest::test_suite("functional::multiply")) { // TODO: rename namespace to (array, multiply) - NMTOOLS_TESTING_DECLARE_NS(view, multiply, case1); + NMTOOLS_TESTING_USE_CASE(view, multiply, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::multiply, a, b ); @@ -43,7 +43,7 @@ TEST_CASE("multiply(case1)" * doctest::test_suite("functional::multiply")) TEST_CASE("reduce_multiply(case1)" * doctest::test_suite("functional::multiply")) { // TODO: rename namespace to (array, reduce_multiply) - NMTOOLS_TESTING_DECLARE_NS(view, reduce_multiply, case1); + NMTOOLS_TESTING_USE_CASE(view, reduce_multiply, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::reduce_multiply[axis], a ); @@ -56,7 +56,7 @@ TEST_CASE("reduce_multiply(case1)" * doctest::test_suite("functional::multiply") TEST_CASE("reduce_multiply(case4)" * doctest::test_suite("functional::multiply")) { // TODO: rename namespace to (array, reduce_multiply) - NMTOOLS_TESTING_DECLARE_NS(view, reduce_multiply, case4); + NMTOOLS_TESTING_USE_CASE(view, reduce_multiply, case4); using namespace args; FUNCTIONAL_SUBCASE( "case4", fn::reduce_multiply[axis], a ); @@ -69,7 +69,7 @@ TEST_CASE("reduce_multiply(case4)" * doctest::test_suite("functional::multiply") TEST_CASE("reduce_multiply(case8)" * doctest::test_suite("functional::multiply")) { // TODO: rename namespace to (array, reduce_multiply) - NMTOOLS_TESTING_DECLARE_NS(view, reduce_multiply, case8); + NMTOOLS_TESTING_USE_CASE(view, reduce_multiply, case8); using namespace args; FUNCTIONAL_SUBCASE( "case8", fn::reduce_multiply[axis][dtype][initial], a ); @@ -82,7 +82,7 @@ TEST_CASE("reduce_multiply(case8)" * doctest::test_suite("functional::multiply") TEST_CASE("reduce_multiply(case9)" * doctest::test_suite("functional::multiply")) { // TODO: rename namespace to (array, reduce_multiply) - NMTOOLS_TESTING_DECLARE_NS(view, reduce_multiply, case9); + NMTOOLS_TESTING_USE_CASE(view, reduce_multiply, case9); using namespace args; FUNCTIONAL_SUBCASE( "case9", fn::reduce_multiply[axis][dtype][initial][keepdims], a ); @@ -94,7 +94,7 @@ TEST_CASE("reduce_multiply(case9)" * doctest::test_suite("functional::multiply") TEST_CASE("accumulate_multiply(case1)" * doctest::test_suite("functional::multiply")) { - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_multiply, case1); + NMTOOLS_TESTING_USE_CASE(view, accumulate_multiply, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::accumulate_multiply[axis], a ); @@ -106,7 +106,7 @@ TEST_CASE("accumulate_multiply(case1)" * doctest::test_suite("functional::multip TEST_CASE("outer_multiply(case1)" * doctest::test_suite("functional::multiply")) { - NMTOOLS_TESTING_DECLARE_NS(view, outer_multiply, case1); + NMTOOLS_TESTING_USE_CASE(view, outer_multiply, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::outer_multiply, a, b ); @@ -126,7 +126,7 @@ namespace view = nmtools::view; TEST_CASE("multiply" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,multiply,case1); + NMTOOLS_TESTING_USE_CASE(view,multiply,case1); using namespace args; auto array = view::multiply(a,b); @@ -142,7 +142,7 @@ namespace kwargs = nmtools::args; TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_multiply,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_multiply,case9); using namespace args; auto array = view::reduce_multiply(a,axis,dtype,initial,keepdims); @@ -162,7 +162,7 @@ TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_comp TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_multiply,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_multiply,case9); using namespace args; auto op = view::multiply_t<>{}; @@ -183,7 +183,7 @@ TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_comp TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_composition") * doctest::may_fail()) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_multiply,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_multiply,case9); using namespace args; auto op = view::multiply_t<>{}; @@ -207,7 +207,7 @@ TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_comp #ifndef __clang__ TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_multiply,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_multiply,case9); using namespace args; auto kwargs = kwargs::reduce{ @@ -229,7 +229,7 @@ TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_comp TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_multiply,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_multiply,case9); using namespace args; auto array = view::reduce_multiply(a,axis,dtype,initial,keepdims); @@ -249,7 +249,7 @@ TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_comp TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_multiply,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_multiply,case9); using namespace args; auto op = view::multiply_t<>{}; @@ -271,7 +271,7 @@ TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_comp TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_multiply,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_multiply,case9); using namespace args; auto op = view::multiply_t<>{}; @@ -299,7 +299,7 @@ TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_comp TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_multiply,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_multiply,case9); using namespace args; auto array = view::reduce_multiply(a,kwargs::reduce{ @@ -324,7 +324,7 @@ TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_comp TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_multiply,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_multiply,case9); using namespace args; auto op = view::multiply_t{}; @@ -350,7 +350,7 @@ TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_comp TEST_CASE("reduce_multiply" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reduce_multiply,case9); + NMTOOLS_TESTING_USE_CASE(view,reduce_multiply,case9); using namespace args; auto op = view::multiply_t{}; diff --git a/tests/functional/src/ufuncs/negative.cpp b/tests/functional/src/ufuncs/negative.cpp index 9faec8ad9..fb2d62253 100644 --- a/tests/functional/src/ufuncs/negative.cpp +++ b/tests/functional/src/ufuncs/negative.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("negative(case1)" * doctest::test_suite("functional::negative")) { - NMTOOLS_TESTING_DECLARE_NS(view, negative, case1); + NMTOOLS_TESTING_USE_CASE(view, negative, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::negative, a ); @@ -30,7 +30,7 @@ namespace view = nmtools::view; TEST_CASE("negative" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,negative,case1); + NMTOOLS_TESTING_USE_CASE(view,negative,case1); using namespace args; auto array = view::negative(a); @@ -43,7 +43,7 @@ TEST_CASE("negative" * doctest::test_suite("functional::get_function_composition TEST_CASE("negative" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,negative,case1); + NMTOOLS_TESTING_USE_CASE(view,negative,case1); using namespace args; auto array = view::negative(a); diff --git a/tests/functional/src/ufuncs/positive.cpp b/tests/functional/src/ufuncs/positive.cpp index 19694e0ae..ad868c399 100644 --- a/tests/functional/src/ufuncs/positive.cpp +++ b/tests/functional/src/ufuncs/positive.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("positive(case1)" * doctest::test_suite("functional::positive")) { - NMTOOLS_TESTING_DECLARE_NS(view, positive, case1); + NMTOOLS_TESTING_USE_CASE(view, positive, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::positive, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("positive" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,positive,case1); + NMTOOLS_TESTING_USE_CASE(view,positive,case1); using namespace args; auto array = view::positive(a); @@ -42,7 +42,7 @@ TEST_CASE("positive" * doctest::test_suite("functional::get_function_composition TEST_CASE("positive" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,positive,case1); + NMTOOLS_TESTING_USE_CASE(view,positive,case1); using namespace args; auto array = view::positive(a); diff --git a/tests/functional/src/ufuncs/reciprocal.cpp b/tests/functional/src/ufuncs/reciprocal.cpp index f3da6ab5f..6666097e5 100644 --- a/tests/functional/src/ufuncs/reciprocal.cpp +++ b/tests/functional/src/ufuncs/reciprocal.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("reciprocal(case1)" * doctest::test_suite("functional::reciprocal")) { - NMTOOLS_TESTING_DECLARE_NS(view, reciprocal, case1); + NMTOOLS_TESTING_USE_CASE(view, reciprocal, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::reciprocal, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("reciprocal" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reciprocal,case1); + NMTOOLS_TESTING_USE_CASE(view,reciprocal,case1); using namespace args; auto array = view::reciprocal(a); @@ -42,7 +42,7 @@ TEST_CASE("reciprocal" * doctest::test_suite("functional::get_function_compositi TEST_CASE("reciprocal" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,reciprocal,case1); + NMTOOLS_TESTING_USE_CASE(view,reciprocal,case1); using namespace args; auto array = view::reciprocal(a); diff --git a/tests/functional/src/ufuncs/rint.cpp b/tests/functional/src/ufuncs/rint.cpp index c37501dde..a09b303a4 100644 --- a/tests/functional/src/ufuncs/rint.cpp +++ b/tests/functional/src/ufuncs/rint.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("rint(case1)" * doctest::test_suite("functional::rint")) { - NMTOOLS_TESTING_DECLARE_NS(view, rint, case1); + NMTOOLS_TESTING_USE_CASE(view, rint, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::rint, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("rint" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,rint,case1); + NMTOOLS_TESTING_USE_CASE(view,rint,case1); using namespace args; auto array = view::rint(a); @@ -42,7 +42,7 @@ TEST_CASE("rint" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("rint" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,rint,case1); + NMTOOLS_TESTING_USE_CASE(view,rint,case1); using namespace args; auto array = view::rint(a); diff --git a/tests/functional/src/ufuncs/signbit.cpp b/tests/functional/src/ufuncs/signbit.cpp index f09f23358..2ba463abb 100644 --- a/tests/functional/src/ufuncs/signbit.cpp +++ b/tests/functional/src/ufuncs/signbit.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("signbit(case1)" * doctest::test_suite("functional::signbit")) { - NMTOOLS_TESTING_DECLARE_NS(view, signbit, case1); + NMTOOLS_TESTING_USE_CASE(view, signbit, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::signbit, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("signbit" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,signbit,case1); + NMTOOLS_TESTING_USE_CASE(view,signbit,case1); using namespace args; auto array = view::signbit(a); @@ -42,7 +42,7 @@ TEST_CASE("signbit" * doctest::test_suite("functional::get_function_composition" TEST_CASE("signbit" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,signbit,case1); + NMTOOLS_TESTING_USE_CASE(view,signbit,case1); using namespace args; auto array = view::signbit(a); diff --git a/tests/functional/src/ufuncs/sin.cpp b/tests/functional/src/ufuncs/sin.cpp index 9b8c79bf2..f9d5f46ff 100644 --- a/tests/functional/src/ufuncs/sin.cpp +++ b/tests/functional/src/ufuncs/sin.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("sin(case1)" * doctest::test_suite("functional::sin")) { - NMTOOLS_TESTING_DECLARE_NS(view, sin, case1); + NMTOOLS_TESTING_USE_CASE(view, sin, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::sin, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("sin" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,sin,case1); + NMTOOLS_TESTING_USE_CASE(view,sin,case1); using namespace args; auto array = view::sin(a); @@ -42,7 +42,7 @@ TEST_CASE("sin" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("sin" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,sin,case1); + NMTOOLS_TESTING_USE_CASE(view,sin,case1); using namespace args; auto array = view::sin(a); diff --git a/tests/functional/src/ufuncs/sinh.cpp b/tests/functional/src/ufuncs/sinh.cpp index 16085d92a..69fdf9d86 100644 --- a/tests/functional/src/ufuncs/sinh.cpp +++ b/tests/functional/src/ufuncs/sinh.cpp @@ -19,7 +19,7 @@ SUBCASE(subcase_name) \ TEST_CASE("sinh(case1)" * doctest::test_suite("functional::sinh")) { - NMTOOLS_TESTING_DECLARE_NS(view, sinh, case1); + NMTOOLS_TESTING_USE_CASE(view, sinh, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::sinh, a ); @@ -33,7 +33,7 @@ namespace view = nmtools::view; TEST_CASE("sinh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,sinh,case1); + NMTOOLS_TESTING_USE_CASE(view,sinh,case1); using namespace args; auto array = view::sinh(a); @@ -46,7 +46,7 @@ TEST_CASE("sinh" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("sinh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,sinh,case1); + NMTOOLS_TESTING_USE_CASE(view,sinh,case1); using namespace args; auto array = view::sinh(a); diff --git a/tests/functional/src/ufuncs/sqrt.cpp b/tests/functional/src/ufuncs/sqrt.cpp index b534d69f4..43c9cbe19 100644 --- a/tests/functional/src/ufuncs/sqrt.cpp +++ b/tests/functional/src/ufuncs/sqrt.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("sqrt(case1)" * doctest::test_suite("functional::sqrt")) { - NMTOOLS_TESTING_DECLARE_NS(view, sqrt, case1); + NMTOOLS_TESTING_USE_CASE(view, sqrt, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::sqrt, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("sqrt" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,sqrt,case1); + NMTOOLS_TESTING_USE_CASE(view,sqrt,case1); using namespace args; auto array = view::sqrt(a); @@ -42,7 +42,7 @@ TEST_CASE("sqrt" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("sqrt" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,sqrt,case1); + NMTOOLS_TESTING_USE_CASE(view,sqrt,case1); using namespace args; auto array = view::sqrt(a); diff --git a/tests/functional/src/ufuncs/tan.cpp b/tests/functional/src/ufuncs/tan.cpp index c1987a324..503524e8a 100644 --- a/tests/functional/src/ufuncs/tan.cpp +++ b/tests/functional/src/ufuncs/tan.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("tan(case1)" * doctest::test_suite("functional::tan")) { - NMTOOLS_TESTING_DECLARE_NS(view, tan, case1); + NMTOOLS_TESTING_USE_CASE(view, tan, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::tan, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("tan" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,tan,case1); + NMTOOLS_TESTING_USE_CASE(view,tan,case1); using namespace args; auto array = view::tan(a); @@ -42,7 +42,7 @@ TEST_CASE("tan" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("tan" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,tan,case1); + NMTOOLS_TESTING_USE_CASE(view,tan,case1); using namespace args; auto array = view::tan(a); diff --git a/tests/functional/src/ufuncs/tanh.cpp b/tests/functional/src/ufuncs/tanh.cpp index a070c58ca..e2e9b312a 100644 --- a/tests/functional/src/ufuncs/tanh.cpp +++ b/tests/functional/src/ufuncs/tanh.cpp @@ -15,7 +15,7 @@ SUBCASE(subcase_name) \ TEST_CASE("tanh(case1)" * doctest::test_suite("functional::tanh")) { - NMTOOLS_TESTING_DECLARE_NS(view, tanh, case1); + NMTOOLS_TESTING_USE_CASE(view, tanh, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::tanh, a ); @@ -29,7 +29,7 @@ namespace view = nmtools::view; TEST_CASE("tanh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,tanh,case1); + NMTOOLS_TESTING_USE_CASE(view,tanh,case1); using namespace args; auto array = view::tanh(a); @@ -42,7 +42,7 @@ TEST_CASE("tanh" * doctest::test_suite("functional::get_function_composition")) TEST_CASE("tanh" * doctest::test_suite("functional::get_function_composition")) { - NMTOOLS_TESTING_DECLARE_NS(view,tanh,case1); + NMTOOLS_TESTING_USE_CASE(view,tanh,case1); using namespace args; auto array = view::tanh(a); diff --git a/tests/functional/src/var.cpp b/tests/functional/src/var.cpp index 17bb4ce8a..d0c8cbffa 100644 --- a/tests/functional/src/var.cpp +++ b/tests/functional/src/var.cpp @@ -16,7 +16,7 @@ SUBCASE(subcase_name) \ TEST_CASE("var(case1)" * doctest::test_suite("functional::var")) { - NMTOOLS_TESTING_DECLARE_NS(array, var, case1); + NMTOOLS_TESTING_USE_CASE(array, var, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::var[axis], array ); @@ -28,7 +28,7 @@ TEST_CASE("var(case1)" * doctest::test_suite("functional::var")) TEST_CASE("var(case6)" * doctest::test_suite("functional::var")) { - NMTOOLS_TESTING_DECLARE_NS(array, var, case6); + NMTOOLS_TESTING_USE_CASE(array, var, case6); using namespace args; FUNCTIONAL_SUBCASE( "case6", fn::var[axis][nm::None][ddof][keepdims], array ); diff --git a/tests/functional/src/vstack.cpp b/tests/functional/src/vstack.cpp index 3e4fc0719..b3f07a146 100644 --- a/tests/functional/src/vstack.cpp +++ b/tests/functional/src/vstack.cpp @@ -29,7 +29,7 @@ namespace fn = nmtools::functional; #define FUNCTIONAL_SUBCASE(subcase_name, function, ...) \ SUBCASE(#subcase_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( TESTING_NAMESPACE, subcase_name ); \ + NMTOOLS_TESTING_USE_CASE( TESTING_NAMESPACE, subcase_name ); \ using namespace args; \ auto result = function (__VA_ARGS__); \ NMTOOLS_REQUIRE_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ @@ -39,7 +39,7 @@ SUBCASE(#subcase_name) \ #define BINARY_FUNCTIONAL_SUBCASE(subcase_name, function, a, b) \ SUBCASE(#subcase_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( TESTING_NAMESPACE, subcase_name ); \ + NMTOOLS_TESTING_USE_CASE( TESTING_NAMESPACE, subcase_name ); \ using namespace args; \ auto result = function (a) (b); \ NMTOOLS_REQUIRE_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/functional/src/where.cpp b/tests/functional/src/where.cpp index ef98565fd..7964354fd 100644 --- a/tests/functional/src/where.cpp +++ b/tests/functional/src/where.cpp @@ -16,7 +16,7 @@ SUBCASE(subcase_name) \ TEST_CASE("where(case1)" * doctest::test_suite("functional::where")) { - NMTOOLS_TESTING_DECLARE_NS(view, where, case1); + NMTOOLS_TESTING_USE_CASE(view, where, case1); using namespace args; FUNCTIONAL_SUBCASE( "case1", fn::where, condition, x, y ); diff --git a/tests/index/src/argsort.cpp b/tests/index/src/argsort.cpp index 75068977b..a3ccd315e 100644 --- a/tests/index/src/argsort.cpp +++ b/tests/index/src/argsort.cpp @@ -169,7 +169,7 @@ RUN_impl(__VA_ARGS__); #define ARGSORT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, argsort, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, argsort, case_name); \ using namespace args; \ auto result = RUN_argsort(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -178,7 +178,7 @@ SUBCASE(#case_name) \ #define CONSTEXPR_ARGSORT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, constexpr_argsort, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, constexpr_argsort, case_name); \ using namespace args; \ constexpr auto result = RUN_impl(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/index/src/array_slice.cpp b/tests/index/src/array_slice.cpp index ddf864fe3..3422e9779 100644 --- a/tests/index/src/array_slice.cpp +++ b/tests/index/src/array_slice.cpp @@ -34,7 +34,7 @@ RUN_shape_array_slice_impl(__VA_ARGS__); #define SHAPE_ARRAY_SLICE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, shape_array_slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, shape_array_slice, case_name); \ using namespace args; \ auto result = RUN_shape_array_slice(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/index/src/broadcast_shape.cpp b/tests/index/src/broadcast_shape.cpp index 1cff8e3e0..235937189 100644 --- a/tests/index/src/broadcast_shape.cpp +++ b/tests/index/src/broadcast_shape.cpp @@ -33,7 +33,7 @@ RUN_impl(__VA_ARGS__); #define BROADCAST_SHAPE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(broadcast_shape, case_name); \ + NMTOOLS_TESTING_USE_CASE(broadcast_shape, case_name); \ using namespace args; \ const auto result = RUN_broadcast_shape(case_name,__VA_ARGS__); \ const auto success = static_cast(result); \ diff --git a/tests/index/src/broadcast_to.cpp b/tests/index/src/broadcast_to.cpp index 25737da63..18f681ab0 100644 --- a/tests/index/src/broadcast_to.cpp +++ b/tests/index/src/broadcast_to.cpp @@ -14,7 +14,7 @@ namespace kind = na::kind; #define SHAPE_BROADCAST_TO_SUBCASE(case_name, ashape, bshape) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, broadcast_to, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, broadcast_to, case_name); \ auto m_result = nmtools::index::shape_broadcast_to(args::ashape, args::bshape); \ auto success = static_cast(m_result); \ NMTOOLS_ASSERT_EQUAL( success, expect::success ); \ diff --git a/tests/index/src/choose.cpp b/tests/index/src/choose.cpp index 7e95b457a..efb5c3c8f 100644 --- a/tests/index/src/choose.cpp +++ b/tests/index/src/choose.cpp @@ -87,7 +87,7 @@ RUN_choose_impl(__VA_ARGS__); #define CHOOSE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, choose, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, choose, case_name); \ using namespace args; \ auto result = RUN_choose(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::expected ); \ diff --git a/tests/index/src/compress.cpp b/tests/index/src/compress.cpp index c468c7055..2495ee23b 100644 --- a/tests/index/src/compress.cpp +++ b/tests/index/src/compress.cpp @@ -246,7 +246,7 @@ RUN_shape_compress_impl(__VA_ARGS__); #define SHAPE_COMPRESS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, shape_compress, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, shape_compress, case_name); \ using namespace args; \ auto result = RUN_shape_compress(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -459,7 +459,7 @@ RUN_compress_impl(__VA_ARGS__); #define COMPRESS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, compress, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, compress, case_name); \ using namespace args; \ auto result = RUN_compress(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/index/src/compute_indices.cpp b/tests/index/src/compute_indices.cpp index ce1eb24e0..f689fce58 100644 --- a/tests/index/src/compute_indices.cpp +++ b/tests/index/src/compute_indices.cpp @@ -7,7 +7,7 @@ namespace nm = nmtools; #define COMPUTE_INDICES_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(compute_indices, case_name); \ + NMTOOLS_TESTING_USE_CASE(compute_indices, case_name); \ using namespace args; \ auto indices = nmtools::index::compute_indices(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL_MSG_ATTRIBUTES( indices, expect::indices, __VA_ARGS__ ); \ diff --git a/tests/index/src/compute_offset.cpp b/tests/index/src/compute_offset.cpp index 13b29dfb8..a4d8e4539 100644 --- a/tests/index/src/compute_offset.cpp +++ b/tests/index/src/compute_offset.cpp @@ -5,7 +5,7 @@ #define COMPUTE_OFFSET_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, compute_offset, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, compute_offset, case_name); \ using namespace args; \ auto offset = nmtools::index::compute_offset(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL_MSG_ATTRIBUTES( offset, expect::result, __VA_ARGS__ ); \ diff --git a/tests/index/src/compute_strides.cpp b/tests/index/src/compute_strides.cpp index b9e34b433..9af08b3bc 100644 --- a/tests/index/src/compute_strides.cpp +++ b/tests/index/src/compute_strides.cpp @@ -9,7 +9,7 @@ using namespace nmtools::literals; #define COMPUTE_STRIDES_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(compute_strides, case_name); \ + NMTOOLS_TESTING_USE_CASE(compute_strides, case_name); \ using namespace args; \ auto result = nmtools::index::compute_strides(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL_MSG_ATTRIBUTES( result, expect::result, __VA_ARGS__ ); \ diff --git a/tests/index/src/concatenate.cpp b/tests/index/src/concatenate.cpp index 598aca664..6a4bf0bd2 100644 --- a/tests/index/src/concatenate.cpp +++ b/tests/index/src/concatenate.cpp @@ -118,7 +118,7 @@ RUN_shape_concatenate_impl(__VA_ARGS__); #define SHAPE_CONCATENATE_SUBCASE(case_name, ashape, bshape, axis) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(shape_concatenate, case_name) \ + NMTOOLS_TESTING_USE_CASE(shape_concatenate, case_name) \ auto result = RUN_shape_concatenate(case_name, args::ashape, args::bshape, args::axis); \ auto success = nmtools::get<0>(result); \ auto shape = nmtools::get<1>(result); \ @@ -130,7 +130,7 @@ SUBCASE(#case_name) \ #define SHAPE_CONCATENATE_SUBCASE(case_name, ashape, bshape, axis) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(shape_concatenate, case_name) \ + NMTOOLS_TESTING_USE_CASE(shape_concatenate, case_name) \ const auto [success, shape] = RUN_shape_concatenate(case_name, args::ashape, args::bshape, args::axis); \ NMTOOLS_ASSERT_EQUAL( success, expect::success ); \ if (expect::success) \ @@ -484,7 +484,7 @@ RUN_impl(__VA_ARGS__); #define CONCATENATE_SUBCASE(case_name, ashape, bshape, indices, axis) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index,concatenate,case_name); \ + NMTOOLS_TESTING_USE_CASE(index,concatenate,case_name); \ auto result = RUN_concatenate(case_name,args::ashape,args::bshape,args::indices,args::axis); \ auto aflag = nmtools::get<0>(result) ; \ auto bflag = nmtools::get<1>(result) ; \ @@ -501,7 +501,7 @@ SUBCASE(#case_name) \ #define CONCATENATE_SUBCASE(case_name, ashape, bshape, indices, axis) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index,concatenate,case_name); \ + NMTOOLS_TESTING_USE_CASE(index,concatenate,case_name); \ const auto [aflag,bflag,a_idx,b_idx] = RUN_concatenate(case_name, args::ashape,args::bshape,args::indices,args::axis); \ NMTOOLS_ASSERT_EQUAL( aflag, expect::aflag ); \ NMTOOLS_ASSERT_EQUAL( bflag, expect::bflag ); \ diff --git a/tests/index/src/conv.cpp b/tests/index/src/conv.cpp index 8d8a50ac5..985db7747 100644 --- a/tests/index/src/conv.cpp +++ b/tests/index/src/conv.cpp @@ -35,7 +35,7 @@ RUN_shape_conv2d_impl(__VA_ARGS__); #define SHAPE_CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, shape_conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, shape_conv2d, case_name); \ using namespace args; \ auto result = RUN_shape_conv2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -202,7 +202,7 @@ RUN_slice_conv2d_impl(__VA_ARGS__); #define SLICE_CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, slice_conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, slice_conv2d, case_name); \ using namespace args; \ auto result = RUN_slice_conv2d(case_name, __VA_ARGS__); \ for (size_t i=0; i(result); \ @@ -494,7 +494,7 @@ RUN_shape_matmul_impl(__VA_ARGS__); #define SHAPE_MATMUL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, shape_matmul, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, shape_matmul, case_name); \ using namespace args; \ auto result = RUN_shape_matmul(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -697,7 +697,7 @@ RUN_index_matmul_impl(__VA_ARGS__); #define INDEX_MATMUL_SUBCASE(case_name, res_left, res_right, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, matmul, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, matmul, case_name); \ using namespace args; \ auto result = RUN_index_matmul(case_name, __VA_ARGS__); \ auto left = nmtools::get<0>(result); \ @@ -711,7 +711,7 @@ SUBCASE(#case_name) \ #define DYNAMIC_INDEX_MATMUL_SUBCASE(case_name, res_left, res_right, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, matmul, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, matmul, case_name); \ using namespace args; \ auto result = RUN_index_matmul(case_name, __VA_ARGS__); \ auto left = nmtools::get<0>(result); \ diff --git a/tests/index/src/moveaxis.cpp b/tests/index/src/moveaxis.cpp index dbe5f1604..f554885b0 100644 --- a/tests/index/src/moveaxis.cpp +++ b/tests/index/src/moveaxis.cpp @@ -532,7 +532,7 @@ RUN_moveaxis_to_transpose_impl(__VA_ARGS__); #define MOVEAXIS_TO_TRANSPOSE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, moveaxis_to_transpose, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, moveaxis_to_transpose, case_name); \ using namespace args; \ auto result = RUN_moveaxis_to_transpose(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -541,7 +541,7 @@ SUBCASE(#case_name) \ #define CONSTEXPR_MOVEAXIS_TO_TRANSPOSE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, constexpr_moveaxis_to_transpose, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, constexpr_moveaxis_to_transpose, case_name); \ using namespace args; \ constexpr auto result = RUN_moveaxis_to_transpose_impl(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -955,7 +955,7 @@ TEST_CASE("moveaxis_to_transpose(case19)" * doctest::test_suite("index::moveaxis MOVEAXIS_TO_TRANSPOSE_SUBCASE( case19, shape, source, destination ); #endif { - NMTOOLS_TESTING_DECLARE_NS(index, moveaxis_to_transpose, case19); + NMTOOLS_TESTING_USE_CASE(index, moveaxis_to_transpose, case19); // using namespace args; constexpr auto shape = meta::to_value_v; constexpr auto source = meta::to_value_v; diff --git a/tests/index/src/nonzero.cpp b/tests/index/src/nonzero.cpp index c026472a8..80f46b979 100644 --- a/tests/index/src/nonzero.cpp +++ b/tests/index/src/nonzero.cpp @@ -5,7 +5,7 @@ #define NONZERO_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(nonzero, case_name); \ + NMTOOLS_TESTING_USE_CASE(nonzero, case_name); \ using namespace args; \ auto result = ::nmtools::index::nonzero(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL_MSG_ATTRIBUTES( result, expect::result, __VA_ARGS__ ); \ diff --git a/tests/index/src/normalize_axis.cpp b/tests/index/src/normalize_axis.cpp index dbdaa3b0d..2390cbad6 100644 --- a/tests/index/src/normalize_axis.cpp +++ b/tests/index/src/normalize_axis.cpp @@ -192,7 +192,7 @@ RUN_impl(__VA_ARGS__); #define NORMALIZE_AXIS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, normalize_axis, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, normalize_axis, case_name); \ using namespace args; \ auto result = RUN_normalize_axis(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -464,7 +464,7 @@ NMTOOLS_TESTING_DECLARE_CASE(index, constexpr_normalize_axis) #define CONSTEXPR_NORMALIZE_AXIS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, constexpr_normalize_axis, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, constexpr_normalize_axis, case_name); \ using namespace args; \ constexpr auto result = RUN_impl(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/index/src/outer.cpp b/tests/index/src/outer.cpp index f5cccc871..2289f7e9d 100644 --- a/tests/index/src/outer.cpp +++ b/tests/index/src/outer.cpp @@ -89,7 +89,7 @@ RUN_shape_outer_impl(__VA_ARGS__); #define SHAPE_OUTER_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, shape_outer, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, shape_outer, case_name); \ using namespace args; \ auto result = RUN_shape_outer(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -225,7 +225,7 @@ RUN_outer_impl(__VA_ARGS__); #define OUTER_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, outer, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, outer, case_name); \ using namespace args; \ auto result = RUN_outer(case_name, __VA_ARGS__); \ auto aidx = nmtools::get<0>(result); \ diff --git a/tests/index/src/pad.cpp b/tests/index/src/pad.cpp index f4f26e14f..bbca3a18f 100644 --- a/tests/index/src/pad.cpp +++ b/tests/index/src/pad.cpp @@ -28,7 +28,7 @@ RUN_shape_pad_impl(__VA_ARGS__); #define SHAPE_PAD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, shape_pad, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, shape_pad, case_name); \ using namespace args; \ auto result = RUN_shape_pad(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -100,7 +100,7 @@ TEST_CASE("shape_pad(case6)" * doctest::test_suite("index::shape_pad")) #define CONSTEXPR_SHAPE_PAD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, constexpr_shape_pad, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, constexpr_shape_pad, case_name); \ using namespace args; \ constexpr auto result = RUN_shape_pad_impl(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -177,7 +177,7 @@ RUN_index_pad_impl(__VA_ARGS__); #define INDEX_PAD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, pad, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, pad, case_name); \ using namespace args; \ auto result = RUN_index_pad(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/index/src/pooling.cpp b/tests/index/src/pooling.cpp index 2d9155e13..d8ee636c2 100644 --- a/tests/index/src/pooling.cpp +++ b/tests/index/src/pooling.cpp @@ -35,7 +35,7 @@ RUN_shape_pool2d_impl(__VA_ARGS__); #define SHAPE_POOL2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, shape_pool2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, shape_pool2d, case_name); \ using namespace args; \ auto result = RUN_shape_pool2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -44,7 +44,7 @@ SUBCASE(#case_name) \ #define CONSTEXPR_SHAPE_POOL2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, constexpr_shape_pool2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, constexpr_shape_pool2d, case_name); \ using namespace args; \ constexpr auto result = RUN_shape_pool2d_impl(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -187,7 +187,7 @@ nmtools::utils::apply_to_string(array) #define SLICE_POOL2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, slice_pool2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, slice_pool2d, case_name); \ using namespace args; \ auto result = RUN_slice_pool2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_APPLY_EQUAL( result, expect::result ); \ diff --git a/tests/index/src/remove_dims.cpp b/tests/index/src/remove_dims.cpp index 32a0decec..6aa168193 100644 --- a/tests/index/src/remove_dims.cpp +++ b/tests/index/src/remove_dims.cpp @@ -65,7 +65,7 @@ RUN_impl(__VA_ARGS__); #define REMOVE_DIMS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, remove_dims, case_name) \ + NMTOOLS_TESTING_USE_CASE(index, remove_dims, case_name) \ using namespace args; \ auto result = RUN_remove_dims(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/index/src/remove_single_dims.cpp b/tests/index/src/remove_single_dims.cpp index 488c7925a..77cf93648 100644 --- a/tests/index/src/remove_single_dims.cpp +++ b/tests/index/src/remove_single_dims.cpp @@ -38,7 +38,7 @@ RUN_impl(__VA_ARGS__); #define REMOVE_SINGLE_DIMS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, remove_single_dims, case_name) \ + NMTOOLS_TESTING_USE_CASE(index, remove_single_dims, case_name) \ using namespace args; \ auto result = RUN_remove_single_dims(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/index/src/repeat.cpp b/tests/index/src/repeat.cpp index 0171ff962..3beb02978 100644 --- a/tests/index/src/repeat.cpp +++ b/tests/index/src/repeat.cpp @@ -36,7 +36,7 @@ RUN_shape_repeat_impl(__VA_ARGS__); #define SHAPE_REPEAT_SUBCASE(case_name,ashape,repeats,axis) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(shape_repeat, case_name); \ + NMTOOLS_TESTING_USE_CASE(shape_repeat, case_name); \ auto shape = RUN_shape_repeat(case_name, args::ashape, args::repeats, args::axis); \ NMTOOLS_ASSERT_EQUAL( shape, expect::shape ); \ } @@ -44,7 +44,7 @@ SUBCASE(#case_name) \ #define CONSTEXPR_SHAPE_REPEAT_SUBCASE(case_name,ashape,repeats,axis) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(constexpr_shape_repeat, case_name); \ + NMTOOLS_TESTING_USE_CASE(constexpr_shape_repeat, case_name); \ constexpr auto shape = RUN_shape_repeat_impl( args::ashape, args::repeats, args::axis ); \ NMTOOLS_ASSERT_EQUAL( shape, expect::shape ); \ } @@ -209,7 +209,7 @@ RUN_impl(__VA_ARGS__); #define REPEAT_SUBCASE(case_name, shape, indices, repeats, axis) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(repeat, case_name); \ + NMTOOLS_TESTING_USE_CASE(repeat, case_name); \ auto result = RUN_repeat(case_name, args::shape, args::indices, args::repeats, args::axis); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ } diff --git a/tests/index/src/reshape.cpp b/tests/index/src/reshape.cpp index 5d7a702f2..176907133 100644 --- a/tests/index/src/reshape.cpp +++ b/tests/index/src/reshape.cpp @@ -8,7 +8,7 @@ using namespace nm::literals; #define CONSTEXPR_SHAPE_RESHAPE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(constexpr_shape_reshape, case_name); \ + NMTOOLS_TESTING_USE_CASE(constexpr_shape_reshape, case_name); \ using namespace args; \ constexpr auto result = nmtools::index::shape_reshape(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -17,7 +17,7 @@ SUBCASE(#case_name) \ #define SHAPE_RESHAPE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(shape_reshape, case_name); \ + NMTOOLS_TESTING_USE_CASE(shape_reshape, case_name); \ using namespace args; \ auto result = nmtools::index::shape_reshape(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/index/src/resize.cpp b/tests/index/src/resize.cpp index 828623521..dc9c36dfc 100644 --- a/tests/index/src/resize.cpp +++ b/tests/index/src/resize.cpp @@ -7,7 +7,7 @@ namespace nm = nmtools; #define SHAPE_RESIZE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, shape_resize, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, shape_resize, case_name); \ using namespace args; \ auto result = nm::index::shape_resize(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::expected ); \ @@ -16,7 +16,7 @@ SUBCASE(#case_name) \ #define RESIZE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, resize, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, resize, case_name); \ using namespace args; \ auto result = nm::index::resize(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::expected ); \ diff --git a/tests/index/src/roll.cpp b/tests/index/src/roll.cpp index aaa7f162d..f2437ea86 100644 --- a/tests/index/src/roll.cpp +++ b/tests/index/src/roll.cpp @@ -7,7 +7,7 @@ namespace meta = nmtools::meta; #define ROLL_SUBCASE(case_name,...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, roll, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, roll, case_name); \ using namespace args; \ auto result = nmtools::index::roll(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL_MSG_ATTRIBUTES( result, expect::result, __VA_ARGS__ ); \ @@ -28,7 +28,7 @@ TEST_CASE("roll(case1a1)" * doctest::test_suite("index::roll")) { { using meta::to_value_v; - NMTOOLS_TESTING_DECLARE_NS(index,roll,case1a1); + NMTOOLS_TESTING_USE_CASE(index,roll,case1a1); using namespace args; NMTOOLS_ASSERT_EQUAL( to_value_v, shape ); NMTOOLS_ASSERT_EQUAL( to_value_v, indices ); diff --git a/tests/index/src/slice.cpp b/tests/index/src/slice.cpp index a1f975c01..8037c0996 100644 --- a/tests/index/src/slice.cpp +++ b/tests/index/src/slice.cpp @@ -43,7 +43,7 @@ RUN_shape_slice_impl(__VA_ARGS__); #define SHAPE_SLICE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, shape_slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, shape_slice, case_name); \ using namespace args; \ auto result = RUN_shape_slice(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -477,7 +477,7 @@ RUN_shape_dynamic_slice_impl(__VA_ARGS__); #define SHAPE_DYNAMIC_SLICE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, shape_dynamic_slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, shape_dynamic_slice, case_name); \ using namespace args; \ auto result = RUN_shape_dynamic_slice(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -774,7 +774,7 @@ RUN_dynamic_slice_impl(__VA_ARGS__); #define DYNAMIC_SLICE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, dynamic_slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, dynamic_slice, case_name); \ using namespace args; \ auto result = RUN_dynamic_slice(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -784,7 +784,7 @@ SUBCASE(#case_name) \ #define APPLY_SLICE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, slice, case_name); \ using namespace args; \ auto result = RUN_dynamic_slice(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -793,7 +793,7 @@ SUBCASE(#case_name) \ #define SLICE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, slice, case_name); \ using namespace args; \ auto result = RUN_slice(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/index/src/sliding_window.cpp b/tests/index/src/sliding_window.cpp index 0d97c8b35..ec1f21945 100644 --- a/tests/index/src/sliding_window.cpp +++ b/tests/index/src/sliding_window.cpp @@ -5,7 +5,7 @@ #define SHAPE_SLIDING_WINDOW_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, shape_sliding_window, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, shape_sliding_window, case_name); \ using namespace args; \ auto result = nmtools::index::shape_sliding_window(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL_MSG_ATTRIBUTES( result, expect::dst_shape, __VA_ARGS__ ); \ @@ -14,7 +14,7 @@ SUBCASE(#case_name) \ #define SLIDING_WINDOW_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, sliding_window, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, sliding_window, case_name); \ using namespace args; \ auto result = nmtools::index::sliding_window(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL_MSG_ATTRIBUTES( result, expect::expected, __VA_ARGS__ ); \ diff --git a/tests/index/src/take.cpp b/tests/index/src/take.cpp index a56e078fd..1924837be 100644 --- a/tests/index/src/take.cpp +++ b/tests/index/src/take.cpp @@ -192,7 +192,7 @@ RUN_shape_take_impl(__VA_ARGS__); #define SHAPE_TAKE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, shape_take, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, shape_take, case_name); \ using namespace args; \ auto result = RUN_shape_take(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -201,7 +201,7 @@ SUBCASE(#case_name) \ #define CONSTEXPR_SHAPE_TAKE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, constexpr_shape_take, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, constexpr_shape_take, case_name); \ using namespace args; \ constexpr auto result = RUN_shape_take_impl(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -290,7 +290,7 @@ RUN_take_impl(__VA_ARGS__); #define TAKE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, take, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, take, case_name); \ using namespace args; \ auto result = RUN_take(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/index/src/take_along_axis.cpp b/tests/index/src/take_along_axis.cpp index 0bc2e9379..14e719fcb 100644 --- a/tests/index/src/take_along_axis.cpp +++ b/tests/index/src/take_along_axis.cpp @@ -31,7 +31,7 @@ RUN_shape_take_along_axis_impl(__VA_ARGS__); #define SHAPE_TAKE_ALONG_AXIS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, shape_take_along_axis, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, shape_take_along_axis, case_name); \ using namespace args; \ auto result = RUN_shape_take_along_axis(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/index/src/tile.cpp b/tests/index/src/tile.cpp index e88d8b2c9..dcfc363c7 100644 --- a/tests/index/src/tile.cpp +++ b/tests/index/src/tile.cpp @@ -216,7 +216,7 @@ RUN_shape_tile_impl(__VA_ARGS__); #define SHAPE_TILE_SUBCASE(case_name,shape,reps) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( shape_tile, case_name ); \ + NMTOOLS_TESTING_USE_CASE( shape_tile, case_name ); \ auto result = RUN_shape_tile( case_name, args::shape,args::reps ); \ NMTOOLS_ASSERT_EQUAL( result, expect:: result ); \ } @@ -224,7 +224,7 @@ SUBCASE(#case_name) \ #define CONSTEXPR_SHAPE_TILE_SUBCASE(case_name,shape,reps) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( constexpr_shape_tile, case_name ); \ + NMTOOLS_TESTING_USE_CASE( constexpr_shape_tile, case_name ); \ constexpr auto result = RUN_shape_tile_impl( args::shape,args::reps ); \ NMTOOLS_ASSERT_EQUAL( result, expect:: result ); \ } @@ -568,7 +568,7 @@ RUN_impl(__VA_ARGS__); #define TILE_SUBCASE(case_name, shape, reps, indices) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(tile, case_name) \ + NMTOOLS_TESTING_USE_CASE(tile, case_name) \ auto result = RUN_tile(case_name, args::shape, args::reps, args::indices); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ } diff --git a/tests/opencl/index/broadcast_shape.cpp b/tests/opencl/index/broadcast_shape.cpp index ea3443913..553b83317 100644 --- a/tests/opencl/index/broadcast_shape.cpp +++ b/tests/opencl/index/broadcast_shape.cpp @@ -106,7 +106,7 @@ namespace testing = nmtools::testing; #define BROADCAST_SHAPE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(broadcast_shape, case_name); \ + NMTOOLS_TESTING_USE_CASE(broadcast_shape, case_name); \ using namespace args; \ tester.test(opencl::default_context(),expect::expected,__VA_ARGS__); \ } diff --git a/tests/opencl/index/broadcast_to.cpp b/tests/opencl/index/broadcast_to.cpp index d850a5f65..1107d2974 100644 --- a/tests/opencl/index/broadcast_to.cpp +++ b/tests/opencl/index/broadcast_to.cpp @@ -75,7 +75,7 @@ namespace testing = nmtools::testing; #define SHAPE_BROADCAST_TO_SUBCASE(case_name, ashape, bshape) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, broadcast_to, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, broadcast_to, case_name); \ tester.test(opencl::default_context(),expect::shape,args::ashape,args::bshape); \ } diff --git a/tests/opencl/index/compute_indices.cpp b/tests/opencl/index/compute_indices.cpp index cfbe8fa05..6dd1ec6b5 100644 --- a/tests/opencl/index/compute_indices.cpp +++ b/tests/opencl/index/compute_indices.cpp @@ -39,7 +39,7 @@ namespace testing = nmtools::testing; #define COMPUTE_INDICES_SUBCASE(case_name, offset, shape) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(compute_indices, case_name); \ + NMTOOLS_TESTING_USE_CASE(compute_indices, case_name); \ tester.test(opencl::default_context(),expect::indices,args::offset,args::shape); \ } diff --git a/tests/opencl/index/compute_strides.cpp b/tests/opencl/index/compute_strides.cpp index d08ddb988..fc42eb50d 100644 --- a/tests/opencl/index/compute_strides.cpp +++ b/tests/opencl/index/compute_strides.cpp @@ -38,7 +38,7 @@ namespace testing = nmtools::testing; #define COMPUTE_STRIDES_SUBCASE(case_name, shape) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(compute_strides, case_name); \ + NMTOOLS_TESTING_USE_CASE(compute_strides, case_name); \ tester.test(opencl::default_context(), expect::result, args::shape); \ } diff --git a/tests/opencl/index/gather.cpp b/tests/opencl/index/gather.cpp index 8a8a6e805..76c9418f6 100644 --- a/tests/opencl/index/gather.cpp +++ b/tests/opencl/index/gather.cpp @@ -42,7 +42,7 @@ namespace testing = nmtools::testing; #define GATHER_SUBCASE(case_name, vec, indices) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(gather, case_name); \ + NMTOOLS_TESTING_USE_CASE(gather, case_name); \ tester.test(opencl::default_context(), expect::result, args::vec, args::indices); \ } \ diff --git a/tests/opencl/index/logical_not.cpp b/tests/opencl/index/logical_not.cpp index f82b631f2..5a09eb06e 100644 --- a/tests/opencl/index/logical_not.cpp +++ b/tests/opencl/index/logical_not.cpp @@ -64,7 +64,7 @@ TEST_CASE("logical_not(case1)" * doctest::test_suite("index::logical_not") * doc { auto tester = testing::OpenCLTester(logical_not_kernel_name,nm_cl_test_logical_not_spv,nm_cl_test_logical_not_spv_len); - NMTOOLS_TESTING_DECLARE_NS(logical_not, case1); + NMTOOLS_TESTING_USE_CASE(logical_not, case1); tester.test(opencl::default_context(),expect::x_a,args::x_a); } diff --git a/tests/opencl/index/nonzero.cpp b/tests/opencl/index/nonzero.cpp index fbb4b67e4..9bc0a2b15 100644 --- a/tests/opencl/index/nonzero.cpp +++ b/tests/opencl/index/nonzero.cpp @@ -55,7 +55,7 @@ TEST_CASE("nonzero(case1)" * doctest::test_suite("index::nonzero")) { auto tester = testing::OpenCLTester(nonzero_kernel_name,nm_cl_test_nonzero_spv,nm_cl_test_nonzero_spv_len); - NMTOOLS_TESTING_DECLARE_NS(nonzero,case1); + NMTOOLS_TESTING_USE_CASE(nonzero,case1); tester.test(opencl::default_context(),expect::result,args::x); } diff --git a/tests/opencl/index/pooling.cpp b/tests/opencl/index/pooling.cpp index b9210bb1d..f0b742870 100644 --- a/tests/opencl/index/pooling.cpp +++ b/tests/opencl/index/pooling.cpp @@ -55,7 +55,7 @@ TEST_CASE("shape_pool2d(case1)" * doctest::test_suite("index::shape_pool2d") * d { auto tester = testing::OpenCLTester(shape_pool2d_kernel_name,nm_cl_test_pooling_spv,nm_cl_test_pooling_spv_len); - NMTOOLS_TESTING_DECLARE_NS(index,shape_pool2d,case1); + NMTOOLS_TESTING_USE_CASE(index,shape_pool2d,case1); tester.test(opencl::default_context() , ix::cast(expect::result) , ix::cast(args::shape_a) diff --git a/tests/opencl/index/repeat.cpp b/tests/opencl/index/repeat.cpp index 4315b0848..a1db48cfa 100644 --- a/tests/opencl/index/repeat.cpp +++ b/tests/opencl/index/repeat.cpp @@ -48,7 +48,7 @@ TEST_CASE("shape_repeat(case1)" * doctest::test_suite("index::shape_repeat")) { auto tester = testing::OpenCLTester(shape_repeat_kernel_name,nm_cl_test_repeat_spv,nm_cl_test_repeat_spv_len); - NMTOOLS_TESTING_DECLARE_NS(shape_repeat,case4); + NMTOOLS_TESTING_USE_CASE(shape_repeat,case4); tester.test(opencl::default_context() ,ix::cast(expect::shape) ,ix::cast(args::shape_a) @@ -61,7 +61,7 @@ TEST_CASE("shape_repeat(case2)" * doctest::test_suite("index::shape_repeat")) { auto tester = testing::OpenCLTester(shape_repeat_kernel_name,nm_cl_test_repeat_spv,nm_cl_test_repeat_spv_len); - NMTOOLS_TESTING_DECLARE_NS(shape_repeat,case5); + NMTOOLS_TESTING_USE_CASE(shape_repeat,case5); tester.test(opencl::default_context() ,ix::cast(expect::shape) ,ix::cast(args::shape_a) diff --git a/tests/opencl/index/resize.cpp b/tests/opencl/index/resize.cpp index 96c6a31b4..be9969cc5 100644 --- a/tests/opencl/index/resize.cpp +++ b/tests/opencl/index/resize.cpp @@ -77,7 +77,7 @@ TEST_CASE("shape_resize(case1)" * doctest::test_suite("index::shape_resize")) { auto tester = testing::OpenCLTester(shape_resize_kernel_name,nm_cl_test_resize_spv,nm_cl_test_resize_spv_len); - NMTOOLS_TESTING_DECLARE_NS(index,shape_resize,case1); + NMTOOLS_TESTING_USE_CASE(index,shape_resize,case1); tester.test(opencl::default_context() , ix::cast(expect::expected) , ix::cast(args::src_shape_a) @@ -89,7 +89,7 @@ TEST_CASE("shape_resize(case2)" * doctest::test_suite("index::shape_resize")) { auto tester = testing::OpenCLTester(shape_resize_kernel_name,nm_cl_test_resize_spv,nm_cl_test_resize_spv_len); - NMTOOLS_TESTING_DECLARE_NS(index,shape_resize,case2); + NMTOOLS_TESTING_USE_CASE(index,shape_resize,case2); tester.test(opencl::default_context() , ix::cast(expect::expected) , ix::cast(args::src_shape_a) @@ -101,7 +101,7 @@ TEST_CASE("shape_resize(case3)" * doctest::test_suite("index::shape_resize")) { auto tester = testing::OpenCLTester(shape_resize_kernel_name,nm_cl_test_resize_spv,nm_cl_test_resize_spv_len); - NMTOOLS_TESTING_DECLARE_NS(index,shape_resize,case3); + NMTOOLS_TESTING_USE_CASE(index,shape_resize,case3); tester.test(opencl::default_context() , ix::cast(expect::expected) , ix::cast(args::src_shape_a) @@ -113,7 +113,7 @@ TEST_CASE("shape_resize(case4)" * doctest::test_suite("index::shape_resize")) { auto tester = testing::OpenCLTester(shape_resize_kernel_name,nm_cl_test_resize_spv,nm_cl_test_resize_spv_len); - NMTOOLS_TESTING_DECLARE_NS(index,shape_resize,case4); + NMTOOLS_TESTING_USE_CASE(index,shape_resize,case4); tester.test(opencl::default_context() , ix::cast(expect::expected) , ix::cast(args::src_shape_a) @@ -125,7 +125,7 @@ TEST_CASE("shape_resize(case5)" * doctest::test_suite("index::shape_resize")) { auto tester = testing::OpenCLTester(shape_resize_kernel_name,nm_cl_test_resize_spv,nm_cl_test_resize_spv_len); - NMTOOLS_TESTING_DECLARE_NS(index,shape_resize,case5); + NMTOOLS_TESTING_USE_CASE(index,shape_resize,case5); tester.test(opencl::default_context() , ix::cast(expect::expected) , ix::cast(args::src_shape_a) @@ -137,7 +137,7 @@ TEST_CASE("shape_resize(case6)" * doctest::test_suite("index::shape_resize")) { auto tester = testing::OpenCLTester(shape_resize_kernel_name,nm_cl_test_resize_spv,nm_cl_test_resize_spv_len); - NMTOOLS_TESTING_DECLARE_NS(index,shape_resize,case6); + NMTOOLS_TESTING_USE_CASE(index,shape_resize,case6); tester.test(opencl::default_context() , ix::cast(expect::expected) , ix::cast(args::src_shape_a) @@ -149,7 +149,7 @@ TEST_CASE("resize(case6)" * doctest::test_suite("index::resize")) { auto tester = testing::OpenCLTester(index_resize_kernel_name,nm_cl_test_resize_spv,nm_cl_test_resize_spv_len); - NMTOOLS_TESTING_DECLARE_NS(index,resize,case6); + NMTOOLS_TESTING_USE_CASE(index,resize,case6); tester.test(opencl::default_context() , ix::cast(expect::expected) , ix::cast(args::indices_a) diff --git a/tests/opencl/index/transpose.cpp b/tests/opencl/index/transpose.cpp index 397a26775..e7dd3b2d3 100644 --- a/tests/opencl/index/transpose.cpp +++ b/tests/opencl/index/transpose.cpp @@ -43,7 +43,7 @@ TEST_CASE("shape_transpose(case1)" * doctest::test_suite("index::shape_transpose { auto tester = testing::OpenCLTester(shape_transpose_kernel_name,nm_cl_test_transpose_spv,nm_cl_test_transpose_spv_len); - NMTOOLS_TESTING_DECLARE_NS(index,shape_transpose,case4); + NMTOOLS_TESTING_USE_CASE(index,shape_transpose,case4); tester.test(opencl::default_context(),expect::result,args::shape_a,args::axes_a); } @@ -51,7 +51,7 @@ TEST_CASE("shape_transpose(case2)" * doctest::test_suite("index::shape_transpose { auto tester = testing::OpenCLTester(shape_transpose_kernel_name,nm_cl_test_transpose_spv,nm_cl_test_transpose_spv_len); - NMTOOLS_TESTING_DECLARE_NS(index,shape_transpose,case5); + NMTOOLS_TESTING_USE_CASE(index,shape_transpose,case5); tester.test(opencl::default_context(),expect::result,args::shape_a,args::axes_a); } @@ -59,7 +59,7 @@ TEST_CASE("shape_transpose(case3)" * doctest::test_suite("index::shape_transpose { auto tester = testing::OpenCLTester(shape_transpose_kernel_name,nm_cl_test_transpose_spv,nm_cl_test_transpose_spv_len); - NMTOOLS_TESTING_DECLARE_NS(index,shape_transpose,case6); + NMTOOLS_TESTING_USE_CASE(index,shape_transpose,case6); tester.test(opencl::default_context(),expect::result,args::shape_a,args::axes_a); } @@ -67,7 +67,7 @@ TEST_CASE("shape_transpose(case4)" * doctest::test_suite("index::shape_transpose { auto tester = testing::OpenCLTester(shape_transpose_kernel_name,nm_cl_test_transpose_spv,nm_cl_test_transpose_spv_len); - NMTOOLS_TESTING_DECLARE_NS(index,shape_transpose,case7); + NMTOOLS_TESTING_USE_CASE(index,shape_transpose,case7); tester.test(opencl::default_context(),expect::result,args::shape_a,args::axes_a); } @@ -75,7 +75,7 @@ TEST_CASE("shape_transpose(case5)" * doctest::test_suite("index::shape_transpose { auto tester = testing::OpenCLTester(shape_transpose_kernel_name,nm_cl_test_transpose_spv,nm_cl_test_transpose_spv_len); - NMTOOLS_TESTING_DECLARE_NS(index,shape_transpose,case8); + NMTOOLS_TESTING_USE_CASE(index,shape_transpose,case8); tester.test(opencl::default_context(),expect::result,args::shape_a,args::axes_a); } diff --git a/tests/platformio/arduino/constexpr/test/test_main.cpp b/tests/platformio/arduino/constexpr/test/test_main.cpp index 8cafbddfb..3e9c3e911 100644 --- a/tests/platformio/arduino/constexpr/test/test_main.cpp +++ b/tests/platformio/arduino/constexpr/test/test_main.cpp @@ -32,13 +32,13 @@ using nmtools::array::moveaxis; NM_TEST_SUBCASE(constexpr_atleast_1d, case1) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_atleast_1d, case1); + NMTOOLS_TESTING_USE_CASE( array, constexpr_atleast_1d, case1); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, atleast_1d, a ); } NM_TEST_SUBCASE(constexpr_atleast_1d, case2) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_atleast_1d, case2); + NMTOOLS_TESTING_USE_CASE( array, constexpr_atleast_1d, case2); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR @@ -58,7 +58,7 @@ NM_TEST_SUBCASE(constexpr_atleast_1d, case2) NM_TEST_SUBCASE(constexpr_atleast_1d, case3) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_atleast_1d, case3); + NMTOOLS_TESTING_USE_CASE( array, constexpr_atleast_1d, case3); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR NMTOOLS_PIO_CONSTEXPR_SUBCASE( case3, result, atleast_1d, a ); @@ -77,7 +77,7 @@ NM_TEST_SUBCASE(constexpr_atleast_1d, case3) NM_TEST_SUBCASE(constexpr_atleast_1d, case4) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_atleast_1d, case4); + NMTOOLS_TESTING_USE_CASE( array, constexpr_atleast_1d, case4); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, result, atleast_1d, a ); @@ -98,13 +98,13 @@ NM_TEST_SUBCASE(constexpr_atleast_1d, case4) NM_TEST_SUBCASE(constexpr_atleast_2d, case1) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_atleast_2d, case1); + NMTOOLS_TESTING_USE_CASE( array, constexpr_atleast_2d, case1); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, atleast_2d, a ); } NM_TEST_SUBCASE(constexpr_atleast_2d, case2) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_atleast_2d, case2); + NMTOOLS_TESTING_USE_CASE( array, constexpr_atleast_2d, case2); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, result, atleast_2d, a ); @@ -123,7 +123,7 @@ NM_TEST_SUBCASE(constexpr_atleast_2d, case2) NM_TEST_SUBCASE(constexpr_atleast_2d, case3) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_atleast_2d, case3); + NMTOOLS_TESTING_USE_CASE( array, constexpr_atleast_2d, case3); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR NMTOOLS_PIO_CONSTEXPR_SUBCASE( case3, result, atleast_2d, a ); @@ -142,7 +142,7 @@ NM_TEST_SUBCASE(constexpr_atleast_2d, case3) NM_TEST_SUBCASE(constexpr_atleast_2d, case4) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_atleast_2d, case4); + NMTOOLS_TESTING_USE_CASE( array, constexpr_atleast_2d, case4); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, result, atleast_2d, a ); @@ -163,13 +163,13 @@ NM_TEST_SUBCASE(constexpr_atleast_2d, case4) NM_TEST_SUBCASE(constexpr_atleast_3d, case1) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_atleast_3d, case1); + NMTOOLS_TESTING_USE_CASE( array, constexpr_atleast_3d, case1); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, atleast_3d, a ); } NM_TEST_SUBCASE(constexpr_atleast_3d, case2) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_atleast_3d, case2); + NMTOOLS_TESTING_USE_CASE( array, constexpr_atleast_3d, case2); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR @@ -191,7 +191,7 @@ NM_TEST_SUBCASE(constexpr_atleast_3d, case2) NM_TEST_SUBCASE(constexpr_atleast_3d, case3) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_atleast_3d, case3); + NMTOOLS_TESTING_USE_CASE( array, constexpr_atleast_3d, case3); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR @@ -211,7 +211,7 @@ NM_TEST_SUBCASE(constexpr_atleast_3d, case3) NM_TEST_SUBCASE(constexpr_atleast_3d, case4) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_atleast_3d, case4); + NMTOOLS_TESTING_USE_CASE( array, constexpr_atleast_3d, case4); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR @@ -231,7 +231,7 @@ NM_TEST_SUBCASE(constexpr_atleast_3d, case4) NM_TEST_SUBCASE(constexpr_atleast_3d, case5) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_atleast_3d, case5); + NMTOOLS_TESTING_USE_CASE( array, constexpr_atleast_3d, case5); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR @@ -254,7 +254,7 @@ NM_TEST_SUBCASE(constexpr_atleast_3d, case5) NM_TEST_SUBCASE(constexpr_transpose, case1) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case1); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case1); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, expected, transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, expected, transpose, array_a, axes_a ); @@ -271,7 +271,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case1) NM_TEST_SUBCASE(constexpr_transpose, case2) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case2); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case2); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, expected, transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, expected, transpose, array_a, axes_a ); @@ -288,7 +288,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case2) NM_TEST_SUBCASE(constexpr_transpose, case3) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case3); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case3); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case3, expected, transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case3, expected, transpose, array_a, axes_a ); @@ -305,7 +305,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case3) NM_TEST_SUBCASE(constexpr_transpose, case4) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case4); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case4); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, expected, transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, expected, transpose, array_a, axes_a ); @@ -322,7 +322,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case4) NM_TEST_SUBCASE(constexpr_transpose, case5) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case5); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case5); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case5, expected, transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case5, expected, transpose, array_a, axes_a ); @@ -339,7 +339,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case5) NM_TEST_SUBCASE(constexpr_transpose, case6) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case6); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case6); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case6, expected, transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case6, expected, transpose, array_a, axes_a ); @@ -356,7 +356,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case6) NM_TEST_SUBCASE(constexpr_transpose, case7) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case7); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case7); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case7, expected, transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case7, expected, transpose, array_a, axes_a ); @@ -373,7 +373,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case7) NM_TEST_SUBCASE(constexpr_transpose, case8) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case8); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case8); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case8, expected, transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case8, expected, transpose, array_a, axes_a ); @@ -390,7 +390,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case8) NM_TEST_SUBCASE(constexpr_transpose, case9) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case9); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case9); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case9, expected, transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case9, expected, transpose, array_a, axes_a ); @@ -407,7 +407,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case9) NM_TEST_SUBCASE(constexpr_transpose, case10) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case10); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case10); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case10, expected, transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case10, expected, transpose, array_a, axes_a ); @@ -426,7 +426,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case10) NM_TEST_SUBCASE(constexpr_moveaxis, case1) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_moveaxis, case1); + NMTOOLS_TESTING_USE_CASE( array, constexpr_moveaxis, case1); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR @@ -447,7 +447,7 @@ NM_TEST_SUBCASE(constexpr_moveaxis, case1) NM_TEST_SUBCASE(constexpr_moveaxis, case2) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_moveaxis, case2); + NMTOOLS_TESTING_USE_CASE( array, constexpr_moveaxis, case2); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR @@ -469,7 +469,7 @@ NM_TEST_SUBCASE(constexpr_moveaxis, case2) NM_TEST_SUBCASE(constexpr_moveaxis, case3) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_moveaxis, case3); + NMTOOLS_TESTING_USE_CASE( array, constexpr_moveaxis, case3); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR @@ -491,7 +491,7 @@ NM_TEST_SUBCASE(constexpr_moveaxis, case3) NM_TEST_SUBCASE(constexpr_moveaxis, case4) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_moveaxis, case4); + NMTOOLS_TESTING_USE_CASE( array, constexpr_moveaxis, case4); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR @@ -513,7 +513,7 @@ NM_TEST_SUBCASE(constexpr_moveaxis, case4) NM_TEST_SUBCASE(constexpr_moveaxis, case5) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_moveaxis, case5); + NMTOOLS_TESTING_USE_CASE( array, constexpr_moveaxis, case5); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR @@ -535,7 +535,7 @@ NM_TEST_SUBCASE(constexpr_moveaxis, case5) NM_TEST_SUBCASE(constexpr_moveaxis, case6) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_moveaxis, case6); + NMTOOLS_TESTING_USE_CASE( array, constexpr_moveaxis, case6); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR @@ -557,7 +557,7 @@ NM_TEST_SUBCASE(constexpr_moveaxis, case6) NM_TEST_SUBCASE(constexpr_moveaxis, case7) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_moveaxis, case7); + NMTOOLS_TESTING_USE_CASE( array, constexpr_moveaxis, case7); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR @@ -579,7 +579,7 @@ NM_TEST_SUBCASE(constexpr_moveaxis, case7) NM_TEST_SUBCASE(constexpr_moveaxis, case8) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_moveaxis, case8); + NMTOOLS_TESTING_USE_CASE( array, constexpr_moveaxis, case8); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR @@ -601,7 +601,7 @@ NM_TEST_SUBCASE(constexpr_moveaxis, case8) NM_TEST_SUBCASE(constexpr_moveaxis, case9) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_moveaxis, case9); + NMTOOLS_TESTING_USE_CASE( array, constexpr_moveaxis, case9); // temporarily skip this on avr: error: non-type template parameters of class type #ifndef ARDUINO_ARCH_AVR diff --git a/tests/platformio/arduino/manip/test/test_main.cpp b/tests/platformio/arduino/manip/test/test_main.cpp index c810b66b6..ec16bc4d0 100644 --- a/tests/platformio/arduino/manip/test/test_main.cpp +++ b/tests/platformio/arduino/manip/test/test_main.cpp @@ -72,35 +72,35 @@ RUN_TEST(test_##test_name##_##case_name); NM_TEST_SUBCASE(transpose, case1) { - NMTOOLS_TESTING_DECLARE_NS( transpose, case1 ); + NMTOOLS_TESTING_USE_CASE( transpose, case1 ); NMTOOLS_PIO_SUBCASE( case1, expected, view::transpose, array_a, axes_a ); NMTOOLS_PIO_SUBCASE( case1, expected, view::transpose, array, axes_a ); } NM_TEST_SUBCASE(transpose, case2) { - NMTOOLS_TESTING_DECLARE_NS( transpose, case2 ); + NMTOOLS_TESTING_USE_CASE( transpose, case2 ); NMTOOLS_PIO_SUBCASE( case2, expected, view::transpose, array_a, axes_a ); NMTOOLS_PIO_SUBCASE( case2, expected, view::transpose, array, axes_a ); } NM_TEST_SUBCASE(transpose, case5) { - NMTOOLS_TESTING_DECLARE_NS( transpose, case5 ); + NMTOOLS_TESTING_USE_CASE( transpose, case5 ); NMTOOLS_PIO_SUBCASE( case5, expected, view::transpose, array_a, axes_a ); NMTOOLS_PIO_SUBCASE( case5, expected, view::transpose, array, axes ); } NM_TEST_SUBCASE(transpose, case8) { - NMTOOLS_TESTING_DECLARE_NS( transpose, case8 ); + NMTOOLS_TESTING_USE_CASE( transpose, case8 ); NMTOOLS_PIO_SUBCASE( case8, expected, view::transpose, array_a, axes_a ); NMTOOLS_PIO_SUBCASE( case8, expected, view::transpose, array, axes ); } NM_TEST_SUBCASE(transpose, case10) { - NMTOOLS_TESTING_DECLARE_NS( transpose, case10 ); + NMTOOLS_TESTING_USE_CASE( transpose, case10 ); NMTOOLS_PIO_SUBCASE( case10, expected, view::transpose, array_a, axes_a ); NMTOOLS_PIO_SUBCASE( case10, expected, view::transpose, array, axes ); // TODO: support fixed ndarray @@ -109,7 +109,7 @@ NM_TEST_SUBCASE(transpose, case10) NM_TEST_SUBCASE(constexpr_transpose, case1) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case1 ); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case1 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, expected, view::transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, expected, view::transpose, array_a, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, expected, view::transpose, array_f, axes_a ); @@ -124,7 +124,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case1) NM_TEST_SUBCASE(constexpr_transpose, case2) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case2 ); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case2 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, expected, view::transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, expected, view::transpose, array_a, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, expected, view::transpose, array_f, axes_a ); @@ -138,7 +138,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case2) NM_TEST_SUBCASE(constexpr_transpose, case5) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case5 ); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case5 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case5, expected, view::transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case5, expected, view::transpose, array_a, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case5, expected, view::transpose, array_f, axes_a ); @@ -152,7 +152,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case5) NM_TEST_SUBCASE(constexpr_transpose, case8) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case8 ); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case8 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case8, expected, view::transpose, array, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case8, expected, view::transpose, array_a, axes_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case8, expected, view::transpose, array_f, axes_a ); @@ -166,7 +166,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case8) NM_TEST_SUBCASE(constexpr_transpose, case10) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_transpose, case10 ); + NMTOOLS_TESTING_USE_CASE( constexpr_transpose, case10 ); // NOTE: the following view currently deduced as dynamic ndarray // TODO: deduce as hybrid ndarray // NMTOOLS_PIO_CONSTEXPR_SUBCASE( case10, expected, view::transpose, array_a, axes_a ); @@ -183,7 +183,7 @@ NM_TEST_SUBCASE(constexpr_transpose, case10) NM_TEST_SUBCASE(tile, case1) { - NMTOOLS_TESTING_DECLARE_NS( view, tile, case1 ); + NMTOOLS_TESTING_USE_CASE( view, tile, case1 ); NMTOOLS_PIO_SUBCASE( case1, result, view::tile, array, reps ); NMTOOLS_PIO_SUBCASE( case1, result, view::tile, array_a, reps_a ); // NMTOOLS_PIO_SUBCASE( case1, result, view::tile, array_f, reps_a ); @@ -202,7 +202,7 @@ NM_TEST_SUBCASE(tile, case1) NM_TEST_SUBCASE(tile, case3) { - NMTOOLS_TESTING_DECLARE_NS( view, tile, case3 ); + NMTOOLS_TESTING_USE_CASE( view, tile, case3 ); NMTOOLS_PIO_SUBCASE( case3, result, view::tile, array, reps ); NMTOOLS_PIO_SUBCASE( case3, result, view::tile, array_a, reps_a ); @@ -214,7 +214,7 @@ NM_TEST_SUBCASE(tile, case3) NM_TEST_SUBCASE(tile, case5) { - NMTOOLS_TESTING_DECLARE_NS( view, tile, case5 ); + NMTOOLS_TESTING_USE_CASE( view, tile, case5 ); NMTOOLS_PIO_SUBCASE( case5, result, view::tile, array, reps ); NMTOOLS_PIO_SUBCASE( case5, result, view::tile, array_a, reps_a ); @@ -226,28 +226,28 @@ NM_TEST_SUBCASE(tile, case5) NM_TEST_SUBCASE(constexpr_tile, case1) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_tile, case1 ); + NMTOOLS_TESTING_USE_CASE( array, constexpr_tile, case1 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::tile, array, reps ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::tile, array_a, reps_a ); } NM_TEST_SUBCASE(constexpr_tile, case3) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_tile, case3 ); + NMTOOLS_TESTING_USE_CASE( array, constexpr_tile, case3 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case3, result, view::tile, array, reps ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case3, result, view::tile, array_a, reps_a ); } NM_TEST_SUBCASE(constexpr_tile, case5) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_tile, case5 ); + NMTOOLS_TESTING_USE_CASE( array, constexpr_tile, case5 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case5, result, view::tile, array, reps ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case5, result, view::tile, array_a, reps_a ); } NM_TEST_SUBCASE(take, case1) { - NMTOOLS_TESTING_DECLARE_NS( view, take, case1 ); + NMTOOLS_TESTING_USE_CASE( view, take, case1 ); NMTOOLS_PIO_SUBCASE( case1, result, view::take, array, indices, axis ); NMTOOLS_PIO_SUBCASE( case1, result, view::take, array_a, indices_a, axis ); // NMTOOLS_PIO_SUBCASE( case1, result, view::take, array_f, indices_a, axis ); @@ -266,42 +266,42 @@ NM_TEST_SUBCASE(take, case1) NM_TEST_SUBCASE(take, case2) { - NMTOOLS_TESTING_DECLARE_NS( view, take, case2 ); + NMTOOLS_TESTING_USE_CASE( view, take, case2 ); NMTOOLS_PIO_SUBCASE( case2, result, view::take, array_a, indices_a, axis ); NMTOOLS_PIO_SUBCASE( case2, result, view::take, array, indices, axis ); } NM_TEST_SUBCASE(take, case5) { - NMTOOLS_TESTING_DECLARE_NS( view, take, case5 ); + NMTOOLS_TESTING_USE_CASE( view, take, case5 ); NMTOOLS_PIO_SUBCASE( case5, result, view::take, array_a, indices_a, axis ); NMTOOLS_PIO_SUBCASE( case5, result, view::take, array, indices, axis ); } NM_TEST_SUBCASE(constexpr_take, case1) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_take, case1 ); + NMTOOLS_TESTING_USE_CASE( array, constexpr_take, case1 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::take, array, indices, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::take, array_a, indices_a, axis ); } NM_TEST_SUBCASE(constexpr_take, case2) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_take, case2 ); + NMTOOLS_TESTING_USE_CASE( array, constexpr_take, case2 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, result, view::take, array_a, indices_a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, result, view::take, array, indices, axis ); } NM_TEST_SUBCASE(constexpr_take, case5) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_take, case5 ); + NMTOOLS_TESTING_USE_CASE( array, constexpr_take, case5 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case5, result, view::take, array_a, indices_a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case5, result, view::take, array, indices, axis ); } NM_TEST_SUBCASE(where, case1) { - NMTOOLS_TESTING_DECLARE_NS( view, where, case1 ); + NMTOOLS_TESTING_USE_CASE( view, where, case1 ); NMTOOLS_PIO_SUBCASE( case1, result, view::where, condition, x, y ); NMTOOLS_PIO_SUBCASE( case1, result, view::where, condition_a, x_a, y_a ); @@ -311,7 +311,7 @@ NM_TEST_SUBCASE(where, case1) NM_TEST_SUBCASE(where, case2) { - NMTOOLS_TESTING_DECLARE_NS( view, where, case2 ); + NMTOOLS_TESTING_USE_CASE( view, where, case2 ); NMTOOLS_PIO_SUBCASE( case2, result, view::where, condition_a, x_a, y_a ); NMTOOLS_PIO_SUBCASE( case2, result, view::where, condition_a, x, y ); @@ -321,7 +321,7 @@ NM_TEST_SUBCASE(where, case2) NM_TEST_SUBCASE(reshape, case1) { - NMTOOLS_TESTING_DECLARE_NS( reshape, case1 ); + NMTOOLS_TESTING_USE_CASE( reshape, case1 ); NMTOOLS_PIO_SUBCASE( case1, expected, view::reshape, array_a, newshape_a ); NMTOOLS_PIO_SUBCASE( case1, expected, view::reshape, array, newshape ); @@ -336,7 +336,7 @@ NM_TEST_SUBCASE(reshape, case1) NM_TEST_SUBCASE(constexpr_reshape, case1) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_reshape, case1 ); + NMTOOLS_TESTING_USE_CASE( constexpr_reshape, case1 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, expected, view::reshape, array_a, newshape_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, expected, view::reshape, array, newshape ); @@ -351,7 +351,7 @@ NM_TEST_SUBCASE(constexpr_reshape, case1) NM_TEST_SUBCASE(flatten, case4) { - NMTOOLS_TESTING_DECLARE_NS( flatten, case4 ); + NMTOOLS_TESTING_USE_CASE( flatten, case4 ); NMTOOLS_PIO_SUBCASE( case4, expected, view::flatten, array_a ); NMTOOLS_PIO_SUBCASE( case4, expected, view::flatten, array ); @@ -361,7 +361,7 @@ NM_TEST_SUBCASE(flatten, case4) NM_TEST_SUBCASE(constexpr_flatten, case4) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_flatten, case4 ); + NMTOOLS_TESTING_USE_CASE( constexpr_flatten, case4 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, expected, view::flatten, array_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, expected, view::flatten, array ); @@ -371,7 +371,7 @@ NM_TEST_SUBCASE(constexpr_flatten, case4) NM_TEST_SUBCASE(concatenate, case3) { - NMTOOLS_TESTING_DECLARE_NS( view, concatenate, case3 ); + NMTOOLS_TESTING_USE_CASE( view, concatenate, case3 ); NMTOOLS_PIO_SUBCASE( case3, expected, view::concatenate, lhs_a, rhs_a, axis ); NMTOOLS_PIO_SUBCASE( case3, expected, view::concatenate, lhs, rhs, axis ); @@ -381,7 +381,7 @@ NM_TEST_SUBCASE(concatenate, case3) NM_TEST_SUBCASE(concatenate, case4) { - NMTOOLS_TESTING_DECLARE_NS( view, concatenate, case4 ); + NMTOOLS_TESTING_USE_CASE( view, concatenate, case4 ); NMTOOLS_PIO_SUBCASE( case4, expected, view::concatenate, lhs_a, rhs_a, axis ); NMTOOLS_PIO_SUBCASE( case4, expected, view::concatenate, lhs, rhs, axis ); @@ -396,7 +396,7 @@ NM_TEST_SUBCASE(concatenate, case4) NM_TEST_SUBCASE(constexpr_concatenate, case3) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_concatenate, case3 ); + NMTOOLS_TESTING_USE_CASE( array, constexpr_concatenate, case3 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case3, expected, view::concatenate, lhs_a, rhs_a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case3, expected, view::concatenate, lhs, rhs, axis ); @@ -406,7 +406,7 @@ NM_TEST_SUBCASE(constexpr_concatenate, case3) NM_TEST_SUBCASE(constexpr_concatenate, case4) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_concatenate, case4 ); + NMTOOLS_TESTING_USE_CASE( array, constexpr_concatenate, case4 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, expected, view::concatenate, lhs_a, rhs_a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, expected, view::concatenate, lhs, rhs, axis ); @@ -416,7 +416,7 @@ NM_TEST_SUBCASE(constexpr_concatenate, case4) NM_TEST_SUBCASE(broadcast_to, case1) { - NMTOOLS_TESTING_DECLARE_NS( broadcast_to, case1 ); + NMTOOLS_TESTING_USE_CASE( broadcast_to, case1 ); NMTOOLS_PIO_SUBCASE( case1, expected, view::broadcast_to, x_a, shape ); NMTOOLS_PIO_SUBCASE( case1, expected, view::broadcast_to, x, shape ); @@ -434,7 +434,7 @@ NM_TEST_SUBCASE(broadcast_to, case1) NM_TEST_SUBCASE(broadcast_to, case7) { - NMTOOLS_TESTING_DECLARE_NS( broadcast_to, case7 ); + NMTOOLS_TESTING_USE_CASE( broadcast_to, case7 ); NMTOOLS_PIO_SUBCASE( case7, expected, view::broadcast_to, x_a, shape ); NMTOOLS_PIO_SUBCASE( case7, expected, view::broadcast_to, x, shape ); @@ -449,14 +449,14 @@ NM_TEST_SUBCASE(broadcast_to, case7) NM_TEST_SUBCASE(broadcast_to, case10) { - NMTOOLS_TESTING_DECLARE_NS( broadcast_to, case10 ); + NMTOOLS_TESTING_USE_CASE( broadcast_to, case10 ); NMTOOLS_PIO_SUBCASE( case10, expected, view::broadcast_to, x, shape ); // NMTOOLS_PIO_SUBCASE( case10, expected, na::broadcast_to, x, shape_ct ); } NM_TEST_SUBCASE(constexpr_broadcast_to, case1) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_broadcast_to, case1 ); + NMTOOLS_TESTING_USE_CASE( constexpr_broadcast_to, case1 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, expected, view::broadcast_to, x_a, shape ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, expected, view::broadcast_to, x, shape ); @@ -465,7 +465,7 @@ NM_TEST_SUBCASE(constexpr_broadcast_to, case1) NM_TEST_SUBCASE(constexpr_broadcast_to, case7) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_broadcast_to, case7 ); + NMTOOLS_TESTING_USE_CASE( constexpr_broadcast_to, case7 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case7, expected, view::broadcast_to, x_a, shape ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case7, expected, view::broadcast_to, x, shape ); @@ -474,20 +474,20 @@ NM_TEST_SUBCASE(constexpr_broadcast_to, case7) NM_TEST_SUBCASE(constexpr_broadcast_to, case10) { - NMTOOLS_TESTING_DECLARE_NS( constexpr_broadcast_to, case10 ); + NMTOOLS_TESTING_USE_CASE( constexpr_broadcast_to, case10 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case10, expected, view::broadcast_to, x, shape ); } // list not supported yet on arduino // NM_TEST_SUBCASE(split, case1) // { -// NMTOOLS_TESTING_DECLARE_NS( array, split, case1 ); +// NMTOOLS_TESTING_USE_CASE( array, split, case1 ); // NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case1, result, view::split, a, indices_or_sections, axis ); // } NM_TEST_SUBCASE(split, case2) { - NMTOOLS_TESTING_DECLARE_NS( array, split, case2 ); + NMTOOLS_TESTING_USE_CASE( array, split, case2 ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case2, result, view::split, a, indices_or_sections, axis ); // NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case2, result, view::split, a_f, indices_or_sections, axis ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case2, result, view::split, a_a, indices_or_sections, axis ); @@ -495,7 +495,7 @@ NM_TEST_SUBCASE(split, case2) NM_TEST_SUBCASE(split, case3) { - NMTOOLS_TESTING_DECLARE_NS( array, split, case3 ); + NMTOOLS_TESTING_USE_CASE( array, split, case3 ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case3, result, view::split, a, indices_or_sections, axis ); // NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case3, result, view::split, a_f, indices_or_sections, axis ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case3, result, view::split, a_a, indices_or_sections, axis ); @@ -503,21 +503,21 @@ NM_TEST_SUBCASE(split, case3) NM_TEST_SUBCASE(split, case4) { - NMTOOLS_TESTING_DECLARE_NS( array, split, case4 ); + NMTOOLS_TESTING_USE_CASE( array, split, case4 ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case4, result, view::split, a, indices_or_sections, axis ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case4, result, view::split, a_a, indices_or_sections, axis ); } NM_TEST_SUBCASE(split, case5) { - NMTOOLS_TESTING_DECLARE_NS( array, split, case5 ); + NMTOOLS_TESTING_USE_CASE( array, split, case5 ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case5, result, view::split, a, indices_or_sections, axis ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case5, result, view::split, a_a, indices_or_sections, axis ); } NM_TEST_SUBCASE(split, case6) { - NMTOOLS_TESTING_DECLARE_NS( array, split, case6 ); + NMTOOLS_TESTING_USE_CASE( array, split, case6 ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case6, result, view::split, a, indices_or_sections, axis ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case6, result, view::split, a_a, indices_or_sections, axis ); } @@ -525,20 +525,20 @@ NM_TEST_SUBCASE(split, case6) // list not supported on arduino yet // NM_TEST_SUBCASE(split, case7) // { -// NMTOOLS_TESTING_DECLARE_NS( array, split, case7 ); +// NMTOOLS_TESTING_USE_CASE( array, split, case7 ); // NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case7, result, view::split, a, indices_or_sections, axis ); // } NM_TEST_SUBCASE(split, case12) { - NMTOOLS_TESTING_DECLARE_NS( array, split, case12 ); + NMTOOLS_TESTING_USE_CASE( array, split, case12 ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case12, result, view::split, a, indices_or_sections, axis ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case12, result, view::split, a_a, indices_or_sections, axis ); } NM_TEST_SUBCASE(split, case13) { - NMTOOLS_TESTING_DECLARE_NS( array, split, case13 ); + NMTOOLS_TESTING_USE_CASE( array, split, case13 ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case13, result, view::split, a, indices_or_sections, axis ); NMTOOLS_PIO_SUBCASE_APPLY_ISEQUAL( case13, result, view::split, a_a, indices_or_sections, axis ); } @@ -551,157 +551,157 @@ NM_TEST_SUBCASE(split, case13) #ifndef NMTOOLS_TESTING_MINIMIZE_FOOTPRINT NM_TEST_SUBCASE(transpose, case3) { - NMTOOLS_TESTING_DECLARE_NS( transpose, case3 ); + NMTOOLS_TESTING_USE_CASE( transpose, case3 ); NMTOOLS_PIO_SUBCASE( case3, expected, view::transpose, array_a, axes_a ); } NM_TEST_SUBCASE(transpose, case4) { - NMTOOLS_TESTING_DECLARE_NS( transpose, case4 ); + NMTOOLS_TESTING_USE_CASE( transpose, case4 ); NMTOOLS_PIO_SUBCASE( case4, expected, view::transpose, array_a, axes_a ); } NM_TEST_SUBCASE(transpose, case6) { - NMTOOLS_TESTING_DECLARE_NS( transpose, case6 ); + NMTOOLS_TESTING_USE_CASE( transpose, case6 ); NMTOOLS_PIO_SUBCASE( case6, expected, view::transpose, array_a, axes_a ); } NM_TEST_SUBCASE(transpose, case7) { - NMTOOLS_TESTING_DECLARE_NS( transpose, case7 ); + NMTOOLS_TESTING_USE_CASE( transpose, case7 ); NMTOOLS_PIO_SUBCASE( case7, expected, view::transpose, array_a, axes_a ); } NM_TEST_SUBCASE(transpose, case9) { - NMTOOLS_TESTING_DECLARE_NS( transpose, case9 ); + NMTOOLS_TESTING_USE_CASE( transpose, case9 ); NMTOOLS_PIO_SUBCASE( case9, expected, view::transpose, array_a, axes_a ); } NM_TEST_SUBCASE(tile, case2) { - NMTOOLS_TESTING_DECLARE_NS( view, tile, case2 ); + NMTOOLS_TESTING_USE_CASE( view, tile, case2 ); NMTOOLS_PIO_SUBCASE( case2, result, view::tile, array_a, reps_a ); } NM_TEST_SUBCASE(tile, case4) { - NMTOOLS_TESTING_DECLARE_NS( view, tile, case4 ); + NMTOOLS_TESTING_USE_CASE( view, tile, case4 ); NMTOOLS_PIO_SUBCASE( case4, result, view::tile, array_a, reps_a ); } NM_TEST_SUBCASE(take, case3) { - NMTOOLS_TESTING_DECLARE_NS( view, take, case3 ); + NMTOOLS_TESTING_USE_CASE( view, take, case3 ); NMTOOLS_PIO_SUBCASE( case3, result, view::take, array_a, indices_a, axis ); } NM_TEST_SUBCASE(take, case4) { - NMTOOLS_TESTING_DECLARE_NS( view, take, case4 ); + NMTOOLS_TESTING_USE_CASE( view, take, case4 ); NMTOOLS_PIO_SUBCASE( case4, result, view::take, array_a, indices_a, axis ); } NM_TEST_SUBCASE(take, case6) { - NMTOOLS_TESTING_DECLARE_NS( view, take, case6 ); + NMTOOLS_TESTING_USE_CASE( view, take, case6 ); NMTOOLS_PIO_SUBCASE( case6, result, view::take, array_a, indices_a, axis ); } NM_TEST_SUBCASE(where, case3) { - NMTOOLS_TESTING_DECLARE_NS( view, where, case3 ); + NMTOOLS_TESTING_USE_CASE( view, where, case3 ); NMTOOLS_PIO_SUBCASE( case3, result, view::where, condition_a, x_a, y_a ); } NM_TEST_SUBCASE(reshape, case2) { - NMTOOLS_TESTING_DECLARE_NS( reshape, case2 ); + NMTOOLS_TESTING_USE_CASE( reshape, case2 ); NMTOOLS_PIO_SUBCASE( case2, expected, view::reshape, array_a, newshape_a ); } NM_TEST_SUBCASE(reshape, case3) { - NMTOOLS_TESTING_DECLARE_NS( reshape, case3 ); + NMTOOLS_TESTING_USE_CASE( reshape, case3 ); NMTOOLS_PIO_SUBCASE( case3, expected, view::reshape, array_a, newshape_a ); } NM_TEST_SUBCASE(flatten, case1) { - NMTOOLS_TESTING_DECLARE_NS( flatten, case1 ); + NMTOOLS_TESTING_USE_CASE( flatten, case1 ); NMTOOLS_PIO_SUBCASE( case1, expected, view::flatten, array_a ); } NM_TEST_SUBCASE(flatten, case2) { - NMTOOLS_TESTING_DECLARE_NS( flatten, case2 ); + NMTOOLS_TESTING_USE_CASE( flatten, case2 ); NMTOOLS_PIO_SUBCASE( case2, expected, view::flatten, array_a ); } NM_TEST_SUBCASE(flatten, case3) { - NMTOOLS_TESTING_DECLARE_NS( flatten, case3 ); + NMTOOLS_TESTING_USE_CASE( flatten, case3 ); NMTOOLS_PIO_SUBCASE( case3, expected, view::flatten, array_a ); } NM_TEST_SUBCASE(concatenate, case1) { - NMTOOLS_TESTING_DECLARE_NS( view, concatenate, case1 ); + NMTOOLS_TESTING_USE_CASE( view, concatenate, case1 ); NMTOOLS_PIO_SUBCASE( case1, expected, view::concatenate, lhs_a, rhs_a, axis ); } NM_TEST_SUBCASE(concatenate, case2) { - NMTOOLS_TESTING_DECLARE_NS( view, concatenate, case2 ); + NMTOOLS_TESTING_USE_CASE( view, concatenate, case2 ); NMTOOLS_PIO_SUBCASE( case2, expected, view::concatenate, lhs_a, rhs_a, axis ); } NM_TEST_SUBCASE(broadcast_to, case2) { - NMTOOLS_TESTING_DECLARE_NS( broadcast_to, case2 ); + NMTOOLS_TESTING_USE_CASE( broadcast_to, case2 ); NMTOOLS_PIO_SUBCASE( case2, expected, view::broadcast_to, x_a, shape ); } NM_TEST_SUBCASE(broadcast_to, case3) { - NMTOOLS_TESTING_DECLARE_NS( broadcast_to, case3 ); + NMTOOLS_TESTING_USE_CASE( broadcast_to, case3 ); NMTOOLS_PIO_SUBCASE( case3, expected, view::broadcast_to, x_a, shape ); } NM_TEST_SUBCASE(broadcast_to, case4) { - NMTOOLS_TESTING_DECLARE_NS( broadcast_to, case4 ); + NMTOOLS_TESTING_USE_CASE( broadcast_to, case4 ); NMTOOLS_PIO_SUBCASE( case4, expected, view::broadcast_to, x_a, shape ); } NM_TEST_SUBCASE(broadcast_to, case5) { - NMTOOLS_TESTING_DECLARE_NS( broadcast_to, case5 ); + NMTOOLS_TESTING_USE_CASE( broadcast_to, case5 ); NMTOOLS_PIO_SUBCASE( case5, expected, view::broadcast_to, x_a, shape ); } NM_TEST_SUBCASE(broadcast_to, case6) { - NMTOOLS_TESTING_DECLARE_NS( broadcast_to, case6 ); + NMTOOLS_TESTING_USE_CASE( broadcast_to, case6 ); NMTOOLS_PIO_SUBCASE( case6, expected, view::broadcast_to, x_a, shape ); } NM_TEST_SUBCASE(broadcast_to, case8) { - NMTOOLS_TESTING_DECLARE_NS( broadcast_to, case8 ); + NMTOOLS_TESTING_USE_CASE( broadcast_to, case8 ); NMTOOLS_PIO_SUBCASE( case8, expected, view::broadcast_to, x_a, shape ); } NM_TEST_SUBCASE(broadcast_to, case9) { - NMTOOLS_TESTING_DECLARE_NS( broadcast_to, case9 ); + NMTOOLS_TESTING_USE_CASE( broadcast_to, case9 ); NMTOOLS_PIO_SUBCASE( case9, expected, view::broadcast_to, x_a, shape ); } NM_TEST_SUBCASE(broadcast_to, case11) { - NMTOOLS_TESTING_DECLARE_NS( broadcast_to, case11 ); + NMTOOLS_TESTING_USE_CASE( broadcast_to, case11 ); NMTOOLS_PIO_SUBCASE( case11, expected, view::broadcast_to, x, shape ); } #endif // NMTOOLS_TESTING_MINIMIZE_FOOTPRINT diff --git a/tests/platformio/arduino/ufuncs/test/test_main.cpp b/tests/platformio/arduino/ufuncs/test/test_main.cpp index de54a277d..afead420e 100644 --- a/tests/platformio/arduino/ufuncs/test/test_main.cpp +++ b/tests/platformio/arduino/ufuncs/test/test_main.cpp @@ -51,7 +51,7 @@ RUN_TEST(test_##test_name##_##case_name); NM_TEST_SUBCASE(add, case1) { - NMTOOLS_TESTING_DECLARE_NS( view, add, case1 ); + NMTOOLS_TESTING_USE_CASE( view, add, case1 ); // NOTE: somehow broken on arduino uno (atmega328p) simavr (not confirmed on HW yet) // but ok on arduino mega (atmega2560) simavr, may be related to limited memory or smth NMTOOLS_PIO_SUBCASE( case1, result, view::add, a_a, b_a ); @@ -62,7 +62,7 @@ NM_TEST_SUBCASE(add, case1) NM_TEST_SUBCASE(constexpr_add, case1) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_add, case1); + NMTOOLS_TESTING_USE_CASE( array, constexpr_add, case1); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::add, a, b ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::add, a_a, b_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::add, a_f, b_f ); @@ -78,7 +78,7 @@ NM_TEST_SUBCASE(constexpr_add, case1) NM_TEST_SUBCASE(constexpr_add, case2) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_add, case2); + NMTOOLS_TESTING_USE_CASE( array, constexpr_add, case2); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, result, view::add, a, b ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, result, view::add, a_a, b ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, result, view::add, a_f, b ); @@ -91,7 +91,7 @@ NM_TEST_SUBCASE(constexpr_add, case2) NM_TEST_SUBCASE(constexpr_add, case3) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_add, case3); + NMTOOLS_TESTING_USE_CASE( array, constexpr_add, case3); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case3, result, view::add, a, b ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case3, result, na::add, a, b ); @@ -99,7 +99,7 @@ NM_TEST_SUBCASE(constexpr_add, case3) NM_TEST_SUBCASE(constexpr_add, case4) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_add, case4); + NMTOOLS_TESTING_USE_CASE( array, constexpr_add, case4); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, result, view::add, a, b ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, result, view::add, a_a, b ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, result, view::add, a_f, b ); @@ -112,7 +112,7 @@ NM_TEST_SUBCASE(constexpr_add, case4) NM_TEST_SUBCASE(relu, case1) { - NMTOOLS_TESTING_DECLARE_NS( activations, relu, case1 ); + NMTOOLS_TESTING_USE_CASE( activations, relu, case1 ); NMTOOLS_PIO_SUBCASE( case1, result, view::relu, a_a ); NMTOOLS_PIO_SUBCASE( case1, result, na::relu, a_a ); @@ -123,7 +123,7 @@ NM_TEST_SUBCASE(relu, case1) #if 0 NM_TEST_SUBCASE(reduce_add, case1) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case1); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case1); NMTOOLS_PIO_SUBCASE( case1, result, view::reduce_add, a_a, axis ); NMTOOLS_PIO_SUBCASE( case1, result, view::reduce_add, a, axis ); NMTOOLS_PIO_SUBCASE( case1, result, na::add.reduce, a_a, axis ); @@ -132,7 +132,7 @@ NM_TEST_SUBCASE(reduce_add, case1) NM_TEST_SUBCASE(constexpr_reduce_add, case1) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_reduce_add, case1); + NMTOOLS_TESTING_USE_CASE( array, constexpr_reduce_add, case1); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::reduce_add, a_a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::reduce_add, a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, na::add.reduce, a_a, axis ); @@ -141,7 +141,7 @@ NM_TEST_SUBCASE(constexpr_reduce_add, case1) NM_TEST_SUBCASE(constexpr_reduce_add, case4) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_reduce_add, case4); + NMTOOLS_TESTING_USE_CASE( array, constexpr_reduce_add, case4); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, result, view::reduce_add, a_a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, result, view::reduce_add, a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case4, result, na::add.reduce, a_a, axis ); @@ -150,7 +150,7 @@ NM_TEST_SUBCASE(constexpr_reduce_add, case4) NM_TEST_SUBCASE(constexpr_reduce_add, case9) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_reduce_add, case9); + NMTOOLS_TESTING_USE_CASE( array, constexpr_reduce_add, case9); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case9, result, view::reduce_add, a_a, axis, dtype, initial, keepdims ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case9, result, view::reduce_add, a, axis, dtype, initial, keepdims ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case9, result, na::add.reduce, a_a, axis, dtype, initial, keepdims ); @@ -159,7 +159,7 @@ NM_TEST_SUBCASE(constexpr_reduce_add, case9) NM_TEST_SUBCASE(constexpr_reduce_add, case14) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_reduce_add, case14); + NMTOOLS_TESTING_USE_CASE( array, constexpr_reduce_add, case14); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case14, result, view::reduce_add, a_a, axis, dtype, initial, keepdims ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case14, result, view::reduce_add, a, axis, dtype, initial, keepdims ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case14, result, na::add.reduce, a_a, axis, dtype, initial, keepdims ); @@ -170,7 +170,7 @@ NM_TEST_SUBCASE(constexpr_reduce_add, case14) NM_TEST_SUBCASE(accumulate_add, case1) { - NMTOOLS_TESTING_DECLARE_NS( view, accumulate_add, case1 ); + NMTOOLS_TESTING_USE_CASE( view, accumulate_add, case1 ); NMTOOLS_PIO_SUBCASE( case1, result, view::accumulate_add, a_a, axis ); NMTOOLS_PIO_SUBCASE( case1, result, view::accumulate_add, a, axis ); NMTOOLS_PIO_SUBCASE( case1, result, na::add.accumulate, a_a, axis ); @@ -179,7 +179,7 @@ NM_TEST_SUBCASE(accumulate_add, case1) NM_TEST_SUBCASE(accumulate_add, case2) { - NMTOOLS_TESTING_DECLARE_NS( view, accumulate_add, case2 ); + NMTOOLS_TESTING_USE_CASE( view, accumulate_add, case2 ); NMTOOLS_PIO_SUBCASE( case2, result, view::accumulate_add, a_a, axis ); NMTOOLS_PIO_SUBCASE( case2, result, view::accumulate_add, a, axis ); NMTOOLS_PIO_SUBCASE( case2, result, na::add.accumulate, a_a, axis ); @@ -188,7 +188,7 @@ NM_TEST_SUBCASE(accumulate_add, case2) NM_TEST_SUBCASE(accumulate_add, case3) { - NMTOOLS_TESTING_DECLARE_NS( view, accumulate_add, case3 ); + NMTOOLS_TESTING_USE_CASE( view, accumulate_add, case3 ); NMTOOLS_PIO_SUBCASE( case3, result, view::accumulate_add, a_a, axis ); NMTOOLS_PIO_SUBCASE( case3, result, view::accumulate_add, a, axis ); NMTOOLS_PIO_SUBCASE( case3, result, na::add.accumulate, a_a, axis ); @@ -197,7 +197,7 @@ NM_TEST_SUBCASE(accumulate_add, case3) NM_TEST_SUBCASE(constexpr_accumulate_add, case1) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_accumulate_add, case1 ); + NMTOOLS_TESTING_USE_CASE( array, constexpr_accumulate_add, case1 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::accumulate_add, a_a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::accumulate_add, a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, na::add.accumulate, a_a, axis ); @@ -206,7 +206,7 @@ NM_TEST_SUBCASE(constexpr_accumulate_add, case1) NM_TEST_SUBCASE(constexpr_accumulate_add, case2) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_accumulate_add, case2 ); + NMTOOLS_TESTING_USE_CASE( array, constexpr_accumulate_add, case2 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, result, view::accumulate_add, a_a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, result, view::accumulate_add, a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case2, result, na::add.accumulate, a_a, axis ); @@ -215,7 +215,7 @@ NM_TEST_SUBCASE(constexpr_accumulate_add, case2) NM_TEST_SUBCASE(constexpr_accumulate_add, case3) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_accumulate_add, case3 ); + NMTOOLS_TESTING_USE_CASE( array, constexpr_accumulate_add, case3 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case3, result, view::accumulate_add, a_a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case3, result, view::accumulate_add, a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case3, result, na::add.accumulate, a_a, axis ); @@ -224,7 +224,7 @@ NM_TEST_SUBCASE(constexpr_accumulate_add, case3) NM_TEST_SUBCASE(outer_add, case1) { - NMTOOLS_TESTING_DECLARE_NS( view, outer_add, case1 ); + NMTOOLS_TESTING_USE_CASE( view, outer_add, case1 ); NMTOOLS_PIO_SUBCASE( case1, result, view::outer_add, a_a, b_a ); NMTOOLS_PIO_SUBCASE( case1, result, view::outer_add, a, b ); NMTOOLS_PIO_SUBCASE( case1, result, na::add.outer, a_a, b_a ); @@ -233,7 +233,7 @@ NM_TEST_SUBCASE(outer_add, case1) NM_TEST_SUBCASE(constexpr_outer_add, case1) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_outer_add, case1 ); + NMTOOLS_TESTING_USE_CASE( array, constexpr_outer_add, case1 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::outer_add, a_a, b_a ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::outer_add, a, b ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, na::add.outer, a_a, b_a ); @@ -242,7 +242,7 @@ NM_TEST_SUBCASE(constexpr_outer_add, case1) NM_TEST_SUBCASE(mean, case1) { - NMTOOLS_TESTING_DECLARE_NS( array, mean, case1 ); + NMTOOLS_TESTING_USE_CASE( array, mean, case1 ); NMTOOLS_PIO_SUBCASE( case1, result, view::mean, a_a, axis ); NMTOOLS_PIO_SUBCASE( case1, result, na::mean, a_a, axis ); NMTOOLS_PIO_SUBCASE( case1, result, view::mean, a, axis ); @@ -251,7 +251,7 @@ NM_TEST_SUBCASE(mean, case1) NM_TEST_SUBCASE(constexpr_mean, case1) { - NMTOOLS_TESTING_DECLARE_NS( array, constexpr_mean, case1 ); + NMTOOLS_TESTING_USE_CASE( array, constexpr_mean, case1 ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::mean, a_a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, view::mean, a, axis ); NMTOOLS_PIO_CONSTEXPR_SUBCASE( case1, result, na::mean, a_a, axis ); @@ -264,14 +264,14 @@ NM_TEST_SUBCASE(constexpr_mean, case1) NM_TEST_SUBCASE(add, case2) { - NMTOOLS_TESTING_DECLARE_NS( view, add, case2 ); + NMTOOLS_TESTING_USE_CASE( view, add, case2 ); NMTOOLS_PIO_SUBCASE( case2, result, view::add, a_a, b ); } #if 0 NM_TEST_SUBCASE(reduce_add, case4) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case4); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case4); NMTOOLS_PIO_SUBCASE( case4, result, view::reduce_add, a_a, axis_a ); NMTOOLS_PIO_SUBCASE( case4, result, view::reduce_add, a, axis ); // NOTE: need dynamic ndarray, currently disabled for platformio arduino @@ -282,7 +282,7 @@ NM_TEST_SUBCASE(reduce_add, case4) NM_TEST_SUBCASE(reduce_add, case9) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case9 ); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case9 ); NMTOOLS_PIO_SUBCASE( case9, result, view::reduce_add, a_a, axis, dtype, initial, keepdims ); NMTOOLS_PIO_SUBCASE( case9, result, view::reduce_add, a, axis, dtype, initial, keepdims ); // NOTE: need dynamic ndarray, currently disabled for platformio arduino @@ -293,7 +293,7 @@ NM_TEST_SUBCASE(reduce_add, case9) NM_TEST_SUBCASE(reduce_add, case14) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case14 ); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case14 ); NMTOOLS_PIO_SUBCASE( case14, result, view::reduce_add, a_a, axis, dtype, initial, keepdims ); NMTOOLS_PIO_SUBCASE( case14, result, view::reduce_add, a, axis, dtype, initial, keepdims ); // NOTE: need dynamic ndarray, currently disabled for platformio arduino @@ -304,7 +304,7 @@ NM_TEST_SUBCASE(reduce_add, case14) NM_TEST_SUBCASE(reduce_add, case15) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case15 ); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case15 ); NMTOOLS_PIO_SUBCASE( case15, result, view::reduce_add, a_a, axis ); NMTOOLS_PIO_SUBCASE( case15, result, view::reduce_add, a, axis ); // NOTE: need dynamic ndarray, currently disabled for platformio arduino @@ -315,121 +315,121 @@ NM_TEST_SUBCASE(reduce_add, case15) NM_TEST_SUBCASE(reduce_add, case2) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case2); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case2); NMTOOLS_PIO_SUBCASE( case2, result, view::reduce_add, a_a, axis ); } NM_TEST_SUBCASE(reduce_add, case3) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case3); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case3); NMTOOLS_PIO_SUBCASE( case3, result, view::reduce_add, a_a, axis ); } NM_TEST_SUBCASE(reduce_add, case5) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case5); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case5); NMTOOLS_PIO_SUBCASE( case5, result, view::reduce_add, a_a, axis_a ); } NM_TEST_SUBCASE(reduce_add, case6) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case6); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case6); NMTOOLS_PIO_SUBCASE( case6, result, view::reduce_add, a_a, axis_a ); } NM_TEST_SUBCASE(reduce_add, case7) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case7); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case7); NMTOOLS_PIO_SUBCASE( case7, result, view::reduce_add, a_a, axis, dtype ); } NM_TEST_SUBCASE(reduce_add, case8) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case8); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case8); NMTOOLS_PIO_SUBCASE( case8, result, view::reduce_add, a_a, axis, dtype, initial ); } NM_TEST_SUBCASE(reduce_add, case10) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case10); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case10); NMTOOLS_PIO_SUBCASE( case10, result, view::reduce_add, a_a, axis, dtype, initial, keepdims ); } NM_TEST_SUBCASE(reduce_add, case11) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case11); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case11); NMTOOLS_PIO_SUBCASE( case11, result, view::reduce_add, a_a, axis, dtype, initial, keepdims ); } NM_TEST_SUBCASE(reduce_add, case12) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case12); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case12); NMTOOLS_PIO_SUBCASE( case12, result, view::reduce_add, a_a, axis_a, dtype, initial, keepdims ); } NM_TEST_SUBCASE(reduce_add, case13) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case13); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case13); NMTOOLS_PIO_SUBCASE( case13, result, view::reduce_add, a_a, axis_a, dtype, initial, keepdims ); } NM_TEST_SUBCASE(reduce_add, case16) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case16); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case16); NMTOOLS_PIO_SUBCASE( case16, result, view::reduce_add, a_a, axis, nm::None, initial); } NM_TEST_SUBCASE(reduce_add, case17) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case17); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case17); NMTOOLS_PIO_SUBCASE( case17, result, view::reduce_add, a_a, axis, nm::None, initial, keepdims ); } NM_TEST_SUBCASE(reduce_add, case18) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case18); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case18); NMTOOLS_PIO_SUBCASE( case18, result, view::reduce_add, a_a, axis, nm::None, initial, keepdims ); } NM_TEST_SUBCASE(reduce_add, case19) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case19); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case19); NMTOOLS_PIO_SUBCASE( case19, result, view::reduce_add, a_a, axis, nm::None, initial, keepdims ); } NM_TEST_SUBCASE(reduce_add, case20) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case20); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case20); NMTOOLS_PIO_SUBCASE( case20, result, view::reduce_add, a_a, axis, nm::None, initial, keepdims ); } NM_TEST_SUBCASE(reduce_add, case21) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case21); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case21); NMTOOLS_PIO_SUBCASE( case21, result, view::reduce_add, a_a, axis, dtype ); } NM_TEST_SUBCASE(reduce_add, case22) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case22); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case22); NMTOOLS_PIO_SUBCASE( case22, result, view::reduce_add, a_a, axis, dtype ); } NM_TEST_SUBCASE(reduce_add, case23) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case23); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case23); NMTOOLS_PIO_SUBCASE( case23, result, view::reduce_add, a_a, axis, nm::None, nm::None, keepdims ); } NM_TEST_SUBCASE(reduce_add, case24) { - NMTOOLS_TESTING_DECLARE_NS( view, reduce_add, case24); + NMTOOLS_TESTING_USE_CASE( view, reduce_add, case24); NMTOOLS_PIO_SUBCASE( case24, result, view::reduce_add, a_a, axis, nm::None, nm::None, keepdims ); } NM_TEST_SUBCASE(mean, case2) { - NMTOOLS_TESTING_DECLARE_NS( array, mean, case2 ); + NMTOOLS_TESTING_USE_CASE( array, mean, case2 ); NMTOOLS_PIO_SUBCASE( case2, result, view::mean, a_a, axis ); NMTOOLS_PIO_SUBCASE( case2, result, view::mean, a, axis ); // NMTOOLS_PIO_SUBCASE( case2, result, na::mean, a_a, axis ); @@ -438,7 +438,7 @@ NM_TEST_SUBCASE(mean, case2) NM_TEST_SUBCASE(mean, case3) { - NMTOOLS_TESTING_DECLARE_NS( array, mean, case3 ); + NMTOOLS_TESTING_USE_CASE( array, mean, case3 ); NMTOOLS_PIO_SUBCASE( case3, result, view::mean, a_a, axis ); NMTOOLS_PIO_SUBCASE( case3, result, view::mean, a, axis ); // NMTOOLS_PIO_SUBCASE( case3, result, na::mean, a_a, axis ); @@ -447,7 +447,7 @@ NM_TEST_SUBCASE(mean, case3) NM_TEST_SUBCASE(mean, case4) { - NMTOOLS_TESTING_DECLARE_NS( array, mean, case4 ); + NMTOOLS_TESTING_USE_CASE( array, mean, case4 ); NMTOOLS_PIO_SUBCASE( case4, result, view::mean, a_a, axis ); NMTOOLS_PIO_SUBCASE( case4, result, view::mean, a, axis ); // NMTOOLS_PIO_SUBCASE( case4, result, na::mean, a_a, axis ); @@ -456,7 +456,7 @@ NM_TEST_SUBCASE(mean, case4) NM_TEST_SUBCASE(mean, case5) { - NMTOOLS_TESTING_DECLARE_NS( array, mean, case5 ); + NMTOOLS_TESTING_USE_CASE( array, mean, case5 ); NMTOOLS_PIO_SUBCASE( case4, result, view::mean, a_a, axis ); NMTOOLS_PIO_SUBCASE( case4, result, view::mean, a, axis ); // NMTOOLS_PIO_SUBCASE( case4, result, na::mean, a_a, axis ); @@ -465,7 +465,7 @@ NM_TEST_SUBCASE(mean, case5) NM_TEST_SUBCASE(mean, case6) { - NMTOOLS_TESTING_DECLARE_NS( array, mean, case6 ); + NMTOOLS_TESTING_USE_CASE( array, mean, case6 ); NMTOOLS_PIO_SUBCASE( case6, result, view::mean, a_a, axis, /*dtype=*/nm::None, keepdims ); NMTOOLS_PIO_SUBCASE( case6, result, view::mean, a, axis, /*dtype=*/nm::None, keepdims ); // NMTOOLS_PIO_SUBCASE( case6, result, na::mean, a_a, axis, /*dtype=*/nm::None, keepdims ); @@ -474,7 +474,7 @@ NM_TEST_SUBCASE(mean, case6) NM_TEST_SUBCASE(mean, case7) { - NMTOOLS_TESTING_DECLARE_NS( array, mean, case7 ); + NMTOOLS_TESTING_USE_CASE( array, mean, case7 ); NMTOOLS_PIO_SUBCASE( case7, result, view::mean, a_a, axis, /*dtype=*/nm::None, keepdims ); NMTOOLS_PIO_SUBCASE( case7, result, view::mean, a, axis, /*dtype=*/nm::None, keepdims ); // NMTOOLS_PIO_SUBCASE( case7, result, na::mean, a_a, axis, /*dtype=*/nm::None, keepdims ); @@ -483,7 +483,7 @@ NM_TEST_SUBCASE(mean, case7) NM_TEST_SUBCASE(mean, case8) { - NMTOOLS_TESTING_DECLARE_NS( array, mean, case8 ); + NMTOOLS_TESTING_USE_CASE( array, mean, case8 ); NMTOOLS_PIO_SUBCASE( case8, result, view::mean, a_a, axis, /*dtype=*/nm::None, keepdims ); NMTOOLS_PIO_SUBCASE( case8, result, view::mean, a, axis, /*dtype=*/nm::None, keepdims ); // NMTOOLS_PIO_SUBCASE( case8, result, na::mean, a_a, axis, /*dtype=*/nm::None, keepdims ); @@ -492,7 +492,7 @@ NM_TEST_SUBCASE(mean, case8) NM_TEST_SUBCASE(mean, case9) { - NMTOOLS_TESTING_DECLARE_NS( array, mean, case9 ); + NMTOOLS_TESTING_USE_CASE( array, mean, case9 ); NMTOOLS_PIO_SUBCASE( case9, result, view::mean, a_a, axis, /*dtype=*/nm::None, keepdims ); NMTOOLS_PIO_SUBCASE( case9, result, view::mean, a, axis, /*dtype=*/nm::None, keepdims ); // NMTOOLS_PIO_SUBCASE( case9, result, na::mean, a_a, axis, /*dtype=*/nm::None, keepdims ); @@ -501,7 +501,7 @@ NM_TEST_SUBCASE(mean, case9) NM_TEST_SUBCASE(mean, case10) { - NMTOOLS_TESTING_DECLARE_NS( array, mean, case10 ); + NMTOOLS_TESTING_USE_CASE( array, mean, case10 ); NMTOOLS_PIO_SUBCASE( case10, result, view::mean, a_a, axis, /*dtype=*/nm::None, keepdims ); NMTOOLS_PIO_SUBCASE( case10, result, view::mean, a, axis, /*dtype=*/nm::None, keepdims ); // NMTOOLS_PIO_SUBCASE( case10, result, na::mean, a_a, axis, /*dtype=*/nm::None, keepdims ); diff --git a/tests/platformio/mbed/manip/test/test_main.cpp b/tests/platformio/mbed/manip/test/test_main.cpp index 68277865a..790c89de9 100644 --- a/tests/platformio/mbed/manip/test/test_main.cpp +++ b/tests/platformio/mbed/manip/test/test_main.cpp @@ -69,7 +69,7 @@ using nm::utils::isclose, nm::utils::isequal; void test_transpose() { - NMTOOLS_TESTING_DECLARE_NS(transpose); + NMTOOLS_TESTING_USE_CASE(transpose); NMTOOLS_PIO_SUBCASE( case1, expected, view::transpose, array ); NMTOOLS_PIO_SUBCASE( case2, expected, view::transpose, array ); NMTOOLS_PIO_SUBCASE( case3, expected, view::transpose, array, axes ); @@ -84,7 +84,7 @@ void test_transpose() void test_zeros() { - NMTOOLS_TESTING_DECLARE_NS(array, zeros); + NMTOOLS_TESTING_USE_CASE(array, zeros); NMTOOLS_PIO_SUBCASE( case1, result, view::zeros, shape, dtype ); // eval @@ -93,7 +93,7 @@ void test_zeros() void test_where() { - NMTOOLS_TESTING_DECLARE_NS(view, where); + NMTOOLS_TESTING_USE_CASE(view, where); NMTOOLS_PIO_SUBCASE( case1, result, view::where, condition, x, y ); NMTOOLS_PIO_SUBCASE( case2, result, view::where, condition, x, y ); NMTOOLS_PIO_SUBCASE( case3, result, view::where, condition, x, y ); @@ -101,7 +101,7 @@ void test_where() void test_tile() { - NMTOOLS_TESTING_DECLARE_NS(view, tile); + NMTOOLS_TESTING_USE_CASE(view, tile); NMTOOLS_PIO_SUBCASE( case1, result, view::tile, array, reps ); NMTOOLS_PIO_SUBCASE( case2, result, view::tile, array, reps ); NMTOOLS_PIO_SUBCASE( case3, result, view::tile, array, reps ); @@ -111,7 +111,7 @@ void test_tile() void test_take() { - NMTOOLS_TESTING_DECLARE_NS(view, take); + NMTOOLS_TESTING_USE_CASE(view, take); NMTOOLS_PIO_SUBCASE( case1, result, view::take, array, indices, axis ); NMTOOLS_PIO_SUBCASE( case2, result, view::take, array, indices, axis ); NMTOOLS_PIO_SUBCASE( case3, result, view::take, array, indices, axis ); @@ -122,7 +122,7 @@ void test_take() void test_squeeze() { - NMTOOLS_TESTING_DECLARE_NS(squeeze); + NMTOOLS_TESTING_USE_CASE(squeeze); NMTOOLS_PIO_SUBCASE( case1, expected, view::squeeze, array ); NMTOOLS_PIO_SUBCASE( case2, expected, view::squeeze, array ); NMTOOLS_PIO_SUBCASE( case3, expected, view::squeeze, array ); @@ -133,7 +133,7 @@ void test_squeeze() void test_slice() { - NMTOOLS_TESTING_DECLARE_NS(array, slice); + NMTOOLS_TESTING_USE_CASE(array, slice); NMTOOLS_PIO_SUBCASE( case1, result, view::slice, array, slice0, slice1, slice2 ); NMTOOLS_PIO_SUBCASE( case2, result, view::slice, array, slice0, slice1, slice2 ); NMTOOLS_PIO_SUBCASE( case3, result, view::slice, array, slice0, slice1, slice2 ); @@ -164,7 +164,7 @@ void test_slice() void test_reshape() { - NMTOOLS_TESTING_DECLARE_NS(reshape); + NMTOOLS_TESTING_USE_CASE(reshape); NMTOOLS_PIO_SUBCASE( case1, expected, view::reshape, array, newshape ); NMTOOLS_PIO_SUBCASE( case2, expected, view::reshape, array, newshape ); NMTOOLS_PIO_SUBCASE( case3, expected, view::reshape, array, newshape ); @@ -172,7 +172,7 @@ void test_reshape() void test_repeat() { - NMTOOLS_TESTING_DECLARE_NS(array, repeat); + NMTOOLS_TESTING_USE_CASE(array, repeat); NMTOOLS_PIO_SUBCASE( case1, result, view::repeat, array, repeats, axis ); NMTOOLS_PIO_SUBCASE( case2, result, view::repeat, array, repeats, axis ); NMTOOLS_PIO_SUBCASE( case3, result, view::repeat, array, repeats, axis ); @@ -183,7 +183,7 @@ void test_repeat() void test_pad() { - NMTOOLS_TESTING_DECLARE_NS(array, pad); + NMTOOLS_TESTING_USE_CASE(array, pad); NMTOOLS_PIO_SUBCASE( case1, result, view::pad, array, pad_width ); NMTOOLS_PIO_SUBCASE( case2, result, view::pad, array, pad_width ); NMTOOLS_PIO_SUBCASE( case3, result, view::pad, array, pad_width ); @@ -193,19 +193,19 @@ void test_pad() void test_ones() { - NMTOOLS_TESTING_DECLARE_NS(array, ones); + NMTOOLS_TESTING_USE_CASE(array, ones); NMTOOLS_PIO_SUBCASE( case1, result, view::ones, shape, dtype ); } void test_full() { - NMTOOLS_TESTING_DECLARE_NS(array, full); + NMTOOLS_TESTING_USE_CASE(array, full); NMTOOLS_PIO_SUBCASE( case1, result, view::full, shape, fill_value ); } void test_flip() { - NMTOOLS_TESTING_DECLARE_NS(flip); + NMTOOLS_TESTING_USE_CASE(flip); NMTOOLS_PIO_SUBCASE( case1, result, view::flip, array, axis ); NMTOOLS_PIO_SUBCASE( case2, result, view::flip, array, axis ); NMTOOLS_PIO_SUBCASE( case3, result, view::flip, array, axis ); @@ -214,7 +214,7 @@ void test_flip() void test_flatten() { - NMTOOLS_TESTING_DECLARE_NS(flatten); + NMTOOLS_TESTING_USE_CASE(flatten); NMTOOLS_PIO_SUBCASE( case1, expected, view::flatten, array ); NMTOOLS_PIO_SUBCASE( case2, expected, view::flatten, array ); NMTOOLS_PIO_SUBCASE( case3, expected, view::flatten, array ); @@ -223,7 +223,7 @@ void test_flatten() void test_expand_dims() { - NMTOOLS_TESTING_DECLARE_NS(expand_dims); + NMTOOLS_TESTING_USE_CASE(expand_dims); NMTOOLS_PIO_SUBCASE( case1, expected, view::expand_dims, array, axis ); NMTOOLS_PIO_SUBCASE( case2, expected, view::expand_dims, array, axis ); NMTOOLS_PIO_SUBCASE( case3, expected, view::expand_dims, array, axis ); @@ -238,7 +238,7 @@ void test_expand_dims() void test_concatenate() { - NMTOOLS_TESTING_DECLARE_NS(view, concatenate); + NMTOOLS_TESTING_USE_CASE(view, concatenate); NMTOOLS_PIO_SUBCASE( case1, expected, view::concatenate, lhs, rhs, axis ); NMTOOLS_PIO_SUBCASE( case2, expected, view::concatenate, lhs, rhs, axis ); NMTOOLS_PIO_SUBCASE( case3, expected, view::concatenate, lhs, rhs, axis ); @@ -247,7 +247,7 @@ void test_concatenate() void test_compress() { - NMTOOLS_TESTING_DECLARE_NS(array, compress); + NMTOOLS_TESTING_USE_CASE(array, compress); NMTOOLS_PIO_SUBCASE( case1, result, view::compress, condition, array, axis ); NMTOOLS_PIO_SUBCASE( case2, result, view::compress, condition, array, axis ); NMTOOLS_PIO_SUBCASE( case3, result, view::compress, condition, array, axis ); @@ -257,7 +257,7 @@ void test_compress() void test_broadcast_to() { - NMTOOLS_TESTING_DECLARE_NS(broadcast_to); + NMTOOLS_TESTING_USE_CASE(broadcast_to); NMTOOLS_PIO_SUBCASE( case1, expected, view::broadcast_to, x, shape ); NMTOOLS_PIO_SUBCASE( case2, expected, view::broadcast_to, x, shape ); NMTOOLS_PIO_SUBCASE( case3, expected, view::broadcast_to, x, shape ); @@ -273,7 +273,7 @@ void test_broadcast_to() void test_atleast_3d() { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d); + NMTOOLS_TESTING_USE_CASE(array, atleast_3d); NMTOOLS_PIO_SUBCASE( case1, result, view::atleast_3d, a ); NMTOOLS_PIO_SUBCASE( case2, result, view::atleast_3d, a ); NMTOOLS_PIO_SUBCASE( case3, result, view::atleast_3d, a ); @@ -283,7 +283,7 @@ void test_atleast_3d() void test_atleast_2d() { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d); + NMTOOLS_TESTING_USE_CASE(array, atleast_2d); NMTOOLS_PIO_SUBCASE( case1, result, view::atleast_2d, a ); NMTOOLS_PIO_SUBCASE( case2, result, view::atleast_2d, a ); NMTOOLS_PIO_SUBCASE( case3, result, view::atleast_2d, a ); @@ -292,7 +292,7 @@ void test_atleast_2d() void test_atleast_1d() { - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d); + NMTOOLS_TESTING_USE_CASE(array, atleast_1d); NMTOOLS_PIO_SUBCASE( case1, result, view::atleast_1d, a ); NMTOOLS_PIO_SUBCASE( case2, result, view::atleast_1d, a ); NMTOOLS_PIO_SUBCASE( case3, result, view::atleast_1d, a ); @@ -301,7 +301,7 @@ void test_atleast_1d() void test_arange() { - NMTOOLS_TESTING_DECLARE_NS(array, arange); + NMTOOLS_TESTING_USE_CASE(array, arange); NMTOOLS_PIO_SUBCASE( case1, result, view::arange, stop, dtype ); NMTOOLS_PIO_SUBCASE( case2, result, view::arange, start, stop, dtype ); NMTOOLS_PIO_SUBCASE( case3, result, view::arange, start, stop, step, dtype ); diff --git a/tests/platformio/mbed/ufuncs/test/test_main.cpp b/tests/platformio/mbed/ufuncs/test/test_main.cpp index 950bb8c49..de7fdadf9 100644 --- a/tests/platformio/mbed/ufuncs/test/test_main.cpp +++ b/tests/platformio/mbed/ufuncs/test/test_main.cpp @@ -207,7 +207,7 @@ using nm::utils::isclose, nm::utils::isequal; void test_clip() { - NMTOOLS_TESTING_DECLARE_NS(array, clip); + NMTOOLS_TESTING_USE_CASE(array, clip); NMTOOLS_PIO_SUBCASE( case1, result, view::clip, a, amin, amax ); NMTOOLS_PIO_SUBCASE( case2, result, view::clip, a, amin, amax ); NMTOOLS_PIO_SUBCASE( case3, result, view::clip, a, amin, amax ); @@ -215,7 +215,7 @@ void test_clip() void test_add() { - NMTOOLS_TESTING_DECLARE_NS(view, add); + NMTOOLS_TESTING_USE_CASE(view, add); NMTOOLS_PIO_SUBCASE( case1, result, view::add, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::add, a, b ); NMTOOLS_PIO_SUBCASE( case3, result, view::add, a, b ); @@ -226,7 +226,7 @@ using nmtools::None; void test_reduce_add() { - NMTOOLS_TESTING_DECLARE_NS(view, reduce_add); + NMTOOLS_TESTING_USE_CASE(view, reduce_add); NMTOOLS_PIO_SUBCASE( case1, result, view::reduce_add, a, axis ); NMTOOLS_PIO_SUBCASE( case2, result, view::reduce_add, a, axis ); NMTOOLS_PIO_SUBCASE( case3, result, view::reduce_add, a, axis ); @@ -255,7 +255,7 @@ void test_reduce_add() void test_accumulate_add() { - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_add); + NMTOOLS_TESTING_USE_CASE(view, accumulate_add); NMTOOLS_PIO_SUBCASE( case1, result, view::accumulate_add, a, axis ); NMTOOLS_PIO_SUBCASE( case2, result, view::accumulate_add, a, axis ); NMTOOLS_PIO_SUBCASE( case3, result, view::accumulate_add, a, axis ); @@ -263,145 +263,145 @@ void test_accumulate_add() void test_outer_add() { - NMTOOLS_TESTING_DECLARE_NS(view, outer_add); + NMTOOLS_TESTING_USE_CASE(view, outer_add); NMTOOLS_PIO_SUBCASE( case1, result, view::outer_add, a, b ); } void test_sin() { - NMTOOLS_TESTING_DECLARE_NS(view, sin); + NMTOOLS_TESTING_USE_CASE(view, sin); NMTOOLS_PIO_SUBCASE( case1, result, view::sin, a ); } void test_relu() { - NMTOOLS_TESTING_DECLARE_NS(activations, relu); + NMTOOLS_TESTING_USE_CASE(activations, relu); NMTOOLS_PIO_SUBCASE( case1, result, view::relu, a ); } void test_relu6() { - NMTOOLS_TESTING_DECLARE_NS(activations, relu6); + NMTOOLS_TESTING_USE_CASE(activations, relu6); NMTOOLS_PIO_SUBCASE( case1, result, view::relu6, a ); } void test_prelu() { - NMTOOLS_TESTING_DECLARE_NS(activations, prelu); + NMTOOLS_TESTING_USE_CASE(activations, prelu); NMTOOLS_PIO_SUBCASE( case1, result, view::prelu, a ); } void test_leaky_relu() { - NMTOOLS_TESTING_DECLARE_NS(activations, leaky_relu); + NMTOOLS_TESTING_USE_CASE(activations, leaky_relu); NMTOOLS_PIO_SUBCASE( case1, result, view::leaky_relu, a ); } void test_sigmoid() { - NMTOOLS_TESTING_DECLARE_NS(activations, sigmoid); + NMTOOLS_TESTING_USE_CASE(activations, sigmoid); NMTOOLS_PIO_SUBCASE( case1, result, view::sigmoid, a ); } void test_hardtanh() { - NMTOOLS_TESTING_DECLARE_NS(activations, hardtanh); + NMTOOLS_TESTING_USE_CASE(activations, hardtanh); NMTOOLS_PIO_SUBCASE( case1, result, view::hardtanh, a ); } void test_hardshrink() { - NMTOOLS_TESTING_DECLARE_NS(activations, hardshrink); + NMTOOLS_TESTING_USE_CASE(activations, hardshrink); NMTOOLS_PIO_SUBCASE( case1, result, view::hardshrink, a ); } void test_hardswish() { - NMTOOLS_TESTING_DECLARE_NS(activations, hardswish); + NMTOOLS_TESTING_USE_CASE(activations, hardswish); NMTOOLS_PIO_SUBCASE( case1, result, view::hardswish, a ); } void test_divide() { - NMTOOLS_TESTING_DECLARE_NS(view, divide); + NMTOOLS_TESTING_USE_CASE(view, divide); NMTOOLS_PIO_SUBCASE( case1, result, view::divide, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::divide, a, b ); } void test_greater_equal() { - NMTOOLS_TESTING_DECLARE_NS(view, greater_equal); + NMTOOLS_TESTING_USE_CASE(view, greater_equal); NMTOOLS_PIO_SUBCASE( case1, result, view::greater_equal, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::greater_equal, a, b ); } void test_hypot() { - NMTOOLS_TESTING_DECLARE_NS(view, hypot); + NMTOOLS_TESTING_USE_CASE(view, hypot); NMTOOLS_PIO_SUBCASE( case1, result, view::hypot, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::hypot, a, b ); } void test_invert() { - NMTOOLS_TESTING_DECLARE_NS(view, invert); + NMTOOLS_TESTING_USE_CASE(view, invert); NMTOOLS_PIO_SUBCASE( case1, result, view::invert, a ); } void test_isfinite() { - NMTOOLS_TESTING_DECLARE_NS(view, isfinite); + NMTOOLS_TESTING_USE_CASE(view, isfinite); NMTOOLS_PIO_SUBCASE( case1, result, view::isfinite, a ); } void test_isinf() { - NMTOOLS_TESTING_DECLARE_NS(view, isinf); + NMTOOLS_TESTING_USE_CASE(view, isinf); NMTOOLS_PIO_SUBCASE( case1, result, view::isinf, a ); } void test_isnan() { - NMTOOLS_TESTING_DECLARE_NS(view, isnan); + NMTOOLS_TESTING_USE_CASE(view, isnan); NMTOOLS_PIO_SUBCASE( case1, result, view::isnan, a ); } void test_left_shift() { - NMTOOLS_TESTING_DECLARE_NS(view, left_shift); + NMTOOLS_TESTING_USE_CASE(view, left_shift); NMTOOLS_PIO_SUBCASE( case1, result, view::left_shift, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::left_shift, a, b ); } void test_log_sigmoid() { - NMTOOLS_TESTING_DECLARE_NS(activations, log_sigmoid); + NMTOOLS_TESTING_USE_CASE(activations, log_sigmoid); NMTOOLS_PIO_SUBCASE( case1, result, view::log_sigmoid, a ); } void test_logical_and() { - NMTOOLS_TESTING_DECLARE_NS(view, logical_and); + NMTOOLS_TESTING_USE_CASE(view, logical_and); NMTOOLS_PIO_SUBCASE( case1, result, view::logical_and, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::logical_and, a, b ); } void test_logical_not() { - NMTOOLS_TESTING_DECLARE_NS(view, logical_not); + NMTOOLS_TESTING_USE_CASE(view, logical_not); NMTOOLS_PIO_SUBCASE( case1, result, view::logical_not, a ); } void test_maximum() { - NMTOOLS_TESTING_DECLARE_NS(view, maximum); + NMTOOLS_TESTING_USE_CASE(view, maximum); NMTOOLS_PIO_SUBCASE( case1, result, view::maximum, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::maximum, a, b ); } void test_mean() { - NMTOOLS_TESTING_DECLARE_NS(array, mean); + NMTOOLS_TESTING_USE_CASE(array, mean); NMTOOLS_PIO_SUBCASE( case1, result, view::mean, a, axis ); NMTOOLS_PIO_SUBCASE( case2, result, view::mean, a, axis ); NMTOOLS_PIO_SUBCASE( case3, result, view::mean, a, axis ); @@ -438,45 +438,45 @@ void test_mean() void test_multiply() { - NMTOOLS_TESTING_DECLARE_NS(view, multiply); + NMTOOLS_TESTING_USE_CASE(view, multiply); NMTOOLS_PIO_SUBCASE( case1, result, view::multiply, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::multiply, a, b ); } void test_power() { - NMTOOLS_TESTING_DECLARE_NS(view, power); + NMTOOLS_TESTING_USE_CASE(view, power); NMTOOLS_PIO_SUBCASE( case1, result, view::power, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::power, a, b ); } void test_reciprocal() { - NMTOOLS_TESTING_DECLARE_NS(view, reciprocal); + NMTOOLS_TESTING_USE_CASE(view, reciprocal); NMTOOLS_PIO_SUBCASE( case1, result, view::reciprocal, a ); } void test_rint() { - NMTOOLS_TESTING_DECLARE_NS(view, rint); + NMTOOLS_TESTING_USE_CASE(view, rint); NMTOOLS_PIO_SUBCASE( case1, result, view::rint, a ); } void test_signbit() { - NMTOOLS_TESTING_DECLARE_NS(view, signbit); + NMTOOLS_TESTING_USE_CASE(view, signbit); NMTOOLS_PIO_SUBCASE( case1, result, view::signbit, a ); } void test_sqrt() { - NMTOOLS_TESTING_DECLARE_NS(view, sqrt); + NMTOOLS_TESTING_USE_CASE(view, sqrt); NMTOOLS_PIO_SUBCASE( case1, result, view::sqrt, a ); } void test_stddev() { - NMTOOLS_TESTING_DECLARE_NS(array, stddev); + NMTOOLS_TESTING_USE_CASE(array, stddev); NMTOOLS_PIO_SUBCASE( case1, result, view::stddev, array, axis, None, ddof, keepdims ); NMTOOLS_PIO_SUBCASE( case2, result, view::stddev, array, axis, None, ddof, keepdims ); NMTOOLS_PIO_SUBCASE( case3, result, view::stddev, array, axis, None, ddof, keepdims ); @@ -498,20 +498,20 @@ void test_stddev() void test_subtract() { - NMTOOLS_TESTING_DECLARE_NS( view, subtract ); + NMTOOLS_TESTING_USE_CASE( view, subtract ); NMTOOLS_PIO_SUBCASE( case1, result, view::subtract, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::subtract, a, b ); } void test_trunc() { - NMTOOLS_TESTING_DECLARE_NS( view, trunc ); + NMTOOLS_TESTING_USE_CASE( view, trunc ); NMTOOLS_PIO_SUBCASE( case1, result, view::trunc, a ); } void test_var() { - NMTOOLS_TESTING_DECLARE_NS( array, var ); + NMTOOLS_TESTING_USE_CASE( array, var ); NMTOOLS_PIO_SUBCASE( case1, result, view::var, array, axis ); NMTOOLS_PIO_SUBCASE( case2, result, view::var, array, axis ); NMTOOLS_PIO_SUBCASE( case3, result, view::var, array, axis ); @@ -530,305 +530,305 @@ void test_var() void test_tanhshrink() { - NMTOOLS_TESTING_DECLARE_NS( activations, tanhshrink ); + NMTOOLS_TESTING_USE_CASE( activations, tanhshrink ); NMTOOLS_PIO_SUBCASE( case1, result, view::tanhshrink, a ); } void test_tanh() { - NMTOOLS_TESTING_DECLARE_NS( view, tanh ); + NMTOOLS_TESTING_USE_CASE( view, tanh ); NMTOOLS_PIO_SUBCASE( case1, result, view::tanh, a ); } void test_tan() { - NMTOOLS_TESTING_DECLARE_NS( view, tan ); + NMTOOLS_TESTING_USE_CASE( view, tan ); NMTOOLS_PIO_SUBCASE( case1, result, view::tan, a ); } void test_square() { - NMTOOLS_TESTING_DECLARE_NS( view, square ); + NMTOOLS_TESTING_USE_CASE( view, square ); NMTOOLS_PIO_SUBCASE( case1, result, view::square, a ); } void test_softsign() { - NMTOOLS_TESTING_DECLARE_NS( activations, softsign ); + NMTOOLS_TESTING_USE_CASE( activations, softsign ); NMTOOLS_PIO_SUBCASE( case1, result, view::softsign, a ); } void test_softshrink() { - NMTOOLS_TESTING_DECLARE_NS( activations, softshrink ); + NMTOOLS_TESTING_USE_CASE( activations, softshrink ); NMTOOLS_PIO_SUBCASE( case1, result, view::softshrink, a ); } void test_softplus() { - NMTOOLS_TESTING_DECLARE_NS( activations, softplus ); + NMTOOLS_TESTING_USE_CASE( activations, softplus ); NMTOOLS_PIO_SUBCASE( case1, result, view::softplus, a ); } void test_silu() { - NMTOOLS_TESTING_DECLARE_NS( activations, silu ); + NMTOOLS_TESTING_USE_CASE( activations, silu ); NMTOOLS_PIO_SUBCASE( case1, result, view::silu, a ); } void test_selu() { - NMTOOLS_TESTING_DECLARE_NS( activations, selu ); + NMTOOLS_TESTING_USE_CASE( activations, selu ); NMTOOLS_PIO_SUBCASE( case1, result, view::selu, a ); } void test_celu() { - NMTOOLS_TESTING_DECLARE_NS( activations, celu ); + NMTOOLS_TESTING_USE_CASE( activations, celu ); NMTOOLS_PIO_SUBCASE( case1, result, view::celu, a ); NMTOOLS_PIO_SUBCASE( case2, result, view::celu, a, alpha ); } void test_elu() { - NMTOOLS_TESTING_DECLARE_NS( activations, elu ); + NMTOOLS_TESTING_USE_CASE( activations, elu ); NMTOOLS_PIO_SUBCASE( case1, result, view::elu, a ); NMTOOLS_PIO_SUBCASE( case2, result, view::elu, a, alpha ); } void test_exp() { - NMTOOLS_TESTING_DECLARE_NS( view, exp ); + NMTOOLS_TESTING_USE_CASE( view, exp ); NMTOOLS_PIO_SUBCASE( case1, result, view::exp, a ); } void test_exp2() { - NMTOOLS_TESTING_DECLARE_NS( view, exp2); + NMTOOLS_TESTING_USE_CASE( view, exp2); NMTOOLS_PIO_SUBCASE( case1, result, view::exp2, a ); } void test_expm1() { - NMTOOLS_TESTING_DECLARE_NS( view, expm1 ); + NMTOOLS_TESTING_USE_CASE( view, expm1 ); NMTOOLS_PIO_SUBCASE( case1, result, view::expm1, a ); } void test_fmax() { - NMTOOLS_TESTING_DECLARE_NS( view, fmax ); + NMTOOLS_TESTING_USE_CASE( view, fmax ); NMTOOLS_PIO_SUBCASE( case1, result, view::fmax, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::fmax, a, b ); } void test_fmin() { - NMTOOLS_TESTING_DECLARE_NS( view, fmin ); + NMTOOLS_TESTING_USE_CASE( view, fmin ); NMTOOLS_PIO_SUBCASE( case1, result, view::fmin, a, b ); NMTOOLS_PIO_SUBCASE( case1, result, view::fmin, a, b ); } void test_fmod() { - NMTOOLS_TESTING_DECLARE_NS( view, fmod ); + NMTOOLS_TESTING_USE_CASE( view, fmod ); NMTOOLS_PIO_SUBCASE( case1, result, view::fmod, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::fmod, a, b ); } void test_log() { - NMTOOLS_TESTING_DECLARE_NS( view, log ); + NMTOOLS_TESTING_USE_CASE( view, log ); NMTOOLS_PIO_SUBCASE( case1, result, view::log, a ); } void test_log2() { - NMTOOLS_TESTING_DECLARE_NS( view, log2 ); + NMTOOLS_TESTING_USE_CASE( view, log2 ); NMTOOLS_PIO_SUBCASE( case1, result, view::log2, a ); } void test_log1p() { - NMTOOLS_TESTING_DECLARE_NS( view, log1p ); + NMTOOLS_TESTING_USE_CASE( view, log1p ); NMTOOLS_PIO_SUBCASE( case1, result, view::log1p, a ); } void test_log10() { - NMTOOLS_TESTING_DECLARE_NS( view, log10 ); + NMTOOLS_TESTING_USE_CASE( view, log10 ); NMTOOLS_PIO_SUBCASE( case1, result, view::log10, a ); } void test_sinh() { - NMTOOLS_TESTING_DECLARE_NS( view, sinh ); + NMTOOLS_TESTING_USE_CASE( view, sinh ); NMTOOLS_PIO_SUBCASE( case1, result, view::sinh, a ); } void test_cos() { - NMTOOLS_TESTING_DECLARE_NS( view, cos ); + NMTOOLS_TESTING_USE_CASE( view, cos ); NMTOOLS_PIO_SUBCASE( case1, result, view::cos, a ); } void test_cosh() { - NMTOOLS_TESTING_DECLARE_NS( view, cosh ); + NMTOOLS_TESTING_USE_CASE( view, cosh ); NMTOOLS_PIO_SUBCASE( case1, result, view::cosh, a ); } void test_cbrt() { - NMTOOLS_TESTING_DECLARE_NS( view, cbrt ); + NMTOOLS_TESTING_USE_CASE( view, cbrt ); NMTOOLS_PIO_SUBCASE( case1, result, view::cbrt, a ); } void test_ceil() { - NMTOOLS_TESTING_DECLARE_NS( view, ceil ); + NMTOOLS_TESTING_USE_CASE( view, ceil ); NMTOOLS_PIO_SUBCASE( case1, result, view::ceil, a ); } void test_equal() { - NMTOOLS_TESTING_DECLARE_NS( view, equal ); + NMTOOLS_TESTING_USE_CASE( view, equal ); NMTOOLS_PIO_SUBCASE( case1, result, view::equal, a, b ); } void test_greater() { - NMTOOLS_TESTING_DECLARE_NS( view, greater ); + NMTOOLS_TESTING_USE_CASE( view, greater ); NMTOOLS_PIO_SUBCASE( case1, result, view::greater, a, b ); } void test_less() { - NMTOOLS_TESTING_DECLARE_NS( view, less ); + NMTOOLS_TESTING_USE_CASE( view, less ); NMTOOLS_PIO_SUBCASE( case1, result, view::less, a, b ); } void test_logical_or() { - NMTOOLS_TESTING_DECLARE_NS( view, logical_or ); + NMTOOLS_TESTING_USE_CASE( view, logical_or ); NMTOOLS_PIO_SUBCASE( case1, result, view::logical_or, a, b ); } void test_logical_xor() { - NMTOOLS_TESTING_DECLARE_NS( view, logical_xor ); + NMTOOLS_TESTING_USE_CASE( view, logical_xor ); NMTOOLS_PIO_SUBCASE( case1, result, view::logical_xor, a, b ); } void test_minimum() { - NMTOOLS_TESTING_DECLARE_NS( view, minimum ); + NMTOOLS_TESTING_USE_CASE( view, minimum ); NMTOOLS_PIO_SUBCASE( case1, result, view::minimum, a, b ); } void test_fabs() { - NMTOOLS_TESTING_DECLARE_NS( view, fabs ); + NMTOOLS_TESTING_USE_CASE( view, fabs ); NMTOOLS_PIO_SUBCASE( case1, result, view::fabs, a ); } void test_floor() { - NMTOOLS_TESTING_DECLARE_NS( view, floor ); + NMTOOLS_TESTING_USE_CASE( view, floor ); NMTOOLS_PIO_SUBCASE( case1, result, view::floor, a ) } void test_less_equal() { - NMTOOLS_TESTING_DECLARE_NS( view, less_equal ); + NMTOOLS_TESTING_USE_CASE( view, less_equal ); NMTOOLS_PIO_SUBCASE( case1, result, view::less_equal, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::less_equal, a, b ); } void test_not_equal() { - NMTOOLS_TESTING_DECLARE_NS( view, not_equal ); + NMTOOLS_TESTING_USE_CASE( view, not_equal ); NMTOOLS_PIO_SUBCASE( case1, result, view::not_equal, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::not_equal, a, b ); } void test_positive() { - NMTOOLS_TESTING_DECLARE_NS( view, positive ); + NMTOOLS_TESTING_USE_CASE( view, positive ); NMTOOLS_PIO_SUBCASE( case1, result, view::positive, a ); } void test_negative() { - NMTOOLS_TESTING_DECLARE_NS( view, negative ); + NMTOOLS_TESTING_USE_CASE( view, negative ); NMTOOLS_PIO_SUBCASE( case1, result, view::negative, a ); } void test_arccos() { - NMTOOLS_TESTING_DECLARE_NS( view, arccos ); + NMTOOLS_TESTING_USE_CASE( view, arccos ); NMTOOLS_PIO_SUBCASE( case1, result, view::arccos, a ); } void test_arccosh() { - NMTOOLS_TESTING_DECLARE_NS( view, arccosh ); + NMTOOLS_TESTING_USE_CASE( view, arccosh ); NMTOOLS_PIO_SUBCASE( case1, result, view::arccosh, a ); } void test_arcsin() { - NMTOOLS_TESTING_DECLARE_NS( view, arcsin ); + NMTOOLS_TESTING_USE_CASE( view, arcsin ); NMTOOLS_PIO_SUBCASE( case1, result, view::arcsin, a ); } void test_arcsinh() { - NMTOOLS_TESTING_DECLARE_NS( view, arcsinh ); + NMTOOLS_TESTING_USE_CASE( view, arcsinh ); NMTOOLS_PIO_SUBCASE( case1, result, view::arcsinh, a ); } void test_arctan() { - NMTOOLS_TESTING_DECLARE_NS( view, arctan ); + NMTOOLS_TESTING_USE_CASE( view, arctan ); NMTOOLS_PIO_SUBCASE( case1, result, view::arctan, a ); } void test_arctan2() { - NMTOOLS_TESTING_DECLARE_NS( view, arctan2 ); + NMTOOLS_TESTING_USE_CASE( view, arctan2 ); NMTOOLS_PIO_SUBCASE( case1, result, view::arctan2, a, b ); } void test_arctanh() { - NMTOOLS_TESTING_DECLARE_NS( view, arctanh ); + NMTOOLS_TESTING_USE_CASE( view, arctanh ); NMTOOLS_PIO_SUBCASE( case1, result, view::arctanh, a ); } void test_bitwise_and() { - NMTOOLS_TESTING_DECLARE_NS( view, bitwise_and ); + NMTOOLS_TESTING_USE_CASE( view, bitwise_and ); NMTOOLS_PIO_SUBCASE( case1, result, view::bitwise_and, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::bitwise_and, a, b ); } void test_bitwise_or() { - NMTOOLS_TESTING_DECLARE_NS( view, bitwise_or ); + NMTOOLS_TESTING_USE_CASE( view, bitwise_or ); NMTOOLS_PIO_SUBCASE( case1, result, view::bitwise_or, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::bitwise_or, a, b ); } void test_bitwise_xor() { - NMTOOLS_TESTING_DECLARE_NS( view, bitwise_xor ); + NMTOOLS_TESTING_USE_CASE( view, bitwise_xor ); NMTOOLS_PIO_SUBCASE( case1, result, view::bitwise_xor, a, b ); NMTOOLS_PIO_SUBCASE( case2, result, view::bitwise_xor, a, b ); } void test_mish() { - NMTOOLS_TESTING_DECLARE_NS( activations, mish ); + NMTOOLS_TESTING_USE_CASE( activations, mish ); NMTOOLS_PIO_SUBCASE( case1, result, view::mish, a ); } diff --git a/tests/sycl/array/accumulations/add.cpp b/tests/sycl/array/accumulations/add.cpp index a51b55d36..ce0c759d3 100644 --- a/tests/sycl/array/accumulations/add.cpp +++ b/tests/sycl/array/accumulations/add.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define ACCUMULATE_ADD(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_add, case_name); \ using namespace args; \ auto result = na::add.accumulate(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::add.accumulate(__VA_ARGS__); \ diff --git a/tests/sycl/array/accumulations/multiply.cpp b/tests/sycl/array/accumulations/multiply.cpp index 81b444e84..4994b9cc3 100644 --- a/tests/sycl/array/accumulations/multiply.cpp +++ b/tests/sycl/array/accumulations/multiply.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define ACCUMULATE_MULTIPLY(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_multiply, case_name); \ using namespace args; \ auto result = na::multiply.accumulate(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::multiply.accumulate(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/celu.cpp b/tests/sycl/array/activations/celu.cpp index 2f1b9c937..9b60f65c9 100644 --- a/tests/sycl/array/activations/celu.cpp +++ b/tests/sycl/array/activations/celu.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define CELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, celu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, celu, case_name); \ using namespace args; \ auto result = na::celu(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::celu(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/elu.cpp b/tests/sycl/array/activations/elu.cpp index b482ef41d..ee587f7ea 100644 --- a/tests/sycl/array/activations/elu.cpp +++ b/tests/sycl/array/activations/elu.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define ELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, elu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, elu, case_name); \ using namespace args; \ auto result = na::elu(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::elu(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/hardshrink.cpp b/tests/sycl/array/activations/hardshrink.cpp index 7b701d14d..9bd19b25a 100644 --- a/tests/sycl/array/activations/hardshrink.cpp +++ b/tests/sycl/array/activations/hardshrink.cpp @@ -25,7 +25,7 @@ namespace na = nm::array; #define HARDSHRINK_SUBCASE(case_name, ...) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, hardshrink, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, hardshrink, case_name); \ using namespace args; \ auto result = na::hardshrink(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::hardshrink(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/hardswish.cpp b/tests/sycl/array/activations/hardswish.cpp index 0ea8d31f9..abe32fba5 100644 --- a/tests/sycl/array/activations/hardswish.cpp +++ b/tests/sycl/array/activations/hardswish.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define HARDSWISH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, hardswish, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, hardswish, case_name); \ using namespace args; \ auto result = na::hardswish(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::hardswish(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/hardtanh.cpp b/tests/sycl/array/activations/hardtanh.cpp index eb8832917..2ee7eb0a5 100644 --- a/tests/sycl/array/activations/hardtanh.cpp +++ b/tests/sycl/array/activations/hardtanh.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define HARDTANH_SUBCASE(case_name,...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, hardtanh, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, hardtanh, case_name); \ using namespace args; \ auto result = na::hardtanh(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::hardtanh(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/leaky_relu.cpp b/tests/sycl/array/activations/leaky_relu.cpp index cb2f62b9e..dc47453b3 100644 --- a/tests/sycl/array/activations/leaky_relu.cpp +++ b/tests/sycl/array/activations/leaky_relu.cpp @@ -25,7 +25,7 @@ namespace na = nm::array; #define LEAKY_RELU_SUBCASE(case_name, ...) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, leaky_relu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, leaky_relu, case_name); \ using namespace args; \ auto result = na::leaky_relu(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::leaky_relu(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/log_sigmoid.cpp b/tests/sycl/array/activations/log_sigmoid.cpp index 5e94c1499..0f79c3eb0 100644 --- a/tests/sycl/array/activations/log_sigmoid.cpp +++ b/tests/sycl/array/activations/log_sigmoid.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define LOG_SIGMOID_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, log_sigmoid, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, log_sigmoid, case_name); \ using namespace args; \ auto result = na::log_sigmoid(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::log_sigmoid(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/mish.cpp b/tests/sycl/array/activations/mish.cpp index f2dfd2b59..bc3017117 100644 --- a/tests/sycl/array/activations/mish.cpp +++ b/tests/sycl/array/activations/mish.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define MISH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, mish, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, mish, case_name); \ using namespace args; \ auto result = na::mish(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::mish(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/prelu.cpp b/tests/sycl/array/activations/prelu.cpp index c136fad8e..941dca9cf 100644 --- a/tests/sycl/array/activations/prelu.cpp +++ b/tests/sycl/array/activations/prelu.cpp @@ -25,7 +25,7 @@ namespace na = nm::array; #define PRELU_SUBCASE(case_name, ...) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, prelu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, prelu, case_name); \ using namespace args; \ auto result = na::prelu(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::prelu(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/relu.cpp b/tests/sycl/array/activations/relu.cpp index f04f38591..03d70fde5 100644 --- a/tests/sycl/array/activations/relu.cpp +++ b/tests/sycl/array/activations/relu.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define RELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, relu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, relu, case_name); \ using namespace args; \ auto result = na::relu(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::relu(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/relu6.cpp b/tests/sycl/array/activations/relu6.cpp index affd34402..9eaaf9c40 100644 --- a/tests/sycl/array/activations/relu6.cpp +++ b/tests/sycl/array/activations/relu6.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define RELU6_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, relu6, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, relu6, case_name); \ using namespace args; \ auto result = na::relu6(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::relu6(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/selu.cpp b/tests/sycl/array/activations/selu.cpp index e1c0ad5d2..3280d9cc7 100644 --- a/tests/sycl/array/activations/selu.cpp +++ b/tests/sycl/array/activations/selu.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define SELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, selu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, selu, case_name); \ using namespace args; \ auto result = na::selu(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::selu(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/sigmoid.cpp b/tests/sycl/array/activations/sigmoid.cpp index 644a40717..154649c6f 100644 --- a/tests/sycl/array/activations/sigmoid.cpp +++ b/tests/sycl/array/activations/sigmoid.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define SIGMOID_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, sigmoid, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, sigmoid, case_name); \ using namespace args; \ auto result = na::sigmoid(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::sigmoid(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/silu.cpp b/tests/sycl/array/activations/silu.cpp index efe1def1f..ba8d9830b 100644 --- a/tests/sycl/array/activations/silu.cpp +++ b/tests/sycl/array/activations/silu.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define SILU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, silu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, silu, case_name); \ using namespace args; \ auto result = na::silu(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::silu(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/softplus.cpp b/tests/sycl/array/activations/softplus.cpp index ad6ee64ae..3d430cd57 100644 --- a/tests/sycl/array/activations/softplus.cpp +++ b/tests/sycl/array/activations/softplus.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define SOFTPLUS_SUBCASE(case_name,...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, softplus, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, softplus, case_name); \ using namespace args; \ auto result = na::softplus(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::softplus(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/softshrink.cpp b/tests/sycl/array/activations/softshrink.cpp index 0a23e6925..c7ec23637 100644 --- a/tests/sycl/array/activations/softshrink.cpp +++ b/tests/sycl/array/activations/softshrink.cpp @@ -25,7 +25,7 @@ namespace na = nm::array; #define SOFTSHRINK_SUBCASE(case_name, ...) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, softshrink, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, softshrink, case_name); \ using namespace args; \ auto result = na::softshrink(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::softshrink(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/softsign.cpp b/tests/sycl/array/activations/softsign.cpp index 93f0898e4..632b99b24 100644 --- a/tests/sycl/array/activations/softsign.cpp +++ b/tests/sycl/array/activations/softsign.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define SOFTSIGN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, softsign, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, softsign, case_name); \ using namespace args; \ auto result = na::softsign(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::softsign(__VA_ARGS__); \ diff --git a/tests/sycl/array/activations/tanhshrink.cpp b/tests/sycl/array/activations/tanhshrink.cpp index 72086f5c1..dff30a95d 100644 --- a/tests/sycl/array/activations/tanhshrink.cpp +++ b/tests/sycl/array/activations/tanhshrink.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define TANHSHRINK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, tanhshrink, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, tanhshrink, case_name); \ using namespace args; \ auto result = na::tanhshrink(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::tanhshrink(__VA_ARGS__); \ diff --git a/tests/sycl/array/arange.cpp b/tests/sycl/array/arange.cpp index 6e669792d..0e048bd08 100644 --- a/tests/sycl/array/arange.cpp +++ b/tests/sycl/array/arange.cpp @@ -9,7 +9,7 @@ namespace na = nm::array; #define ARANGE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, arange, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, arange, case_name); \ using namespace args; \ auto expect = na::arange(__VA_ARGS__); \ /* auto result = na::arange(__VA_ARGS__, na::sycl::default_context()); */ \ diff --git a/tests/sycl/array/atleast_1d.cpp b/tests/sycl/array/atleast_1d.cpp index d8387dd57..b92077462 100644 --- a/tests/sycl/array/atleast_1d.cpp +++ b/tests/sycl/array/atleast_1d.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define ATLEAST_1D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_1d, case_name); \ using namespace args; \ auto result = na::atleast_1d(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::atleast_1d(__VA_ARGS__); \ diff --git a/tests/sycl/array/atleast_2d.cpp b/tests/sycl/array/atleast_2d.cpp index 42734b8e5..b6686bfb2 100644 --- a/tests/sycl/array/atleast_2d.cpp +++ b/tests/sycl/array/atleast_2d.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define ATLEAST_2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_2d, case_name); \ using namespace args; \ auto result = na::atleast_2d(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::atleast_2d(__VA_ARGS__); \ diff --git a/tests/sycl/array/atleast_3d.cpp b/tests/sycl/array/atleast_3d.cpp index fe02c3c91..c63a55a6f 100644 --- a/tests/sycl/array/atleast_3d.cpp +++ b/tests/sycl/array/atleast_3d.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define ATLEAST_3D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_3d, case_name); \ using namespace args; \ auto result = na::atleast_3d(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::atleast_3d(__VA_ARGS__); \ diff --git a/tests/sycl/array/broadcast_to.cpp b/tests/sycl/array/broadcast_to.cpp index 16f2ef344..ecd93f030 100644 --- a/tests/sycl/array/broadcast_to.cpp +++ b/tests/sycl/array/broadcast_to.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define BROADCAST_TO_SUBCASE(case_name, array, shape) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(broadcast_to, case_name); \ + NMTOOLS_TESTING_USE_CASE(broadcast_to, case_name); \ auto result = na::broadcast_to(args::array, args::shape, na::sycl::default_context()); \ auto expect = na::broadcast_to(args::array, args::shape); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect) ); \ diff --git a/tests/sycl/array/concatenate.cpp b/tests/sycl/array/concatenate.cpp index d474462cb..b6b48b7f7 100644 --- a/tests/sycl/array/concatenate.cpp +++ b/tests/sycl/array/concatenate.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define CONCATENATE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, concatenate, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, concatenate, case_name); \ using namespace args; \ auto result = na::concatenate(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::concatenate(__VA_ARGS__); \ diff --git a/tests/sycl/array/cumprod.cpp b/tests/sycl/array/cumprod.cpp index 5f98eb083..f4882de98 100644 --- a/tests/sycl/array/cumprod.cpp +++ b/tests/sycl/array/cumprod.cpp @@ -19,7 +19,7 @@ namespace ix = nm::index; #define CUMPROD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, cumprod, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, cumprod, case_name); \ using namespace args; \ SYCL_CUMPROD_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/sycl/array/cumsum.cpp b/tests/sycl/array/cumsum.cpp index 98a70dfea..f112a995a 100644 --- a/tests/sycl/array/cumsum.cpp +++ b/tests/sycl/array/cumsum.cpp @@ -19,7 +19,7 @@ namespace ix = nm::index; #define CUMSUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, cumsum, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, cumsum, case_name); \ using namespace args; \ SYCL_CUMSUM_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/sycl/array/expand_dims.cpp b/tests/sycl/array/expand_dims.cpp index 9b341df03..ff447fd60 100644 --- a/tests/sycl/array/expand_dims.cpp +++ b/tests/sycl/array/expand_dims.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define EXPAND_DIMS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(expand_dims, case_name); \ + NMTOOLS_TESTING_USE_CASE(expand_dims, case_name); \ using namespace args; \ auto result = na::expand_dims(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::expand_dims(__VA_ARGS__); \ diff --git a/tests/sycl/array/flatten.cpp b/tests/sycl/array/flatten.cpp index 6aacc5edc..a7a421f97 100644 --- a/tests/sycl/array/flatten.cpp +++ b/tests/sycl/array/flatten.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define FLATTEN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(flatten, case_name); \ + NMTOOLS_TESTING_USE_CASE(flatten, case_name); \ using namespace args; \ auto result = na::flatten(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::flatten(__VA_ARGS__); \ diff --git a/tests/sycl/array/flip.cpp b/tests/sycl/array/flip.cpp index e1082a825..200600b8a 100644 --- a/tests/sycl/array/flip.cpp +++ b/tests/sycl/array/flip.cpp @@ -28,7 +28,7 @@ namespace na = nm::array; #define FLIP_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(flip, case_name); \ + NMTOOLS_TESTING_USE_CASE(flip, case_name); \ using namespace args; \ auto result = na::flip(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::flip(__VA_ARGS__); \ @@ -39,7 +39,7 @@ SUBCASE(#case_name) \ #define FLIPLR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(fliplr, case_name); \ + NMTOOLS_TESTING_USE_CASE(fliplr, case_name); \ using namespace args; \ auto result = na::fliplr(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::fliplr(__VA_ARGS__); \ @@ -50,7 +50,7 @@ SUBCASE(#case_name) \ #define FLIPUD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(flipud, case_name); \ + NMTOOLS_TESTING_USE_CASE(flipud, case_name); \ using namespace args; \ auto result = na::flipud(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::flipud(__VA_ARGS__); \ diff --git a/tests/sycl/array/full.cpp b/tests/sycl/array/full.cpp index d2a6781f0..a8e5c3431 100644 --- a/tests/sycl/array/full.cpp +++ b/tests/sycl/array/full.cpp @@ -17,7 +17,7 @@ namespace na = nm::array; #define FULL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, full, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, full, case_name); \ using namespace args; \ SYCL_FULL_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/sycl/array/hstack.cpp b/tests/sycl/array/hstack.cpp index 28890f7bc..5c840947e 100644 --- a/tests/sycl/array/hstack.cpp +++ b/tests/sycl/array/hstack.cpp @@ -27,7 +27,7 @@ namespace meta = nm::meta; #define HSTACK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( hstack, case_name ) \ + NMTOOLS_TESTING_USE_CASE( hstack, case_name ) \ using namespace args; \ auto result = nmtools::array::hstack(__VA_ARGS__, na::sycl::default_context()); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/sycl/array/mean.cpp b/tests/sycl/array/mean.cpp index 98cd9443b..ef05d1e9c 100644 --- a/tests/sycl/array/mean.cpp +++ b/tests/sycl/array/mean.cpp @@ -22,7 +22,7 @@ using nmtools::unwrap; #define MEAN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, mean, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, mean, case_name); \ using namespace args; \ SYCL_MEAN_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/sycl/array/moveaxis.cpp b/tests/sycl/array/moveaxis.cpp index b04c30e1a..7c48a9f0f 100644 --- a/tests/sycl/array/moveaxis.cpp +++ b/tests/sycl/array/moveaxis.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define MOVEAXIS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, moveaxis, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, moveaxis, case_name); \ using namespace args; \ auto expect = na::moveaxis(__VA_ARGS__); \ auto result = na::moveaxis(__VA_ARGS__, na::sycl::default_context()); \ diff --git a/tests/sycl/array/ones.cpp b/tests/sycl/array/ones.cpp index cba41ebd1..132291d1b 100644 --- a/tests/sycl/array/ones.cpp +++ b/tests/sycl/array/ones.cpp @@ -17,7 +17,7 @@ namespace na = nm::array; #define ONES_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, ones, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, ones, case_name); \ using namespace args; \ SYCL_ONES_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/sycl/array/outer/add.cpp b/tests/sycl/array/outer/add.cpp index a9f6111fa..b4fff0c86 100644 --- a/tests/sycl/array/outer/add.cpp +++ b/tests/sycl/array/outer/add.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define OUTER_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_add, case_name); \ using namespace args; \ auto result = na::add.outer(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::add.outer(__VA_ARGS__); \ diff --git a/tests/sycl/array/outer/multiply.cpp b/tests/sycl/array/outer/multiply.cpp index 545542df5..8892c894d 100644 --- a/tests/sycl/array/outer/multiply.cpp +++ b/tests/sycl/array/outer/multiply.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define ACCUMULATE_MULTIPLY(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_multiply, case_name); \ using namespace args; \ auto result = na::multiply.accumulate(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::multiply.accumulate(__VA_ARGS__); \ diff --git a/tests/sycl/array/pad.cpp b/tests/sycl/array/pad.cpp index e0b43141b..0756d5ee8 100644 --- a/tests/sycl/array/pad.cpp +++ b/tests/sycl/array/pad.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define PAD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, pad, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, pad, case_name); \ using namespace args; \ auto result = na::pad(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::pad(__VA_ARGS__); \ diff --git a/tests/sycl/array/pooling.cpp b/tests/sycl/array/pooling.cpp index ebbdd21f7..436f9d897 100644 --- a/tests/sycl/array/pooling.cpp +++ b/tests/sycl/array/pooling.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define MAX_POOL2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, max_pool2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, max_pool2d, case_name); \ using namespace args; \ auto result = na::max_pool2d(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::max_pool2d(__VA_ARGS__); \ @@ -37,7 +37,7 @@ SUBCASE(#case_name) \ #define AVG_POOL2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, avg_pool2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, avg_pool2d, case_name); \ using namespace args; \ auto result = na::avg_pool2d(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::avg_pool2d(__VA_ARGS__); \ diff --git a/tests/sycl/array/prod.cpp b/tests/sycl/array/prod.cpp index 9ebd24fde..439313d12 100644 --- a/tests/sycl/array/prod.cpp +++ b/tests/sycl/array/prod.cpp @@ -19,7 +19,7 @@ namespace ix = nm::index; #define PROD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, prod, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, prod, case_name); \ using namespace args; \ SYCL_PROD_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/sycl/array/reductions/add.cpp b/tests/sycl/array/reductions/add.cpp index 22c15a3fa..d01a2492a 100644 --- a/tests/sycl/array/reductions/add.cpp +++ b/tests/sycl/array/reductions/add.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define REDUCE_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_add, case_name); \ using namespace args; \ auto result = na::add.reduce(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::add.reduce(__VA_ARGS__); \ diff --git a/tests/sycl/array/reductions/multiply.cpp b/tests/sycl/array/reductions/multiply.cpp index db7ac4f73..e4516ba7e 100644 --- a/tests/sycl/array/reductions/multiply.cpp +++ b/tests/sycl/array/reductions/multiply.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define REDUCE_MULTIPLY_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_multiply, case_name); \ using namespace args; \ auto result = na::multiply.reduce(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::multiply.reduce(__VA_ARGS__); \ diff --git a/tests/sycl/array/repeat.cpp b/tests/sycl/array/repeat.cpp index bc1d550c1..11c88c6ab 100644 --- a/tests/sycl/array/repeat.cpp +++ b/tests/sycl/array/repeat.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define REPEAT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, repeat, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, repeat, case_name); \ using namespace args; \ auto result = na::repeat(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::repeat(__VA_ARGS__); \ diff --git a/tests/sycl/array/reshape.cpp b/tests/sycl/array/reshape.cpp index 2e4b223c1..1faf8d87b 100644 --- a/tests/sycl/array/reshape.cpp +++ b/tests/sycl/array/reshape.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define RESHAPE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(reshape, case_name); \ + NMTOOLS_TESTING_USE_CASE(reshape, case_name); \ using namespace args; \ auto result = na::reshape(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::reshape(__VA_ARGS__); \ diff --git a/tests/sycl/array/resize.cpp b/tests/sycl/array/resize.cpp index a0478109e..e396be3ff 100644 --- a/tests/sycl/array/resize.cpp +++ b/tests/sycl/array/resize.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define RESIZE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(resize, case_name); \ + NMTOOLS_TESTING_USE_CASE(resize, case_name); \ using namespace args; \ auto result = na::resize(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::resize(__VA_ARGS__); \ diff --git a/tests/sycl/array/slice.cpp b/tests/sycl/array/slice.cpp index 0f9292c46..dae2e1153 100644 --- a/tests/sycl/array/slice.cpp +++ b/tests/sycl/array/slice.cpp @@ -39,7 +39,7 @@ CHECK_MESSAGE(nmtools::utils::apply_isclose(result,expect), \ #define SLICE_SUBCASE(case_name, a, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, slice, case_name); \ using namespace args; \ auto result = na::apply_slice(a, nmtools_tuple{__VA_ARGS__}, na::sycl::default_context()); \ auto expect = na::apply_slice(a, nmtools_tuple{__VA_ARGS__}); \ diff --git a/tests/sycl/array/squeeze.cpp b/tests/sycl/array/squeeze.cpp index 821240915..f52973507 100644 --- a/tests/sycl/array/squeeze.cpp +++ b/tests/sycl/array/squeeze.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define SQUEEZE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(squeeze, case_name); \ + NMTOOLS_TESTING_USE_CASE(squeeze, case_name); \ using namespace args; \ auto result = na::squeeze(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::squeeze(__VA_ARGS__); \ diff --git a/tests/sycl/array/stack.cpp b/tests/sycl/array/stack.cpp index b81219258..406968485 100644 --- a/tests/sycl/array/stack.cpp +++ b/tests/sycl/array/stack.cpp @@ -27,7 +27,7 @@ namespace meta = nm::meta; #define STACK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( stack, case_name ) \ + NMTOOLS_TESTING_USE_CASE( stack, case_name ) \ using namespace args; \ auto result = nmtools::array::stack(__VA_ARGS__,na::sycl::default_context()); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/sycl/array/sum.cpp b/tests/sycl/array/sum.cpp index c67f56019..b8f1ebf9a 100644 --- a/tests/sycl/array/sum.cpp +++ b/tests/sycl/array/sum.cpp @@ -19,7 +19,7 @@ namespace ix = nm::index; #define SUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, sum, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, sum, case_name); \ using namespace args; \ SYCL_SUM_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/sycl/array/tile.cpp b/tests/sycl/array/tile.cpp index 6fc35f757..901213cb0 100644 --- a/tests/sycl/array/tile.cpp +++ b/tests/sycl/array/tile.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define TILE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, tile, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, tile, case_name); \ using namespace args; \ auto result = na::tile(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::tile(__VA_ARGS__); \ diff --git a/tests/sycl/array/transpose.cpp b/tests/sycl/array/transpose.cpp index 67f1f2e38..ec7158b41 100644 --- a/tests/sycl/array/transpose.cpp +++ b/tests/sycl/array/transpose.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define TRANSPOSE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(transpose, case_name); \ + NMTOOLS_TESTING_USE_CASE(transpose, case_name); \ using namespace args; \ auto result = na::transpose(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::transpose(__VA_ARGS__); \ diff --git a/tests/sycl/array/ufuncs/add.cpp b/tests/sycl/array/ufuncs/add.cpp index b403b16b2..5487350cd 100644 --- a/tests/sycl/array/ufuncs/add.cpp +++ b/tests/sycl/array/ufuncs/add.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, add, case_name); \ using namespace args; \ auto result = na::add(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::add(__VA_ARGS__); \ diff --git a/tests/sycl/array/ufuncs/multiply.cpp b/tests/sycl/array/ufuncs/multiply.cpp index 9130b1393..0a8633e88 100644 --- a/tests/sycl/array/ufuncs/multiply.cpp +++ b/tests/sycl/array/ufuncs/multiply.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define MULTIPLY_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, multiply, case_name); \ using namespace args; \ auto result = na::multiply(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::multiply(__VA_ARGS__); \ diff --git a/tests/sycl/array/vstack.cpp b/tests/sycl/array/vstack.cpp index 0bc34429f..73f027725 100644 --- a/tests/sycl/array/vstack.cpp +++ b/tests/sycl/array/vstack.cpp @@ -27,7 +27,7 @@ namespace meta = nm::meta; #define VSTACK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( vstack, case_name ) \ + NMTOOLS_TESTING_USE_CASE( vstack, case_name ) \ using namespace args; \ auto result = nmtools::array::vstack(__VA_ARGS__,na::sycl::default_context()); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/sycl/array/where.cpp b/tests/sycl/array/where.cpp index ad7b97864..ef9dbb565 100644 --- a/tests/sycl/array/where.cpp +++ b/tests/sycl/array/where.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define WHERE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, where, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, where, case_name); \ using namespace args; \ auto result = na::where(__VA_ARGS__, na::sycl::default_context()); \ auto expect = na::where(__VA_ARGS__); \ diff --git a/tests/sycl/array/zeros.cpp b/tests/sycl/array/zeros.cpp index e48ffdba2..fdc0131c7 100644 --- a/tests/sycl/array/zeros.cpp +++ b/tests/sycl/array/zeros.cpp @@ -17,7 +17,7 @@ namespace na = nm::array; #define ZEROS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, zeros, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, zeros, case_name); \ using namespace args; \ SYCL_ZEROS_SUBCASE(__VA_ARGS__); \ } diff --git a/tests/view/src/activations/celu.cpp b/tests/view/src/activations/celu.cpp index e5dbff746..a109af890 100644 --- a/tests/view/src/activations/celu.cpp +++ b/tests/view/src/activations/celu.cpp @@ -31,7 +31,7 @@ RUN_celu_impl(__VA_ARGS__); #define CELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, celu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, celu, case_name); \ using namespace args; \ auto result = RUN_celu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/elu.cpp b/tests/view/src/activations/elu.cpp index 7bb251b53..4f44f62e6 100644 --- a/tests/view/src/activations/elu.cpp +++ b/tests/view/src/activations/elu.cpp @@ -31,7 +31,7 @@ RUN_elu_impl(__VA_ARGS__); #define ELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, elu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, elu, case_name); \ using namespace args; \ auto result = RUN_elu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/hardshrink.cpp b/tests/view/src/activations/hardshrink.cpp index 2739a6318..eb8d0e957 100644 --- a/tests/view/src/activations/hardshrink.cpp +++ b/tests/view/src/activations/hardshrink.cpp @@ -31,7 +31,7 @@ RUN_hardshrink_impl(__VA_ARGS__); #define HARDSHRINK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, hardshrink, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, hardshrink, case_name); \ using namespace args; \ auto result = RUN_hardshrink(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/hardswish.cpp b/tests/view/src/activations/hardswish.cpp index 24a5eb98f..fbebda394 100644 --- a/tests/view/src/activations/hardswish.cpp +++ b/tests/view/src/activations/hardswish.cpp @@ -31,7 +31,7 @@ RUN_hardswish_impl(__VA_ARGS__); #define HARDSWISH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, hardswish, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, hardswish, case_name); \ using namespace args; \ auto result = RUN_hardswish(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/hardtanh.cpp b/tests/view/src/activations/hardtanh.cpp index 89995135b..54a038cfd 100644 --- a/tests/view/src/activations/hardtanh.cpp +++ b/tests/view/src/activations/hardtanh.cpp @@ -31,7 +31,7 @@ RUN_hardtanh_impl(__VA_ARGS__); #define HARDTANH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, hardtanh, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, hardtanh, case_name); \ using namespace args; \ auto result = RUN_hardtanh(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/leaky_relu.cpp b/tests/view/src/activations/leaky_relu.cpp index 6ce4776ec..cec5663af 100644 --- a/tests/view/src/activations/leaky_relu.cpp +++ b/tests/view/src/activations/leaky_relu.cpp @@ -31,7 +31,7 @@ RUN_leaky_relu_impl(__VA_ARGS__); #define LEAKY_RELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, leaky_relu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, leaky_relu, case_name); \ using namespace args; \ auto result = RUN_leaky_relu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/log_sigmoid.cpp b/tests/view/src/activations/log_sigmoid.cpp index 8325a7217..c1035e78e 100644 --- a/tests/view/src/activations/log_sigmoid.cpp +++ b/tests/view/src/activations/log_sigmoid.cpp @@ -31,7 +31,7 @@ RUN_log_sigmoid_impl(__VA_ARGS__); #define LOG_SIGMOID_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, log_sigmoid, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, log_sigmoid, case_name); \ using namespace args; \ auto result = RUN_log_sigmoid(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/mish.cpp b/tests/view/src/activations/mish.cpp index 821c57ab1..e5d46e5f6 100644 --- a/tests/view/src/activations/mish.cpp +++ b/tests/view/src/activations/mish.cpp @@ -31,7 +31,7 @@ RUN_mish_impl(__VA_ARGS__); #define MISH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, mish, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, mish, case_name); \ using namespace args; \ auto result = RUN_mish(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/prelu.cpp b/tests/view/src/activations/prelu.cpp index 8855a6441..c6de5f907 100644 --- a/tests/view/src/activations/prelu.cpp +++ b/tests/view/src/activations/prelu.cpp @@ -31,7 +31,7 @@ RUN_prelu_impl(__VA_ARGS__); #define PRELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, prelu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, prelu, case_name); \ using namespace args; \ auto result = RUN_prelu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/relu.cpp b/tests/view/src/activations/relu.cpp index 9d0608c77..2c2209138 100644 --- a/tests/view/src/activations/relu.cpp +++ b/tests/view/src/activations/relu.cpp @@ -31,7 +31,7 @@ RUN_relu_impl(__VA_ARGS__); #define RELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, relu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, relu, case_name); \ using namespace args; \ auto result = RUN_relu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/relu6.cpp b/tests/view/src/activations/relu6.cpp index 5f366fe41..d2f0ee733 100644 --- a/tests/view/src/activations/relu6.cpp +++ b/tests/view/src/activations/relu6.cpp @@ -31,7 +31,7 @@ RUN_relu6_impl(__VA_ARGS__); #define RELU6_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, relu6, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, relu6, case_name); \ using namespace args; \ auto result = RUN_relu6(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/selu.cpp b/tests/view/src/activations/selu.cpp index 32b7a271c..58bdfe9a1 100644 --- a/tests/view/src/activations/selu.cpp +++ b/tests/view/src/activations/selu.cpp @@ -31,7 +31,7 @@ RUN_selu_impl(__VA_ARGS__); #define SELU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, selu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, selu, case_name); \ using namespace args; \ auto result = RUN_selu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/sigmoid.cpp b/tests/view/src/activations/sigmoid.cpp index c1c5e8f51..8ddf479de 100644 --- a/tests/view/src/activations/sigmoid.cpp +++ b/tests/view/src/activations/sigmoid.cpp @@ -31,7 +31,7 @@ RUN_sigmoid_impl(__VA_ARGS__); #define SIGMOID_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, sigmoid, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, sigmoid, case_name); \ using namespace args; \ auto result = RUN_sigmoid(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/silu.cpp b/tests/view/src/activations/silu.cpp index 5414d94ca..4f8235653 100644 --- a/tests/view/src/activations/silu.cpp +++ b/tests/view/src/activations/silu.cpp @@ -31,7 +31,7 @@ RUN_silu_impl(__VA_ARGS__); #define SILU_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, silu, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, silu, case_name); \ using namespace args; \ auto result = RUN_silu(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/softplus.cpp b/tests/view/src/activations/softplus.cpp index fcd71cc6e..c46a9738e 100644 --- a/tests/view/src/activations/softplus.cpp +++ b/tests/view/src/activations/softplus.cpp @@ -31,7 +31,7 @@ RUN_softplus_impl(__VA_ARGS__); #define SOFTPLUS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, softplus, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, softplus, case_name); \ using namespace args; \ auto result = RUN_softplus(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/softshrink.cpp b/tests/view/src/activations/softshrink.cpp index 8e2806b7e..ae848bc93 100644 --- a/tests/view/src/activations/softshrink.cpp +++ b/tests/view/src/activations/softshrink.cpp @@ -31,7 +31,7 @@ RUN_softshrink_impl(__VA_ARGS__); #define SOFTSHRINK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, softshrink, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, softshrink, case_name); \ using namespace args; \ auto result = RUN_softshrink(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/softsign.cpp b/tests/view/src/activations/softsign.cpp index 1a1a1c418..af2618f47 100644 --- a/tests/view/src/activations/softsign.cpp +++ b/tests/view/src/activations/softsign.cpp @@ -31,7 +31,7 @@ RUN_softsign_impl(__VA_ARGS__); #define SOFTSIGN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, softsign, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, softsign, case_name); \ using namespace args; \ auto result = RUN_softsign(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/activations/tanhshrink.cpp b/tests/view/src/activations/tanhshrink.cpp index d001b7154..5b2411735 100644 --- a/tests/view/src/activations/tanhshrink.cpp +++ b/tests/view/src/activations/tanhshrink.cpp @@ -31,7 +31,7 @@ RUN_tanhshrink_impl(__VA_ARGS__); #define TANHSHRINK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(activations, tanhshrink, case_name); \ + NMTOOLS_TESTING_USE_CASE(activations, tanhshrink, case_name); \ using namespace args; \ auto result = RUN_tanhshrink(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/arange.cpp b/tests/view/src/arange.cpp index 893f9c7ab..c187edc25 100644 --- a/tests/view/src/arange.cpp +++ b/tests/view/src/arange.cpp @@ -32,7 +32,7 @@ RUN_arange_impl(__VA_ARGS__); #define ARANGE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, arange, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, arange, case_name); \ using namespace args; \ auto result = RUN_arange(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result.shape(), expect::shape ); \ diff --git a/tests/view/src/argsort.cpp b/tests/view/src/argsort.cpp index aed7f47ef..9d64e2b18 100644 --- a/tests/view/src/argsort.cpp +++ b/tests/view/src/argsort.cpp @@ -49,7 +49,7 @@ RUN_argsort_impl(__VA_ARGS__); #define ARGSORT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, argsort, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, argsort, case_name); \ using namespace args; \ auto view = RUN_argsort(case_name, __VA_ARGS__); \ NMTOOLS_REQUIRE_EQUAL( nm::shape(*view), nm::shape(expect::result) ); \ diff --git a/tests/view/src/array_slice.cpp b/tests/view/src/array_slice.cpp index 0b2d5e7c3..957b3f620 100644 --- a/tests/view/src/array_slice.cpp +++ b/tests/view/src/array_slice.cpp @@ -26,7 +26,7 @@ namespace na = nm::array; #define ARRAY_SLICE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, array_slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, array_slice, case_name); \ using namespace args; \ auto view = nmtools::view::array_slice(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(view), nm::shape(expect::result) ); \ diff --git a/tests/view/src/atleast_1d.cpp b/tests/view/src/atleast_1d.cpp index 430658080..a0c7b6bc3 100644 --- a/tests/view/src/atleast_1d.cpp +++ b/tests/view/src/atleast_1d.cpp @@ -47,7 +47,7 @@ RUN_atleast_1d_impl(__VA_ARGS__); #define ATLEAST_1D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_1d, case_name); \ using namespace args; \ auto result = RUN_atleast_1d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/atleast_2d.cpp b/tests/view/src/atleast_2d.cpp index 171188e83..3b5cad43b 100644 --- a/tests/view/src/atleast_2d.cpp +++ b/tests/view/src/atleast_2d.cpp @@ -47,7 +47,7 @@ RUN_atleast_2d_impl(__VA_ARGS__); #define ATLEAST_2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_2d, case_name); \ using namespace args; \ auto result = RUN_atleast_2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(nmtools::unwrap(result)), expect::shape ); \ diff --git a/tests/view/src/atleast_3d.cpp b/tests/view/src/atleast_3d.cpp index 45890cac4..d5ed6ff40 100644 --- a/tests/view/src/atleast_3d.cpp +++ b/tests/view/src/atleast_3d.cpp @@ -48,7 +48,7 @@ RUN_atleast_3d_impl(__VA_ARGS__); #define ATLEAST_3D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_3d, case_name); \ using namespace args; \ auto result = RUN_atleast_3d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(nmtools::unwrap(result)), expect::shape ); \ diff --git a/tests/view/src/atleast_nd.cpp b/tests/view/src/atleast_nd.cpp index ed356b138..29124948c 100644 --- a/tests/view/src/atleast_nd.cpp +++ b/tests/view/src/atleast_nd.cpp @@ -31,7 +31,7 @@ using namespace nm::literals; #define ATLEAST_1D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_1d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_1d, case_name); \ using namespace args; \ auto result = view::atleast_nd(__VA_ARGS__, 1_ct); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -40,7 +40,7 @@ SUBCASE(#case_name) \ #define ATLEAST_2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_2d, case_name); \ using namespace args; \ auto result = view::atleast_nd(__VA_ARGS__, 2_ct); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -49,7 +49,7 @@ SUBCASE(#case_name) \ #define ATLEAST_3D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, atleast_3d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, atleast_3d, case_name); \ using namespace args; \ auto result = view::atleast_nd(__VA_ARGS__, 3_ct); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/batch_norm.cpp b/tests/view/src/batch_norm.cpp index e25dfbeeb..2419ed974 100644 --- a/tests/view/src/batch_norm.cpp +++ b/tests/view/src/batch_norm.cpp @@ -48,7 +48,7 @@ RUN_batch_norm_impl(__VA_ARGS__); #define BATCH_NORM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, batch_norm, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, batch_norm, case_name); \ using namespace args; \ auto result = RUN_batch_norm(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/broadcast_arrays.cpp b/tests/view/src/broadcast_arrays.cpp index ec7911801..01432be6c 100644 --- a/tests/view/src/broadcast_arrays.cpp +++ b/tests/view/src/broadcast_arrays.cpp @@ -30,7 +30,7 @@ namespace view = nm::view; #define BROADCAST_ARRAYS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(broadcast_arrays, case_name); \ + NMTOOLS_TESTING_USE_CASE(broadcast_arrays, case_name); \ using namespace args; \ const auto results = view::broadcast_arrays(__VA_ARGS__); \ constexpr auto N = meta::len_v; \ diff --git a/tests/view/src/broadcast_to.cpp b/tests/view/src/broadcast_to.cpp index 5c47de1ed..c975e7309 100644 --- a/tests/view/src/broadcast_to.cpp +++ b/tests/view/src/broadcast_to.cpp @@ -29,7 +29,7 @@ namespace view = nm::view; #define BROADCAST_TO_SUBCASE(case_name, array, shape_, expected) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(broadcast_to, case_name); \ + NMTOOLS_TESTING_USE_CASE(broadcast_to, case_name); \ auto array_ref = view::broadcast_to(args::array,args::shape_); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(array_ref), nmtools::shape(expect::expected) ); \ NMTOOLS_ASSERT_CLOSE( array_ref, expect::expected ); \ diff --git a/tests/view/src/composition/mean_subtract.cpp b/tests/view/src/composition/mean_subtract.cpp index 72c261ae0..91694d3ee 100644 --- a/tests/view/src/composition/mean_subtract.cpp +++ b/tests/view/src/composition/mean_subtract.cpp @@ -187,7 +187,7 @@ RUN_mean_subtract_impl(__VA_ARGS__); #define MEAN_SUBTRACT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(composition, mean_subtract, case_name); \ + NMTOOLS_TESTING_USE_CASE(composition, mean_subtract, case_name); \ using namespace args; \ auto result = RUN_mean_subtract(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -196,7 +196,7 @@ SUBCASE(#case_name) \ TEST_CASE("mean_subtract(case1)" * doctest::test_suite("composition::mean_subtract")) { { - NMTOOLS_TESTING_DECLARE_NS(composition, mean_subtract, case1); + NMTOOLS_TESTING_USE_CASE(composition, mean_subtract, case1); } MEAN_SUBTRACT_SUBCASE( case1, array, axis ); @@ -237,7 +237,7 @@ TEST_CASE("mean_subtract(case4)" * doctest::test_suite("composition::mean_subtra // TODO: fix compile-time shape inference #if 0 { - NMTOOLS_TESTING_DECLARE_NS(composition, mean_subtract, case4); + NMTOOLS_TESTING_USE_CASE(composition, mean_subtract, case4); using namespace args; auto a = composition::mean_subtract( array, axis ); diff --git a/tests/view/src/composition/square_sum_divide.cpp b/tests/view/src/composition/square_sum_divide.cpp index fdd8fd5fc..946adbfe6 100644 --- a/tests/view/src/composition/square_sum_divide.cpp +++ b/tests/view/src/composition/square_sum_divide.cpp @@ -101,7 +101,7 @@ RUN_square_sum_impl(__VA_ARGS__); #define SQUARE_SUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(composition, square_sum, case_name); \ + NMTOOLS_TESTING_USE_CASE(composition, square_sum, case_name); \ using namespace args; \ auto result = RUN_square_sum(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -116,7 +116,7 @@ TEST_CASE("square_sum(case1)" * doctest::test_suite("composition::square_sum")) // SQUARE_SUM_SUBCASE( case1, a_d, axis, keepdims ); { - NMTOOLS_TESTING_DECLARE_NS(composition, square_sum, case1); + NMTOOLS_TESTING_USE_CASE(composition, square_sum, case1); using namespace args; auto view = composition::square_sum(a, axis, dtype, keepdims); @@ -344,7 +344,7 @@ RUN_square_sum_divide_impl(__VA_ARGS__); #define SQUARE_SUM_DIVIDE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(composition, square_sum_divide, case_name); \ + NMTOOLS_TESTING_USE_CASE(composition, square_sum_divide, case_name); \ using namespace args; \ auto result = RUN_square_sum_divide(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -368,7 +368,7 @@ TEST_CASE("square_sum_divide(case2)" * doctest::test_suite("composition::square_ // SQUARE_SUM_DIVIDE_SUBCASE( case2, a_d, N, axis, dtype, keepdims ); { - NMTOOLS_TESTING_DECLARE_NS(composition, square_sum_divide, case2); + NMTOOLS_TESTING_USE_CASE(composition, square_sum_divide, case2); using namespace args; auto view = composition::square_sum_divide(a, N, axis, dtype, keepdims); diff --git a/tests/view/src/composition/subtract_fabs_square.cpp b/tests/view/src/composition/subtract_fabs_square.cpp index b213a1d38..f5177ab48 100644 --- a/tests/view/src/composition/subtract_fabs_square.cpp +++ b/tests/view/src/composition/subtract_fabs_square.cpp @@ -121,7 +121,7 @@ RUN_subtract_fabs_square_impl(__VA_ARGS__); #define SUBTRACT_FABS_SQUARE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(composition, subtract_fabs_square, case_name); \ + NMTOOLS_TESTING_USE_CASE(composition, subtract_fabs_square, case_name); \ using namespace args; \ auto result = RUN_subtract_fabs_square(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/compress.cpp b/tests/view/src/compress.cpp index 996b19f4d..a9a09b87b 100644 --- a/tests/view/src/compress.cpp +++ b/tests/view/src/compress.cpp @@ -50,7 +50,7 @@ RUN_compress_impl(__VA_ARGS__); #define COMPRESS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, compress, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, compress, case_name); \ using namespace args; \ auto result = RUN_compress(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/view/src/concatenate.cpp b/tests/view/src/concatenate.cpp index a58f19f96..875072a9e 100644 --- a/tests/view/src/concatenate.cpp +++ b/tests/view/src/concatenate.cpp @@ -57,7 +57,7 @@ RUN_impl(__VA_ARGS__); #define CONCATENATE_SUBCASE(case_name, lhs, rhs, axis) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, concatenate, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, concatenate, case_name); \ auto array_ref = RUN_concatenate(case_name, args::lhs, args::rhs, args::axis); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(array_ref), nmtools::shape(expect::expected) ); \ NMTOOLS_ASSERT_CLOSE( array_ref, expect::expected ); \ diff --git a/tests/view/src/conv-1.cpp b/tests/view/src/conv-1.cpp index 6729f9be2..69c7f9150 100644 --- a/tests/view/src/conv-1.cpp +++ b/tests/view/src/conv-1.cpp @@ -49,7 +49,7 @@ RUN_conv2d_impl(__VA_ARGS__); #define CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, conv2d, case_name); \ using namespace args; \ auto result = RUN_conv2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ @@ -61,7 +61,7 @@ using nmtools::None; TEST_CASE("conv2d(case1)" * doctest::test_suite("view::conv2d")) { { - NMTOOLS_TESTING_DECLARE_NS(array, conv2d, case1); + NMTOOLS_TESTING_USE_CASE(array, conv2d, case1); using namespace args; [[maybe_unused]] auto result = RUN_conv2d(case_name, input, weight); } diff --git a/tests/view/src/conv-2.cpp b/tests/view/src/conv-2.cpp index 04cf10ba9..d5d66913a 100644 --- a/tests/view/src/conv-2.cpp +++ b/tests/view/src/conv-2.cpp @@ -49,7 +49,7 @@ RUN_conv2d_impl(__VA_ARGS__); #define CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, conv2d, case_name); \ using namespace args; \ auto result = RUN_conv2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/view/src/conv-3.cpp b/tests/view/src/conv-3.cpp index 63cc14468..7fd8bc771 100644 --- a/tests/view/src/conv-3.cpp +++ b/tests/view/src/conv-3.cpp @@ -49,7 +49,7 @@ RUN_conv2d_impl(__VA_ARGS__); #define CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, conv2d, case_name); \ using namespace args; \ auto result = RUN_conv2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/view/src/conv-4.cpp b/tests/view/src/conv-4.cpp index 94bad4561..364ec3838 100644 --- a/tests/view/src/conv-4.cpp +++ b/tests/view/src/conv-4.cpp @@ -49,7 +49,7 @@ RUN_conv2d_impl(__VA_ARGS__); #define CONV2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, conv2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, conv2d, case_name); \ using namespace args; \ auto result = RUN_conv2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/view/src/cumprod.cpp b/tests/view/src/cumprod.cpp index bdf267af6..a378efead 100644 --- a/tests/view/src/cumprod.cpp +++ b/tests/view/src/cumprod.cpp @@ -36,7 +36,7 @@ RUN_cumprod_impl(__VA_ARGS__); SUBCASE(#case_name) \ { \ /* using test case from accumulate_add since they're basically the same */ \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_multiply, case_name); \ using namespace args; \ auto result = RUN_cumprod(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result.shape(), expect::shape ); \ diff --git a/tests/view/src/cumsum.cpp b/tests/view/src/cumsum.cpp index d3ebe746b..7dd6ac50c 100644 --- a/tests/view/src/cumsum.cpp +++ b/tests/view/src/cumsum.cpp @@ -36,7 +36,7 @@ RUN_cumsum_impl(__VA_ARGS__); SUBCASE(#case_name) \ { \ /* using test case from accumulate_add since they're basically the same */ \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_add, case_name); \ using namespace args; \ auto result = RUN_cumsum(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result.shape(), expect::shape ); \ diff --git a/tests/view/src/expand_dims.cpp b/tests/view/src/expand_dims.cpp index a610e5b25..257b696b7 100644 --- a/tests/view/src/expand_dims.cpp +++ b/tests/view/src/expand_dims.cpp @@ -33,7 +33,7 @@ namespace view = nm::view; #define EXPAND_DIMS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(expand_dims, case_name); \ + NMTOOLS_TESTING_USE_CASE(expand_dims, case_name); \ using namespace args; \ auto result = nmtools::view::expand_dims(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), expect::shape ); \ diff --git a/tests/view/src/flatten.cpp b/tests/view/src/flatten.cpp index 893de7d2d..a17caa129 100644 --- a/tests/view/src/flatten.cpp +++ b/tests/view/src/flatten.cpp @@ -29,7 +29,7 @@ namespace meta = nm::meta; #define FLATTEN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(flatten,case_name); \ + NMTOOLS_TESTING_USE_CASE(flatten,case_name); \ using namespace args; \ auto result = view::flatten(__VA_ARGS__); \ NMTOOLS_REQUIRE_EQUAL( nmtools::shape(result), expect::shape ); \ diff --git a/tests/view/src/flip.cpp b/tests/view/src/flip.cpp index 50feb3a5a..144c0b8b8 100644 --- a/tests/view/src/flip.cpp +++ b/tests/view/src/flip.cpp @@ -25,7 +25,7 @@ namespace nm = nmtools; #define FLIP_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(flip, case_name); \ + NMTOOLS_TESTING_USE_CASE(flip, case_name); \ using namespace args; \ auto result = nmtools::view::flip(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -34,7 +34,7 @@ SUBCASE(#case_name) \ #define FLIPLR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(fliplr, case_name); \ + NMTOOLS_TESTING_USE_CASE(fliplr, case_name); \ using namespace args; \ auto result = nmtools::view::fliplr(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ @@ -43,7 +43,7 @@ SUBCASE(#case_name) \ #define FLIPUD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(flipud, case_name); \ + NMTOOLS_TESTING_USE_CASE(flipud, case_name); \ using namespace args; \ auto result = nmtools::view::flipud(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/view/src/full.cpp b/tests/view/src/full.cpp index 4498d27a4..b1929658c 100644 --- a/tests/view/src/full.cpp +++ b/tests/view/src/full.cpp @@ -32,7 +32,7 @@ RUN_full_impl(__VA_ARGS__); #define FULL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, full, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, full, case_name); \ using namespace args; \ auto result = RUN_full(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/hstack.cpp b/tests/view/src/hstack.cpp index 9f04cb241..e9732658a 100644 --- a/tests/view/src/hstack.cpp +++ b/tests/view/src/hstack.cpp @@ -28,7 +28,7 @@ namespace meta = nm::meta; #define HSTACK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( hstack, case_name ) \ + NMTOOLS_TESTING_USE_CASE( hstack, case_name ) \ using namespace args; \ auto result = nmtools::view::hstack(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/view/src/matmul-1.cpp b/tests/view/src/matmul-1.cpp index 67bf9b137..dc37c0309 100644 --- a/tests/view/src/matmul-1.cpp +++ b/tests/view/src/matmul-1.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define MATMUL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, matmul, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, matmul, case_name); \ using namespace args; \ auto result = nmtools::view::matmul(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/view/src/matmul-2.cpp b/tests/view/src/matmul-2.cpp index 61a7b4dc9..bc049cf64 100644 --- a/tests/view/src/matmul-2.cpp +++ b/tests/view/src/matmul-2.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define MATMUL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, matmul, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, matmul, case_name); \ using namespace args; \ auto result = nmtools::view::matmul(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/view/src/matmul-3.cpp b/tests/view/src/matmul-3.cpp index f335f859f..9300ae06e 100644 --- a/tests/view/src/matmul-3.cpp +++ b/tests/view/src/matmul-3.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define MATMUL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, matmul, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, matmul, case_name); \ using namespace args; \ auto result = nmtools::view::matmul(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/view/src/matmul.cpp b/tests/view/src/matmul.cpp index f2eb64b59..d57e2da63 100644 --- a/tests/view/src/matmul.cpp +++ b/tests/view/src/matmul.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define MATMUL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, matmul, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, matmul, case_name); \ using namespace args; \ auto result = nmtools::view::matmul(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/view/src/mean.cpp b/tests/view/src/mean.cpp index fcdf8fc59..ef07a266d 100644 --- a/tests/view/src/mean.cpp +++ b/tests/view/src/mean.cpp @@ -24,7 +24,7 @@ namespace na = nm::array; #define MEAN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, mean, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, mean, case_name); \ using namespace args; \ auto result = nmtools::view::mean(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/moveaxis.cpp b/tests/view/src/moveaxis.cpp index 9ac5415fa..828ab5067 100644 --- a/tests/view/src/moveaxis.cpp +++ b/tests/view/src/moveaxis.cpp @@ -50,7 +50,7 @@ RUN_moveaxis_impl(__VA_ARGS__); #define MOVEAXIS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, moveaxis, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, moveaxis, case_name); \ using namespace args; \ auto result = RUN_moveaxis(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/mutable_flatten.cpp b/tests/view/src/mutable_flatten.cpp index 82057f4ad..4ba3a23a6 100644 --- a/tests/view/src/mutable_flatten.cpp +++ b/tests/view/src/mutable_flatten.cpp @@ -29,7 +29,7 @@ namespace meta = nm::meta; #define MUTABLE_FLATTEN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(flatten,case_name); \ + NMTOOLS_TESTING_USE_CASE(flatten,case_name); \ using namespace args; \ auto result = view::mutable_flatten(__VA_ARGS__); \ NMTOOLS_REQUIRE_EQUAL( nmtools::shape(result), expect::shape ); \ diff --git a/tests/view/src/mutable_reshape.cpp b/tests/view/src/mutable_reshape.cpp index ca207e3f5..d9102c7bf 100644 --- a/tests/view/src/mutable_reshape.cpp +++ b/tests/view/src/mutable_reshape.cpp @@ -29,7 +29,7 @@ namespace meta = nm::meta; #define MUTABLE_RESHAPE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(reshape, case_name) \ + NMTOOLS_TESTING_USE_CASE(reshape, case_name) \ using namespace args; \ auto array_ref = nmtools::view::mutable_reshape(__VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( array_ref, expect::expected ); \ diff --git a/tests/view/src/mutable_slice.cpp b/tests/view/src/mutable_slice.cpp index 6e7a52a8b..9568672ba 100644 --- a/tests/view/src/mutable_slice.cpp +++ b/tests/view/src/mutable_slice.cpp @@ -952,7 +952,7 @@ RUN_apply_mutable_slice_impl(__VA_ARGS__); #define MUTABLE_SLICE_SUBCASE(case_name, input, rhs, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, slice, case_name); \ using namespace args; \ auto input_ = na::copy(array); \ auto result = RUN_mutable_slice(case_name, input_, __VA_ARGS__ ); \ @@ -966,7 +966,7 @@ SUBCASE(#case_name) \ #define APPLY_MUTABLE_SLICE_SUBCASE(case_name, input, rhs, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, slice, case_name); \ using namespace args; \ auto input_ = na::copy(array); \ auto result = RUN_apply_mutable_slice(case_name, input_, __VA_ARGS__ ); \ diff --git a/tests/view/src/ones.cpp b/tests/view/src/ones.cpp index d3406b7b3..e863bdb66 100644 --- a/tests/view/src/ones.cpp +++ b/tests/view/src/ones.cpp @@ -32,7 +32,7 @@ RUN_ones_impl(__VA_ARGS__); #define ONES_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, ones, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, ones, case_name); \ using namespace args; \ auto result = RUN_ones(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/pad.cpp b/tests/view/src/pad.cpp index 40c581780..881dfadc5 100644 --- a/tests/view/src/pad.cpp +++ b/tests/view/src/pad.cpp @@ -47,7 +47,7 @@ RUN_pad_impl(__VA_ARGS__); #define PAD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, pad, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, pad, case_name); \ using namespace args; \ auto result = RUN_pad(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/view/src/pooling.cpp b/tests/view/src/pooling.cpp index 642ef7ee3..3cba1eee8 100644 --- a/tests/view/src/pooling.cpp +++ b/tests/view/src/pooling.cpp @@ -50,7 +50,7 @@ RUN_max_pool2d_impl(__VA_ARGS__); #define MAX_POOL2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, max_pool2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, max_pool2d, case_name); \ using namespace args; \ auto result = RUN_max_pool2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -392,7 +392,7 @@ RUN_avg_pool2d_impl(__VA_ARGS__); #define AVG_POOL2D_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, avg_pool2d, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, avg_pool2d, case_name); \ using namespace args; \ auto result = RUN_avg_pool2d(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/prod.cpp b/tests/view/src/prod.cpp index b74a2e8f1..3983e2d8d 100644 --- a/tests/view/src/prod.cpp +++ b/tests/view/src/prod.cpp @@ -36,7 +36,7 @@ RUN_prod_impl(__VA_ARGS__); SUBCASE(#case_name) \ { \ /* using test case from reduce_multiply since they're basically the same */ \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_multiply, case_name); \ using namespace args; \ auto result = RUN_prod(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/repeat.cpp b/tests/view/src/repeat.cpp index b0dba896f..6b2d9bbaa 100644 --- a/tests/view/src/repeat.cpp +++ b/tests/view/src/repeat.cpp @@ -56,7 +56,7 @@ RUN_impl(__VA_ARGS__); #define REPEAT_SUBCASE(case_name, array_input, repeats, axis) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, repeat, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, repeat, case_name); \ auto array_view = RUN_repeat(case_name, args::array_input, args::repeats, args::axis); \ NMTOOLS_ASSERT_EQUAL( nmtools::dim(array_view), nmtools::dim(expect::result) ); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(array_view), nmtools::shape(expect::result) ); \ diff --git a/tests/view/src/reshape.cpp b/tests/view/src/reshape.cpp index 2fd1614aa..5e4872843 100644 --- a/tests/view/src/reshape.cpp +++ b/tests/view/src/reshape.cpp @@ -29,7 +29,7 @@ namespace meta = nm::meta; #define RESHAPE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(reshape, case_name) \ + NMTOOLS_TESTING_USE_CASE(reshape, case_name) \ using namespace args; \ auto result = view::reshape(__VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::expected ); \ diff --git a/tests/view/src/resize.cpp b/tests/view/src/resize.cpp index 557d419c9..a748bc454 100644 --- a/tests/view/src/resize.cpp +++ b/tests/view/src/resize.cpp @@ -49,7 +49,7 @@ RUN_resize_impl(__VA_ARGS__); #define RESIZE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(resize, case_name); \ + NMTOOLS_TESTING_USE_CASE(resize, case_name); \ using namespace args; \ auto result = RUN_resize(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_SHAPE( result, expect::expected ); \ diff --git a/tests/view/src/roll.cpp b/tests/view/src/roll.cpp index 73f37cc0c..c3a155e20 100644 --- a/tests/view/src/roll.cpp +++ b/tests/view/src/roll.cpp @@ -29,7 +29,7 @@ namespace meta = nm::meta; #define ROLL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(roll, case_name) \ + NMTOOLS_TESTING_USE_CASE(roll, case_name) \ using namespace args; \ auto result = view::roll(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/view/src/slice.cpp b/tests/view/src/slice.cpp index 4f7fdfa27..559771cd2 100644 --- a/tests/view/src/slice.cpp +++ b/tests/view/src/slice.cpp @@ -50,7 +50,7 @@ RUN_slice_impl(__VA_ARGS__); #define SLICE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, slice, case_name); \ using namespace args; \ auto result = RUN_slice(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ @@ -1465,7 +1465,7 @@ RUN_apply_slice_impl(__VA_ARGS__); #define APPLY_SLICE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, slice, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, slice, case_name); \ using namespace args; \ auto result = RUN_apply_slice(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/view/src/sliding_window.cpp b/tests/view/src/sliding_window.cpp index c72f753e6..fd1062762 100644 --- a/tests/view/src/sliding_window.cpp +++ b/tests/view/src/sliding_window.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define SLIDING_WINDOW_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, sliding_window, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, sliding_window, case_name); \ using namespace args; \ auto result = nmtools::view::sliding_window(__VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::expected ); \ diff --git a/tests/view/src/softmax.cpp b/tests/view/src/softmax.cpp index e3dbb81ab..4495da262 100644 --- a/tests/view/src/softmax.cpp +++ b/tests/view/src/softmax.cpp @@ -28,7 +28,7 @@ RUN_softmax_impl(__VA_ARGS__); #define SOFTMAX_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, softmax, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, softmax, case_name); \ using namespace args; \ auto result = RUN_softmax(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/softmin.cpp b/tests/view/src/softmin.cpp index a0597a131..5e9e6015b 100644 --- a/tests/view/src/softmin.cpp +++ b/tests/view/src/softmin.cpp @@ -28,7 +28,7 @@ RUN_softmin_impl(__VA_ARGS__); #define SOFTMIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, softmin, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, softmin, case_name); \ using namespace args; \ auto result = RUN_softmin(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/split.cpp b/tests/view/src/split.cpp index cecac1eff..6d134c18e 100644 --- a/tests/view/src/split.cpp +++ b/tests/view/src/split.cpp @@ -51,7 +51,7 @@ RUN_split_args_impl(__VA_ARGS__); #define SPLIT_ARGS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(index, split_args, case_name); \ + NMTOOLS_TESTING_USE_CASE(index, split_args, case_name); \ using namespace args; \ auto result = RUN_split_args(case_name, __VA_ARGS__); \ auto msg1 = std::string("Expected:\n") + nm::utils::to_string(expect::result); \ @@ -196,7 +196,7 @@ RUN_split_impl(__VA_ARGS__); #define SPLIT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, split, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, split, case_name); \ using namespace args; \ auto result = RUN_split(case_name, __VA_ARGS__); \ auto msg1 = std::string("Expected:\n") + nm::utils::apply_to_string(expect::result); \ diff --git a/tests/view/src/squeeze.cpp b/tests/view/src/squeeze.cpp index 67cdb20ae..89841508b 100644 --- a/tests/view/src/squeeze.cpp +++ b/tests/view/src/squeeze.cpp @@ -28,7 +28,7 @@ namespace meta = nm::meta; #define SQUEEZE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(squeeze, case_name) \ + NMTOOLS_TESTING_USE_CASE(squeeze, case_name) \ using namespace args; \ auto result = nmtools::view::squeeze(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), expect::shape ); \ diff --git a/tests/view/src/stack.cpp b/tests/view/src/stack.cpp index 2f5c9d458..23e5d58da 100644 --- a/tests/view/src/stack.cpp +++ b/tests/view/src/stack.cpp @@ -28,7 +28,7 @@ namespace meta = nm::meta; #define STACK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( stack, case_name ) \ + NMTOOLS_TESTING_USE_CASE( stack, case_name ) \ using namespace args; \ auto result = nmtools::view::stack(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/view/src/stddev.cpp b/tests/view/src/stddev.cpp index 7d0202637..8734e19f8 100644 --- a/tests/view/src/stddev.cpp +++ b/tests/view/src/stddev.cpp @@ -28,7 +28,7 @@ RUN_stddev_impl(__VA_ARGS__); #define STDDEV_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, stddev, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, stddev, case_name); \ using namespace args; \ auto result = RUN_stddev(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ diff --git a/tests/view/src/sum.cpp b/tests/view/src/sum.cpp index 1c932cff9..1371e7724 100644 --- a/tests/view/src/sum.cpp +++ b/tests/view/src/sum.cpp @@ -36,7 +36,7 @@ RUN_sum_impl(__VA_ARGS__); SUBCASE(#case_name) \ { \ /* using test case from reduce_add since they're basically the same */ \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_add, case_name); \ using namespace args; \ auto result = RUN_sum(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/take.cpp b/tests/view/src/take.cpp index 3a2f77a63..a1a536ae1 100644 --- a/tests/view/src/take.cpp +++ b/tests/view/src/take.cpp @@ -51,7 +51,7 @@ RUN_take_impl(__VA_ARGS__); #define TAKE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, take, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, take, case_name); \ using namespace args; \ auto result = RUN_take(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result, expect::result ); \ diff --git a/tests/view/src/take_along_axis.cpp b/tests/view/src/take_along_axis.cpp index 40a0d34a5..8e34dda6c 100644 --- a/tests/view/src/take_along_axis.cpp +++ b/tests/view/src/take_along_axis.cpp @@ -48,7 +48,7 @@ RUN_take_along_axis_impl(__VA_ARGS__); #define TAKE_ALONG_AXIS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, take_along_axis, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, take_along_axis, case_name); \ using namespace args; \ auto view = RUN_take_along_axis(case_name, __VA_ARGS__); \ NMTOOLS_REQUIRE_EQUAL( nm::shape(*view), nm::shape(expect::result) ); \ @@ -60,7 +60,7 @@ SUBCASE(#case_name) \ #define TAKE_ALONG_AXIS_META_SUBCASE(case_name, ...) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, take_along_axis, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, take_along_axis, case_name); \ using namespace args; \ auto view = RUN_take_along_axis(case_name, __VA_ARGS__); \ using element_t = nm::meta::get_element_type_t>; \ diff --git a/tests/view/src/tile.cpp b/tests/view/src/tile.cpp index 338134c1b..360994013 100644 --- a/tests/view/src/tile.cpp +++ b/tests/view/src/tile.cpp @@ -54,7 +54,7 @@ RUN_impl(__VA_ARGS__); #define TILE_VIEW_SUBCASE(case_name,array,reps) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( view, tile, case_name ); \ + NMTOOLS_TESTING_USE_CASE( view, tile, case_name ); \ auto array_view = RUN_tile( case_name, args::array, args::reps ); \ NMTOOLS_ASSERT_EQUAL( nm::dim(array_view), expect::dim ); \ NMTOOLS_ASSERT_EQUAL( nm::shape(array_view), expect::shape ); \ diff --git a/tests/view/src/transpose.cpp b/tests/view/src/transpose.cpp index f5174af38..64b6b65ef 100644 --- a/tests/view/src/transpose.cpp +++ b/tests/view/src/transpose.cpp @@ -32,7 +32,7 @@ namespace view = nm::view; #define TRANSPOSE_SUBCASE(case_name, array, axes) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( transpose, case_name ); \ + NMTOOLS_TESTING_USE_CASE( transpose, case_name ); \ auto array_ref = view::transpose(args::array, args::axes); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(array_ref), nmtools::shape(expect::expected) ); \ NMTOOLS_ASSERT_CLOSE( array_ref, expect::expected ); \ diff --git a/tests/view/src/ufuncs/add.cpp b/tests/view/src/ufuncs/add.cpp index 8afbd0bbb..229884c2a 100644 --- a/tests/view/src/ufuncs/add.cpp +++ b/tests/view/src/ufuncs/add.cpp @@ -53,7 +53,7 @@ RUN_add_impl(__VA_ARGS__); #define ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, add, case_name); \ using namespace args; \ auto result = RUN_add(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ @@ -272,7 +272,7 @@ RUN_reduce_add_impl(__VA_ARGS__); #define REDUCE_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_add, case_name); \ using namespace args; \ auto result = RUN_reduce_add(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -1225,7 +1225,7 @@ RUN_accumulate_add_impl(__VA_ARGS__); #define ACCUMULATE_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_add, case_name); \ using namespace args; \ auto result = RUN_accumulate_add(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result.shape(), expect::shape ); \ @@ -1354,7 +1354,7 @@ RUN_outer_add_impl(__VA_ARGS__); #define OUTER_ADD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_add, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_add, case_name); \ using namespace args; \ auto result = RUN_outer_add(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result.shape(), expect::shape ); \ diff --git a/tests/view/src/ufuncs/amax.cpp b/tests/view/src/ufuncs/amax.cpp index ab9b0bbf9..d7eec335a 100644 --- a/tests/view/src/ufuncs/amax.cpp +++ b/tests/view/src/ufuncs/amax.cpp @@ -32,7 +32,7 @@ RUN_amax_impl(__VA_ARGS__); #define AMAX_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_maximum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_maximum, case_name); \ using namespace args; \ auto result = RUN_amax(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/amin.cpp b/tests/view/src/ufuncs/amin.cpp index 69e00688c..c2df05f50 100644 --- a/tests/view/src/ufuncs/amin.cpp +++ b/tests/view/src/ufuncs/amin.cpp @@ -32,7 +32,7 @@ RUN_amin_impl(__VA_ARGS__); #define AMIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_minimum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_minimum, case_name); \ using namespace args; \ auto result = RUN_amin(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/arccos.cpp b/tests/view/src/ufuncs/arccos.cpp index 18450cbda..d7d3a9e00 100644 --- a/tests/view/src/ufuncs/arccos.cpp +++ b/tests/view/src/ufuncs/arccos.cpp @@ -35,7 +35,7 @@ RUN_arccos_impl(__VA_ARGS__); #define ARCCOS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arccos, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arccos, case_name); \ using namespace args; \ auto result = RUN_arccos(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result.shape(), expect::shape ); \ diff --git a/tests/view/src/ufuncs/arccosh.cpp b/tests/view/src/ufuncs/arccosh.cpp index 9d2d27304..a5bfb0d7a 100644 --- a/tests/view/src/ufuncs/arccosh.cpp +++ b/tests/view/src/ufuncs/arccosh.cpp @@ -35,7 +35,7 @@ RUN_arccosh_impl(__VA_ARGS__); #define ARCCOSH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arccosh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arccosh, case_name); \ using namespace args; \ auto result = RUN_arccosh(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result.shape(), expect::shape ); \ diff --git a/tests/view/src/ufuncs/arcsin.cpp b/tests/view/src/ufuncs/arcsin.cpp index 4f8f301ee..a7ddaae55 100644 --- a/tests/view/src/ufuncs/arcsin.cpp +++ b/tests/view/src/ufuncs/arcsin.cpp @@ -35,7 +35,7 @@ RUN_arcsin_impl(__VA_ARGS__); #define ARCSIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arcsin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arcsin, case_name); \ using namespace args; \ auto result = RUN_arcsin(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result.shape(), expect::shape ); \ diff --git a/tests/view/src/ufuncs/arcsinh.cpp b/tests/view/src/ufuncs/arcsinh.cpp index 76b13b55d..ae9a94b4b 100644 --- a/tests/view/src/ufuncs/arcsinh.cpp +++ b/tests/view/src/ufuncs/arcsinh.cpp @@ -35,7 +35,7 @@ RUN_arcsinh_impl(__VA_ARGS__); #define ARCSINH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arcsinh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arcsinh, case_name); \ using namespace args; \ auto result = RUN_arcsinh(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result.shape(), expect::shape ); \ diff --git a/tests/view/src/ufuncs/arctan.cpp b/tests/view/src/ufuncs/arctan.cpp index e3d8dd931..3cad54ba8 100644 --- a/tests/view/src/ufuncs/arctan.cpp +++ b/tests/view/src/ufuncs/arctan.cpp @@ -35,7 +35,7 @@ RUN_arctan_impl(__VA_ARGS__); #define ARCTAN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arctan, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arctan, case_name); \ using namespace args; \ auto result = RUN_arctan(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result.shape(), expect::shape ); \ diff --git a/tests/view/src/ufuncs/arctan2.cpp b/tests/view/src/ufuncs/arctan2.cpp index 676ec6a86..f9022404e 100644 --- a/tests/view/src/ufuncs/arctan2.cpp +++ b/tests/view/src/ufuncs/arctan2.cpp @@ -12,7 +12,7 @@ namespace view = nm::view; #define ARCTAN2_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arctan2, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arctan2, case_name); \ using namespace args; \ auto result = view::arctan2(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/arctanh.cpp b/tests/view/src/ufuncs/arctanh.cpp index 1f88e906e..7e97a53df 100644 --- a/tests/view/src/ufuncs/arctanh.cpp +++ b/tests/view/src/ufuncs/arctanh.cpp @@ -35,7 +35,7 @@ RUN_arctanh_impl(__VA_ARGS__); #define ARCTANH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, arctanh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, arctanh, case_name); \ using namespace args; \ auto result = RUN_arctanh(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result.shape(), expect::shape ); \ diff --git a/tests/view/src/ufuncs/bitwise_and.cpp b/tests/view/src/ufuncs/bitwise_and.cpp index 34f8d6972..44c20b52b 100644 --- a/tests/view/src/ufuncs/bitwise_and.cpp +++ b/tests/view/src/ufuncs/bitwise_and.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define BITWISE_AND_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, bitwise_and, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, bitwise_and, case_name); \ using namespace args; \ auto result = view::bitwise_and(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/bitwise_or.cpp b/tests/view/src/ufuncs/bitwise_or.cpp index 5058ce20b..374c74c12 100644 --- a/tests/view/src/ufuncs/bitwise_or.cpp +++ b/tests/view/src/ufuncs/bitwise_or.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define BITWISE_OR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, bitwise_or, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, bitwise_or, case_name); \ using namespace args; \ auto result = view::bitwise_or(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/bitwise_xor.cpp b/tests/view/src/ufuncs/bitwise_xor.cpp index a597da179..1a0d50e95 100644 --- a/tests/view/src/ufuncs/bitwise_xor.cpp +++ b/tests/view/src/ufuncs/bitwise_xor.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define BITWISE_XOR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, bitwise_xor, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, bitwise_xor, case_name); \ using namespace args; \ auto result = view::bitwise_xor(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/cbrt.cpp b/tests/view/src/ufuncs/cbrt.cpp index ff1bd3b13..b3ae4e753 100644 --- a/tests/view/src/ufuncs/cbrt.cpp +++ b/tests/view/src/ufuncs/cbrt.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define CBRT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, cbrt, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, cbrt, case_name); \ using namespace args; \ auto result = view::cbrt(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/ceil.cpp b/tests/view/src/ufuncs/ceil.cpp index c858fb937..1bd48c1c1 100644 --- a/tests/view/src/ufuncs/ceil.cpp +++ b/tests/view/src/ufuncs/ceil.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define CEIL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, ceil, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, ceil, case_name); \ using namespace args; \ auto result = view::ceil(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/clip.cpp b/tests/view/src/ufuncs/clip.cpp index 2b47486ba..49aca240a 100644 --- a/tests/view/src/ufuncs/clip.cpp +++ b/tests/view/src/ufuncs/clip.cpp @@ -9,7 +9,7 @@ namespace view = nmtools::view; #define CLIP_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, clip, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, clip, case_name); \ using namespace args; \ auto result = view::clip(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/cos.cpp b/tests/view/src/ufuncs/cos.cpp index 4479f5b7d..12aae5102 100644 --- a/tests/view/src/ufuncs/cos.cpp +++ b/tests/view/src/ufuncs/cos.cpp @@ -25,7 +25,7 @@ namespace view = nm::view; #define COS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, cos, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, cos, case_name); \ using namespace args; \ auto result = view::cos(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(result), nmtools::shape(expect::result) ); \ diff --git a/tests/view/src/ufuncs/cosh.cpp b/tests/view/src/ufuncs/cosh.cpp index 21587fc84..48df43190 100644 --- a/tests/view/src/ufuncs/cosh.cpp +++ b/tests/view/src/ufuncs/cosh.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; #define COSH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, cosh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, cosh, case_name); \ using namespace args; \ auto result = view::cosh(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/divide.cpp b/tests/view/src/ufuncs/divide.cpp index a6e723aa7..d35d884af 100644 --- a/tests/view/src/ufuncs/divide.cpp +++ b/tests/view/src/ufuncs/divide.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define DIVIDE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, divide, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, divide, case_name); \ using namespace args; \ auto result = view::divide(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/equal.cpp b/tests/view/src/ufuncs/equal.cpp index 741cc36a7..397afa16a 100644 --- a/tests/view/src/ufuncs/equal.cpp +++ b/tests/view/src/ufuncs/equal.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define EQUAL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, equal, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, equal, case_name); \ using namespace args; \ auto result = view::equal(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/exp.cpp b/tests/view/src/ufuncs/exp.cpp index bbf3709ee..ee4f02d6e 100644 --- a/tests/view/src/ufuncs/exp.cpp +++ b/tests/view/src/ufuncs/exp.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define EXP_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, exp, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, exp, case_name); \ using namespace args; \ auto result = view::exp(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/exp2.cpp b/tests/view/src/ufuncs/exp2.cpp index 0e2b8e24c..89779620c 100644 --- a/tests/view/src/ufuncs/exp2.cpp +++ b/tests/view/src/ufuncs/exp2.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define EXP2_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, exp2, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, exp2, case_name); \ using namespace args; \ auto result = view::exp2(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/expm1.cpp b/tests/view/src/ufuncs/expm1.cpp index 6f0dc7ca0..cfb2b2772 100644 --- a/tests/view/src/ufuncs/expm1.cpp +++ b/tests/view/src/ufuncs/expm1.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; #define EXPM1_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, expm1, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, expm1, case_name); \ using namespace args; \ auto result = view::expm1(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/fabs.cpp b/tests/view/src/ufuncs/fabs.cpp index ded3f3bc2..90e232bca 100644 --- a/tests/view/src/ufuncs/fabs.cpp +++ b/tests/view/src/ufuncs/fabs.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define FABS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, fabs, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, fabs, case_name); \ using namespace args; \ auto result = view::fabs(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/floor.cpp b/tests/view/src/ufuncs/floor.cpp index 41bb5db1d..ad9392f7e 100644 --- a/tests/view/src/ufuncs/floor.cpp +++ b/tests/view/src/ufuncs/floor.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define FLOOR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, floor, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, floor, case_name); \ using namespace args; \ auto result = view::floor(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/fmax.cpp b/tests/view/src/ufuncs/fmax.cpp index b143834a3..f545924c5 100644 --- a/tests/view/src/ufuncs/fmax.cpp +++ b/tests/view/src/ufuncs/fmax.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define FMAX_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, fmax, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, fmax, case_name); \ using namespace args; \ auto result = view::fmax(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -37,7 +37,7 @@ TEST_CASE("fmax(case2)" * doctest::test_suite("view::fmax")) #define REDUCE_FMAX_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_fmax, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_fmax, case_name); \ using namespace args; \ auto result = view::reduce_fmax(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -203,7 +203,7 @@ TEST_CASE("reduce_fmax(case18)" * doctest::test_suite("view::reduce_fmax")) #define ACCUMULATE_FMAX_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_fmax, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_fmax, case_name); \ using namespace args; \ auto result = view::accumulate_fmax(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -243,7 +243,7 @@ TEST_CASE("accumulate_fmax(case3)" * doctest::test_suite("view::accumulate_fmax" #define OUTER_FMAX_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_fmax, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_fmax, case_name); \ using namespace args; \ auto result = view::outer_fmax(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/fmin.cpp b/tests/view/src/ufuncs/fmin.cpp index 66f8eb630..9eb87d762 100644 --- a/tests/view/src/ufuncs/fmin.cpp +++ b/tests/view/src/ufuncs/fmin.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define FMIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, fmin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, fmin, case_name); \ using namespace args; \ auto result = view::fmin(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -37,7 +37,7 @@ TEST_CASE("fmin(case2)" * doctest::test_suite("view::fmin")) #define REDUCE_FMIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_fmin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_fmin, case_name); \ using namespace args; \ auto result = view::reduce_fmin(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -195,7 +195,7 @@ TEST_CASE("reduce_fmin(case16)" * doctest::test_suite("view::reduce_fmin")) #define ACCUMULATE_FMIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_fmin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_fmin, case_name); \ using namespace args; \ auto result = view::accumulate_fmin(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -235,7 +235,7 @@ TEST_CASE("accumulate_fmin(case3)" * doctest::test_suite("view::accumulate_fmin" #define OUTER_FMIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_fmin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_fmin, case_name); \ using namespace args; \ auto result = view::outer_fmin(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/fmod.cpp b/tests/view/src/ufuncs/fmod.cpp index b50b7984a..d5e9ae5cc 100644 --- a/tests/view/src/ufuncs/fmod.cpp +++ b/tests/view/src/ufuncs/fmod.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define FMOD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, fmod, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, fmod, case_name); \ using namespace args; \ auto result = view::fmod( __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -37,7 +37,7 @@ TEST_CASE("fmod(case2)" * doctest::test_suite("view::fmod")) #define REDUCE_FMOD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_fmod, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_fmod, case_name); \ using namespace args; \ auto result = view::reduce_fmod(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -117,7 +117,7 @@ TEST_CASE("reduce_fmod(case8)" * doctest::test_suite("view::reduce_fmod")) #define ACCUMULATE_FMOD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_fmod, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_fmod, case_name); \ using namespace args; \ auto result = view::accumulate_fmod(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -157,7 +157,7 @@ TEST_CASE("accumulate_fmod(case3)" * doctest::test_suite("view::accumulate_fmod" #define OUTER_FMOD_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_fmod, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_fmod, case_name); \ using namespace args; \ auto result = view::outer_fmod(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/greater.cpp b/tests/view/src/ufuncs/greater.cpp index 9890aec79..85b611e83 100644 --- a/tests/view/src/ufuncs/greater.cpp +++ b/tests/view/src/ufuncs/greater.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define GREATER_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, greater, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, greater, case_name); \ using namespace args; \ auto result = view::greater(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/greater_equal.cpp b/tests/view/src/ufuncs/greater_equal.cpp index 2a661b479..530131c2e 100644 --- a/tests/view/src/ufuncs/greater_equal.cpp +++ b/tests/view/src/ufuncs/greater_equal.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define GREATER_EQUAL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, greater_equal, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, greater_equal, case_name); \ using namespace args; \ auto result = view::greater_equal(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/hypot.cpp b/tests/view/src/ufuncs/hypot.cpp index cf8d023c5..9107dab4a 100644 --- a/tests/view/src/ufuncs/hypot.cpp +++ b/tests/view/src/ufuncs/hypot.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define HYPOT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, hypot, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, hypot, case_name); \ using namespace args; \ auto result = view::hypot(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/invert.cpp b/tests/view/src/ufuncs/invert.cpp index 6e42ebd26..62e3ef6bd 100644 --- a/tests/view/src/ufuncs/invert.cpp +++ b/tests/view/src/ufuncs/invert.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define INVERT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, invert, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, invert, case_name); \ using namespace args; \ auto result = view::invert(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/isfinite.cpp b/tests/view/src/ufuncs/isfinite.cpp index 9c09e949d..985c5bf5f 100644 --- a/tests/view/src/ufuncs/isfinite.cpp +++ b/tests/view/src/ufuncs/isfinite.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define ISFINITE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, isfinite, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, isfinite, case_name); \ using namespace args; \ auto result = view::isfinite(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/isinf.cpp b/tests/view/src/ufuncs/isinf.cpp index f3aafb961..d4f698a9c 100644 --- a/tests/view/src/ufuncs/isinf.cpp +++ b/tests/view/src/ufuncs/isinf.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define ISINF_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, isinf, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, isinf, case_name); \ using namespace args; \ auto result = view::isinf(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/isnan.cpp b/tests/view/src/ufuncs/isnan.cpp index 5a6637b84..1a6407493 100644 --- a/tests/view/src/ufuncs/isnan.cpp +++ b/tests/view/src/ufuncs/isnan.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define ISNAN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, isnan, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, isnan, case_name); \ using namespace args; \ auto result = view::isnan(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/ldexp.cpp b/tests/view/src/ufuncs/ldexp.cpp index 9d1498510..942e6aaba 100644 --- a/tests/view/src/ufuncs/ldexp.cpp +++ b/tests/view/src/ufuncs/ldexp.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define LDEXP_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, ldexp, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, ldexp, case_name); \ using namespace args; \ auto result = view::ldexp(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/left_shift.cpp b/tests/view/src/ufuncs/left_shift.cpp index ab493a45a..d2ac7ff57 100644 --- a/tests/view/src/ufuncs/left_shift.cpp +++ b/tests/view/src/ufuncs/left_shift.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define LEFT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, left_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, left_shift, case_name); \ using namespace args; \ auto result = view::left_shift(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -37,7 +37,7 @@ TEST_CASE("left_shift(case2)" * doctest::test_suite("view::left_shift")) #define REDUCE_LEFT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_left_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_left_shift, case_name); \ using namespace args; \ auto result = view::reduce_left_shift(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -125,7 +125,7 @@ TEST_CASE("reduce_left_shift(case9)" * doctest::test_suite("view::reduce_left_sh #define ACCUMULATE_LEFT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_left_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_left_shift, case_name); \ using namespace args; \ auto result = view::accumulate_left_shift(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -165,7 +165,7 @@ TEST_CASE("accumulate_left_shift(case3)" * doctest::test_suite("view::accumulate #define OUTER_LEFT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_left_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_left_shift, case_name); \ using namespace args; \ auto result = view::outer_left_shift(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/less.cpp b/tests/view/src/ufuncs/less.cpp index 56d1cc188..6c2744f16 100644 --- a/tests/view/src/ufuncs/less.cpp +++ b/tests/view/src/ufuncs/less.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define LESS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, less, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, less, case_name); \ using namespace args; \ auto result = view::less(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/less_equal.cpp b/tests/view/src/ufuncs/less_equal.cpp index 71ee78863..95351cb2a 100644 --- a/tests/view/src/ufuncs/less_equal.cpp +++ b/tests/view/src/ufuncs/less_equal.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define LESS_EQUAL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, less_equal, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, less_equal, case_name); \ using namespace args; \ auto result = view::less_equal(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/log.cpp b/tests/view/src/ufuncs/log.cpp index 3552255d7..2dec5b8ee 100644 --- a/tests/view/src/ufuncs/log.cpp +++ b/tests/view/src/ufuncs/log.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define LOG_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, log, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, log, case_name); \ using namespace args; \ auto result = view::log(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/log10.cpp b/tests/view/src/ufuncs/log10.cpp index 31b4060d8..0bea39092 100644 --- a/tests/view/src/ufuncs/log10.cpp +++ b/tests/view/src/ufuncs/log10.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define LOG10_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, log10, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, log10, case_name); \ using namespace args; \ auto result = view::log10(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/log1p.cpp b/tests/view/src/ufuncs/log1p.cpp index a732b4cdb..54d25e896 100644 --- a/tests/view/src/ufuncs/log1p.cpp +++ b/tests/view/src/ufuncs/log1p.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define LOG1P_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, log1p, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, log1p, case_name); \ using namespace args; \ auto result = view::log1p(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/log2.cpp b/tests/view/src/ufuncs/log2.cpp index 5d9bbbc93..e928298a9 100644 --- a/tests/view/src/ufuncs/log2.cpp +++ b/tests/view/src/ufuncs/log2.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define LOG2_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, log2, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, log2, case_name); \ using namespace args; \ auto result = view::log2(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/logical_and.cpp b/tests/view/src/ufuncs/logical_and.cpp index 7afcf799a..01b2884da 100644 --- a/tests/view/src/ufuncs/logical_and.cpp +++ b/tests/view/src/ufuncs/logical_and.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define LOGICAL_AND_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, logical_and, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, logical_and, case_name); \ using namespace args; \ auto result = view::logical_and(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -37,7 +37,7 @@ TEST_CASE("logical_and(case2)" * doctest::test_suite("view::logical_and")) #define REDUCE_LOGICAL_AND_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_logical_and, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_logical_and, case_name); \ using namespace args; \ auto result = view::reduce_logical_and(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/logical_not.cpp b/tests/view/src/ufuncs/logical_not.cpp index 7ef5eb837..f11aa5d2a 100644 --- a/tests/view/src/ufuncs/logical_not.cpp +++ b/tests/view/src/ufuncs/logical_not.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define LOGICAL_NOT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, logical_not, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, logical_not, case_name); \ using namespace args; \ auto result = view::logical_not( __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/logical_or.cpp b/tests/view/src/ufuncs/logical_or.cpp index 63564317b..47d22a4bf 100644 --- a/tests/view/src/ufuncs/logical_or.cpp +++ b/tests/view/src/ufuncs/logical_or.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define LOGICAL_OR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, logical_or, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, logical_or, case_name); \ using namespace args; \ auto result = view::logical_or( __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -37,7 +37,7 @@ TEST_CASE("logical_or(case2)" * doctest::test_suite("view::logical_or")) #define REDUCE_LOGICAL_OR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_logical_or, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_logical_or, case_name); \ using namespace args; \ auto result = view::reduce_logical_or(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/logical_xor.cpp b/tests/view/src/ufuncs/logical_xor.cpp index 41c4de2f8..04d69a52b 100644 --- a/tests/view/src/ufuncs/logical_xor.cpp +++ b/tests/view/src/ufuncs/logical_xor.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define LOGICAL_XOR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, logical_xor, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, logical_xor, case_name); \ using namespace args; \ auto result = view::logical_xor( __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -37,7 +37,7 @@ TEST_CASE("logical_xor(case2)" * doctest::test_suite("view::logical_xor")) #define REDUCE_LOGICAL_XOR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_logical_xor, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_logical_xor, case_name); \ using namespace args; \ auto result = view::reduce_logical_xor( __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/maximum.cpp b/tests/view/src/ufuncs/maximum.cpp index bdfd211e3..f4b94e977 100644 --- a/tests/view/src/ufuncs/maximum.cpp +++ b/tests/view/src/ufuncs/maximum.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define MAXIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, maximum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, maximum, case_name); \ using namespace args; \ auto result = view::maximum(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -37,7 +37,7 @@ TEST_CASE("maximum(case2)" * doctest::test_suite("view::maximum")) #define REDUCE_MAXIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_maximum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_maximum, case_name); \ using namespace args; \ auto result = view::reduce_maximum( __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -195,7 +195,7 @@ TEST_CASE("reduce_maximum(case17)" * doctest::test_suite("view::reduce_maximum") #define ACCUMULATE_MAXIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_maximum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_maximum, case_name); \ using namespace args; \ auto result = view::accumulate_maximum(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -235,7 +235,7 @@ TEST_CASE("accumulate_maximum(case3)" * doctest::test_suite("view::accumulate_ma #define OUTER_MAXIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_maximum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_maximum, case_name); \ using namespace args; \ auto result = view::outer_maximum(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/minimum.cpp b/tests/view/src/ufuncs/minimum.cpp index aef797866..7b576fef0 100644 --- a/tests/view/src/ufuncs/minimum.cpp +++ b/tests/view/src/ufuncs/minimum.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define MINIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, minimum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, minimum, case_name); \ using namespace args; \ auto result = view::minimum(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -37,7 +37,7 @@ TEST_CASE("minimum(case2)" * doctest::test_suite("view::minimum")) #define REDUCE_MINIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_minimum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_minimum, case_name); \ using namespace args; \ auto result = view::reduce_minimum(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -195,7 +195,7 @@ TEST_CASE("reduce_minimum(case17)" * doctest::test_suite("view::reduce_minimum") #define ACCUMULATE_MINIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_minimum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_minimum, case_name); \ using namespace args; \ auto result = view::accumulate_minimum(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -235,7 +235,7 @@ TEST_CASE("accumulate_minimum(case3)" * doctest::test_suite("view::accumulate_mi #define OUTER_MINIMUM_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_minimum, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_minimum, case_name); \ using namespace args; \ auto result = view::outer_minimum(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/multiply.cpp b/tests/view/src/ufuncs/multiply.cpp index 1a9b0378c..185eb38fe 100644 --- a/tests/view/src/ufuncs/multiply.cpp +++ b/tests/view/src/ufuncs/multiply.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define MULTIPLY_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, multiply, case_name); \ using namespace args; \ auto result = view::multiply(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -37,7 +37,7 @@ TEST_CASE("multiply(case2)" * doctest::test_suite("view::multiply")) #define REDUCE_MULTIPLY_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_multiply, case_name); \ using namespace args; \ auto result = view::reduce_multiply(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -193,7 +193,7 @@ TEST_CASE("reduce_multiply(case18)" * doctest::test_suite("view::reduce_multiply #define ACCUMULATE_MULTIPLY_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_multiply, case_name); \ using namespace args; \ auto result = view::accumulate_multiply(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -233,7 +233,7 @@ TEST_CASE("accumulate_multiply(case3)" * doctest::test_suite("view::accumulate_m #define OUTER_MULTIPLY_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_multiply, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_multiply, case_name); \ using namespace args; \ auto result = view::outer_multiply(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/negative.cpp b/tests/view/src/ufuncs/negative.cpp index a8825ef42..bfad4d8de 100644 --- a/tests/view/src/ufuncs/negative.cpp +++ b/tests/view/src/ufuncs/negative.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define NEGATIVE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, negative, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, negative, case_name); \ using namespace args; \ auto result = view::negative(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/not_equal.cpp b/tests/view/src/ufuncs/not_equal.cpp index a329a4dd6..55abe3503 100644 --- a/tests/view/src/ufuncs/not_equal.cpp +++ b/tests/view/src/ufuncs/not_equal.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define NOT_EQUAL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, not_equal, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, not_equal, case_name); \ using namespace args; \ auto result = view::not_equal(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/positive.cpp b/tests/view/src/ufuncs/positive.cpp index 6742d8532..68036979d 100644 --- a/tests/view/src/ufuncs/positive.cpp +++ b/tests/view/src/ufuncs/positive.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define POSITIVE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, positive, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, positive, case_name); \ using namespace args; \ auto result = view::positive(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/power.cpp b/tests/view/src/ufuncs/power.cpp index 1b7b90969..b0c02acd0 100644 --- a/tests/view/src/ufuncs/power.cpp +++ b/tests/view/src/ufuncs/power.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define POWER_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, power, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, power, case_name); \ using namespace args; \ auto result = view::power( __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -37,7 +37,7 @@ TEST_CASE("power(case2)" * doctest::test_suite("view::power")) #define REDUCE_POWER_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_power, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_power, case_name); \ using namespace args; \ auto result = view::reduce_power(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -128,7 +128,7 @@ TEST_CASE("reduce_power(case9)" * doctest::test_suite("view::reduce_power")) #define ACCUMULATE_POWER_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_power, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_power, case_name); \ using namespace args; \ auto result = view::accumulate_power(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -160,7 +160,7 @@ TEST_CASE("accumulate_power(case2)" * doctest::test_suite("view::accumulate_powe #define OUTER_POWER_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_power, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_power, case_name); \ using namespace args; \ auto result = view::outer_power(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/reciprocal.cpp b/tests/view/src/ufuncs/reciprocal.cpp index f4ab0c0ab..bfb334b75 100644 --- a/tests/view/src/ufuncs/reciprocal.cpp +++ b/tests/view/src/ufuncs/reciprocal.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define RECIPROCAL_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reciprocal, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reciprocal, case_name); \ using namespace args; \ auto result = view::reciprocal( __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/right_shift.cpp b/tests/view/src/ufuncs/right_shift.cpp index c21269a33..b8c3baeed 100644 --- a/tests/view/src/ufuncs/right_shift.cpp +++ b/tests/view/src/ufuncs/right_shift.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define RIGHT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, right_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, right_shift, case_name); \ using namespace args; \ auto result = view::right_shift(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -37,7 +37,7 @@ TEST_CASE("right_shift(case2)" * doctest::test_suite("view::right_shift")) #define REDUCE_RIGHT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_right_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_right_shift, case_name); \ using namespace args; \ auto result = view::reduce_right_shift( __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -117,7 +117,7 @@ TEST_CASE("reduce_right_shift(case8)" * doctest::test_suite("view::reduce_right_ #define ACCUMULATE_RIGHT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_right_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_right_shift, case_name); \ using namespace args; \ auto result = view::accumulate_right_shift(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result.shape(), expect::shape ); \ @@ -157,7 +157,7 @@ TEST_CASE("accumulate_right_shift(case3)" * doctest::test_suite("view::accumulat #define OUTER_RIGHT_SHIFT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_right_shift, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_right_shift, case_name); \ using namespace args; \ auto result = view::outer_right_shift(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( result.shape(), expect::shape ); \ diff --git a/tests/view/src/ufuncs/rint.cpp b/tests/view/src/ufuncs/rint.cpp index 49e43c01f..627fbe5ab 100644 --- a/tests/view/src/ufuncs/rint.cpp +++ b/tests/view/src/ufuncs/rint.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define RINT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, rint, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, rint, case_name); \ using namespace args; \ auto result = view::rint(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/signbit.cpp b/tests/view/src/ufuncs/signbit.cpp index 01d660f2a..cdaa58f4c 100644 --- a/tests/view/src/ufuncs/signbit.cpp +++ b/tests/view/src/ufuncs/signbit.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define SIGNBIT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, signbit, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, signbit, case_name); \ using namespace args; \ auto result = view::signbit( __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/sin.cpp b/tests/view/src/ufuncs/sin.cpp index 2c2635f66..6aef1869d 100644 --- a/tests/view/src/ufuncs/sin.cpp +++ b/tests/view/src/ufuncs/sin.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define SIN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, sin, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, sin, case_name); \ using namespace args; \ auto result = view::sin(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/sinh.cpp b/tests/view/src/ufuncs/sinh.cpp index d9768d05a..fc6f624e4 100644 --- a/tests/view/src/ufuncs/sinh.cpp +++ b/tests/view/src/ufuncs/sinh.cpp @@ -13,7 +13,7 @@ namespace view = nm::view; #define SINH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, sinh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, sinh, case_name); \ using namespace args; \ auto result = view::sinh(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/sqrt.cpp b/tests/view/src/ufuncs/sqrt.cpp index 0be67969d..ae45d2c8f 100644 --- a/tests/view/src/ufuncs/sqrt.cpp +++ b/tests/view/src/ufuncs/sqrt.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define SQRT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, sqrt, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, sqrt, case_name); \ using namespace args; \ auto result = view::sqrt(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/square.cpp b/tests/view/src/ufuncs/square.cpp index 2e881322f..40c7a6e76 100644 --- a/tests/view/src/ufuncs/square.cpp +++ b/tests/view/src/ufuncs/square.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define SQUARE_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, square, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, square, case_name); \ using namespace args; \ auto result = view::square(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/subtract.cpp b/tests/view/src/ufuncs/subtract.cpp index a15ec0893..0242a8e1d 100644 --- a/tests/view/src/ufuncs/subtract.cpp +++ b/tests/view/src/ufuncs/subtract.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define SUBTRACT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, subtract, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, subtract, case_name); \ using namespace args; \ auto result = view::subtract(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -37,7 +37,7 @@ TEST_CASE("subtract(case2)" * doctest::test_suite("view::subtract")) #define REDUCE_SUBTRACT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, reduce_subtract, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, reduce_subtract, case_name); \ using namespace args; \ auto result = view::reduce_subtract(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -117,7 +117,7 @@ TEST_CASE("reduce_subtract(case8)" * doctest::test_suite("view::reduce_subtract" #define ACCUMULATE_SUBTRACT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, accumulate_subtract, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, accumulate_subtract, case_name); \ using namespace args; \ auto result = view::accumulate_subtract(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ @@ -157,7 +157,7 @@ TEST_CASE("accumulate_subtract(case3)" * doctest::test_suite("view::accumulate_s #define OUTER_SUBTRACT_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, outer_subtract, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, outer_subtract, case_name); \ using namespace args; \ auto result = view::outer_subtract( __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/tan.cpp b/tests/view/src/ufuncs/tan.cpp index 43d95e170..b0c144e2f 100644 --- a/tests/view/src/ufuncs/tan.cpp +++ b/tests/view/src/ufuncs/tan.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define TAN_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, tan, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, tan, case_name); \ using namespace args; \ auto result = view::tan(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/tanh.cpp b/tests/view/src/ufuncs/tanh.cpp index 90244c846..5b5f77ee1 100644 --- a/tests/view/src/ufuncs/tanh.cpp +++ b/tests/view/src/ufuncs/tanh.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define TANH_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, tanh, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, tanh, case_name); \ using namespace args; \ auto result = view::tanh( __VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/ufuncs/trunc.cpp b/tests/view/src/ufuncs/trunc.cpp index 633ea8880..ea0e40313 100644 --- a/tests/view/src/ufuncs/trunc.cpp +++ b/tests/view/src/ufuncs/trunc.cpp @@ -9,7 +9,7 @@ namespace view = nm::view; #define TRUNC_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(view, trunc, case_name); \ + NMTOOLS_TESTING_USE_CASE(view, trunc, case_name); \ using namespace args; \ auto result = view::trunc(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), expect::shape ); \ diff --git a/tests/view/src/var.cpp b/tests/view/src/var.cpp index 61ec6bfb8..188414f5f 100644 --- a/tests/view/src/var.cpp +++ b/tests/view/src/var.cpp @@ -23,7 +23,7 @@ namespace nm = nmtools; #define VAR_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, var, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, var, case_name); \ using namespace args; \ auto result = nmtools::view::var(__VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \ @@ -305,7 +305,7 @@ namespace meta = nm::meta; TEST_CASE("var(case10)" * doctest::test_suite("view::var")) { { - NMTOOLS_TESTING_DECLARE_NS(array, var, case10); + NMTOOLS_TESTING_USE_CASE(array, var, case10); using namespace args; auto var = view::var(array, axis, nm::None, ddof, keepdims ); diff --git a/tests/view/src/vstack.cpp b/tests/view/src/vstack.cpp index 8ef346e9b..9a6f01fc4 100644 --- a/tests/view/src/vstack.cpp +++ b/tests/view/src/vstack.cpp @@ -28,7 +28,7 @@ namespace meta = nm::meta; #define VSTACK_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( vstack, case_name ) \ + NMTOOLS_TESTING_USE_CASE( vstack, case_name ) \ using namespace args; \ auto result = nmtools::view::vstack(__VA_ARGS__); \ NMTOOLS_ASSERT_EQUAL( nm::shape(result), nm::shape(expect::result) ); \ diff --git a/tests/view/src/where.cpp b/tests/view/src/where.cpp index cc2d272ec..c3a85e7e6 100644 --- a/tests/view/src/where.cpp +++ b/tests/view/src/where.cpp @@ -24,7 +24,7 @@ inline auto name##_ls_db = nmtools::cast(name, nmtools::array::kind::ndarray_ls_ #define WHERE_SUBCASE(case_name,condition,x,y) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS( view, where, case_name ); \ + NMTOOLS_TESTING_USE_CASE( view, where, case_name ); \ auto array_view = nmtools::view::where( args::condition, args::x, args::y ); \ NMTOOLS_ASSERT_EQUAL( nmtools::dim(array_view), expect::dim ); \ NMTOOLS_ASSERT_EQUAL( nmtools::shape(array_view), expect::shape ); \ diff --git a/tests/view/src/zeros.cpp b/tests/view/src/zeros.cpp index bcdf73ea0..baba2bd5f 100644 --- a/tests/view/src/zeros.cpp +++ b/tests/view/src/zeros.cpp @@ -32,7 +32,7 @@ RUN_zeros_impl(__VA_ARGS__); #define ZEROS_SUBCASE(case_name, ...) \ SUBCASE(#case_name) \ { \ - NMTOOLS_TESTING_DECLARE_NS(array, zeros, case_name); \ + NMTOOLS_TESTING_USE_CASE(array, zeros, case_name); \ using namespace args; \ auto result = RUN_zeros(case_name, __VA_ARGS__); \ NMTOOLS_ASSERT_CLOSE( result, expect::result ); \