From 6341903aa2b837b39168b62a19481f9f1953c08f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 26 Apr 2024 15:05:24 -0500 Subject: [PATCH 1/3] define 'ucx' pytest marker --- python/raft-dask/pytest.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/python/raft-dask/pytest.ini b/python/raft-dask/pytest.ini index 8904172272..5559bb08c8 100644 --- a/python/raft-dask/pytest.ini +++ b/python/raft-dask/pytest.ini @@ -6,3 +6,4 @@ markers = mg: marks a test as multi-GPU memleak: marks a test as a memory leak test nccl: marks a test as using NCCL + ucx: marks a test as using ucx-py From 5729de49ee86495ab0e8868bc0d7fdf546d90ae0 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 29 Apr 2024 08:06:10 -0700 Subject: [PATCH 2/3] get more logs from failing conda tests --- .github/workflows/pr.yaml | 108 ++++++++++++++++++------------------ .github/workflows/test.yaml | 36 ++++++------ ci/test_python.sh | 2 + 3 files changed, 74 insertions(+), 72 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c2d9556859..001e19cc70 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -18,12 +18,12 @@ jobs: - conda-cpp-checks - conda-python-build - conda-python-tests - - docs-build - - wheel-build-pylibraft - - wheel-tests-pylibraft - - wheel-build-raft-dask - - wheel-tests-raft-dask - - devcontainer + # - docs-build + # - wheel-build-pylibraft + # - wheel-tests-pylibraft + # - wheel-build-raft-dask + # - wheel-tests-raft-dask + #- devcontainer secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.06 checks: @@ -64,51 +64,51 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.06 with: build_type: pull-request - docs-build: - needs: conda-python-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06 - with: - build_type: pull-request - node_type: "gpu-v100-latest-1" - arch: "amd64" - container_image: "rapidsai/ci-conda:latest" - run_script: "ci/build_docs.sh" - wheel-build-pylibraft: - needs: checks - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 - with: - build_type: pull-request - script: ci/build_wheel_pylibraft.sh - wheel-tests-pylibraft: - needs: wheel-build-pylibraft - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - with: - build_type: pull-request - script: ci/test_wheel_pylibraft.sh - wheel-build-raft-dask: - needs: wheel-tests-pylibraft - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 - with: - build_type: pull-request - script: "ci/build_wheel_raft_dask.sh" - wheel-tests-raft-dask: - needs: wheel-build-raft-dask - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - with: - build_type: pull-request - script: ci/test_wheel_raft_dask.sh - devcontainer: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.06 - with: - arch: '["amd64"]' - cuda: '["12.2"]' - build_command: | - sccache -z; - build-all -DBUILD_PRIMS_BENCH=ON -DBUILD_ANN_BENCH=ON --verbose; - sccache -s; + # docs-build: + # needs: conda-python-build + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06 + # with: + # build_type: pull-request + # node_type: "gpu-v100-latest-1" + # arch: "amd64" + # container_image: "rapidsai/ci-conda:latest" + # run_script: "ci/build_docs.sh" + # wheel-build-pylibraft: + # needs: checks + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + # with: + # build_type: pull-request + # script: ci/build_wheel_pylibraft.sh + # wheel-tests-pylibraft: + # needs: wheel-build-pylibraft + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + # with: + # build_type: pull-request + # script: ci/test_wheel_pylibraft.sh + # wheel-build-raft-dask: + # needs: wheel-tests-pylibraft + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + # with: + # build_type: pull-request + # script: "ci/build_wheel_raft_dask.sh" + # wheel-tests-raft-dask: + # needs: wheel-build-raft-dask + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + # with: + # build_type: pull-request + # script: ci/test_wheel_raft_dask.sh + # devcontainer: + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.06 + # with: + # arch: '["amd64"]' + # cuda: '["12.2"]' + # build_command: | + # sccache -z; + # build-all -DBUILD_PRIMS_BENCH=ON -DBUILD_ANN_BENCH=ON --verbose; + # sccache -s; diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 18094cc05a..50c0351504 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -40,21 +40,21 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - wheel-tests-pylibraft: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - with: - build_type: nightly - branch: ${{ inputs.branch }} - date: ${{ inputs.date }} - sha: ${{ inputs.sha }} - script: ci/test_wheel_pylibraft.sh - wheel-tests-raft-dask: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - with: - build_type: nightly - branch: ${{ inputs.branch }} - date: ${{ inputs.date }} - sha: ${{ inputs.sha }} - script: ci/test_wheel_raft_dask.sh + # wheel-tests-pylibraft: + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + # with: + # build_type: nightly + # branch: ${{ inputs.branch }} + # date: ${{ inputs.date }} + # sha: ${{ inputs.sha }} + # script: ci/test_wheel_pylibraft.sh + # wheel-tests-raft-dask: + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + # with: + # build_type: nightly + # branch: ${{ inputs.branch }} + # date: ${{ inputs.date }} + # sha: ${{ inputs.sha }} + # script: ci/test_wheel_raft_dask.sh diff --git a/ci/test_python.sh b/ci/test_python.sh index f5b188ca0b..e8716bc45b 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -43,6 +43,8 @@ EXITCODE=0 trap "EXITCODE=1" ERR set +e +export LD_DEBUG=ALL + rapids-logger "pytest pylibraft" ./ci/run_pylibraft_pytests.sh \ --junitxml="${RAPIDS_TESTS_DIR}/junit-pylibraft.xml" \ From e970c48d448b1dfb02d4211d31f2fdec4e605907 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 29 Apr 2024 11:47:06 -0700 Subject: [PATCH 3/3] revert debugging changes --- .github/workflows/pr.yaml | 108 ++++++++++++++++++------------------ .github/workflows/test.yaml | 36 ++++++------ ci/test_python.sh | 2 - 3 files changed, 72 insertions(+), 74 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 001e19cc70..c2d9556859 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -18,12 +18,12 @@ jobs: - conda-cpp-checks - conda-python-build - conda-python-tests - # - docs-build - # - wheel-build-pylibraft - # - wheel-tests-pylibraft - # - wheel-build-raft-dask - # - wheel-tests-raft-dask - #- devcontainer + - docs-build + - wheel-build-pylibraft + - wheel-tests-pylibraft + - wheel-build-raft-dask + - wheel-tests-raft-dask + - devcontainer secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.06 checks: @@ -64,51 +64,51 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.06 with: build_type: pull-request - # docs-build: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06 - # with: - # build_type: pull-request - # node_type: "gpu-v100-latest-1" - # arch: "amd64" - # container_image: "rapidsai/ci-conda:latest" - # run_script: "ci/build_docs.sh" - # wheel-build-pylibraft: - # needs: checks - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 - # with: - # build_type: pull-request - # script: ci/build_wheel_pylibraft.sh - # wheel-tests-pylibraft: - # needs: wheel-build-pylibraft - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - # with: - # build_type: pull-request - # script: ci/test_wheel_pylibraft.sh - # wheel-build-raft-dask: - # needs: wheel-tests-pylibraft - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 - # with: - # build_type: pull-request - # script: "ci/build_wheel_raft_dask.sh" - # wheel-tests-raft-dask: - # needs: wheel-build-raft-dask - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - # with: - # build_type: pull-request - # script: ci/test_wheel_raft_dask.sh - # devcontainer: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.06 - # with: - # arch: '["amd64"]' - # cuda: '["12.2"]' - # build_command: | - # sccache -z; - # build-all -DBUILD_PRIMS_BENCH=ON -DBUILD_ANN_BENCH=ON --verbose; - # sccache -s; + docs-build: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06 + with: + build_type: pull-request + node_type: "gpu-v100-latest-1" + arch: "amd64" + container_image: "rapidsai/ci-conda:latest" + run_script: "ci/build_docs.sh" + wheel-build-pylibraft: + needs: checks + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + with: + build_type: pull-request + script: ci/build_wheel_pylibraft.sh + wheel-tests-pylibraft: + needs: wheel-build-pylibraft + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + with: + build_type: pull-request + script: ci/test_wheel_pylibraft.sh + wheel-build-raft-dask: + needs: wheel-tests-pylibraft + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + with: + build_type: pull-request + script: "ci/build_wheel_raft_dask.sh" + wheel-tests-raft-dask: + needs: wheel-build-raft-dask + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + with: + build_type: pull-request + script: ci/test_wheel_raft_dask.sh + devcontainer: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.06 + with: + arch: '["amd64"]' + cuda: '["12.2"]' + build_command: | + sccache -z; + build-all -DBUILD_PRIMS_BENCH=ON -DBUILD_ANN_BENCH=ON --verbose; + sccache -s; diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 50c0351504..18094cc05a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -40,21 +40,21 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - # wheel-tests-pylibraft: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - # with: - # build_type: nightly - # branch: ${{ inputs.branch }} - # date: ${{ inputs.date }} - # sha: ${{ inputs.sha }} - # script: ci/test_wheel_pylibraft.sh - # wheel-tests-raft-dask: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - # with: - # build_type: nightly - # branch: ${{ inputs.branch }} - # date: ${{ inputs.date }} - # sha: ${{ inputs.sha }} - # script: ci/test_wheel_raft_dask.sh + wheel-tests-pylibraft: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + with: + build_type: nightly + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + script: ci/test_wheel_pylibraft.sh + wheel-tests-raft-dask: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + with: + build_type: nightly + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + script: ci/test_wheel_raft_dask.sh diff --git a/ci/test_python.sh b/ci/test_python.sh index e8716bc45b..f5b188ca0b 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -43,8 +43,6 @@ EXITCODE=0 trap "EXITCODE=1" ERR set +e -export LD_DEBUG=ALL - rapids-logger "pytest pylibraft" ./ci/run_pylibraft_pytests.sh \ --junitxml="${RAPIDS_TESTS_DIR}/junit-pylibraft.xml" \