Skip to content
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

clean unused sycl version switch and change the badge #1702

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
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: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div align="center">

[![License](https://img.shields.io/github/license/ginkgo-project/ginkgo.svg)](./LICENSE)|[![c++ standard](https://img.shields.io/badge/c%2B%2B-14-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B#Standardization)|[![Documentation](https://img.shields.io/badge/Documentation-latest-blue.svg)](https://ginkgo-project.github.io/ginkgo-generated-documentation/doc/develop/)|[![DOI](https://joss.theoj.org/papers/10.21105/joss.02260/status.svg)](https://doi.org/10.21105/joss.02260)
[![License](https://img.shields.io/github/license/ginkgo-project/ginkgo.svg)](./LICENSE)|[![c++ standard](https://img.shields.io/badge/c%2B%2B-17-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B#Standardization)|[![Documentation](https://img.shields.io/badge/Documentation-latest-blue.svg)](https://ginkgo-project.github.io/ginkgo-generated-documentation/doc/develop/)|[![DOI](https://joss.theoj.org/papers/10.21105/joss.02260/status.svg)](https://doi.org/10.21105/joss.02260)
|:-:|:-:|:-:|:-:|


Expand Down
12 changes: 0 additions & 12 deletions dpcpp/base/executor.dp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,8 @@ void DpcppExecutor::set_device_property(dpcpp_queue_property property)
}
this->get_exec_info().max_workgroup_size = static_cast<int>(
device.get_info<sycl::info::device::max_work_group_size>());
// They change the max_work_item_size with template parameter Dimension after
// major version 6 and adding the default = 3 is not in the same release.
#if GINKGO_DPCPP_MAJOR_VERSION >= 6
auto max_workitem_sizes =
device.get_info<sycl::info::device::max_work_item_sizes<3>>();
#else
auto max_workitem_sizes =
device.get_info<sycl::info::device::max_work_item_sizes>();
#endif
// Get the max dimension of a sycl::id object
auto max_work_item_dimensions =
device.get_info<sycl::info::device::max_work_item_dimensions>();
Expand All @@ -273,13 +266,8 @@ void DpcppExecutor::set_device_property(dpcpp_queue_property property)

// Get the hardware threads per eu
if (device.has(sycl::aspect::ext_intel_gpu_hw_threads_per_eu)) {
#if GINKGO_DPCPP_MAJOR_VERSION >= 6
this->get_exec_info().num_pu_per_cu = device.get_info<
sycl::ext::intel::info::device::gpu_hw_threads_per_eu>();
#else
this->get_exec_info().num_pu_per_cu = device.get_info<
sycl::info::device::ext_intel_gpu_hw_threads_per_eu>();
#endif
} else {
// To make the usage still valid.
// TODO: check the value for other vendor gpu or cpu.
Expand Down
6 changes: 0 additions & 6 deletions dpcpp/components/cooperative_groups.dp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -451,9 +451,6 @@ __dpct_inline__ grid_group this_grid(sycl::nd_item<3>& group)


// Enable group can directly use group function
#if GINKGO_DPCPP_MAJOR_VERSION < 6
inline namespace cl {
#endif
namespace sycl {
namespace detail {

Expand All @@ -480,9 +477,6 @@ struct group_scope<
} // namespace spirv
} // namespace detail
} // namespace sycl
#if GINKGO_DPCPP_MAJOR_VERSION < 6
} // namespace cl
#endif


#endif // GKO_DPCPP_COMPONENTS_COOPERATIVE_GROUPS_DP_HPP_
15 changes: 0 additions & 15 deletions include/ginkgo/core/base/fwd_decls.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ struct ihipEvent_t;
#endif


// after intel/llvm September'22 release, which uses major version 6, they
// introduce another inline namespace _V1.
#if GINKGO_DPCPP_MAJOR_VERSION >= 6
namespace sycl {
inline namespace _V1 {

Expand All @@ -45,18 +42,6 @@ class event;

} // namespace _V1
} // namespace sycl
#else // GINKGO_DPCPP_MAJOR_VERSION < 6
inline namespace cl {
namespace sycl {


class queue;
class event;


} // namespace sycl
} // namespace cl
#endif


#endif // GKO_PUBLIC_CORE_BASE_FWD_DECLS_HPP_
Loading