test our_rand_r

ClemDoum · ClemDoum · commit e9e94e8cc467 · 2019-03-13T14:09:05.000+01:00
diff --git a/build_tools/azure/test_script.cmd b/build_tools/azure/test_script.cmd
@@ -13,4 +13,4 @@ if "%COVERAGE%" == "true" (
     set PYTEST_ARGS=%PYTEST_ARGS% --cov sklearn
 )
 
-pytest -s -k "test_seq_dataset_shuffle or test_sgd_proba" --pyargs sklearn
+pytest -s -k test_our_rand_r --pyargs sklearn
diff --git a/build_tools/azure/test_script.sh b/build_tools/azure/test_script.sh
@@ -21,7 +21,7 @@ except ImportError:
 python -c "import multiprocessing as mp; print('%d CPUs' % mp.cpu_count())"
 pip list
 
-TEST_CMD="python -m pytest -s -k \"test_seq_dataset_shuffle or test_sgd_proba\" sklearn"
+TEST_CMD="python -m pytest -s -k test_our_rand_r sklearn"
 
 if [[ "$COVERAGE" == "true" ]]; then
     TEST_CMD="$TEST_CMD"
diff --git a/sklearn/utils/seq_dataset.pyx.tp b/sklearn/utils/seq_dataset.pyx.tp
@@ -372,3 +372,8 @@ cdef inline np.uint32_t our_rand_r(np.uint32_t* seed) nogil:
     seed[0] ^= <np.uint32_t>(seed[0] << 5)
 
     return seed[0] % (<np.uint32_t>RAND_R_MAX + 1)
+
+
+def our_rand_r_py(seed):
+    cdef np.uint32_t my_seed = <np.uint32_t>seed
+    return our_rand_r(&my_seed)
diff --git a/sklearn/utils/tests/test_seq_dataset.py b/sklearn/utils/tests/test_seq_dataset.py
@@ -3,18 +3,15 @@
 #
 # License: BSD 3 clause
 
-import pytest
 import numpy as np
-from numpy.testing import assert_array_equal
-from sklearn.utils.testing import assert_allclose
+import pytest
 import scipy.sparse as sp
-
-from sklearn.utils.seq_dataset import ArrayDataset64
-from sklearn.utils.seq_dataset import ArrayDataset32
-from sklearn.utils.seq_dataset import CSRDataset64
-from sklearn.utils.seq_dataset import CSRDataset32
+from numpy.testing import assert_array_equal
+from sklearn.utils.seq_dataset import ArrayDataset32, ArrayDataset64, \
+    CSRDataset32, CSRDataset64, our_rand_r_py
 
 from sklearn.datasets import load_iris
+from sklearn.utils.testing import assert_allclose
 
 iris = load_iris()
 X64 = iris.data.astype(np.float64)
@@ -154,3 +151,10 @@ def test_buffer_dtype_mismatch_error():
     with pytest.raises(ValueError, match='Buffer dtype mismatch'):
         CSRDataset32(X_csr64.data, X_csr64.indptr, X_csr64.indices, y64,
                      sample_weight64, seed=42),
+
+
+def test_our_rand_r():
+    seed = 1273642419
+    assert seed <= np.iinfo(np.int32).max
+    my_random_int = our_rand_r_py(seed)
+    assert my_random_int == 131541053

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@ if "%COVERAGE%" == "true" (`
`13`	`13`	`set PYTEST_ARGS=%PYTEST_ARGS% --cov sklearn`
`14`	`14`	`)`
`15`	`15`
`16`		`-pytest -s -k "test_seq_dataset_shuffle or test_sgd_proba" --pyargs sklearn`
	`16`	`+pytest -s -k test_our_rand_r --pyargs sklearn`