3 files changed, 18 insertions, 18 deletions

diff --git a/modules/remote-sycl/c++/common.hpp b/modules/remote-sycl/c++/common.hpp
index 822dae5..287075f 100644
--- a/modules/remote-sycl/c++/common.hpp
+++ b/modules/remote-sycl/c++/common.hpp
@@ -5,7 +5,7 @@
 #include <forstio/codec/schema_hash.hpp>
 #include <forstio/codec/id_map.hpp>
 
-#include <AdaptiveCpp/CL/sycl.hpp>
+#include <AdaptiveCpp/sycl/sycl.hpp>
 
 namespace saw {
 namespace rmt {
diff --git a/modules/remote-sycl/c++/data.hpp b/modules/remote-sycl/c++/data.hpp
index 2d5893f..c2ee098 100644
--- a/modules/remote-sycl/c++/data.hpp
+++ b/modules/remote-sycl/c++/data.hpp
@@ -15,8 +15,8 @@ public:
 	using Schema = schema::Array<Sch,Dim>;
 private:
 	// cl::sycl::buffer<data<Sch, encode::Native>> data_;
-	using sycl_usm_allocator = acpp::sycl::usm_allocator<data<Sch,Encode>, sycl::usm::alloc::shared>;
-	data<schema::FixedArray<schema::UInt64, sizeof...(D)>, Encode> dims_;
+	using sycl_usm_allocator = acpp::sycl::usm_allocator<data<Sch,Encode>, acpp::sycl::usm::alloc::shared>;
+	data<schema::FixedArray<schema::UInt64, Dim>, Encode> dims_;
 	data<schema::UInt64, Encode> size_;
 	std::vector<data<Sch,Encode>, sycl_usm_allocator> data_;
 
@@ -31,20 +31,20 @@ private:
 		return s;
 	}
 public:
-	data():
+	data(acpp::sycl::queue& q__):
 		dims_{},
 		size_{0u},
-		data_{}
+		data_{0u,q__}
 	{
 		for(uint64_t iter = 0; iter < Dim; ++iter){
 			dims_.at({iter}) = 0u;
 		}
 	}
 
-	data(const data<schema::FixedArray<schema::UInt64, sizeof...(D)>, Encode>& dims__):
+	data(const data<schema::FixedArray<schema::UInt64, Dim>, Encode>& dims__, acpp::sycl::queue& q__):
 		dims_{dims__},
 		size_{get_full_size()},
-		data_{size_}
+		data_{size_,q__}
 	{}
 
 	auto* get_internal_data() {
@@ -62,19 +62,19 @@ public:
 		return size_;
 	}
 
-	data<schema::FixedArray<schema::UInt64, sizeof...(D)>, Encode> dims() const {
+	data<schema::FixedArray<schema::UInt64, Dim>, Encode> dims() const {
 		return dims_;
 	}
 
-	constexpr data<T, Encode>& at(const data<schema::FixedArray<schema::UInt64, sizeof...(D)>, Encode>& i){
-		return value_.at(this->get_flat_index(i));
+	constexpr data<Sch, Encode>& at(const data<schema::FixedArray<schema::UInt64, Dim>, Encode>& i){
+		return data_.at(this->get_flat_index(i));
 	}
 
-	constexpr const data<T, Encode>& at(const data<schema::FixedArray<schema::UInt64, sizeof...(D)>, Encode>& i)const{
-		return value_.at(this->get_flat_index(i));
+	constexpr const data<Sch, Encode>& at(const data<schema::FixedArray<schema::UInt64, Dim>, Encode>& i)const{
+		return data_.at(this->get_flat_index(i));
 	}
 
-	data<schema::UInt64,Encode> internal_flat_index(const data<schema::FixedArray<schema::UInt64, sizeof...(D)>, Encode>& i) const {
+	data<schema::UInt64,Encode> internal_flat_index(const data<schema::FixedArray<schema::UInt64, Dim>, Encode>& i) const {
 		return {this->get_flat_index(i)};
 	}
 private:
@@ -85,7 +85,7 @@ private:
 			std::is_same_v<U,std::array<uint64_t,Dim>>,
 			"Unsupported type"
 		);
-		assert(value_.size() == get_full_size());
+		assert(data_.size() == get_full_size());
 		uint64_t s = 0;
 
 		uint64_t stride = 1;
diff --git a/modules/remote-sycl/c++/device.hpp b/modules/remote-sycl/c++/device.hpp
index a050078..05bb17a 100644
--- a/modules/remote-sycl/c++/device.hpp
+++ b/modules/remote-sycl/c++/device.hpp
@@ -9,10 +9,10 @@ namespace saw {
 template<>
 class device<rmt::Sycl> final {
 private:
-	cl::sycl::queue cmd_queue_;
+	acpp::sycl::queue cmd_queue_;
 public:
 	device():
-		cmd_queue_{cl::sycl::default_selector_v, cl::sycl::property_list{cl::sycl::property::queue::enable_profiling()}}
+		cmd_queue_{acpp::sycl::default_selector_v, acpp::sycl::property_list{acpp::sycl::property::queue::enable_profiling()}}
 	{}
 
 	SAW_FORBID_COPY(device);
@@ -44,14 +44,14 @@ public:
 		});
 		cmd_queue_.wait();
 		*/
-		cl::sycl::host_accessor result{dev_data.get_handle()};
+		acpp::sycl::host_accessor result{dev_data.get_handle()};
 		return result[0];
 	}
 	
 	/**
 	 * Get a reference to the handle
 	 */
-	cl::sycl::queue& get_handle(){
+	acpp::sycl::queue& get_handle(){
 		return cmd_queue_;
 	}
 };