Skip to content
This repository was archived by the owner on May 9, 2024. It is now read-only.

Commit 83c70f5

Browse files
committed
disable CUDA async
1 parent d58406a commit 83c70f5

File tree

15 files changed

+31
-390
lines changed

15 files changed

+31
-390
lines changed

examples/heterogeneous_demo copy.ipynb

Lines changed: 0 additions & 296 deletions
This file was deleted.

omniscidb/BufferProvider/BufferProvider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class BufferProvider {
4444
const int8_t* host_ptr,
4545
const size_t num_bytes,
4646
const int device_id) const = 0;
47-
virtual void synchronizeStream(const int device_id) const = 0;
47+
virtual void synchronizeDeviceDataStream(const int device_id) const = 0;
4848
virtual void copyFromDevice(int8_t* host_ptr,
4949
const int8_t* device_ptr,
5050
const size_t num_bytes,

omniscidb/CudaMgr/CudaMgr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void CudaMgr::copyHostToDeviceAsync(int8_t* device_ptr,
131131
checkError(cuMemcpyHtoDAsync(
132132
reinterpret_cast<CUdeviceptr>(device_ptr), host_ptr, num_bytes, stream_));
133133
}
134-
void CudaMgr::synchronizeStream(const int device_num) {
134+
void CudaMgr::synchronizeDeviceDataStream(const int device_num) {
135135
setContext(device_num);
136136
checkError(cuStreamSynchronize(stream_));
137137
}

omniscidb/CudaMgr/CudaMgr.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class CudaMgr : public GpuMgr {
106106
const size_t num_bytes,
107107
const int device_num) override;
108108

109-
void synchronizeStream(const int device_num) override;
109+
void synchronizeDeviceDataStream(const int device_num) override;
110110

111111
void copyDeviceToHost(int8_t* host_ptr,
112112
const int8_t* device_ptr,
@@ -294,7 +294,7 @@ class CudaMgr : public GpuMgr {
294294
omnisci::DeviceGroup device_group_;
295295
std::vector<CUcontext> device_contexts_;
296296
mutable std::mutex device_cleanup_mutex_;
297-
static constexpr bool async_data_load_available{true};
297+
static constexpr bool async_data_load_available{false};
298298
};
299299

300300
} // Namespace CudaMgr_Namespace

omniscidb/CudaMgr/CudaMgrNoCuda.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void CudaMgr::copyHostToDeviceAsyncIfPossible(int8_t* device_ptr,
5050
CHECK(false);
5151
}
5252

53-
void CudaMgr::synchronizeStream(const int device_num) {
53+
void CudaMgr::synchronizeDeviceDataStream(const int device_num) {
5454
CHECK(false);
5555
}
5656

omniscidb/DataMgr/Allocators/GpuAllocator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,5 @@ void GpuAllocator::setDeviceMem(int8_t* device_ptr,
8686
}
8787

8888
void GpuAllocator::sync(){
89-
buffer_provider_->synchronizeStream(device_id_);
89+
buffer_provider_->synchronizeDeviceDataStream(device_id_);
9090
}

omniscidb/DataMgr/DataMgrBufferProvider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ void DataMgrBufferProvider::copyToDeviceAsyncIfPossible(int8_t* device_ptr,
6060
gpu_mgr->copyHostToDeviceAsyncIfPossible(device_ptr, host_ptr, num_bytes, device_id);
6161
}
6262

63-
void DataMgrBufferProvider::synchronizeStream(const int device_num) const {
63+
void DataMgrBufferProvider::synchronizeDeviceDataStream(const int device_num) const {
6464
CHECK(data_mgr_);
6565
const auto gpu_mgr = data_mgr_->getGpuMgr();
6666
CHECK(gpu_mgr);
67-
gpu_mgr->synchronizeStream(device_num);
67+
gpu_mgr->synchronizeDeviceDataStream(device_num);
6868
}
6969

7070
void DataMgrBufferProvider::copyFromDevice(int8_t* host_ptr,

omniscidb/DataMgr/DataMgrBufferProvider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class DataMgrBufferProvider : public BufferProvider {
4545
const int8_t* host_ptr,
4646
const size_t num_bytes,
4747
const int device_id) const override;
48-
void synchronizeStream(const int device_id) const override;
48+
void synchronizeDeviceDataStream(const int device_id) const override;
4949
void copyFromDevice(int8_t* host_ptr,
5050
const int8_t* device_ptr,
5151
const size_t num_bytes,

omniscidb/DataMgr/GpuMgr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct GpuMgr {
4343
const size_t num_bytes,
4444
const int device_num) = 0;
4545

46-
virtual void synchronizeStream(const int device_num) = 0;
46+
virtual void synchronizeDeviceDataStream(const int device_num) = 0;
4747

4848
virtual void copyDeviceToHost(int8_t* host_ptr,
4949
const int8_t* device_ptr,

0 commit comments

Comments
 (0)