Skip to content

Commit

Permalink
Fix flake8 issues
Browse files Browse the repository at this point in the history
  • Loading branch information
AdrianAbeyta authored and AdrianAbeyta committed May 1, 2024
1 parent 40cd249 commit 2e98be4
Show file tree
Hide file tree
Showing 30 changed files with 234 additions and 161 deletions.
181 changes: 87 additions & 94 deletions cupy_backends/cuda/libs/curand.pyx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,69 +9,69 @@ from cupy_backends.cuda cimport stream as stream_module
IF CUPY_USE_GEN_HIP_CODE:
from cupy_backends.cuda.libs.curand_hip import *
ELSE:
###############################################################################
##########################################################################
# Extern
###############################################################################
##########################################################################

cdef extern from '../../cupy_rand.h' nogil:
ctypedef void* Stream 'cudaStream_t'

# Generator
# Generator
int curandCreateGenerator(Generator* generator, int rng_type)
int curandDestroyGenerator(Generator generator)
int curandGetVersion(int* version)

# Stream
# Stream
int curandSetStream(Generator generator, Stream stream)
int curandSetPseudoRandomGeneratorSeed(
Generator generator, unsigned long long seed)
Generator generator, unsigned long long seed)
int curandSetGeneratorOffset(
Generator generator, unsigned long long offset)
Generator generator, unsigned long long offset)
int curandSetGeneratorOrdering(Generator generator, Ordering order)

# Generation functions
# Generation functions
int curandGenerate(
Generator generator, unsigned int* outputPtr, size_t num)
Generator generator, unsigned int* outputPtr, size_t num)
int curandGenerateLongLong(
Generator generator, unsigned long long* outputPtr, size_t num)
Generator generator, unsigned long long * outputPtr, size_t num)
int curandGenerateUniform(
Generator generator, float* outputPtr, size_t num)
Generator generator, float* outputPtr, size_t num)
int curandGenerateUniformDouble(
Generator generator, double* outputPtr, size_t num)
Generator generator, double* outputPtr, size_t num)
int curandGenerateNormal(
Generator generator, float* outputPtr, size_t num,
float mean, float stddev)
Generator generator, float* outputPtr, size_t num,
float mean, float stddev)
int curandGenerateNormalDouble(
Generator generator, double* outputPtr, size_t n,
double mean, double stddev)
Generator generator, double* outputPtr, size_t n,
double mean, double stddev)
int curandGenerateLogNormal(
Generator generator, float* outputPtr, size_t n,
float mean, float stddev)
Generator generator, float* outputPtr, size_t n,
float mean, float stddev)
int curandGenerateLogNormalDouble(
Generator generator, double* outputPtr, size_t n,
double mean, double stddev)
Generator generator, double* outputPtr, size_t n,
double mean, double stddev)
int curandGeneratePoisson(
Generator generator, unsigned int* outputPtr, size_t n, double lam)
Generator generator, unsigned int* outputPtr, size_t n,
double lam)


###############################################################################
##########################################################################
# Error handling
###############################################################################
##########################################################################

STATUS = {
0: 'CURAND_STATUS_SUCCESS',
100: 'CURAND_STATUS_VERSION_MISMATCH',
101: 'CURAND_STATUS_NOT_INITIALIZED',
102: 'CURAND_STATUS_ALLOCATION_FAILED',
103: 'CURAND_STATUS_TYPE_ERROR',
104: 'CURAND_STATUS_OUT_OF_RANGE',
105: 'CURAND_STATUS_LENGTH_NOT_MULTIPLE',
106: 'CURAND_STATUS_DOUBLE_PRECISION_REQUIRED',
201: 'CURAND_STATUS_LAUNCH_FAILURE',
202: 'CURAND_STATUS_PREEXISTING_FAILURE',
203: 'CURAND_STATUS_INITIALIZATION_FAILED',
204: 'CURAND_STATUS_ARCH_MISMATCH',
999: 'CURAND_STATUS_INTERNAL_ERROR',
0: 'CURAND_STATUS_SUCCESS',
100: 'CURAND_STATUS_VERSION_MISMATCH',
101: 'CURAND_STATUS_NOT_INITIALIZED',
102: 'CURAND_STATUS_ALLOCATION_FAILED',
103: 'CURAND_STATUS_TYPE_ERROR',
104: 'CURAND_STATUS_OUT_OF_RANGE',
105: 'CURAND_STATUS_LENGTH_NOT_MULTIPLE',
106: 'CURAND_STATUS_DOUBLE_PRECISION_REQUIRED',
201: 'CURAND_STATUS_LAUNCH_FAILURE',
202: 'CURAND_STATUS_PREEXISTING_FAILURE',
203: 'CURAND_STATUS_INITIALIZATION_FAILED',
204: 'CURAND_STATUS_ARCH_MISMATCH',
999: 'CURAND_STATUS_INTERNAL_ERROR',
}

class CURANDError(RuntimeError):
Expand All @@ -87,147 +87,140 @@ ELSE:
if status != 0:
raise CURANDError(status)


###############################################################################
##########################################################################
# Generator
###############################################################################
##########################################################################

cpdef size_t createGenerator(int rng_type) except? 0:
cpdef size_t createGenerator(int rng_type) except ? 0:
cdef Generator generator
with nogil:
status = curandCreateGenerator(&generator, <RngType>rng_type)
status = curandCreateGenerator(& generator, < RngType > rng_type)
check_status(status)
return <size_t>generator

return < size_t > generator

cpdef destroyGenerator(size_t generator):
status = curandDestroyGenerator(<Generator>generator)
status = curandDestroyGenerator(< Generator > generator)
check_status(status)


cpdef int getVersion() except? -1:
cpdef int getVersion() except ? -1:
cdef int version
status = curandGetVersion(&version)
status = curandGetVersion(& version)
check_status(status)
return version


cpdef setStream(size_t generator, size_t stream):
# TODO(leofang): The support of stream capture is not mentioned at all in
# the cuRAND docs (as of CUDA 11.5), so we disable this functionality.
if not runtime._is_hip_environment and runtime.streamIsCapturing(stream):
# TODO(leofang): The support of stream capture
# is not mentioned at all in the cuRAND docs (as of CUDA 11.5),
# so we disable this functionality.
if not runtime._is_hip_environment and runtime.streamIsCapturing(
stream):
raise NotImplementedError(
'calling cuRAND API during stream capture is currently '
'unsupported')

status = curandSetStream(<Generator>generator, <Stream>stream)
status = curandSetStream(< Generator > generator, < Stream > stream)
check_status(status)


cdef _setStream(size_t generator):
"""Set current stream"""
setStream(generator, stream_module.get_current_stream_ptr())


cpdef setPseudoRandomGeneratorSeed(size_t generator, unsigned long long seed):
status = curandSetPseudoRandomGeneratorSeed(<Generator>generator, seed)
cpdef setPseudoRandomGeneratorSeed(size_t generator,
unsigned long long seed):
status = curandSetPseudoRandomGeneratorSeed(< Generator > generator,
seed)
check_status(status)


cpdef setGeneratorOffset(size_t generator, unsigned long long offset):
status = curandSetGeneratorOffset(<Generator>generator, offset)
status = curandSetGeneratorOffset(< Generator > generator, offset)
check_status(status)


cpdef setGeneratorOrdering(size_t generator, int order):
status = curandSetGeneratorOrdering(<Generator>generator, <Ordering>order)
status = curandSetGeneratorOrdering(< Generator > generator,
< Ordering > order)
check_status(status)


###############################################################################
##########################################################################
# Generation functions
###############################################################################
##########################################################################

cpdef generate(size_t generator, size_t outputPtr, size_t num):
_setStream(generator)
status = curandGenerate(
<Generator>generator, <unsigned int*>outputPtr, num)
< Generator > generator, < unsigned int * >outputPtr, num)
check_status(status)


cpdef generateLongLong(size_t generator, size_t outputPtr, size_t num):
_setStream(generator)
status = curandGenerateLongLong(
<Generator>generator, <unsigned long long*>outputPtr, num)
< Generator > generator, < unsigned long long * >outputPtr, num)
check_status(status)


cpdef generateUniform(size_t generator, size_t outputPtr, size_t num):
_setStream(generator)
status = curandGenerateUniform(
<Generator>generator, <float*>outputPtr, num)
< Generator > generator, < float * >outputPtr, num)
check_status(status)


cpdef generateUniformDouble(size_t generator, size_t outputPtr, size_t num):
cpdef generateUniformDouble(size_t generator,
size_t outputPtr,
size_t num):
_setStream(generator)
status = curandGenerateUniformDouble(
<Generator>generator, <double*>outputPtr, num)
< Generator > generator, < double * >outputPtr, num)
check_status(status)


cpdef generateNormal(size_t generator, size_t outputPtr, size_t n,
float mean, float stddev):
float mean, float stddev):
if n % 2 == 1:
msg = ('curandGenerateNormal can only generate even number of '
'random variables simultaneously. See issue #390 for detail.')
'random variables simultaneously. '
'See issue #390 for detail.')
raise ValueError(msg)
_setStream(generator)
status = curandGenerateNormal(
<Generator>generator, <float*>outputPtr, n, mean, stddev)
< Generator > generator, < float * >outputPtr, n, mean, stddev)
check_status(status)


cpdef generateNormalDouble(size_t generator, size_t outputPtr, size_t n,
float mean, float stddev):
float mean, float stddev):
if n % 2 == 1:
msg = ('curandGenerateNormalDouble can only generate even number of '
'random variables simultaneously. See issue #390 for detail.')
msg = ('curandGenerateNormalDouble can only generate even number '
'of random variables simultaneously. '
'See issue #390 for detail.')
raise ValueError(msg)
_setStream(generator)
status = curandGenerateNormalDouble(
<Generator>generator, <double*>outputPtr, n, mean, stddev)
< Generator > generator, < double * >outputPtr, n, mean, stddev)
check_status(status)


def generateLogNormal(size_t generator, size_t outputPtr, size_t n,
float mean, float stddev):
float mean, float stddev):
if n % 2 == 1:
msg = ('curandGenerateLogNormal can only generate even number of '
'random variables simultaneously. See issue #390 for detail.')
msg = ('curandGenerateLogNormal can only generate even number '
'of random variables simultaneously. '
'see issue #390 for detail.')
raise ValueError(msg)
_setStream(generator)
status = curandGenerateLogNormal(
<Generator>generator, <float*>outputPtr, n, mean, stddev)
< Generator > generator, < float * >outputPtr, n, mean, stddev)
check_status(status)


cpdef generateLogNormalDouble(size_t generator, size_t outputPtr, size_t n,
float mean, float stddev):
float mean, float stddev):
if n % 2 == 1:
msg = ('curandGenerateLogNormalDouble can only generate even number '
'of random variables simultaneously. See issue #390 for '
'detail.')
msg = ('curandGenerateLogNormalDouble can only generate even '
'number of random variables simultaneously. '
'See issue #390 for detail.')
raise ValueError(msg)
_setStream(generator)
status = curandGenerateLogNormalDouble(
<Generator>generator, <double*>outputPtr, n, mean, stddev)
< Generator > generator, < double * >outputPtr, n, mean, stddev)
check_status(status)


cpdef generatePoisson(size_t generator, size_t outputPtr, size_t n,
double lam):
double lam):
_setStream(generator)
status = curandGeneratePoisson(
<Generator>generator, <unsigned int*>outputPtr, n, lam)
< Generator > generator, < unsigned int * >outputPtr, n, lam)
check_status(status)
2 changes: 1 addition & 1 deletion install/cupy_builder/install_build.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def get_hipcc_path() -> List[str]:
def get_compiler_setting(ctx: Context, use_hip):
cuda_path = None
rocm_path = None

if use_hip:
rocm_path = get_rocm_path()
else:
Expand Down
1 change: 1 addition & 0 deletions install/cupy_builder/install_utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ def search_on_path(filenames: List[str]) -> Optional[str]:
return os.path.abspath(full)
return None


def get_rocm_version() -> int:
rocm_version = -1
if os.getenv("ROCM_HOME"):
Expand Down
5 changes: 3 additions & 2 deletions tests/cupy_tests/cuda_tests/test_stream.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,9 @@ def test_create_with_flags(self):
s2 = cuda.Stream(non_blocking=True)
assert s1.is_non_blocking is False
assert s2.is_non_blocking is True

@pytest.mark.skipif(cupy.cuda.runtime.is_hip, reason='Not supported for ROCm/HIP')

@pytest.mark.skipif(cupy.cuda.runtime.is_hip,
reason='Not supported for ROCm/HIP')
def test_create_with_priority(self):
# parameterize wasn't used since priority gets
# clamped when it isn't initialized within a specific
Expand Down
7 changes: 7 additions & 0 deletions tests/cupy_tests/functional_tests/test_vectorize.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from cupy import testing
from cupy.cuda import runtime


@pytest.mark.skipif(runtime.is_hip, reason='Currently unsupported on ROCm/HIP')
class TestVectorizeOps(unittest.TestCase):

Expand Down Expand Up @@ -221,6 +222,7 @@ def my_usub(x):

return self._run(my_usub, xp, [dtype])


@pytest.mark.skipif(runtime.is_hip, reason='Currently unsupported on ROCm/HIP')
class TestVectorizeExprs(unittest.TestCase):

Expand Down Expand Up @@ -283,6 +285,7 @@ def my_typecast(x):
x = testing.shaped_random((20, 30), xp, dtype1, seed=1)
return f(x)


@pytest.mark.skipif(runtime.is_hip, reason='Currently unsupported on ROCm/HIP')
class TestVectorizeInstructions(unittest.TestCase):

Expand Down Expand Up @@ -361,6 +364,7 @@ def my_nonconst_result(x):
x = testing.shaped_random((20, 30), xp, numpy.int32, seed=1)
return f(x)


@pytest.mark.skipif(runtime.is_hip, reason='Currently unsupported on ROCm/HIP')
class TestVectorizeStmts(unittest.TestCase):

Expand Down Expand Up @@ -557,6 +561,7 @@ class _MyClass:
def __init__(self, x):
self.x = x


@pytest.mark.skipif(runtime.is_hip, reason='Currently unsupported on ROCm/HIP')
class TestVectorizeConstants(unittest.TestCase):

Expand Down Expand Up @@ -584,6 +589,7 @@ def my_func(x1, x2):
x2 = testing.shaped_random((20, 30), xp, xp.int64, seed=2)
return f(x1, x2)


@pytest.mark.skipif(runtime.is_hip, reason='Currently unsupported on ROCm/HIP')
class TestVectorizeBroadcast(unittest.TestCase):

Expand Down Expand Up @@ -620,6 +626,7 @@ def my_func(x1, x2):
x2 = dtype(1)
return f(x1, x2)


@pytest.mark.skipif(runtime.is_hip, reason='Currently unsupported on ROCm/HIP')
class TestVectorize(unittest.TestCase):

Expand Down

0 comments on commit 2e98be4

Please sign in to comment.