-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add implementation of
dpnp.fix function (#1971)
* Implement dpnp.fix() * Add tests to cover function * Update dpnp/dpnp_iface_mathematical.py Co-authored-by: vtavana <120411540+vtavana@users.noreply.github.com> --------- Co-authored-by: vtavana <120411540+vtavana@users.noreply.github.com>
- Loading branch information
1 parent
689aeeb
commit e4acd3e
Showing
11 changed files
with
349 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
125 changes: 125 additions & 0 deletions
125
dpnp/backend/extensions/ufunc/elementwise_functions/fix.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| //***************************************************************************** | ||
| // Copyright (c) 2024, Intel Corporation | ||
| // All rights reserved. | ||
| // | ||
| // Redistribution and use in source and binary forms, with or without | ||
| // modification, are permitted provided that the following conditions are met: | ||
| // - Redistributions of source code must retain the above copyright notice, | ||
| // this list of conditions and the following disclaimer. | ||
| // - Redistributions in binary form must reproduce the above copyright notice, | ||
| // this list of conditions and the following disclaimer in the documentation | ||
| // and/or other materials provided with the distribution. | ||
| // | ||
| // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| // AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| // ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
| // LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| // CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| // SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| // INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| // THE POSSIBILITY OF SUCH DAMAGE. | ||
| //***************************************************************************** | ||
|
|
||
| #include <sycl/sycl.hpp> | ||
|
|
||
| #include "dpctl4pybind11.hpp" | ||
|
|
||
| #include "fix.hpp" | ||
| #include "kernels/elementwise_functions/fix.hpp" | ||
| #include "populate.hpp" | ||
|
|
||
| // include a local copy of elementwise common header from dpctl tensor: | ||
| // dpctl/tensor/libtensor/source/elementwise_functions/elementwise_functions.hpp | ||
| // TODO: replace by including dpctl header once available | ||
| #include "../../elementwise_functions/elementwise_functions.hpp" | ||
|
|
||
| // dpctl tensor headers | ||
| #include "kernels/elementwise_functions/common.hpp" | ||
| #include "utils/type_dispatch.hpp" | ||
|
|
||
| namespace dpnp::extensions::ufunc | ||
| { | ||
| namespace py = pybind11; | ||
| namespace py_int = dpnp::extensions::py_internal; | ||
|
|
||
| namespace impl | ||
| { | ||
| namespace ew_cmn_ns = dpctl::tensor::kernels::elementwise_common; | ||
| namespace td_ns = dpctl::tensor::type_dispatch; | ||
|
|
||
| /** | ||
| * @brief A factory to define pairs of supported types for which | ||
| * sycl::fix<T> function is available. | ||
| * | ||
| * @tparam T Type of input vector `a` and of result vector `y`. | ||
| */ | ||
| template <typename T> | ||
| struct OutputType | ||
| { | ||
| using value_type = | ||
| typename std::disjunction<td_ns::TypeMapResultEntry<T, sycl::half>, | ||
| td_ns::TypeMapResultEntry<T, float>, | ||
| td_ns::TypeMapResultEntry<T, double>, | ||
| td_ns::DefaultResultEntry<void>>::result_type; | ||
| }; | ||
|
|
||
| using dpnp::kernels::fix::FixFunctor; | ||
|
|
||
| template <typename argT, | ||
| typename resT = argT, | ||
| unsigned int vec_sz = 4, | ||
| unsigned int n_vecs = 2, | ||
| bool enable_sg_loadstore = true> | ||
| using ContigFunctor = ew_cmn_ns::UnaryContigFunctor<argT, | ||
| resT, | ||
| FixFunctor<argT, resT>, | ||
| vec_sz, | ||
| n_vecs, | ||
| enable_sg_loadstore>; | ||
|
|
||
| template <typename argTy, typename resTy, typename IndexerT> | ||
| using StridedFunctor = ew_cmn_ns:: | ||
| UnaryStridedFunctor<argTy, resTy, IndexerT, FixFunctor<argTy, resTy>>; | ||
|
|
||
| using ew_cmn_ns::unary_contig_impl_fn_ptr_t; | ||
| using ew_cmn_ns::unary_strided_impl_fn_ptr_t; | ||
|
|
||
| static unary_contig_impl_fn_ptr_t fix_contig_dispatch_vector[td_ns::num_types]; | ||
| static int fix_output_typeid_vector[td_ns::num_types]; | ||
| static unary_strided_impl_fn_ptr_t | ||
| fix_strided_dispatch_vector[td_ns::num_types]; | ||
|
|
||
| MACRO_POPULATE_DISPATCH_VECTORS(fix); | ||
| } // namespace impl | ||
|
|
||
| void init_fix(py::module_ m) | ||
| { | ||
| using arrayT = dpctl::tensor::usm_ndarray; | ||
| using event_vecT = std::vector<sycl::event>; | ||
| { | ||
| impl::populate_fix_dispatch_vectors(); | ||
| using impl::fix_contig_dispatch_vector; | ||
| using impl::fix_output_typeid_vector; | ||
| using impl::fix_strided_dispatch_vector; | ||
|
|
||
| auto fix_pyapi = [&](const arrayT &src, const arrayT &dst, | ||
| sycl::queue &exec_q, | ||
| const event_vecT &depends = {}) { | ||
| return py_int::py_unary_ufunc( | ||
| src, dst, exec_q, depends, fix_output_typeid_vector, | ||
| fix_contig_dispatch_vector, fix_strided_dispatch_vector); | ||
| }; | ||
| m.def("_fix", fix_pyapi, "", py::arg("src"), py::arg("dst"), | ||
| py::arg("sycl_queue"), py::arg("depends") = py::list()); | ||
|
|
||
| auto fix_result_type_pyapi = [&](const py::dtype &dtype) { | ||
| return py_int::py_unary_ufunc_result_type(dtype, | ||
| fix_output_typeid_vector); | ||
| }; | ||
| m.def("_fix_result_type", fix_result_type_pyapi); | ||
| } | ||
| } | ||
| } // namespace dpnp::extensions::ufunc |
35 changes: 35 additions & 0 deletions
35
dpnp/backend/extensions/ufunc/elementwise_functions/fix.hpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| //***************************************************************************** | ||
| // Copyright (c) 2024, Intel Corporation | ||
| // All rights reserved. | ||
| // | ||
| // Redistribution and use in source and binary forms, with or without | ||
| // modification, are permitted provided that the following conditions are met: | ||
| // - Redistributions of source code must retain the above copyright notice, | ||
| // this list of conditions and the following disclaimer. | ||
| // - Redistributions in binary form must reproduce the above copyright notice, | ||
| // this list of conditions and the following disclaimer in the documentation | ||
| // and/or other materials provided with the distribution. | ||
| // | ||
| // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| // AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| // ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
| // LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| // CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| // SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| // INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| // THE POSSIBILITY OF SUCH DAMAGE. | ||
| //***************************************************************************** | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <pybind11/pybind11.h> | ||
|
|
||
| namespace py = pybind11; | ||
|
|
||
| namespace dpnp::extensions::ufunc | ||
| { | ||
| void init_fix(py::module_ m); | ||
| } // namespace dpnp::extensions::ufunc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| //***************************************************************************** | ||
| // Copyright (c) 2024, Intel Corporation | ||
| // All rights reserved. | ||
| // | ||
| // Redistribution and use in source and binary forms, with or without | ||
| // modification, are permitted provided that the following conditions are met: | ||
| // - Redistributions of source code must retain the above copyright notice, | ||
| // this list of conditions and the following disclaimer. | ||
| // - Redistributions in binary form must reproduce the above copyright notice, | ||
| // this list of conditions and the following disclaimer in the documentation | ||
| // and/or other materials provided with the distribution. | ||
| // | ||
| // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| // AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| // ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
| // LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| // CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| // SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| // INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| // THE POSSIBILITY OF SUCH DAMAGE. | ||
| //***************************************************************************** | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <sycl/sycl.hpp> | ||
|
|
||
| namespace dpnp::kernels::fix | ||
| { | ||
| template <typename argT, typename resT> | ||
| struct FixFunctor | ||
| { | ||
| // is function constant for given argT | ||
| using is_constant = typename std::false_type; | ||
| // constant value, if constant | ||
| // constexpr resT constant_value = resT{}; | ||
| // is function defined for sycl::vec | ||
| using supports_vec = typename std::false_type; | ||
| // do both argT and resT support subgroup store/load operation | ||
| using supports_sg_loadstore = typename std::true_type; | ||
|
|
||
| resT operator()(const argT &x) const | ||
| { | ||
| return (x >= 0.0) ? sycl::floor(x) : sycl::ceil(x); | ||
| } | ||
| }; | ||
| } // namespace dpnp::kernels::fix |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.