summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/remote-hip/c++/rpc.hpp8
-rw-r--r--modules/remote-hip/c++/transfer.hpp14
2 files changed, 11 insertions, 11 deletions
diff --git a/modules/remote-hip/c++/rpc.hpp b/modules/remote-hip/c++/rpc.hpp
index f6b519b..905750f 100644
--- a/modules/remote-hip/c++/rpc.hpp
+++ b/modules/remote-hip/c++/rpc.hpp
@@ -163,7 +163,7 @@ template<typename Iface, typename Encoding>
class rpc_server<Iface, Encoding, rmt::Hip> {
public:
using InterfaceCtxT = cl::sycl::queue*;
- using InterfaceT = interface<Iface, encode::Sycl<Encoding>, InterfaceCtxT>;
+ using InterfaceT = interface<Iface, encode::Hip<Encoding>, InterfaceCtxT>;
private:
/**
@@ -224,12 +224,12 @@ public:
/**
* Object needed if and only if the provided data type is not an id
*/
- own<data<typename FuncT::RequestT, encode::Sycl<Encoding>>> dev_tmp_inp = nullptr;
+ own<data<typename FuncT::RequestT, encode::Hip<Encoding>>> dev_tmp_inp = nullptr;
/**
* First check if it's data or an id.
* If it's an id, check if it's registered within the storage and retrieve it.
*/
- auto eoinp = [&,this]() -> error_or<data<typename FuncT::RequestT, encode::Sycl<Encoding>>* > {
+ auto eoinp = [&,this]() -> error_or<data<typename FuncT::RequestT, encode::Hip<Encoding>>* > {
if(input.is_id()){
// storage_.maps
auto eov = data_server_->template find<typename FuncT::RequestT>(input.get_id());
@@ -246,7 +246,7 @@ public:
}
auto& val = eov.get_value();
- dev_tmp_inp = heap<data<typename FuncT::RequestT, encode::Sycl<Encoding>>>(std::move(val));
+ dev_tmp_inp = heap<data<typename FuncT::RequestT, encode::Hip<Encoding>>>(std::move(val));
device_->get_handle().wait();
return dev_tmp_inp.get();
}
diff --git a/modules/remote-hip/c++/transfer.hpp b/modules/remote-hip/c++/transfer.hpp
index 8c2cc02..1fd97e8 100644
--- a/modules/remote-hip/c++/transfer.hpp
+++ b/modules/remote-hip/c++/transfer.hpp
@@ -15,7 +15,7 @@ class data_server<Schema, Encoding, rmt::Hip> final : public i_data_server<rmt::
private:
our<device<rmt::Hip>> device_;
- std::map<uint64_t, data<Schema, encode::Sycl<Encoding>>> values_;
+ std::map<uint64_t, data<Schema, encode::Hip<Encoding>>> values_;
public:
data_server(our<device<rmt::Hip>> device__):
device_{std::move(device__)}
@@ -54,7 +54,7 @@ public:
return make_void();
}
- error_or<ptr<data<Schema, encode::Sycl<Encoding>>>> find(id<Schema> store_id){
+ error_or<ptr<data<Schema, encode::Hip<Encoding>>>> find(id<Schema> store_id){
auto find_res = values_.find(store_id.get_value());
if(find_res == values_.end()){
return make_error<err::not_found>();
@@ -75,7 +75,7 @@ private:
/**
* Store for the data the server manages.
*/
- typename impl::data_server_redux<encode::Sycl<Encoding>, typename tmpl_reduce<tmpl_group<Schema...>>::type >::type values_;
+ typename impl::data_server_redux<encode::Hip<Encoding>, typename tmpl_reduce<tmpl_group<Schema...>>::type >::type values_;
public:
/**
* Main constructor
@@ -89,7 +89,7 @@ public:
*/
template<typename Sch>
error_or<void> send(const data<Sch, Encoding>& dat, id<Sch> store_id){
- auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,encode::Sycl<Encoding>>>>(values_);
+ auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,encode::Hip<Encoding>>>>(values_);
auto eoval = device_->template copy_to_device<Sch, Encoding>(dat);
if(eoval.is_error()){
auto& err = eoval.get_error();
@@ -109,7 +109,7 @@ public:
template<typename Sch>
error_or<void> allocate(const data<typename meta_schema<Sch>::MetaSchema, Encoding>& dat, id<Sch> store_id){
- auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,encode::Sycl<Encoding>>>>(values_);
+ auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,encode::Hip<Encoding>>>>(values_);
auto eoval = device_->template allocate_on_device<Sch, Encoding>(dat);
if(eoval.is_error()){
auto& err = eoval.get_error();
@@ -132,7 +132,7 @@ public:
*/
template<typename Sch>
error_or<data<Sch, Encoding>> receive(id<Sch> store_id){
- auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,encode::Sycl<Encoding>>>>(values_);
+ auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,encode::Hip<Encoding>>>>(values_);
auto find_res = vals.find(store_id.get_value());
if(find_res == vals.end()){
return make_error<err::not_found>();
@@ -161,7 +161,7 @@ public:
* Insert operations may invalidate the pointer.
*/
template<typename Sch>
- error_or<data<Sch, encode::Sycl<Encoding>>*> find(id<Sch> store_id){
+ error_or<data<Sch, encode::Hip<Encoding>>*> find(id<Sch> store_id){
auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,Encoding>>>(values_);
auto find_res = vals.find(store_id.get_value());
if(find_res == vals.end()){