-
Notifications
You must be signed in to change notification settings - Fork 22
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
implement dpnp.bitwise_count
#2308
Open
vtavana
wants to merge
11
commits into
master
Choose a base branch
from
impl-bitwise_count
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
eba47dd
implement bitwise_count
vtavana bf95b38
fix pre-commit
vtavana a660cb7
using std::is_unsigned_v
vtavana 1dafb3b
update tests for numpy>=2
vtavana b5fc64a
remove unnecessary ids
vtavana 220cf9a
add vector implementation of the kernel
vtavana f85f07a
remove unused include
vtavana af0f0c4
Merge branch 'master' into impl-bitwise_count
vtavana 371319a
Merge branch 'master' into impl-bitwise_count
vtavana 21a52c4
Merge branch 'master' into impl-bitwise_count
vtavana be9d9e6
remove skip leftovers
vtavana File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
137 changes: 137 additions & 0 deletions
137
dpnp/backend/extensions/ufunc/elementwise_functions/bitwise_count.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,137 @@ | ||
//***************************************************************************** | ||
// Copyright (c) 2025, 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 "bitwise_count.hpp" | ||
#include "kernels/elementwise_functions/bitwise_count.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::bitwise_count<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, std::uint8_t, std::uint8_t>, | ||
td_ns::TypeMapResultEntry<T, std::int8_t, std::uint8_t>, | ||
td_ns::TypeMapResultEntry<T, std::uint16_t, std::uint8_t>, | ||
td_ns::TypeMapResultEntry<T, std::int16_t, std::uint8_t>, | ||
td_ns::TypeMapResultEntry<T, std::uint32_t, std::uint8_t>, | ||
td_ns::TypeMapResultEntry<T, std::int32_t, std::uint8_t>, | ||
td_ns::TypeMapResultEntry<T, std::uint64_t, std::uint8_t>, | ||
td_ns::TypeMapResultEntry<T, std::int64_t, std::uint8_t>, | ||
td_ns::DefaultResultEntry<void>>::result_type; | ||
}; | ||
|
||
using dpnp::kernels::bitwise_count::BitwiseCountFunctor; | ||
|
||
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, | ||
BitwiseCountFunctor<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, | ||
BitwiseCountFunctor<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 | ||
bitwise_count_contig_dispatch_vector[td_ns::num_types]; | ||
static int bitwise_count_output_typeid_vector[td_ns::num_types]; | ||
static unary_strided_impl_fn_ptr_t | ||
bitwise_count_strided_dispatch_vector[td_ns::num_types]; | ||
|
||
MACRO_POPULATE_DISPATCH_VECTORS(bitwise_count); | ||
} // namespace impl | ||
|
||
void init_bitwise_count(py::module_ m) | ||
{ | ||
using arrayT = dpctl::tensor::usm_ndarray; | ||
using event_vecT = std::vector<sycl::event>; | ||
{ | ||
impl::populate_bitwise_count_dispatch_vectors(); | ||
using impl::bitwise_count_contig_dispatch_vector; | ||
using impl::bitwise_count_output_typeid_vector; | ||
using impl::bitwise_count_strided_dispatch_vector; | ||
|
||
auto bitwise_count_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, bitwise_count_output_typeid_vector, | ||
bitwise_count_contig_dispatch_vector, | ||
bitwise_count_strided_dispatch_vector); | ||
}; | ||
m.def("_bitwise_count", bitwise_count_pyapi, "", py::arg("src"), | ||
py::arg("dst"), py::arg("sycl_queue"), | ||
py::arg("depends") = py::list()); | ||
|
||
auto bitwise_count_result_type_pyapi = [&](const py::dtype &dtype) { | ||
return py_int::py_unary_ufunc_result_type( | ||
dtype, bitwise_count_output_typeid_vector); | ||
}; | ||
m.def("_bitwise_count_result_type", bitwise_count_result_type_pyapi); | ||
} | ||
} | ||
} // namespace dpnp::extensions::ufunc |
35 changes: 35 additions & 0 deletions
35
dpnp/backend/extensions/ufunc/elementwise_functions/bitwise_count.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) 2025, 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_bitwise_count(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
54 changes: 54 additions & 0 deletions
54
dpnp/backend/kernels/elementwise_functions/bitwise_count.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,54 @@ | ||
//***************************************************************************** | ||
// Copyright (c) 2025, 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::bitwise_count | ||
{ | ||
template <typename argT, typename resT> | ||
struct BitwiseCountFunctor | ||
{ | ||
// 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 | ||
{ | ||
if constexpr (std::is_unsigned_v<argT>) { | ||
return sycl::popcount(x); | ||
} | ||
else { | ||
return sycl::popcount(sycl::abs(x)); | ||
} | ||
} | ||
}; | ||
} // namespace dpnp::kernels::bitwise_count |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to have a vector implementation, since
sycl::popcount
support that?And we have options here: it can be supported either only for int8_t where no casting is needed or for all integer types through explicit vector casting, like dpctl does:
The question only if any of that will bring performance benefits.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would be curious to know as well.
In the dpctl PR which started work on adding vector overloads for unary functions (IntelPython/dpctl#1223), little benefit was found, subgroup store/load seemed to make much more of a difference.