Ufuncs, reduce, outer, accumulate: view attribute initializer, genera…

…lized functors, more useful specialized utils functions (#269)

* add missing include for cuda context

* add unary_ufunc, binary_ufunc, broadcast_binary_ufunc view entrypoint

* add unary_ufunc, binary_ufunc, and broadcast_binary_ufunc functors

* add accumulate functor

* add outer functor

* add reduce functor

* simplify various ufunc functors

* add accumulate view attribute initializer

* add outer view attribute initializer

* add reduce view attribute initializer

* add ufunc view attribute initializer

* refactor various ufunc, reduce, outer, accumulate views

* refactor various utils for easier specialization

* add functor isequal specialization

* update tests

* try to fix build

* fix tests

* fix adaptivecpp installs scripts

* fix sycl dockerfile deps installation

* fix simd ufunc specialization

* fix simd ufunc specialization

* fix sycl dockerfile deps installation

* fix build

* fix build

* fix build

.github/workflows/gcc.yml

@@ -117,7 +117,7 @@ jobs:
           ./dockcross-${{ matrix.name }} bash -c 'build/${{ matrix.name }}/tests/index/numeric-tests-index-doctest'
 
   dockcross-gcc-functional:
-    name: ${{ matrix.name }}-index
+    name: ${{ matrix.name }}-functional
     runs-on: ubuntu-20.04
     strategy:
       matrix:

.github/workflows/sycl.yml

@@ -29,4 +29,4 @@ jobs:
       - uses: actions/checkout@v2
       - name: build docker
         run: |
-          docker build . --tag nmtools:sycl-clang14-cuda --file docker/sycl-cuda.dockerfile
+          docker build . --tag nmtools:sycl-clang14-cuda --build-arg BASE=nvidia/cuda:11.8.0-devel-ubuntu22.04 --build-arg cuda_backend=ON --build-arg toolchain=sycl-clang14-cuda --file docker/sycl.dockerfile

docker/sycl.dockerfile

@@ -1,4 +1,6 @@
-from ubuntu:jammy as dev
+# ARG BASE=nvidia/cuda:11.8.0-devel-ubuntu22.04
+ARG BASE=ubuntu:jammy
+from ${BASE} as dev
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=Asia
@@ -46,15 +48,26 @@ COPY scripts/install_doctest.sh scripts/install_doctest.sh
 RUN bash scripts/install_doctest.sh
 
 RUN apt install -y libclang-dev clang-tools libomp-dev llvm-dev lld libboost-dev libboost-fiber-dev libboost-context-dev
-RUN bash scripts/install_opensycl.sh
+
+ARG opencl_backend=OFF
+ENV OPENCL_BACKEND=${opencl_backend}
+
+ARG cuda_backend=OFF
+ENV CUDA_BACKEND=${cuda_backend}
+
+ARG level_zero_backend=OFF
+ENV LEVEL_ZERO_BACKEND=${level_zero_backend}
 
 ARG toolchain=sycl-clang14-omp
+ENV TOOLCHAIN=${toolchain}
+
+RUN bash scripts/install_opensycl.sh
+
 RUN mkdir -p build/${toolchain} && cd build/${toolchain} \
     && cmake -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/${toolchain}.cmake \
         -DNMTOOLS_BUILD_META_TESTS=OFF -DNMTOOLS_BUILD_UTL_TESTS=OFF -DNMTOOLS_TEST_ALL=OFF \
         -DNMTOOLS_BUILD_SYCL_TESTS=ON \
         ../.. \
     && make -j2 VERBOSE=1 numeric-tests-sycl-doctest
 
-ENV toolchain=${toolchain}
-CMD ["sh", "-c", "/workspace/nmtools/build/${toolchain}/tests/sycl/numeric-tests-sycl-doctest"]
+CMD ["sh", "-c", "/workspace/nmtools/build/${TOOLCHAIN}/tests/sycl/numeric-tests-sycl-doctest"]

include/nmtools/array/eval/cuda/context.hpp

@@ -5,6 +5,7 @@
 #include "nmtools/meta.hpp"
 #include "nmtools/array/eval/kernel_helper.hpp"
 #include "nmtools/utility/tuple_cat.hpp"
+#include "nmtools/array/functional/functor.hpp"
 #include <memory>
 
 template <auto out_static_dim=0, typename function_t

include/nmtools/array/eval/simd/simde_avx512/ufunc.hpp

@@ -5,12 +5,12 @@
 
 namespace nmtools::array::simd
 {
-    template <typename data_t, typename...ufunc_args_t>
-    struct ufunc_simd_t<view::softshrink_t<ufunc_args_t...>,simde_avx512_t,data_t> : simd_op_t<simde_avx512_t,data_t>
+    template <typename data_t, typename lambda_t>
+    struct ufunc_simd_t<view::softshrink_t<lambda_t>,simde_avx512_t,data_t> : simd_op_t<simde_avx512_t,data_t>
     {
         using simd_t = simd_op_t<simde_avx512_t,data_t>;
         using simd_dtype_t = decltype(simd_t::set1(0));
-        using ufunc_op_t = view::softshrink_t<ufunc_args_t...>;
+        using ufunc_op_t = view::softshrink_t<lambda_t>;
 
         const simd_dtype_t zero = simd_t::set1(0);
         const simd_dtype_t one  = simd_t::set1(1);
@@ -56,12 +56,12 @@ namespace nmtools::array::simd
         }
     }; // ufunc_simd_t
 
-    template <typename data_t, typename...ufunc_args_t>
-    struct ufunc_simd_t<view::hardshrink_t<ufunc_args_t...>,simde_avx512_t,data_t> : simd_op_t<simde_avx512_t,data_t>
+    template <typename data_t, typename lambda_t>
+    struct ufunc_simd_t<view::hardshrink_t<lambda_t>,simde_avx512_t,data_t> : simd_op_t<simde_avx512_t,data_t>
     {
         using simd_t = simd_op_t<simde_avx512_t,data_t>;
         using simd_dtype_t = decltype(simd_t::set1(0));
-        using ufunc_op_t = view::hardshrink_t<ufunc_args_t...>;
+        using ufunc_op_t = view::hardshrink_t<lambda_t>;
 
         const simd_dtype_t zero = simd_t::set1(0);
         const simd_dtype_t pos_lambda;

include/nmtools/array/eval/simd/ufunc.hpp

@@ -158,12 +158,12 @@ namespace nmtools::array::simd
         }
     }; // ufunc_simd_t
 
-    template <typename simd_tag_t, typename data_t, typename...ufunc_args_t>
-    struct ufunc_simd_t<view::hardtanh_t<ufunc_args_t...>,simd_tag_t,data_t> : simd_op_t<simd_tag_t,data_t>
+    template <typename simd_tag_t, typename data_t, typename min_val_t, typename max_val_t>
+    struct ufunc_simd_t<view::hardtanh_t<min_val_t,max_val_t>,simd_tag_t,data_t> : simd_op_t<simd_tag_t,data_t>
     {
         using simd_t = simd_op_t<simd_tag_t,data_t>;
         using simd_dtype_t = decltype(simd_t::set1(0));
-        using ufunc_op_t = view::hardtanh_t<ufunc_args_t...>;
+        using ufunc_op_t = view::hardtanh_t<min_val_t,max_val_t>;
 
         const simd_dtype_t min_val;
         const simd_dtype_t max_val;
@@ -180,12 +180,12 @@ namespace nmtools::array::simd
         }
     }; // ufunc_simd_t
 
-    template <typename simd_tag_t, typename data_t, typename...ufunc_args_t>
-    struct ufunc_simd_t<view::leaky_relu_t<ufunc_args_t...>,simd_tag_t,data_t> : simd_op_t<simd_tag_t,data_t>
+    template <typename simd_tag_t, typename data_t, typename negative_slope_t>
+    struct ufunc_simd_t<view::leaky_relu_t<negative_slope_t>,simd_tag_t,data_t> : simd_op_t<simd_tag_t,data_t>
     {
         using simd_t = simd_op_t<simd_tag_t,data_t>;
         using simd_dtype_t = decltype(simd_t::set1(0));
-        using ufunc_op_t = view::leaky_relu_t<ufunc_args_t...>;
+        using ufunc_op_t = view::leaky_relu_t<negative_slope_t>;
 
         const simd_dtype_t zero = simd_t::set1(0);
         const simd_dtype_t negative_slope;
@@ -203,12 +203,12 @@ namespace nmtools::array::simd
         }
     }; // ufunc_simd_t
 
-    template <typename simd_tag_t, typename data_t,typename...ufunc_args_t>
-    struct ufunc_simd_t<view::prelu_t<ufunc_args_t...>,simd_tag_t,data_t> : simd_op_t<simd_tag_t,data_t>
+    template <typename simd_tag_t, typename data_t,typename alpha_t>
+    struct ufunc_simd_t<view::prelu_t<alpha_t>,simd_tag_t,data_t> : simd_op_t<simd_tag_t,data_t>
     {
         using simd_t = simd_op_t<simd_tag_t,data_t>;
         using simd_dtype_t = decltype(simd_t::set1(0));
-        using ufunc_op_t = view::prelu_t<ufunc_args_t...>;
+        using ufunc_op_t = view::prelu_t<alpha_t>;
 
         const simd_dtype_t zero = simd_t::set1(0);
         const simd_dtype_t alpha;
@@ -226,12 +226,12 @@ namespace nmtools::array::simd
         }
     }; // ufunc_simd_t
 
-    template <typename simd_tag_t, typename data_t, typename...ufunc_args_t>
-    struct ufunc_simd_t<view::softshrink_t<ufunc_args_t...>,simd_tag_t,data_t> : simd_op_t<simd_tag_t,data_t>
+    template <typename simd_tag_t, typename data_t, typename lambda_t>
+    struct ufunc_simd_t<view::softshrink_t<lambda_t>,simd_tag_t,data_t> : simd_op_t<simd_tag_t,data_t>
     {
         using simd_t = simd_op_t<simd_tag_t,data_t>;
         using simd_dtype_t = decltype(simd_t::set1(0));
-        using ufunc_op_t = view::softshrink_t<ufunc_args_t...>;
+        using ufunc_op_t = view::softshrink_t<lambda_t>;
 
         const simd_dtype_t zero = simd_t::set1(0);
         const simd_dtype_t pos_lambda;
@@ -289,12 +289,12 @@ namespace nmtools::array::simd
         }
     }; // ufunc_simd_t
 
-    template <typename simd_tag_t, typename data_t, typename...ufunc_args_t>
-    struct ufunc_simd_t<view::hardshrink_t<ufunc_args_t...>,simd_tag_t,data_t> : simd_op_t<simd_tag_t,data_t>
+    template <typename simd_tag_t, typename data_t, typename lambda_t>
+    struct ufunc_simd_t<view::hardshrink_t<lambda_t>,simd_tag_t,data_t> : simd_op_t<simd_tag_t,data_t>
     {
         using simd_t = simd_op_t<simd_tag_t,data_t>;
         using simd_dtype_t = decltype(simd_t::set1(0));
-        using ufunc_op_t = view::hardshrink_t<ufunc_args_t...>;
+        using ufunc_op_t = view::hardshrink_t<lambda_t>;
 
         const simd_dtype_t zero = simd_t::set1(0);
         const simd_dtype_t pos_lambda;
@@ -340,12 +340,12 @@ namespace nmtools::array::simd
         }
     };
 
-    template <typename simd_tag_t, typename data_t, typename...op_args_t>
-    struct ufunc_simd_t<view::add_t<op_args_t...>,simd_tag_t,data_t> : simd_op_t<simd_tag_t,data_t>
+    template <typename simd_tag_t, typename data_t, typename lhs_t, typename rhs_t, typename res_t>
+    struct ufunc_simd_t<view::add_t<lhs_t,rhs_t,res_t>,simd_tag_t,data_t> : simd_op_t<simd_tag_t,data_t>
     {
         using simd_t       = simd_op_t<simd_tag_t,data_t>;
         using simd_dtype_t = decltype(simd_t::set1(data_t{0}));
-        using ufunc_op_t   = view::add_t<op_args_t...>;
+        using ufunc_op_t   = view::add_t<lhs_t,rhs_t,res_t>;
 
         ufunc_simd_t([[maybe_unused]] ufunc_op_t op) {}
 

include/nmtools/array/functional/activations/celu.hpp

@@ -3,39 +3,20 @@
 
 #include "nmtools/array/functional/functor.hpp"
 #include "nmtools/array/view/activations/celu.hpp"
+#include "nmtools/array/functional/ufunc/ufunc.hpp"
 
 namespace nmtools::functional
 {
     namespace fun
     {
-        struct celu_t
-        {
-            template <typename...args_t>
-            constexpr auto operator()(const args_t&...args) const
-            {
-                return view::celu(args...);
-            }
-        };
+        using celu = fun::unary_ufunc<view::celu_t<>>;
     }
-    constexpr inline auto celu = functor_t(unary_fmap_t<fun::celu_t>{});
 
-    template <typename alpha_t, typename ...arrays_t>
-    struct get_function_t<
-        view::decorator_t<
-            view::ufunc_t, view::celu_t<alpha_t>, arrays_t...
-        >
-    > {
-        using view_type = view::decorator_t<
-            view::ufunc_t, view::celu_t<alpha_t>, arrays_t...
-        >;
+    // we want celu[alpha] to works, so do not use fun::unary_ufunc<view::celu_t<>>;
+    constexpr inline auto celu = functor_t(unary_fmap_t<fun::celu>{});
 
-        view_type view;
-
-        constexpr auto operator()() const noexcept
-        {
-            return celu[view.op.alpha];
-        }
-    };
+    // using lambda breaks boost type index: Type name demangling failed
+    // constexpr inline auto celu = functor_t(unary_fmap_t<decltype(celu_fun)>{celu_fun});
 } // namespace nmtools::functional
 
 

include/nmtools/array/functional/activations/elu.hpp

@@ -3,40 +3,16 @@
 
 #include "nmtools/array/functional/functor.hpp"
 #include "nmtools/array/view/activations/elu.hpp"
+#include "nmtools/array/functional/ufunc/ufunc.hpp"
 
 namespace nmtools::functional
 {
     namespace fun
     {
-        struct elu_t
-        {
-            template <typename ...args_t>
-            constexpr auto operator()(const args_t&...args) const
-            {
-                return view::elu(args...);
-            }
-        };
+        using elu = fun::unary_ufunc<view::elu_t<>>;
     }
 
-    constexpr inline auto elu = functor_t(unary_fmap_t<fun::elu_t>{});
-
-    template <typename alpha_t, typename...arrays_t>
-    struct get_function_t<
-        view::decorator_t<
-            view::ufunc_t, view::elu_t<alpha_t>, arrays_t...
-        >
-    > {
-        using view_type = view::decorator_t<
-            view::ufunc_t, view::elu_t<alpha_t>, arrays_t...
-        >;
-
-        view_type view;
-
-        constexpr auto operator()() const noexcept
-        {
-            return elu[view.op.alpha];
-        }
-    };
+    constexpr inline auto elu = functor_t(unary_fmap_t<fun::elu>{});
 } // namespace nmtools::functional
 
 

include/nmtools/array/functional/activations/hardshrink.hpp

@@ -3,40 +3,16 @@
 
 #include "nmtools/array/functional/functor.hpp"
 #include "nmtools/array/view/activations/hardshrink.hpp"
+#include "nmtools/array/functional/ufunc/ufunc.hpp"
 
 namespace nmtools::functional
 {
     namespace fun
     {
-        struct hardshrink_t
-        {
-            template <typename...args_t>
-            constexpr auto operator()(const args_t&...args) const
-            {
-                return view::hardshrink(args...);
-            }
-        };
+        using hardshrink = fun::unary_ufunc<view::hardshrink_t<>>;
     }
 
-    constexpr inline auto hardshrink = functor_t(unary_fmap_t<fun::hardshrink_t>{});
-
-    template <typename lambda_t, typename...arrays_t>
-    struct get_function_t<
-        view::decorator_t<
-            view::ufunc_t, view::hardshrink_t<lambda_t>, arrays_t...
-        >
-    > {
-        using view_type = view::decorator_t<
-            view::ufunc_t, view::hardshrink_t<lambda_t>, arrays_t...
-        >;
-
-        view_type view;
-
-        constexpr auto operator()() const noexcept
-        {
-            return hardshrink[view.op.lambda];
-        }
-    };
+    constexpr inline auto hardshrink = functor_t(unary_fmap_t<fun::hardshrink>{});
 } // namespace nmtools::functional
 
 

include/nmtools/array/functional/activations/hardswish.hpp

@@ -3,40 +3,16 @@
 
 #include "nmtools/array/functional/functor.hpp"
 #include "nmtools/array/view/activations/hardswish.hpp"
+#include "nmtools/array/functional/ufunc/ufunc.hpp"
 
 namespace nmtools::functional
 {
     namespace fun
     {
-        struct hardswish_t
-        {
-            template <typename...args_t>
-            constexpr auto operator()(const args_t&...args) const
-            {
-                return view::hardswish(args...);
-            }
-        };
+        using hardswish = fun::unary_ufunc<view::hardswish_t>;
     }
 
-    constexpr inline auto hardswish = functor_t(unary_fmap_t<fun::hardswish_t>{});
-
-    template <typename...arrays_t>
-    struct get_function_t<
-        view::decorator_t<
-            view::ufunc_t, view::hardswish_t, arrays_t...
-        >
-    > {
-        using view_type = view::decorator_t<
-            view::ufunc_t, view::hardswish_t, arrays_t...
-        >;
-
-        view_type view;
-
-        constexpr auto operator()() const noexcept
-        {
-            return hardswish;
-        }
-    };
+    constexpr inline auto hardswish = functor_t(unary_fmap_t<fun::hardswish>{});
 } // namespace nmtools::functional