Skip to content

Remove the random-generator from context during inference #2228

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
jeffra merged 5 commits into from
Aug 18, 2022
Merged

Remove the random-generator from context during inference #2228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
920e6be
Fix the tensor-slicing copy for qkv parameters
Aug 9, 2022
cd0ea26
Merge branch 'master' of github.com:microsoft/DeepSpeed
Aug 17, 2022
ebc83d6
remove the random-generator from context during inference
Aug 17, 2022
9a6ccc1
formatting
jeffra Aug 18, 2022
0a97e0b
Merge branch 'master' into ds-inference/remove-randgen1
jeffra Aug 18, 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
2 changes: 1 addition & 1 deletion csrc/transformer/inference/csrc/pt_binding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#include <ATen/cuda/CUDAContext.h>
#include <c10/cuda/CUDAStream.h>
#include <torch/extension.h>
#include <vector>
#include "context.h"
Expand Down
15 changes: 2 additions & 13 deletions csrc/transformer/inference/includes/context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#pragma once

#include <ATen/cuda/CUDAContext.h>
#include <c10/cuda/CUDAStream.h>
#include <cuda_runtime_api.h>
#include <cassert>
#include <iostream>
#include <vector>
#include "cublas_v2.h"
#include "cuda.h"
#include "curand.h"

#define WARP_SIZE 32

Expand Down Expand Up @@ -42,25 +41,18 @@ class Context {
public:
Context() : _workspace(nullptr), _seed(42), _curr_offset(0), _stream(0)
{
curandCreateGenerator(&_gen, CURAND_RNG_PSEUDO_DEFAULT);
curandSetPseudoRandomGeneratorSeed(_gen, 123);
if (cublasCreate(&_cublasHandle) != CUBLAS_STATUS_SUCCESS) {
auto message = std::string("Fail to create cublas handle.");
std::cerr << message << std::endl;
throw std::runtime_error(message);
}
#ifndef __HIP_PLATFORM_HCC__
cublasSetMathMode(_cublasHandle, CUBLAS_TENSOR_OP_MATH);
cudaEventCreate(&_comp1_event, (cudaEventDisableTiming | cudaEventBlockingSync));
cudaEventCreate(&_comp2_event, (cudaEventDisableTiming | cudaEventBlockingSync));
cudaEventCreate(&_comp_event, (cudaEventDisableTiming | cudaEventBlockingSync));
cudaEventCreate(&_comm_event, (cudaEventDisableTiming | cudaEventBlockingSync));
#else
#endif
cudaEventCreate(&_comp1_event);
cudaEventCreate(&_comp2_event);
cudaEventCreate(&_comp_event);
cudaEventCreate(&_comm_event);
#endif
}

virtual ~Context()
Expand Down Expand Up @@ -113,8 +105,6 @@ class Context {

inline void advance_tokens() { _num_tokens++; }

curandGenerator_t& GetRandGenerator() { return _gen; }

cudaStream_t GetCommStream(bool async_op = false)
{
if (!_comm_stream)
Expand Down Expand Up @@ -158,7 +148,6 @@ class Context {
}

private:
curandGenerator_t _gen;
cublasHandle_t _cublasHandle;

cudaEvent_t _comp_event;
Expand Down