diff --git a/common/src/KokkosFFT_utils.hpp b/common/src/KokkosFFT_utils.hpp index 0e35e6a4..c518c67f 100644 --- a/common/src/KokkosFFT_utils.hpp +++ b/common/src/KokkosFFT_utils.hpp @@ -105,7 +105,7 @@ bool are_valid_axes(const ViewType& view, const ArrayType& axes) { "are_valid_axes: the Rank of FFT axes must be between 1 and View rank"); // Convert the input axes to be in the range of [0, rank-1] - // int type is choosen for consistency with the rest of the code + // int type is chosen for consistency with the rest of the code // the axes are defined with int type std::array non_negative_axes; diff --git a/common/unit_test/Test_Extents.cpp b/common/unit_test/Test_Extents.cpp index 312af11a..54acce6b 100644 --- a/common/unit_test/Test_Extents.cpp +++ b/common/unit_test/Test_Extents.cpp @@ -52,7 +52,7 @@ void test_extents_1d() { EXPECT_TRUE(fft_extents_r2c == ref_fft_extents_r2c); EXPECT_EQ(howmany_r2c, 1); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW({ KokkosFFT::Impl::get_extents(xr, xcout, axes_type({0})); }, std::runtime_error); @@ -70,7 +70,7 @@ void test_extents_1d() { EXPECT_TRUE(fft_extents_c2r == ref_fft_extents_c2r); EXPECT_EQ(howmany_c2r, 1); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW({ KokkosFFT::Impl::get_extents(xcin, xr, axes_type({0})); }, std::runtime_error); @@ -119,7 +119,7 @@ void test_extents_1d_batched_FFT_2d() { EXPECT_TRUE(out_extents_r2c_axis0 == ref_out_extents_r2c_axis0); EXPECT_EQ(howmany_r2c_axis0, ref_howmany_r2c_axis0); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW({ KokkosFFT::Impl::get_extents(xr2, xcout2, axes_type({0})); }, std::runtime_error); @@ -131,7 +131,7 @@ void test_extents_1d_batched_FFT_2d() { EXPECT_TRUE(out_extents_r2c_axis1 == ref_out_extents_r2c_axis1); EXPECT_EQ(howmany_r2c_axis1, ref_howmany_r2c_axis1); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW({ KokkosFFT::Impl::get_extents(xr2, xcout2, axes_type({1})); }, std::runtime_error); @@ -144,7 +144,7 @@ void test_extents_1d_batched_FFT_2d() { EXPECT_TRUE(out_extents_c2r_axis0 == ref_in_extents_r2c_axis0); EXPECT_EQ(howmany_c2r_axis0, ref_howmany_r2c_axis0); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW({ KokkosFFT::Impl::get_extents(xcin2, xr2, axes_type({0})); }, std::runtime_error); @@ -156,7 +156,7 @@ void test_extents_1d_batched_FFT_2d() { EXPECT_TRUE(out_extents_c2r_axis1 == ref_in_extents_r2c_axis1); EXPECT_EQ(howmany_c2r_axis1, ref_howmany_r2c_axis1); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW({ KokkosFFT::Impl::get_extents(xcin2, xr2, axes_type({1})); }, std::runtime_error); @@ -177,7 +177,7 @@ void test_extents_1d_batched_FFT_2d() { EXPECT_TRUE(out_extents_c2c_axis1 == ref_in_extents_r2c_axis1); EXPECT_EQ(howmany_c2c_axis1, ref_howmany_r2c_axis1); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents ComplexView2Dtype xcout2_wrong("xcout2_wrong", n0 + 3, n1); for (int i = 0; i < 2; i++) { EXPECT_THROW( @@ -225,7 +225,7 @@ void test_extents_1d_batched_FFT_3d() { EXPECT_TRUE(out_extents_r2c_axis0 == ref_out_extents_r2c_axis0); EXPECT_EQ(howmany_r2c_axis0, ref_howmany_r2c_axis0); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW({ KokkosFFT::Impl::get_extents(xr3, xcout3, axes_type({0})); }, std::runtime_error); @@ -237,7 +237,7 @@ void test_extents_1d_batched_FFT_3d() { EXPECT_TRUE(out_extents_r2c_axis1 == ref_out_extents_r2c_axis1); EXPECT_EQ(howmany_r2c_axis1, ref_howmany_r2c_axis1); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW({ KokkosFFT::Impl::get_extents(xr3, xcout3, axes_type({1})); }, std::runtime_error); @@ -249,7 +249,7 @@ void test_extents_1d_batched_FFT_3d() { EXPECT_TRUE(out_extents_r2c_axis2 == ref_out_extents_r2c_axis2); EXPECT_EQ(howmany_r2c_axis2, ref_howmany_r2c_axis2); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW({ KokkosFFT::Impl::get_extents(xr3, xcout3, axes_type({2})); }, std::runtime_error); @@ -262,7 +262,7 @@ void test_extents_1d_batched_FFT_3d() { EXPECT_TRUE(out_extents_c2r_axis0 == ref_in_extents_r2c_axis0); EXPECT_EQ(howmany_c2r_axis0, ref_howmany_r2c_axis0); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW({ KokkosFFT::Impl::get_extents(xcin3, xr3, axes_type({0})); }, std::runtime_error); @@ -274,7 +274,7 @@ void test_extents_1d_batched_FFT_3d() { EXPECT_TRUE(out_extents_c2r_axis1 == ref_in_extents_r2c_axis1); EXPECT_EQ(howmany_c2r_axis1, ref_howmany_r2c_axis1); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW({ KokkosFFT::Impl::get_extents(xcin3, xr3, axes_type({1})); }, std::runtime_error); @@ -286,7 +286,7 @@ void test_extents_1d_batched_FFT_3d() { EXPECT_TRUE(out_extents_c2r_axis2 == ref_in_extents_r2c_axis2); EXPECT_EQ(howmany_c2r_axis2, ref_howmany_r2c_axis2); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW({ KokkosFFT::Impl::get_extents(xcin3, xr3, axes_type({2})); }, std::runtime_error); @@ -315,7 +315,7 @@ void test_extents_1d_batched_FFT_3d() { EXPECT_TRUE(out_extents_c2c_axis2 == ref_in_extents_r2c_axis2); EXPECT_EQ(howmany_c2c_axis2, ref_howmany_r2c_axis2); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents ComplexView3Dtype xcout3_wrong("xcout3_wrong", n0 + 3, n1, n2); for (int i = 0; i < 3; i++) { EXPECT_THROW( @@ -382,7 +382,7 @@ void test_extents_2d() { EXPECT_EQ(howmany_r2c_axis01, 1); EXPECT_EQ(howmany_r2c_axis10, 1); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xr2, xcout2, axes_type({0, 1})); @@ -414,7 +414,7 @@ void test_extents_2d() { EXPECT_EQ(howmany_c2r_axis01, 1); EXPECT_EQ(howmany_c2r_axis10, 1); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xcin2, xr2, axes_type({0, 1})); @@ -446,7 +446,7 @@ void test_extents_2d() { EXPECT_EQ(howmany_c2c_axis01, 1); EXPECT_EQ(howmany_c2c_axis10, 1); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents ComplexView2Dtype xcout2_wrong("xcout2_wrong", n0 + 3, n1); for (int axis0 = 0; axis0 < 2; axis0++) { for (int axis1 = 0; axis1 < 2; axis1++) { @@ -518,7 +518,7 @@ void test_extents_2d_batched_FFT_3d() { EXPECT_TRUE(out_extents_r2c_axis_01 == ref_out_extents_r2c_axis_01); EXPECT_EQ(howmany_r2c_axis_01, ref_howmany_r2c_axis_01); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xr3, xcout3, axes_type({0, 1})); @@ -533,7 +533,7 @@ void test_extents_2d_batched_FFT_3d() { EXPECT_TRUE(out_extents_r2c_axis_02 == ref_out_extents_r2c_axis_02); EXPECT_EQ(howmany_r2c_axis_02, ref_howmany_r2c_axis_02); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xr3, xcout3, axes_type({0, 2})); @@ -548,7 +548,7 @@ void test_extents_2d_batched_FFT_3d() { EXPECT_TRUE(out_extents_r2c_axis_10 == ref_out_extents_r2c_axis_10); EXPECT_EQ(howmany_r2c_axis_10, ref_howmany_r2c_axis_10); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xr3, xcout3, axes_type({1, 0})); @@ -563,7 +563,7 @@ void test_extents_2d_batched_FFT_3d() { EXPECT_TRUE(out_extents_r2c_axis_12 == ref_out_extents_r2c_axis_12); EXPECT_EQ(howmany_r2c_axis_12, ref_howmany_r2c_axis_12); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xr3, xcout3, axes_type({1, 2})); @@ -578,7 +578,7 @@ void test_extents_2d_batched_FFT_3d() { EXPECT_TRUE(out_extents_r2c_axis_20 == ref_out_extents_r2c_axis_20); EXPECT_EQ(howmany_r2c_axis_20, ref_howmany_r2c_axis_20); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xr3, xcout3, axes_type({2, 0})); @@ -593,7 +593,7 @@ void test_extents_2d_batched_FFT_3d() { EXPECT_TRUE(out_extents_r2c_axis_21 == ref_out_extents_r2c_axis_21); EXPECT_EQ(howmany_r2c_axis_21, ref_howmany_r2c_axis_21); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xr3, xcout3, axes_type({2, 1})); @@ -609,7 +609,7 @@ void test_extents_2d_batched_FFT_3d() { EXPECT_TRUE(out_extents_c2r_axis_01 == ref_in_extents_r2c_axis_01); EXPECT_EQ(howmany_c2r_axis_01, ref_howmany_r2c_axis_01); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xcin3, xr3, axes_type({0, 1})); @@ -624,7 +624,7 @@ void test_extents_2d_batched_FFT_3d() { EXPECT_TRUE(out_extents_c2r_axis_02 == ref_in_extents_r2c_axis_02); EXPECT_EQ(howmany_c2r_axis_02, ref_howmany_r2c_axis_02); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xcin3, xr3, axes_type({0, 2})); @@ -639,7 +639,7 @@ void test_extents_2d_batched_FFT_3d() { EXPECT_TRUE(out_extents_c2r_axis_10 == ref_in_extents_r2c_axis_10); EXPECT_EQ(howmany_c2r_axis_10, ref_howmany_r2c_axis_10); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xcin3, xr3, axes_type({1, 0})); @@ -654,7 +654,7 @@ void test_extents_2d_batched_FFT_3d() { EXPECT_TRUE(out_extents_c2r_axis_12 == ref_in_extents_r2c_axis_12); EXPECT_EQ(howmany_c2r_axis_12, ref_howmany_r2c_axis_12); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xcin3, xr3, axes_type({1, 2})); @@ -669,7 +669,7 @@ void test_extents_2d_batched_FFT_3d() { EXPECT_TRUE(out_extents_c2r_axis_20 == ref_in_extents_r2c_axis_20); EXPECT_EQ(howmany_c2r_axis_20, ref_howmany_r2c_axis_20); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xcin3, xr3, axes_type({2, 0})); @@ -684,7 +684,7 @@ void test_extents_2d_batched_FFT_3d() { EXPECT_TRUE(out_extents_c2r_axis_21 == ref_in_extents_r2c_axis_21); EXPECT_EQ(howmany_c2r_axis_21, ref_howmany_r2c_axis_21); - // Check if errors are correctly raised aginst invalid extents + // Check if errors are correctly raised against invalid extents EXPECT_THROW( { KokkosFFT::Impl::get_extents(xcin3, xr3, axes_type({2, 1})); diff --git a/common/unit_test/Test_Traits.cpp b/common/unit_test/Test_Traits.cpp index 3a80878b..3afae3d5 100644 --- a/common/unit_test/Test_Traits.cpp +++ b/common/unit_test/Test_Traits.cpp @@ -241,7 +241,7 @@ template void test_admissible_value_type() { using ViewType = Kokkos::View; using real_type = KokkosFFT::Impl::base_floating_point_type; - // Tests that a Value or View has a addmissible value type + // Tests that a Value or View has a admissible value type if constexpr (std::is_same_v || std::is_same_v) { // Base floating point type of a Value is float or double diff --git a/common/unit_test/Test_Utils.cpp b/common/unit_test/Test_Utils.cpp index 48dbcfff..829b5316 100644 --- a/common/unit_test/Test_Utils.cpp +++ b/common/unit_test/Test_Utils.cpp @@ -65,7 +65,7 @@ void test_convert_negative_axes_1d() { EXPECT_EQ(converted_axis_0, ref_converted_axis_0); EXPECT_EQ(converted_axis_minus1, ref_converted_axis_minus1); - // Check if errors are correctly raised aginst invalid axis + // Check if errors are correctly raised against invalid axis // axis must be in [-1, 1) EXPECT_THROW({ KokkosFFT::Impl::convert_negative_axis(x, /*axis=*/1); }, std::runtime_error); @@ -93,7 +93,7 @@ void test_convert_negative_axes_2d() { EXPECT_EQ(converted_axis_1, ref_converted_axis_1); EXPECT_EQ(converted_axis_minus1, ref_converted_axis_minus1); - // Check if errors are correctly raised aginst invalid axis + // Check if errors are correctly raised against invalid axis // axis must be in [-2, 2) EXPECT_THROW({ KokkosFFT::Impl::convert_negative_axis(x, /*axis=*/2); }, std::runtime_error); @@ -128,7 +128,7 @@ void test_convert_negative_axes_3d() { EXPECT_EQ(converted_axis_minus1, ref_converted_axis_minus1); EXPECT_EQ(converted_axis_minus2, ref_converted_axis_minus2); - // Check if errors are correctly raised aginst invalid axis + // Check if errors are correctly raised against invalid axis // axis must be in [-3, 3) EXPECT_THROW({ KokkosFFT::Impl::convert_negative_axis(x, /*axis=*/3); }, std::runtime_error); @@ -170,7 +170,7 @@ void test_convert_negative_axes_4d() { EXPECT_EQ(converted_axis_minus2, ref_converted_axis_minus2); EXPECT_EQ(converted_axis_minus3, ref_converted_axis_minus3); - // Check if errors are correctly raised aginst invalid axis + // Check if errors are correctly raised against invalid axis // axis must be in [-4, 4) EXPECT_THROW({ KokkosFFT::Impl::convert_negative_axis(x, /*axis=*/4); }, std::runtime_error); diff --git a/fft/src/KokkosFFT_Plans.hpp b/fft/src/KokkosFFT_Plans.hpp index 5ec1e744..3bba0fb2 100644 --- a/fft/src/KokkosFFT_Plans.hpp +++ b/fft/src/KokkosFFT_Plans.hpp @@ -151,7 +151,7 @@ class Plan { /// /// \param exec_space [in] Kokkos execution device /// \param in [in] Input data - /// \param out [in] Ouput data + /// \param out [in] Output data /// \param direction [in] Direction of FFT (forward/backward) /// \param axis [in] Axis over which FFT is performed /// \param n [in] Length of the transformed axis of the output (default, @@ -218,7 +218,7 @@ class Plan { /// /// \param exec_space [in] Kokkos execution space for this plan /// \param in [in] Input data - /// \param out [in] Ouput data + /// \param out [in] Output data /// \param direction [in] Direction of FFT (forward/backward) /// \param axes [in] Axes over which FFT is performed /// \param s [in] Shape of the transformed axis of the output (default, {}) @@ -291,7 +291,7 @@ class Plan { /// \brief Execute FFT on input and output Views with normalization /// /// \param in [in] Input data - /// \param out [out] Ouput data + /// \param out [out] Output data /// \param norm [in] How the normalization is applied (default, backward) void execute(const InViewType& in, const OutViewType& out, KokkosFFT::Normalization norm = @@ -379,10 +379,10 @@ class Plan { /// \brief Sanity check of the plan used to call FFT interface with /// pre-defined FFT plan. This raises an error if there is an - /// incosistency between FFT function and plan + /// inconsistency between FFT function and plan /// /// \param in [in] Input data - /// \param out [in] Ouput data + /// \param out [in] Output data void good(const InViewType& in, const OutViewType& out) const { auto in_extents = KokkosFFT::Impl::extract_extents(in); auto out_extents = KokkosFFT::Impl::extract_extents(out); diff --git a/fft/src/KokkosFFT_SYCL_plans.hpp b/fft/src/KokkosFFT_SYCL_plans.hpp index fa9d232c..52c751ef 100644 --- a/fft/src/KokkosFFT_SYCL_plans.hpp +++ b/fft/src/KokkosFFT_SYCL_plans.hpp @@ -115,7 +115,7 @@ template < std::enable_if_t, std::nullptr_t> = nullptr> void destroy_plan_and_info(std::unique_ptr&, InfoType&) { - // In oneMKL, plans are destroybed by destructor + // In oneMKL, plans are destroyed by destructor } } // namespace Impl } // namespace KokkosFFT diff --git a/fft/src/KokkosFFT_Transform.hpp b/fft/src/KokkosFFT_Transform.hpp index b23886ce..3f319b6e 100644 --- a/fft/src/KokkosFFT_Transform.hpp +++ b/fft/src/KokkosFFT_Transform.hpp @@ -16,7 +16,7 @@ namespace KokkosFFT { /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (complex) -/// \param out [out] Ouput data (complex) +/// \param out [out] Output data (complex) /// \param norm [in] How the normalization is applied (default, backward) /// \param axis [in] Axis over which FFT is performed (default, -1) /// \param n [in] Length of the transformed axis of the output (default, @@ -46,7 +46,7 @@ void fft(const ExecutionSpace& exec_space, const InViewType& in, /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (complex) -/// \param out [out] Ouput data (complex) +/// \param out [out] Output data (complex) /// \param norm [in] How the normalization is applied (default, backward) /// \param axis [in] Axis over which FFT is performed (default, -1) /// \param n [in] Length of the transformed axis of the output (default, @@ -76,7 +76,7 @@ void ifft(const ExecutionSpace& exec_space, const InViewType& in, /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (real) -/// \param out [out] Ouput data (complex) +/// \param out [out] Output data (complex) /// \param norm [in] How the normalization is applied (default, backward) /// \param axis [in] Axis over which FFT is performed (default, -1) /// \param n [in] Length of the transformed axis of the output (default, @@ -112,7 +112,7 @@ void rfft(const ExecutionSpace& exec_space, const InViewType& in, /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (complex) -/// \param out [out] Ouput data (real) +/// \param out [out] Output data (real) /// \param norm [in] How the normalization is applied (default, backward) /// \param axis [in] Axis over which FFT is performed (default, -1) /// \param n [in] Length of the transformed axis of the output (default, @@ -149,7 +149,7 @@ void irfft(const ExecutionSpace& exec_space, const InViewType& in, /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (complex) -/// \param out [out] Ouput data (real) +/// \param out [out] Output data (real) /// \param norm [in] How the normalization is applied (default, backward) /// \param axis [in] Axis over which FFT is performed (default, -1) /// \param n [in] Length of the transformed axis of the output (default, @@ -193,7 +193,7 @@ void hfft(const ExecutionSpace& exec_space, const InViewType& in, /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (real) -/// \param out [out] Ouput data (complex) +/// \param out [out] Output data (complex) /// \param norm [in] How the normalization is applied (default, backward) /// \param axis [in] Axis over which FFT is performed (default, -1) /// \param n [in] Length of the transformed axis of the output (default, @@ -235,7 +235,7 @@ void ihfft(const ExecutionSpace& exec_space, const InViewType& in, /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (complex) -/// \param out [out] Ouput data (complex) +/// \param out [out] Output data (complex) /// \param norm [in] How the normalization is applied (default, backward) /// \param axes [in] Axes over which FFT is performed (default, {-2, -1}) /// \param s [in] Shape of the transformed axis of the output (default, {}) @@ -264,7 +264,7 @@ void fft2(const ExecutionSpace& exec_space, const InViewType& in, /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (complex) -/// \param out [out] Ouput data (complex) +/// \param out [out] Output data (complex) /// \param norm [in] How the normalization is applied (default, backward) /// \param axes [in] Axes over which FFT is performed (default, {-2, -1}) /// \param s [in] Shape of the transformed axis of the output (default, {}) @@ -294,7 +294,7 @@ void ifft2(const ExecutionSpace& exec_space, const InViewType& in, /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (real) -/// \param out [out] Ouput data (complex) +/// \param out [out] Output data (complex) /// \param norm [in] How the normalization is applied (default, backward) /// \param axes [in] Axes over which FFT is performed (default, {-2, -1}) /// \param s [in] Shape of the transformed axis of the output (default, {}) @@ -330,7 +330,7 @@ void rfft2(const ExecutionSpace& exec_space, const InViewType& in, /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (complex) -/// \param out [out] Ouput data (real) +/// \param out [out] Output data (real) /// \param norm [in] How the normalization is applied (default, backward) /// \param axes [in] Axes over which FFT is performed (default, {-2, -1}) /// \param s [in] Shape of the transformed axis of the output (default, {}) @@ -368,7 +368,7 @@ void irfft2(const ExecutionSpace& exec_space, const InViewType& in, /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (complex) -/// \param out [out] Ouput data (complex) +/// \param out [out] Output data (complex) /// \param axes [in] Axes over which FFT is performed (default, all axes) /// \param norm [in] How the normalization is applied (default, backward) /// \param s [in] Shape of the transformed axis of the output (default, {}) @@ -409,7 +409,7 @@ void fftn( /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (complex) -/// \param out [out] Ouput data (complex) +/// \param out [out] Output data (complex) /// \param axes [in] Axes over which FFT is performed (default, all axes) /// \param norm [in] How the normalization is applied (default, backward) /// \param s [in] Shape of the transformed axis of the output (default, {}) @@ -452,7 +452,7 @@ void ifftn( /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (real) -/// \param out [out] Ouput data (complex) +/// \param out [out] Output data (complex) /// \param axes [in] Axes over which FFT is performed (default, all axes) /// \param norm [in] How the normalization is applied (default, backward) /// \param s [in] Shape of the transformed axis of the output (default, {}) @@ -501,7 +501,7 @@ void rfftn( /// /// \param exec_space [in] Kokkos execution space /// \param in [in] Input data (complex) -/// \param out [out] Ouput data (real) +/// \param out [out] Output data (real) /// \param axes [in] Axes over which FFT is performed (default, all axes) /// \param norm [in] How the normalization is applied (default, backward) /// \param s [in] Shape of the transformed axis of the output (default, {}) diff --git a/fft/unit_test/Test_Plans.cpp b/fft/unit_test/Test_Plans.cpp index 6d096f41..b71cb737 100644 --- a/fft/unit_test/Test_Plans.cpp +++ b/fft/unit_test/Test_Plans.cpp @@ -155,7 +155,7 @@ void test_plan_1dfft_1dview() { KokkosFFT::Direction::backward, /*axes=*/axes_type<1>({0})); - // Check if errors are correctly raised aginst wrong dirction + // Check if errors are correctly raised against wrong direction // Input Real, Output Complex -> must be forward plan EXPECT_THROW( { @@ -230,7 +230,7 @@ void test_plan_1dfft_2dview() { KokkosFFT::Direction::forward, /*axis=*/1); - // Check if errors are correctly raised aginst wrong dirction + // Check if errors are correctly raised against wrong direction // Input Real, Output Complex -> must be forward plan EXPECT_THROW( { @@ -333,7 +333,7 @@ void test_plan_1dfft_3dview() { KokkosFFT::Direction::backward, /*axis=*/2); - // Check if errors are correctly raised aginst wrong dirction + // Check if errors are correctly raised against wrong direction // Input Real, Output Complex -> must be forward plan EXPECT_THROW( { @@ -443,7 +443,7 @@ void test_plan_2dfft_2dview() { KokkosFFT::Direction::forward, /*axes=*/axes_type<2>({1, 0})); - // Check if errors are correctly raised aginst wrong dirction + // Check if errors are correctly raised against wrong direction // Input Real, Output Complex -> must be forward plan EXPECT_THROW( { @@ -550,7 +550,7 @@ void test_plan_2dfft_3dview() { KokkosFFT::Direction::forward, /*axes=*/axes_type<2>({2, 1})); - // Check if errors are correctly raised aginst wrong dirction + // Check if errors are correctly raised against wrong direction // Input Real, Output Complex -> must be forward plan EXPECT_THROW( { @@ -730,7 +730,7 @@ void test_plan_3dfft_3dview() { KokkosFFT::Direction::forward, /*axes=*/axes_type<3>({2, 1, 0})); - // Check if errors are correctly raised aginst wrong dirction + // Check if errors are correctly raised against wrong direction // Input Real, Output Complex -> must be forward plan EXPECT_THROW( { diff --git a/fft/unit_test/Test_Transform.cpp b/fft/unit_test/Test_Transform.cpp index 60b36ba3..942f332d 100644 --- a/fft/unit_test/Test_Transform.cpp +++ b/fft/unit_test/Test_Transform.cpp @@ -230,7 +230,7 @@ void test_fft1_identity_reuse_plan(T atol = 1.0e-12) { KokkosFFT::Plan irfft_plan(execution_space(), ar_hat, inv_ar_hat, KokkosFFT::Direction::backward, axis); - // Check if errors are correctly raised aginst wrong extents + // Check if errors are correctly raised against wrong extents const int maxlen_wrong = 32 * 2; ComplexView1DType a_wrong("a_wrong", maxlen_wrong), inv_a_hat_wrong("inv_a_hat_wrong", maxlen_wrong); @@ -591,7 +591,7 @@ void test_fft1_1dfft_2dview(T atol = 1.e-12) { Kokkos::fence(); - // Along axis 0 (transpose neeed) + // Along axis 0 (transpose needed) // Perform batched 1D (along 0th axis) FFT sequentially for (int i1 = 0; i1 < n1; i1++) { auto sub_x = Kokkos::subview(x, Kokkos::ALL, i1); @@ -680,7 +680,7 @@ void test_fft1_1dfft_3dview(T atol = 1.e-12) { Kokkos::fence(); - // Along axis 0 (transpose neeed) + // Along axis 0 (transpose needed) // Perform batched 1D (along 0th axis) FFT sequentially for (int i2 = 0; i2 < n2; i2++) { for (int i1 = 0; i1 < n1; i1++) { @@ -710,7 +710,7 @@ void test_fft1_1dfft_3dview(T atol = 1.e-12) { Kokkos::deep_copy(x, ref_x); Kokkos::deep_copy(xr, ref_xr); - // Along axis 1 (transpose neeed) + // Along axis 1 (transpose needed) // Perform batched 1D (along 1st axis) FFT sequentially for (int i2 = 0; i2 < n2; i2++) { for (int i0 = 0; i0 < n0; i0++) { @@ -809,7 +809,7 @@ void test_fft1_1dfft_4dview(T atol = 1.e-12) { Kokkos::fence(); - // Along axis 0 (transpose neeed) + // Along axis 0 (transpose needed) // Perform batched 1D (along 0th axis) FFT sequentially for (int i3 = 0; i3 < n3; i3++) { for (int i2 = 0; i2 < n2; i2++) { @@ -841,7 +841,7 @@ void test_fft1_1dfft_4dview(T atol = 1.e-12) { Kokkos::deep_copy(x, ref_x); Kokkos::deep_copy(xr, ref_xr); - // Along axis 1 (transpose neeed) + // Along axis 1 (transpose needed) // Perform batched 1D (along 1st axis) FFT sequentially for (int i3 = 0; i3 < n3; i3++) { for (int i2 = 0; i2 < n2; i2++) { @@ -1231,7 +1231,7 @@ TYPED_TEST(FFT1D, FFT_1DView_shape) { test_fft1_shape(atol); } -// batced fft1 on 2D Views +// batched fft1 on 2D Views TYPED_TEST(FFT1D, FFT_batched_2DView) { using float_type = typename TestFixture::float_type; using layout_type = typename TestFixture::layout_type; @@ -1240,7 +1240,7 @@ TYPED_TEST(FFT1D, FFT_batched_2DView) { test_fft1_1dfft_2dview(atol); } -// batced fft1 on 3D Views +// batched fft1 on 3D Views TYPED_TEST(FFT1D, FFT_batched_3DView) { using float_type = typename TestFixture::float_type; using layout_type = typename TestFixture::layout_type; @@ -1249,7 +1249,7 @@ TYPED_TEST(FFT1D, FFT_batched_3DView) { test_fft1_1dfft_3dview(atol); } -// batced fft1 on 4D Views +// batched fft1 on 4D Views TYPED_TEST(FFT1D, FFT_batched_4DView) { using float_type = typename TestFixture::float_type; using layout_type = typename TestFixture::layout_type; @@ -1258,7 +1258,7 @@ TYPED_TEST(FFT1D, FFT_batched_4DView) { test_fft1_1dfft_4dview(atol); } -// batced fft1 on 5D Views +// batched fft1 on 5D Views TYPED_TEST(FFT1D, FFT_batched_5DView) { using float_type = typename TestFixture::float_type; using layout_type = typename TestFixture::layout_type; @@ -1267,7 +1267,7 @@ TYPED_TEST(FFT1D, FFT_batched_5DView) { test_fft1_1dfft_5dview(atol); } -// batced fft1 on 6D Views +// batched fft1 on 6D Views TYPED_TEST(FFT1D, FFT_batched_6DView) { using float_type = typename TestFixture::float_type; using layout_type = typename TestFixture::layout_type; @@ -1276,7 +1276,7 @@ TYPED_TEST(FFT1D, FFT_batched_6DView) { test_fft1_1dfft_6dview(atol); } -// batced fft1 on 7D Views +// batched fft1 on 7D Views TYPED_TEST(FFT1D, FFT_batched_7DView) { using float_type = typename TestFixture::float_type; using layout_type = typename TestFixture::layout_type; @@ -1285,7 +1285,7 @@ TYPED_TEST(FFT1D, FFT_batched_7DView) { test_fft1_1dfft_7dview(atol); } -// batced fft1 on 8D Views +// batched fft1 on 8D Views TYPED_TEST(FFT1D, FFT_batched_8DView) { using float_type = typename TestFixture::float_type; using layout_type = typename TestFixture::layout_type; @@ -2354,7 +2354,7 @@ TYPED_TEST(FFT2D, 2DFFT_2DView_inplace) { test_fft2_2dfft_2dview_inplace(); } -// batced fft2 on 3D Views +// batched fft2 on 3D Views TYPED_TEST(FFT2D, FFT_batched_3DView) { using float_type = typename TestFixture::float_type; using layout_type = typename TestFixture::layout_type; @@ -2363,7 +2363,7 @@ TYPED_TEST(FFT2D, FFT_batched_3DView) { test_fft2_2dfft_3dview(atol); } -// batced fft2 on 4D Views +// batched fft2 on 4D Views TYPED_TEST(FFT2D, FFT_batched_4DView) { using float_type = typename TestFixture::float_type; using layout_type = typename TestFixture::layout_type; @@ -2372,7 +2372,7 @@ TYPED_TEST(FFT2D, FFT_batched_4DView) { test_fft2_2dfft_4dview(atol); } -// batced fft2 on 5D Views +// batched fft2 on 5D Views TYPED_TEST(FFT2D, FFT_batched_5DView) { using float_type = typename TestFixture::float_type; using layout_type = typename TestFixture::layout_type; @@ -2381,7 +2381,7 @@ TYPED_TEST(FFT2D, FFT_batched_5DView) { test_fft2_2dfft_5dview(atol); } -// batced fft2 on 6D Views +// batched fft2 on 6D Views TYPED_TEST(FFT2D, FFT_batched_6DView) { using float_type = typename TestFixture::float_type; using layout_type = typename TestFixture::layout_type; @@ -2390,7 +2390,7 @@ TYPED_TEST(FFT2D, FFT_batched_6DView) { test_fft2_2dfft_6dview(atol); } -// batced fft2 on 7D Views +// batched fft2 on 7D Views TYPED_TEST(FFT2D, FFT_batched_7DView) { using float_type = typename TestFixture::float_type; using layout_type = typename TestFixture::layout_type; @@ -2399,7 +2399,7 @@ TYPED_TEST(FFT2D, FFT_batched_7DView) { test_fft2_2dfft_7dview(atol); } -// batced fft2 on 8D Views +// batched fft2 on 8D Views TYPED_TEST(FFT2D, FFT_batched_8DView) { using float_type = typename TestFixture::float_type; using layout_type = typename TestFixture::layout_type; @@ -3045,7 +3045,7 @@ void test_fftn_3dfft_3dview_shape(T atol = 1.0e-12) { for (auto&& shape2 : shapes2) { shape_type<3> new_shape = {shape0, shape1, shape2}; - // Real to comple + // Real to complex ComplexView3DType outr("outr", shape0, shape1, shape2 / 2 + 1), outr_b("outr_b", shape0, shape1, shape2 / 2 + 1), outr_o("outr_o", shape0, shape1, shape2 / 2 + 1),