Skip to content

Add implementation of dpnp.gcd and dpnp.lcm functions #2091

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

Merged
merged 8 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dpnp/backend/extensions/ufunc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ set(_elementwise_sources
${CMAKE_CURRENT_SOURCE_DIR}/elementwise_functions/fmax.cpp
${CMAKE_CURRENT_SOURCE_DIR}/elementwise_functions/fmin.cpp
${CMAKE_CURRENT_SOURCE_DIR}/elementwise_functions/fmod.cpp
${CMAKE_CURRENT_SOURCE_DIR}/elementwise_functions/gcd.cpp
${CMAKE_CURRENT_SOURCE_DIR}/elementwise_functions/heaviside.cpp
${CMAKE_CURRENT_SOURCE_DIR}/elementwise_functions/lcm.cpp
${CMAKE_CURRENT_SOURCE_DIR}/elementwise_functions/logaddexp2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/elementwise_functions/radians.cpp
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
#include "fmax.hpp"
#include "fmin.hpp"
#include "fmod.hpp"
#include "gcd.hpp"
#include "heaviside.hpp"
#include "lcm.hpp"
#include "logaddexp2.hpp"
#include "radians.hpp"

Expand All @@ -52,7 +54,9 @@ void init_elementwise_functions(py::module_ m)
init_fmax(m);
init_fmin(m);
init_fmod(m);
init_gcd(m);
init_heaviside(m);
init_lcm(m);
init_logaddexp2(m);
init_radians(m);
}
Expand Down
186 changes: 186 additions & 0 deletions dpnp/backend/extensions/ufunc/elementwise_functions/gcd.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
//*****************************************************************************
// Copyright (c) 2024, Intel Corporation
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// maxification, 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 "gcd.hpp"
#include "kernels/elementwise_functions/gcd.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 td_ns = dpctl::tensor::type_dispatch;

namespace impl
{
namespace ew_cmn_ns = dpctl::tensor::kernels::elementwise_common;

template <typename T1, typename T2>
struct OutputType
{
using value_type = typename std::disjunction< // disjunction is C++17
// feature, supported by DPC++
td_ns::BinaryTypeMapResultEntry<T1,
std::uint8_t,
T2,
std::uint8_t,
std::uint8_t>,
td_ns::BinaryTypeMapResultEntry<T1,
std::int8_t,
T2,
std::int8_t,
std::int8_t>,
td_ns::BinaryTypeMapResultEntry<T1,
std::uint16_t,
T2,
std::uint16_t,
std::uint16_t>,
td_ns::BinaryTypeMapResultEntry<T1,
std::int16_t,
T2,
std::int16_t,
std::int16_t>,
td_ns::BinaryTypeMapResultEntry<T1,
std::uint32_t,
T2,
std::uint32_t,
std::uint32_t>,
td_ns::BinaryTypeMapResultEntry<T1,
std::int32_t,
T2,
std::int32_t,
std::int32_t>,
td_ns::BinaryTypeMapResultEntry<T1,
std::uint64_t,
T2,
std::uint64_t,
std::uint64_t>,
td_ns::BinaryTypeMapResultEntry<T1,
std::int64_t,
T2,
std::int64_t,
std::int64_t>,
td_ns::BinaryTypeMapResultEntry<T1,
std::uint64_t,
T2,
std::int64_t,
std::uint64_t>,
td_ns::BinaryTypeMapResultEntry<T1,
std::int64_t,
T2,
std::uint64_t,
std::int64_t>,
td_ns::DefaultResultEntry<void>>::result_type;
};

using dpnp::kernels::gcd::GcdFunctor;

template <typename argT1,
typename argT2,
typename resT,
unsigned int vec_sz = 4,
unsigned int n_vecs = 2,
bool enable_sg_loadstore = true>
using ContigFunctor =
ew_cmn_ns::BinaryContigFunctor<argT1,
argT2,
resT,
GcdFunctor<argT1, argT2, resT>,
vec_sz,
n_vecs,
enable_sg_loadstore>;

template <typename argT1, typename argT2, typename resT, typename IndexerT>
using StridedFunctor =
ew_cmn_ns::BinaryStridedFunctor<argT1,
argT2,
resT,
IndexerT,
GcdFunctor<argT1, argT2, resT>>;

using ew_cmn_ns::binary_contig_impl_fn_ptr_t;
using ew_cmn_ns::binary_contig_matrix_contig_row_broadcast_impl_fn_ptr_t;
using ew_cmn_ns::binary_contig_row_contig_matrix_broadcast_impl_fn_ptr_t;
using ew_cmn_ns::binary_strided_impl_fn_ptr_t;

static binary_contig_impl_fn_ptr_t gcd_contig_dispatch_table[td_ns::num_types]
[td_ns::num_types];
static int gcd_output_typeid_table[td_ns::num_types][td_ns::num_types];
static binary_strided_impl_fn_ptr_t
gcd_strided_dispatch_table[td_ns::num_types][td_ns::num_types];

MACRO_POPULATE_DISPATCH_TABLES(gcd);
} // namespace impl

void init_gcd(py::module_ m)
{
using arrayT = dpctl::tensor::usm_ndarray;
using event_vecT = std::vector<sycl::event>;
{
impl::populate_gcd_dispatch_tables();
using impl::gcd_contig_dispatch_table;
using impl::gcd_output_typeid_table;
using impl::gcd_strided_dispatch_table;

auto gcd_pyapi = [&](const arrayT &src1, const arrayT &src2,
const arrayT &dst, sycl::queue &exec_q,
const event_vecT &depends = {}) {
return py_int::py_binary_ufunc(
src1, src2, dst, exec_q, depends, gcd_output_typeid_table,
gcd_contig_dispatch_table, gcd_strided_dispatch_table,
// no dedicated kernel for C-contig row with broadcasting
td_ns::NullPtrTable<
impl::
binary_contig_matrix_contig_row_broadcast_impl_fn_ptr_t>{},
td_ns::NullPtrTable<
impl::
binary_contig_row_contig_matrix_broadcast_impl_fn_ptr_t>{});
};
m.def("_gcd", gcd_pyapi, "", py::arg("src1"), py::arg("src2"),
py::arg("dst"), py::arg("sycl_queue"),
py::arg("depends") = py::list());

auto gcd_result_type_pyapi = [&](const py::dtype &dtype1,
const py::dtype &dtype2) {
return py_int::py_binary_ufunc_result_type(dtype1, dtype2,
gcd_output_typeid_table);
};
m.def("_gcd_result_type", gcd_result_type_pyapi);
}
}
} // namespace dpnp::extensions::ufunc
35 changes: 35 additions & 0 deletions dpnp/backend/extensions/ufunc/elementwise_functions/gcd.hpp
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_gcd(py::module_ m);
} // namespace dpnp::extensions::ufunc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@

// dpctl tensor headers
#include "kernels/elementwise_functions/common.hpp"
#include "kernels/elementwise_functions/maximum.hpp"
#include "utils/type_dispatch.hpp"

namespace dpnp::extensions::ufunc
Expand Down
Loading
Loading