Skip to content

Commit 3339d48

Browse files
oleksandr-pavlykoleksandr-pavlyk
committed
More transitions to experimental complex
1 parent d825887 commit 3339d48

34 files changed

+77
-58
lines changed

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/abs.hpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@
2323
//===---------------------------------------------------------------------===//
2424

2525
#pragma once
26-
#include <CL/sycl.hpp>
2726
#include <cmath>
2827
#include <complex>
2928
#include <cstddef>
3029
#include <cstdint>
3130
#include <limits>
31+
#include <sycl/ext/oneapi/experimental/sycl_complex.hpp>
32+
#include <sycl/sycl.hpp>
3233
#include <type_traits>
3334

3435
#include "kernels/elementwise_functions/common.hpp"
@@ -49,6 +50,7 @@ namespace abs
4950

5051
namespace py = pybind11;
5152
namespace td_ns = dpctl::tensor::type_dispatch;
53+
namespace exprm_ns = sycl::ext::oneapi::experimental;
5254

5355
using dpctl::tensor::type_utils::is_complex;
5456

@@ -120,7 +122,7 @@ template <typename argT, typename resT> struct AbsFunctor
120122
}
121123
else {
122124
#ifdef USE_STD_ABS_FOR_COMPLEX_TYPES
123-
return std::abs(z);
125+
return exprm_ns::abs(exprm_ns::complex<realT>(z));
124126
#else
125127
return std::hypot(std::real(z), std::imag(z));
126128
#endif

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/acos.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
//===---------------------------------------------------------------------===//
2424

2525
#pragma once
26-
#include <CL/sycl.hpp>
2726
#include <cmath>
2827
#include <cstddef>
2928
#include <cstdint>
3029
#include <sycl/ext/oneapi/experimental/sycl_complex.hpp>
30+
#include <sycl/sycl.hpp>
3131
#include <type_traits>
3232

3333
#include "kernels/elementwise_functions/common.hpp"
@@ -48,7 +48,7 @@ namespace acos
4848

4949
namespace py = pybind11;
5050
namespace td_ns = dpctl::tensor::type_dispatch;
51-
namespace cmplx_ns = sycl::ext::oneapi::experimental;
51+
namespace exprm_ns = sycl::ext::oneapi::experimental;
5252

5353
using dpctl::tensor::type_utils::is_complex;
5454

@@ -116,8 +116,8 @@ template <typename argT, typename resT> struct AcosFunctor
116116
}
117117

118118
/* ordinary cases */
119-
return cmplx_ns::acos(
120-
cmplx_ns::complex<realT>(in)); // std::acos(in);
119+
return exprm_ns::acos(
120+
exprm_ns::complex<realT>(in)); // std::acos(in);
121121
}
122122
else {
123123
static_assert(std::is_floating_point_v<argT> ||

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/acosh.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
//===---------------------------------------------------------------------===//
2424

2525
#pragma once
26-
#include <CL/sycl.hpp>
2726
#include <cmath>
2827
#include <cstddef>
2928
#include <cstdint>
3029
#include <sycl/ext/oneapi/experimental/sycl_complex.hpp>
30+
#include <sycl/sycl.hpp>
3131
#include <type_traits>
3232

3333
#include "kernels/elementwise_functions/common.hpp"

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/add.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
//===---------------------------------------------------------------------===//
2525

2626
#pragma once
27-
#include <CL/sycl.hpp>
2827
#include <cstddef>
2928
#include <cstdint>
3029
#include <sycl/ext/oneapi/experimental/sycl_complex.hpp>
30+
#include <sycl/sycl.hpp>
3131
#include <type_traits>
3232

3333
#include "utils/offset_utils.hpp"

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/asin.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
//===---------------------------------------------------------------------===//
2424

2525
#pragma once
26-
#include <CL/sycl.hpp>
2726
#include <cmath>
2827
#include <cstddef>
2928
#include <cstdint>
3029
#include <sycl/ext/oneapi/experimental/sycl_complex.hpp>
30+
#include <sycl/sycl.hpp>
3131
#include <type_traits>
3232

3333
#include "kernels/elementwise_functions/common.hpp"
@@ -48,7 +48,7 @@ namespace asin
4848

4949
namespace py = pybind11;
5050
namespace td_ns = dpctl::tensor::type_dispatch;
51-
namespace cmplx_ns = sycl::ext::oneapi::experimental;
51+
namespace exprm_ns = sycl::ext::oneapi::experimental;
5252

5353
using dpctl::tensor::type_utils::is_complex;
5454

@@ -136,8 +136,8 @@ template <typename argT, typename resT> struct AsinFunctor
136136
return resT{asinh_im, asinh_re};
137137
}
138138
/* ordinary cases */
139-
return cmplx_ns::asin(
140-
cmplx_ns::complex<realT>(in)); // std::asin(in);
139+
return exprm_ns::asin(
140+
exprm_ns::complex<realT>(in)); // std::asin(in);
141141
}
142142
else {
143143
static_assert(std::is_floating_point_v<argT> ||

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/asinh.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
//===---------------------------------------------------------------------===//
2424

2525
#pragma once
26-
#include <CL/sycl.hpp>
2726
#include <cmath>
2827
#include <cstddef>
2928
#include <cstdint>
3029
#include <sycl/ext/oneapi/experimental/sycl_complex.hpp>
30+
#include <sycl/sycl.hpp>
3131
#include <type_traits>
3232

3333
#include "kernels/elementwise_functions/common.hpp"
@@ -48,7 +48,7 @@ namespace asinh
4848

4949
namespace py = pybind11;
5050
namespace td_ns = dpctl::tensor::type_dispatch;
51-
namespace cmplx_ns = sycl::ext::oneapi::experimental;
51+
namespace exprm_ns = sycl::ext::oneapi::experimental;
5252

5353
using dpctl::tensor::type_utils::is_complex;
5454

@@ -117,8 +117,8 @@ template <typename argT, typename resT> struct AsinhFunctor
117117
}
118118

119119
/* ordinary cases */
120-
return cmplx_ns::asinh(
121-
cmplx_ns::complex<realT>(in)); // std::asinh(in);
120+
return exprm_ns::asinh(
121+
exprm_ns::complex<realT>(in)); // std::asinh(in);
122122
}
123123
else {
124124
static_assert(std::is_floating_point_v<argT> ||

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/atan.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
//===---------------------------------------------------------------------===//
2424

2525
#pragma once
26-
#include <CL/sycl.hpp>
2726
#include <cmath>
2827
#include <complex>
2928
#include <cstddef>
3029
#include <cstdint>
3130
#include <sycl/ext/oneapi/experimental/sycl_complex.hpp>
31+
#include <sycl/sycl.hpp>
3232
#include <type_traits>
3333

3434
#include "kernels/elementwise_functions/common.hpp"
@@ -49,7 +49,7 @@ namespace atan
4949

5050
namespace py = pybind11;
5151
namespace td_ns = dpctl::tensor::type_dispatch;
52-
namespace cmplx_ns = sycl::ext::oneapi::experimental;
52+
namespace exprm_ns = sycl::ext::oneapi::experimental;
5353

5454
using dpctl::tensor::type_utils::is_complex;
5555

@@ -128,8 +128,8 @@ template <typename argT, typename resT> struct AtanFunctor
128128
return resT{atanh_im, atanh_re};
129129
}
130130
/* ordinary cases */
131-
return cmplx_ns::atan(
132-
cmplx_ns::complex<realT>(in)); // std::atan(in);
131+
return exprm_ns::atan(
132+
exprm_ns::complex<realT>(in)); // std::atan(in);
133133
}
134134
else {
135135
static_assert(std::is_floating_point_v<argT> ||

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/atan2.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
//===---------------------------------------------------------------------===//
2525

2626
#pragma once
27-
#include <CL/sycl.hpp>
2827
#include <cstddef>
2928
#include <cstdint>
29+
#include <sycl/sycl.hpp>
3030
#include <type_traits>
3131

3232
#include "utils/offset_utils.hpp"

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/atanh.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
//===---------------------------------------------------------------------===//
2424

2525
#pragma once
26-
#include <CL/sycl.hpp>
2726
#include <cmath>
2827
#include <complex>
2928
#include <cstddef>
3029
#include <cstdint>
3130
#include <sycl/ext/oneapi/experimental/sycl_complex.hpp>
31+
#include <sycl/sycl.hpp>
3232
#include <type_traits>
3333

3434
#include "kernels/elementwise_functions/common.hpp"
@@ -49,7 +49,7 @@ namespace atanh
4949

5050
namespace py = pybind11;
5151
namespace td_ns = dpctl::tensor::type_dispatch;
52-
namespace cmplx_ns = sycl::ext::oneapi::experimental;
52+
namespace exprm_ns = sycl::ext::oneapi::experimental;
5353

5454
using dpctl::tensor::type_utils::is_complex;
5555

@@ -121,8 +121,8 @@ template <typename argT, typename resT> struct AtanhFunctor
121121
return resT{res_re, res_im};
122122
}
123123
/* ordinary cases */
124-
return cmplx_ns::atanh(
125-
cmplx_ns::complex<realT>(in)); // std::atanh(in);
124+
return exprm_ns::atanh(
125+
exprm_ns::complex<realT>(in)); // std::atanh(in);
126126
}
127127
else {
128128
static_assert(std::is_floating_point_v<argT> ||

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/bitwise_and.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
//===---------------------------------------------------------------------===//
2424

2525
#pragma once
26-
#include <CL/sycl.hpp>
2726
#include <cstddef>
2827
#include <cstdint>
28+
#include <sycl/sycl.hpp>
2929
#include <type_traits>
3030

3131
#include "utils/offset_utils.hpp"

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/bitwise_invert.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
//===---------------------------------------------------------------------===//
2626

2727
#pragma once
28-
#include <CL/sycl.hpp>
2928
#include <cstddef>
3029
#include <cstdint>
30+
#include <sycl/sycl.hpp>
3131
#include <type_traits>
3232

3333
#include "utils/offset_utils.hpp"

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/bitwise_left_shift.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
//===---------------------------------------------------------------------===//
2525

2626
#pragma once
27-
#include <CL/sycl.hpp>
2827
#include <cstddef>
2928
#include <cstdint>
29+
#include <sycl/sycl.hpp>
3030
#include <type_traits>
3131

3232
#include "utils/offset_utils.hpp"

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/bitwise_or.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
//===---------------------------------------------------------------------===//
2424

2525
#pragma once
26-
#include <CL/sycl.hpp>
2726
#include <cstddef>
2827
#include <cstdint>
28+
#include <sycl/sycl.hpp>
2929
#include <type_traits>
3030

3131
#include "utils/offset_utils.hpp"

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/bitwise_right_shift.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
//===---------------------------------------------------------------------===//
2525

2626
#pragma once
27-
#include <CL/sycl.hpp>
2827
#include <cstddef>
2928
#include <cstdint>
29+
#include <sycl/sycl.hpp>
3030
#include <type_traits>
3131

3232
#include "utils/offset_utils.hpp"

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/bitwise_xor.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
//===---------------------------------------------------------------------===//
2424

2525
#pragma once
26-
#include <CL/sycl.hpp>
2726
#include <cstddef>
2827
#include <cstdint>
28+
#include <sycl/sycl.hpp>
2929
#include <type_traits>
3030

3131
#include "utils/offset_utils.hpp"

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/ceil.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
//===---------------------------------------------------------------------===//
2424

2525
#pragma once
26-
#include <CL/sycl.hpp>
2726
#include <cmath>
2827
#include <cstddef>
2928
#include <cstdint>
29+
#include <sycl/sycl.hpp>
3030
#include <type_traits>
3131

3232
#include "kernels/elementwise_functions/common.hpp"

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/common.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
//===---------------------------------------------------------------------===//
2424

2525
#pragma once
26-
#include <CL/sycl.hpp>
2726
#include <cstddef>
2827
#include <cstdint>
2928
#include <pybind11/pybind11.h>
3029
#include <utility>
30+
#include <sycl/sycl.hpp>
3131

3232
#include "utils/offset_utils.hpp"
3333

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/common_inplace.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
//===---------------------------------------------------------------------===//
2525

2626
#pragma once
27-
#include <CL/sycl.hpp>
2827
#include <cstddef>
2928
#include <cstdint>
3029
#include <pybind11/pybind11.h>
30+
#include <sycl/sycl.hpp>
3131

3232
namespace dpctl
3333
{

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/conj.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
//===---------------------------------------------------------------------===//
2525

2626
#pragma once
27-
#include <CL/sycl.hpp>
2827
#include <cmath>
2928
#include <complex>
3029
#include <cstddef>
3130
#include <cstdint>
3231
#include <sycl/ext/oneapi/experimental/sycl_complex.hpp>
32+
#include <sycl/sycl.hpp>
3333
#include <type_traits>
3434

3535
#include "kernels/elementwise_functions/common.hpp"

Diff for: ‎dpctl/tensor/libtensor/include/kernels/elementwise_functions/cos.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
//===---------------------------------------------------------------------===//
2424

2525
#pragma once
26-
#include <CL/sycl.hpp>
2726
#include <cmath>
2827
#include <cstddef>
2928
#include <cstdint>
3029
#include <sycl/ext/oneapi/experimental/sycl_complex.hpp>
30+
#include <sycl/sycl.hpp>
3131
#include <type_traits>
3232

3333
#include "kernels/elementwise_functions/common.hpp"
@@ -48,7 +48,7 @@ namespace cos
4848

4949
namespace py = pybind11;
5050
namespace td_ns = dpctl::tensor::type_dispatch;
51-
namespace cmplx_ns = sycl::ext::oneapi::experimental;
51+
namespace exprm_ns = sycl::ext::oneapi::experimental;
5252

5353
using dpctl::tensor::type_utils::is_complex;
5454

@@ -83,8 +83,8 @@ template <typename argT, typename resT> struct CosFunctor
8383
* real and imaginary parts of input are finite.
8484
*/
8585
if (in_re_finite && in_im_finite) {
86-
return cmplx_ns::cos(
87-
cmplx_ns::complex<realT>(in)); // std::cos(in);
86+
return exprm_ns::cos(
87+
exprm_ns::complex<realT>(in)); // std::cos(in);
8888
}
8989

9090
/*

0 commit comments

Comments
 (0)