MAINT Use run_in_pyodide in xgboost, opencv, and matplotlib tests (py…

…odide#3184)
rsohlot · Oct 28, 2022 · 53d85a9 · 53d85a9
1 parent ee77f6c
commit 53d85a9
Show file tree

Hide file tree

Showing 26 changed files with 564 additions and 540 deletions.
diff --git a/packages/matplotlib/test_matplotlib.py b/packages/matplotlib/test_matplotlib.py
diff --git a/...opencv-python/reference-images/baboon.png → packages/opencv-python/test_data/baboon.png b/...opencv-python/reference-images/baboon.png → packages/opencv-python/test_data/baboon.png
diff --git a/...-python/reference-images/baboon_canny.png → .../opencv-python/test_data/baboon_canny.png b/...-python/reference-images/baboon_canny.png → .../opencv-python/test_data/baboon_canny.png
diff --git a/...nce-images/baboon_decolor_color_boost.png → .../test_data/baboon_decolor_color_boost.png b/...nce-images/baboon_decolor_color_boost.png → .../test_data/baboon_decolor_color_boost.png
diff --git a/...rence-images/baboon_decolor_grayscale.png → ...on/test_data/baboon_decolor_grayscale.png b/...rence-images/baboon_decolor_grayscale.png → ...on/test_data/baboon_decolor_grayscale.png
diff --git a/...v-python/reference-images/baboon_kaze.png → ...s/opencv-python/test_data/baboon_kaze.png b/...v-python/reference-images/baboon_kaze.png → ...s/opencv-python/test_data/baboon_kaze.png
diff --git a/...hon/reference-images/baboon_laplacian.png → ...ncv-python/test_data/baboon_laplacian.png b/...hon/reference-images/baboon_laplacian.png → ...ncv-python/test_data/baboon_laplacian.png
diff --git a/...-python/reference-images/baboon_sobel.png → .../opencv-python/test_data/baboon_sobel.png b/...-python/reference-images/baboon_sobel.png → .../opencv-python/test_data/baboon_sobel.png
diff --git a/...es/opencv-python/reference-images/box.png → packages/opencv-python/test_data/box.png b/...es/opencv-python/reference-images/box.png → packages/opencv-python/test_data/box.png
diff --git a/...-python/reference-images/box_in_scene.png → .../opencv-python/test_data/box_in_scene.png b/...-python/reference-images/box_in_scene.png → .../opencv-python/test_data/box_in_scene.png
diff --git a/...encv-python/reference-images/box_sift.png → ...ages/opencv-python/test_data/box_sift.png b/...encv-python/reference-images/box_sift.png → ...ages/opencv-python/test_data/box_sift.png
diff --git a/...cv-python/reference-images/chessboard.png → ...es/opencv-python/test_data/chessboard.png b/...cv-python/reference-images/chessboard.png → ...es/opencv-python/test_data/chessboard.png
diff --git a/...n/reference-images/chessboard_corners.png → ...v-python/test_data/chessboard_corners.png b/...n/reference-images/chessboard_corners.png → ...v-python/test_data/chessboard_corners.png
diff --git a/...opencv-python/reference-images/mnist.onnx → packages/opencv-python/test_data/mnist.onnx b/...opencv-python/reference-images/mnist.onnx → packages/opencv-python/test_data/mnist.onnx
diff --git a/...pencv-python/reference-images/mnist_2.png → packages/opencv-python/test_data/mnist_2.png b/...pencv-python/reference-images/mnist_2.png → packages/opencv-python/test_data/mnist_2.png
diff --git a/...encv-python/reference-images/monalisa.png → ...ages/opencv-python/test_data/monalisa.png b/...encv-python/reference-images/monalisa.png → ...ages/opencv-python/test_data/monalisa.png
diff --git a/.../reference-images/monalisa_facedetect.png → ...-python/test_data/monalisa_facedetect.png b/.../reference-images/monalisa_facedetect.png → ...-python/test_data/monalisa_facedetect.png
diff --git a/...ncv-python/reference-images/mountain1.png → ...ges/opencv-python/test_data/mountain1.png b/...ncv-python/reference-images/mountain1.png → ...ges/opencv-python/test_data/mountain1.png
diff --git a/...ncv-python/reference-images/mountain2.png → ...ges/opencv-python/test_data/mountain2.png b/...ncv-python/reference-images/mountain2.png → ...ges/opencv-python/test_data/mountain2.png
diff --git a/...es/opencv-python/reference-images/pca.png → packages/opencv-python/test_data/pca.png b/...es/opencv-python/reference-images/pca.png → packages/opencv-python/test_data/pca.png
diff --git a/...cv-python/reference-images/pca_result.png → ...es/opencv-python/test_data/pca_result.png b/...cv-python/reference-images/pca_result.png → ...es/opencv-python/test_data/pca_result.png
diff --git a/...pencv-python/reference-images/traffic.mp4 → packages/opencv-python/test_data/traffic.mp4 b/...pencv-python/reference-images/traffic.mp4 → packages/opencv-python/test_data/traffic.mp4
diff --git a/...reference-images/traffic_optical_flow.png → ...python/test_data/traffic_optical_flow.png b/...reference-images/traffic_optical_flow.png → ...python/test_data/traffic_optical_flow.png
diff --git a/packages/opencv-python/test_opencv_python.py b/packages/opencv-python/test_opencv_python.py
diff --git a/packages/xgboost/test_xgboost.py b/packages/xgboost/test_xgboost.py
@@ -1,12 +1,10 @@
 # xgboost tests are copied from: https://github.com/dmlc/xgboost/tree/master/tests/python
-import base64
 import pathlib
 
 import pytest
 from pytest_pyodide import run_in_pyodide
 
 DEMO_PATH = pathlib.Path(__file__).parent / "test_data"
-DATA_TRAIN = base64.b64encode((DEMO_PATH / "dermatology.data").read_bytes())
 
 
 @pytest.mark.driver_timeout(60)
@@ -22,23 +20,25 @@ def test_compat(selenium):
 
 @pytest.mark.driver_timeout(60)
 def test_basic_classification(selenium):
-    selenium.load_package("xgboost")
-    selenium.run(
-        f"""
-        import base64
+    @run_in_pyodide(packages=["xgboost"])
+    def run(selenium, data_train):
+
         with open("dermatology.data", "wb") as f:
-            f.write(base64.b64decode({DATA_TRAIN!r}))
+            f.write(data_train)
 
         import numpy as np
         import xgboost as xgb
 
         # label need to be 0 to num_class -1
-        data = np.loadtxt('./dermatology.data', delimiter=',',
-                converters={{33: lambda x:int(x == '?'), 34: lambda x:int(x) - 1}})
+        data = np.loadtxt(
+            "./dermatology.data",
+            delimiter=",",
+            converters={33: lambda x: int(x == "?"), 34: lambda x: int(x) - 1},
+        )
         sz = data.shape
 
-        train = data[:int(sz[0] * 0.7), :]
-        test = data[int(sz[0] * 0.7):, :]
+        train = data[: int(sz[0] * 0.7), :]
+        test = data[int(sz[0] * 0.7) :, :]
 
         train_X = train[:, :33]
         train_Y = train[:, 34]
@@ -49,16 +49,16 @@ def test_basic_classification(selenium):
         xg_train = xgb.DMatrix(train_X, label=train_Y)
         xg_test = xgb.DMatrix(test_X, label=test_Y)
         # setup parameters for xgboost
-        param = {{}}
+        param = {}
         # use softmax multi-class classification
-        param['objective'] = 'multi:softmax'
+        param["objective"] = "multi:softmax"
         # scale weight of positive examples
-        param['eta'] = 0.1
-        param['max_depth'] = 6
-        param['nthread'] = 4
-        param['num_class'] = 6
+        param["eta"] = 0.1  # type: ignore[assignment]
+        param["max_depth"] = 6  # type: ignore[assignment]
+        param["nthread"] = 4  # type: ignore[assignment]
+        param["num_class"] = 6  # type: ignore[assignment]
 
-        watchlist = [(xg_train, 'train'), (xg_test, 'test')]
+        watchlist = [(xg_train, "train"), (xg_test, "test")]
         num_round = 5
         bst = xgb.train(param, xg_train, num_round, watchlist)
         # get prediction
@@ -67,16 +67,17 @@ def test_basic_classification(selenium):
         assert error_rate < 0.1
 
         # do the same thing again, but output probabilities
-        param['objective'] = 'multi:softprob'
+        param["objective"] = "multi:softprob"
         bst = xgb.train(param, xg_train, num_round, watchlist)
         # Note: this convention has been changed since xgboost-unity
         # get prediction, this is in 1D array, need reshape to (ndata, nclass)
         pred_prob = bst.predict(xg_test).reshape(test_Y.shape[0], 6)
         pred_label = np.argmax(pred_prob, axis=1)
         error_rate = np.sum(pred_label != test_Y) / test_Y.shape[0]
         assert error_rate < 0.1
-        """
-    )
+
+    DATA_TRAIN = (DEMO_PATH / "dermatology.data").read_bytes()
+    run(selenium, DATA_TRAIN)
 
 
 @pytest.mark.driver_timeout(60)

diff --git a/requirements.txt b/requirements.txt
@@ -11,4 +11,4 @@
   pytest-cov
   pytest-httpserver
   pytest-benchmark
-  pytest-pyodide==0.23.0
+  pytest-pyodide==0.23.1