Skip to content

[SYCL] Remove incorrect property traits for image_accessor #7176

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.

Sign up for GitHub

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 2 commits into from
Oct 25, 2022
Merged

[SYCL] Remove incorrect property traits for image_accessor #7176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebbf277
[SYCL] Remove incorrect property traits for image_accessor
aelovikov-intel Oct 25, 2022
b78bbee
Remove remaining instances of image_accessor in the test
aelovikov-intel Oct 25, 2022
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
16 changes: 0 additions & 16 deletions sycl/include/sycl/properties/accessor_properties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,6 @@ template <typename DataT, int Dimensions, access::mode AccessMode,
access::target AccessTarget, access::placeholder IsPlaceholder,
typename PropertyListT>
class accessor;
template <typename DataT, int Dimensions, access::mode AccessMode,
access::target AccessTarget, access::placeholder IsPlaceholder>
class image_accessor;
template <typename DataT, int Dimensions, access::mode AccessMode>
class host_accessor;

Expand Down Expand Up @@ -168,19 +165,6 @@ struct is_property_of<ext::intel::property::buffer_location,
IsPlaceholder, PropertyListT>> : std::true_type {
};

template <typename DataT, int Dimensions, access::mode AccessMode,
access::target AccessTarget, access::placeholder IsPlaceholder>
struct is_property_of<
property::noinit,
image_accessor<DataT, Dimensions, AccessMode, AccessTarget, IsPlaceholder>>
: std::true_type {};
template <typename DataT, int Dimensions, access::mode AccessMode,
access::target AccessTarget, access::placeholder IsPlaceholder>
struct is_property_of<
property::no_init,
image_accessor<DataT, Dimensions, AccessMode, AccessTarget, IsPlaceholder>>
: std::true_type {};

template <typename DataT, int Dimensions, access::mode AccessMode>
struct is_property_of<property::noinit,
host_accessor<DataT, Dimensions, AccessMode>>
Expand Down
20 changes: 0 additions & 20 deletions sycl/test/basic_tests/property_traits.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,6 @@ int main() {
accessor<sycl::half, 2, access_mode::write, target::host_buffer,
access::placeholder::false_t>);

// Image-accessor is_property_of
CHECK_IS_PROPERTY_OF(
property::no_init,
image_accessor<unsigned long, 2, access_mode::read, target::host_buffer,
access::placeholder::true_t>);

// Host-accessor is_property_of
CHECK_IS_PROPERTY_OF(property::no_init,
host_accessor<unsigned long, 2, access_mode::read>);
Expand Down Expand Up @@ -177,10 +171,6 @@ int main() {

// Invalid properties with valid object type
CHECK_IS_NOT_PROPERTY_OF(NotAProperty, accessor<int, 1>);
CHECK_IS_NOT_PROPERTY_OF(
NotAProperty,
image_accessor<float, 2, access_mode::read, target::host_buffer,
access::placeholder::true_t>);
CHECK_IS_NOT_PROPERTY_OF(NotAProperty, host_accessor<char, 2>);
CHECK_IS_NOT_PROPERTY_OF(NotAProperty, buffer<int, 2>);
CHECK_IS_NOT_PROPERTY_OF(NotAProperty, context);
Expand Down Expand Up @@ -249,12 +239,6 @@ int main() {
accessor<sycl::half, 2, access_mode::write, target::host_buffer,
access::placeholder::false_t>);

// Image-accessor is_property_of_v
CHECK_IS_PROPERTY_OF_V(
property::no_init,
image_accessor<unsigned long, 2, access_mode::read, target::host_buffer,
access::placeholder::true_t>);

// Host-accessor is_property_of_v
CHECK_IS_PROPERTY_OF_V(property::no_init,
host_accessor<unsigned long, 2, access_mode::read>);
Expand Down Expand Up @@ -322,10 +306,6 @@ int main() {

// Invalid properties with valid object type
CHECK_IS_NOT_PROPERTY_OF_V(NotAProperty, accessor<int, 1>);
CHECK_IS_NOT_PROPERTY_OF_V(
NotAProperty,
image_accessor<float, 2, access_mode::read, target::host_buffer,
access::placeholder::true_t>);
CHECK_IS_NOT_PROPERTY_OF_V(NotAProperty, host_accessor<char, 2>);
CHECK_IS_NOT_PROPERTY_OF_V(NotAProperty, buffer<int, 2>);
CHECK_IS_NOT_PROPERTY_OF_V(NotAProperty, context);
Expand Down