deprecate namespace dpcpp by sycl

ginkgo-project · Aug 22, 2023 · 9eea078 · 9eea078
1 parent 9b4779a
commit 9eea078
Show file tree

Hide file tree

Showing 88 changed files with 200 additions and 173 deletions.
diff --git a/common/unified/base/kernel_launch.hpp b/common/unified/base/kernel_launch.hpp
@@ -105,7 +105,7 @@ GKO_INLINE GKO_ATTRIBUTES constexpr unpack_member_type<T> unpack_member(T value)
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 template <typename T>
@@ -127,7 +127,7 @@ GKO_INLINE GKO_ATTRIBUTES constexpr unpack_member_type<T> unpack_member(T value)
     return value;
 }
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
 

diff --git a/core/base/kernel_declaration.hpp b/core/base/kernel_declaration.hpp
@@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     __VA_ARGS__;                                                             \
     }                                                                        \
     }                                                                        \
-    namespace dpcpp {                                                        \
+    namespace sycl {                                                        \
     namespace _kernel_namespace {                                            \
     __VA_ARGS__;                                                             \
     }                                                                        \

diff --git a/core/device_hooks/dpcpp_hooks.cpp b/core/device_hooks/dpcpp_hooks.cpp
@@ -147,13 +147,13 @@ scoped_device_id_guard::scoped_device_id_guard(const DpcppExecutor* exec,
 
 
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 void destroy_event(sycl::event* event) GKO_NOT_COMPILED(dpcpp);
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 
 

diff --git a/core/log/profiler_hook.hpp b/core/log/profiler_hook.hpp
@@ -155,7 +155,7 @@ using profiling_scope_guard = log::default_profiling_scope_guard;
 }  // namespace hip
 
 
-namespace dpcpp {
+namespace sycl {
 
 
 class profiling_scope_guard {
@@ -174,7 +174,7 @@ class profiling_scope_guard {
 };
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
 

diff --git a/core/matrix/fft_kernels.hpp b/core/matrix/fft_kernels.hpp
@@ -108,13 +108,13 @@ GKO_DECLARE_ALL_AS_TEMPLATES;
 }  // namespace hip
 
 
-namespace dpcpp {
+namespace sycl {
 namespace fft {
 
 GKO_DECLARE_ALL_AS_TEMPLATES;
 
 }  // namespace fft
-}  // namespace dpcpp
+}  // namespace sycl
 
 
 #undef GKO_DECLARE_ALL_AS_TEMPLATES

diff --git a/core/stop/residual_norm_kernels.hpp b/core/stop/residual_norm_kernels.hpp
@@ -148,7 +148,7 @@ GKO_DECLARE_ALL_AS_TEMPLATES2;
 }  // namespace hip
 
 
-namespace dpcpp {
+namespace sycl {
 namespace residual_norm {
 
 GKO_DECLARE_ALL_AS_TEMPLATES;
@@ -161,7 +161,7 @@ namespace implicit_residual_norm {
 GKO_DECLARE_ALL_AS_TEMPLATES2;
 
 }  // namespace implicit_residual_norm
-}  // namespace dpcpp
+}  // namespace sycl
 
 
 #undef GKO_DECLARE_ALL_AS_TEMPLATES

diff --git a/dpcpp/base/batch_multi_vector_kernels.dp.cpp b/dpcpp/base/batch_multi_vector_kernels.dp.cpp
@@ -56,7 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 /**
  * @brief The MultiVector matrix format namespace.
  * @ref MultiVector
@@ -319,6 +319,6 @@ GKO_INSTANTIATE_FOR_EACH_VALUE_TYPE(GKO_DECLARE_BATCH_MULTI_VECTOR_COPY_KERNEL);
 
 
 }  // namespace batch_multi_vector
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
diff --git a/dpcpp/base/batch_struct.hpp b/dpcpp/base/batch_struct.hpp
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 /** @file batch_struct.hpp
@@ -85,7 +85,7 @@ inline batch::multi_vector::uniform_batch<ValueType> get_batch_struct(
 }
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
 

diff --git a/dpcpp/base/config.hpp b/dpcpp/base/config.hpp
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 struct config {
@@ -152,7 +152,7 @@ using dcfg_1sg_type_list_t =
 using dcfg_1sg_list_t = encode_list<dcfg_1sg_type_list_t>::type;
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
 

diff --git a/dpcpp/base/device.hpp b/dpcpp/base/device.hpp
@@ -39,14 +39,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 /** calls delete on the given event. */
 void destroy_event(sycl::event* event);
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
 

diff --git a/dpcpp/base/device_matrix_data_kernels.dp.cpp b/dpcpp/base/device_matrix_data_kernels.dp.cpp
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 namespace components {
 
 
@@ -151,6 +151,6 @@ GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE(
 
 
 }  // namespace components
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
diff --git a/dpcpp/base/dim3.dp.hpp b/dpcpp/base/dim3.dp.hpp
@@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 /**
@@ -88,7 +88,7 @@ inline sycl::nd_range<3> sycl_nd_range(dim3 grid, dim3 block)
 }
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
 

diff --git a/dpcpp/base/executor.dp.cpp b/dpcpp/base/executor.dp.cpp
@@ -317,12 +317,12 @@ void DpcppExecutor::set_device_property(dpcpp_queue_property property)
 
 
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 void destroy_event(sycl::event* event) { delete event; }
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
diff --git a/dpcpp/base/helper.dp.cpp b/dpcpp/base/helper.dp.cpp
@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 bool validate(sycl::queue* queue, unsigned int workgroup_size,
@@ -57,6 +57,6 @@ bool validate(sycl::queue* queue, unsigned int workgroup_size,
 }
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
diff --git a/dpcpp/base/helper.hpp b/dpcpp/base/helper.hpp
@@ -181,7 +181,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 /**
@@ -223,7 +223,7 @@ std::uint32_t get_first_cfg(const IterArr& arr, Validate verify)
 }
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
 

diff --git a/dpcpp/base/index_set_kernels.dp.cpp b/dpcpp/base/index_set_kernels.dp.cpp
@@ -48,7 +48,7 @@ namespace kernels {
  *
  * @ingroup dpcpp
  */
-namespace dpcpp {
+namespace sycl {
 /**
  * @brief The index_set namespace.
  *
@@ -108,6 +108,6 @@ GKO_INSTANTIATE_FOR_EACH_INDEX_TYPE(
 
 
 }  // namespace idx_set
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
diff --git a/dpcpp/base/kernel_launch.dp.hpp b/dpcpp/base/kernel_launch.dp.hpp
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 namespace device_std = std;
@@ -97,6 +97,6 @@ void run_kernel(std::shared_ptr<const DpcppExecutor> exec, KernelFunction fn,
 }
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
diff --git a/dpcpp/base/kernel_launch_reduction.dp.hpp b/dpcpp/base/kernel_launch_reduction.dp.hpp
@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 static constexpr auto dcfg_1d_list_simple_reduction = dcfg_1d_list_t();
@@ -718,6 +718,6 @@ void run_kernel_col_reduction_cached(std::shared_ptr<const DpcppExecutor> exec,
 }
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
diff --git a/dpcpp/base/kernel_launch_solver.dp.hpp b/dpcpp/base/kernel_launch_solver.dp.hpp
@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 template <typename KernelFunction, typename... KernelArgs>
@@ -71,6 +71,6 @@ void run_kernel_solver(std::shared_ptr<const DpcppExecutor> exec,
 }
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
diff --git a/dpcpp/base/onedpl.hpp b/dpcpp/base/onedpl.hpp
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 inline auto onedpl_policy(std::shared_ptr<const DpcppExecutor> exec)
@@ -53,7 +53,7 @@ inline auto onedpl_policy(std::shared_ptr<const DpcppExecutor> exec)
 }
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
 

diff --git a/dpcpp/base/onemkl_bindings.hpp b/dpcpp/base/onemkl_bindings.hpp
@@ -56,7 +56,7 @@ namespace kernels {
  *
  * @ingroup dpcpp
  */
-namespace dpcpp {
+namespace sycl {
 /**
  * @brief The ONEMKL namespace.
  *
@@ -125,7 +125,7 @@ GKO_BIND_DOT(ValueType, conj_dot, detail::not_implemented);
 #undef GKO_BIND_DOT
 
 }  // namespace onemkl
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
 

diff --git a/dpcpp/components/atomic.dp.hpp b/dpcpp/components/atomic.dp.hpp
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 namespace atomic {
 
 
@@ -283,7 +283,7 @@ __dpct_inline__ T atomic_max(T* __restrict__ addr, T val)
 }
 
 
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko
 

diff --git a/dpcpp/components/cooperative_groups.dp.hpp b/dpcpp/components/cooperative_groups.dp.hpp
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace gko {
 namespace kernels {
-namespace dpcpp {
+namespace sycl {
 
 
 /**
@@ -474,7 +474,7 @@ __dpct_inline__ grid_group this_grid(sycl::nd_item<3>& group)
 
 
 }  // namespace group
-}  // namespace dpcpp
+}  // namespace sycl
 }  // namespace kernels
 }  // namespace gko