Browse Source

fix code review defects

tags/v0.5.0-beta
lizhenyu 5 years ago
parent
commit
0a55ebf6e9
4 changed files with 7 additions and 8 deletions
  1. +1
    -1
      mindspore/ccsrc/device/gpu/gpu_kernel_runtime.cc
  2. +2
    -2
      mindspore/ccsrc/device/gpu/gpu_memory_copy_manager.cc
  3. +2
    -3
      mindspore/ccsrc/device/gpu/gpu_memory_copy_manager.h
  4. +2
    -2
      mindspore/ccsrc/pre_activate/mem_reuse/mem_copy_manager.h

+ 1
- 1
mindspore/ccsrc/device/gpu/gpu_kernel_runtime.cc View File

@@ -171,7 +171,7 @@ bool GPUKernelRuntime::Run(session::KernelGraph *graph) {
const uint64_t kUSecondInSecond = 1000000;
uint64_t cost = kUSecondInSecond * static_cast<uint64_t>(end_time.tv_sec - start_time.tv_sec);
cost += static_cast<uint64_t>(end_time.tv_usec - start_time.tv_usec);
MS_LOG(DEBUG) << "kernel runtime run graph in " << cost << " us";
MS_LOG(DEBUG) << "GPU kernel runtime run graph in " << cost << " us";
return ret;
}


+ 2
- 2
mindspore/ccsrc/device/gpu/gpu_memory_copy_manager.cc View File

@@ -104,12 +104,12 @@ DeviceAddressPtr GPUMemCopyManager::UpdateSwapInQueue() {
return device_address;
}

bool GPUMemCopyManager::AllocHostPinnedMem(size_t size, void **addr) {
bool GPUMemCopyManager::AllocHostPinnedMem(size_t size, void **addr) const {
auto alloc_size = CudaDriver::AllocHostPinnedMem(size, addr);
return alloc_size == size;
}

void GPUMemCopyManager::FreeHostPinnedMem(void *addr) { CudaDriver::FreeHostPinnedMem(addr); }
void GPUMemCopyManager::FreeHostPinnedMem(void *addr) const { CudaDriver::FreeHostPinnedMem(addr); }

void GPUMemCopyManager::ClearSwapQueue() {
CHECK_OP_RET_WITH_EXCEPT(SyncMemCopyStream(SwapKind::kDeviceToHost), "Failed to sync swap out stream");


+ 2
- 3
mindspore/ccsrc/device/gpu/gpu_memory_copy_manager.h View File

@@ -48,9 +48,9 @@ class GPUMemCopyManager : public MemCopyManager {

DeviceAddressPtr UpdateSwapInQueue() override;

bool AllocHostPinnedMem(size_t size, void **addr) override;
bool AllocHostPinnedMem(size_t size, void **addr) const override;

void FreeHostPinnedMem(void *addr) override;
void FreeHostPinnedMem(void *addr) const override;

void ClearSwapQueue() override;

@@ -61,7 +61,6 @@ class GPUMemCopyManager : public MemCopyManager {
std::queue<std::pair<DeviceAddressPtr, DeviceEvent>> swap_in_queue_;
};
using GPUMemCopyManagerPtr = std::shared_ptr<GPUMemCopyManager>;

} // namespace gpu
} // namespace device
} // namespace mindspore


+ 2
- 2
mindspore/ccsrc/pre_activate/mem_reuse/mem_copy_manager.h View File

@@ -83,9 +83,9 @@ class MemCopyManager {

virtual DeviceAddressPtr UpdateSwapInQueue() { return nullptr; }

virtual bool AllocHostPinnedMem(size_t size, void **addr) { return true; }
virtual bool AllocHostPinnedMem(size_t size, void **addr) const { return true; }

virtual void FreeHostPinnedMem(void *addr) {}
virtual void FreeHostPinnedMem(void *addr) const {}

virtual void ClearSwapQueue() {}
};


Loading…
Cancel
Save