From 73c996a67ced43d2b71a18107a186cdd1f8edf94 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Wed, 27 Mar 2024 18:08:40 +0000 Subject: [PATCH 1/3] run all pytests for arm jobs --- ci/test_wheel_cuproj.sh | 22 +++++++++------------- ci/test_wheel_cuspatial.sh | 22 +++++++++------------- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/ci/test_wheel_cuproj.sh b/ci/test_wheel_cuproj.sh index e6888134d..9451190e0 100755 --- a/ci/test_wheel_cuproj.sh +++ b/ci/test_wheel_cuproj.sh @@ -19,16 +19,12 @@ python -m pip install --no-deps ./local-cuspatial-dep/cuspatial*.whl # echo to expand wildcard before adding `[extra]` requires for pip python -m pip install $(echo ./dist/cuproj*.whl)[test] -if [[ "$(arch)" == "aarch64" && ${RAPIDS_BUILD_TYPE} == "pull-request" ]]; then - python ./ci/wheel_smoke_test_cuproj.py -else - rapids-logger "pytest cuproj" - pushd python/cuproj/cuproj - python -m pytest \ - --cache-clear \ - --junitxml="${RAPIDS_TESTS_DIR}/junit-cuproj.xml" \ - --numprocesses=8 \ - --dist=worksteal \ - tests - popd -fi +rapids-logger "pytest cuproj" +pushd python/cuproj/cuproj +python -m pytest \ + --cache-clear \ + --junitxml="${RAPIDS_TESTS_DIR}/junit-cuproj.xml" \ + --numprocesses=8 \ + --dist=worksteal \ + tests +popd diff --git a/ci/test_wheel_cuspatial.sh b/ci/test_wheel_cuspatial.sh index ff4a2405f..aa36681bc 100755 --- a/ci/test_wheel_cuspatial.sh +++ b/ci/test_wheel_cuspatial.sh @@ -15,16 +15,12 @@ python -m pip install --no-binary fiona 'fiona>=1.8.19,<1.9' # echo to expand wildcard before adding `[extra]` requires for pip python -m pip install $(echo ./dist/cuspatial*.whl)[test] -if [[ "$(arch)" == "aarch64" && ${RAPIDS_BUILD_TYPE} == "pull-request" ]]; then - python ./ci/wheel_smoke_test_cuspatial.py -else - rapids-logger "pytest cuspatial" - pushd python/cuspatial/cuspatial - python -m pytest \ - --cache-clear \ - --junitxml="${RAPIDS_TESTS_DIR}/junit-cuspatial.xml" \ - --numprocesses=8 \ - --dist=worksteal \ - tests - popd -fi +rapids-logger "pytest cuspatial" +pushd python/cuspatial/cuspatial +python -m pytest \ + --cache-clear \ + --junitxml="${RAPIDS_TESTS_DIR}/junit-cuspatial.xml" \ + --numprocesses=8 \ + --dist=worksteal \ + tests +popd From c9d1301477b7b519569b8de1b7f5bc6546088f89 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Fri, 5 Apr 2024 12:33:28 -0500 Subject: [PATCH 2/3] Delete ci/wheel_smoke_test_cuproj.py --- ci/wheel_smoke_test_cuproj.py | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 ci/wheel_smoke_test_cuproj.py diff --git a/ci/wheel_smoke_test_cuproj.py b/ci/wheel_smoke_test_cuproj.py deleted file mode 100644 index d5b9b494a..000000000 --- a/ci/wheel_smoke_test_cuproj.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. - -from cuproj import Transformer as cuTransformer - -from cupy.testing import assert_allclose - -if __name__ == '__main__': - # Sydney opera house latitude and longitude - lat = -33.8587 - lon = 151.2140 - - # Transform to UTM using cuproj - cu_transformer = cuTransformer.from_crs("epsg:4326", "EPSG:32756") - cuproj_x, cuproj_y = cu_transformer.transform(lat, lon) - - assert_allclose(cuproj_x, 334783.9544807102) - assert_allclose(cuproj_y, 6252075.961741454) From 3c0a0d8f52f082b277a436b430e45b80fb44ecb1 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Fri, 5 Apr 2024 12:33:37 -0500 Subject: [PATCH 3/3] Delete ci/wheel_smoke_test_cuspatial.py --- ci/wheel_smoke_test_cuspatial.py | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 ci/wheel_smoke_test_cuspatial.py diff --git a/ci/wheel_smoke_test_cuspatial.py b/ci/wheel_smoke_test_cuspatial.py deleted file mode 100644 index df2af9abd..000000000 --- a/ci/wheel_smoke_test_cuspatial.py +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. - -import numpy as np -import cudf -import cuspatial -import pyarrow as pa -from shapely.geometry import Point - -if __name__ == '__main__': - order, quadtree = cuspatial.quadtree_on_points( - cuspatial.GeoSeries([Point(0.5, 0.5), Point(1.5, 1.5)]), - *(0, 2, 0, 2), # bbox - 1, # scale - 1, # max_depth - 1, # min_size - ) - cudf.testing.assert_frame_equal( - quadtree, - cudf.DataFrame( - { - "key": cudf.Series(pa.array([0, 3], type=pa.uint32())), - "level": cudf.Series(pa.array([0, 0], type=pa.uint8())), - "is_internal_node": cudf.Series(pa.array([False, False], type=pa.bool_())), - "length": cudf.Series(pa.array([1, 1], type=pa.uint32())), - "offset": cudf.Series(pa.array([0, 1], type=pa.uint32())), - } - ), - )