From ce7b3650d10641d8a21fd87d199f5c310ac40ac0 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 8 Dec 2023 16:09:28 +0000 Subject: [PATCH 1/3] support python 3.12 --- .github/workflows/test.yml | 4 ++-- pyproject.toml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a1d8b33..e79f57d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.7, 3.11] + python: [3.7, 3.12] steps: - uses: actions/checkout@v4 with: {fetch-depth: 0} @@ -41,7 +41,7 @@ jobs: runs-on: [self-hosted, cuda, python] strategy: matrix: - python: [3.7, 3.11] + python: [3.7, 3.12] steps: - uses: actions/checkout@v4 with: {fetch-depth: 0} diff --git a/pyproject.toml b/pyproject.toml index 0acc845..d0156b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,6 +47,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3 :: Only", "Topic :: Software Development :: Libraries", "Topic :: Software Development :: Libraries :: Python Modules", From 0fea48f6d2d1e16b103a08392309ab2eae7902d4 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 8 Dec 2023 21:46:26 +0000 Subject: [PATCH 2/3] Revert "tests: fix CUDA driver incompatibility" This reverts commit 15d791801f0d3746f401baa9e5cd8bf998870f7f. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e79f57d..cb39d7b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,7 @@ jobs: - uses: actions/checkout@v4 with: {fetch-depth: 0} - name: Run setup-python - run: setup-python -p${{ matrix.python }} 'cuda-version<12' 'cupy<13' + run: setup-python -p${{ matrix.python }} cupy - name: pip install -U -e .[dev] run: make CXX_FLAGS='' deps-build build-editable deps-run - run: make test From 71ef18a9c63e41e427170e91db7b0a4404b2dbb9 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Thu, 22 Feb 2024 16:34:39 +0000 Subject: [PATCH 3/3] tests: update timeouts --- pyproject.toml | 2 +- tests/test_common.py | 2 ++ tests/test_cpython.py | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d0156b1..e682d1a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -89,7 +89,7 @@ known_first_party = ["cuvec", "tests"] [tool.pytest.ini_options] minversion = "6.0" -timeout = 30 +timeout = 5 log_level = "INFO" python_files = ["tests/test_*.py"] testpaths = ["tests"] diff --git a/tests/test_common.py b/tests/test_common.py index 75ac884..92b51ee 100644 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -116,6 +116,7 @@ def test_CuVec_creation(cu, classname, caplog): @mark.parametrize("cu", filter(None, [py, sw])) +@mark.timeout(20) def test_asarray(cu): v = cu.asarray(np.random.random(shape)) w = cu.CuVec(v) @@ -158,6 +159,7 @@ def test_resize(cu): assert v._vec.shape == v.shape +@mark.timeout(60) @mark.parametrize("cu", filter(None, [cp, py, sw])) def test_cuda_array_interface(cu): cupy = importorskip("cupy") diff --git a/tests/test_cpython.py b/tests/test_cpython.py index 5a1f442..919402e 100644 --- a/tests/test_cpython.py +++ b/tests/test_cpython.py @@ -28,6 +28,7 @@ def test_CVector_strides(): assert a.strides == (473344, 1376, 4) +@mark.timeout(20) def test_asarray(): v = cu.asarray(np.random.random(shape)) w = cu.CuVec(v)