Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[gpuCI] Auto-merge branch-0.17 to branch-0.18 [skip ci] #1306

Merged
merged 9 commits into from
Dec 9, 2020
Merged

[gpuCI] Auto-merge branch-0.17 to branch-0.18 [skip ci] #1306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
698aa28
Temporarily adding --allgpuarch to GPU build script since some tests …
rlratzel Dec 9, 2020
070b68e
update mechanism for detecting we're on Pascal or earlier GPU
ChuckHastings Dec 9, 2020
332b049
Merge pull request #4 from ChuckHastings/branch-0.17-archtempfix
rlratzel Dec 9, 2020
6a6996a
Fixed cupy/scipy test markers that were causing test warnings.
rlratzel Dec 9, 2020
67e220c
Added PR 1304 to CHANGELOG.md.
rlratzel Dec 9, 2020
2941bb3
Merge remote-tracking branch 'upstream/branch-0.17' into branch-0.17-…
rlratzel Dec 9, 2020
6f4712d
Revert "update mechanism for detecting we're on Pascal or earlier GPU"
rlratzel Dec 9, 2020
4ca0f9c
Updated CHANGELOG entry since Louvain arch check is not being include…
rlratzel Dec 9, 2020
9017928
Merge pull request #1304 from rlratzel/branch-0.17-archtempfix
BradReesWork Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
- PR #1285 Move codecov upload to gpu build script
- PR #1290 Update weights check in bc and graph prims wrappers
- PR #1299 Update doc and notebook
- PR #1304 Enable all GPU archs for test builds

# cuGraph 0.16.0 (21 Oct 2020)

Expand Down
2 changes: 1 addition & 1 deletion ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ conda list --show-channel-urls

if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
gpuci_logger "Build from source"
$WORKSPACE/build.sh clean libcugraph cugraph
$WORKSPACE/build.sh -v clean libcugraph cugraph --allgpuarch
fi

################################################################################
Expand Down
6 changes: 3 additions & 3 deletions python/cugraph/tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@

MATRIX_INPUT_TYPES = [
pytest.param(
cp_coo_matrix, marks=pytest.mark.cupy_types, id="CuPy.coo_matrix"
cp_coo_matrix, marks=pytest.mark.matrix_types, id="CuPy.coo_matrix"
),
pytest.param(
cp_csr_matrix, marks=pytest.mark.cupy_types, id="CuPy.csr_matrix"
cp_csr_matrix, marks=pytest.mark.matrix_types, id="CuPy.csr_matrix"
),
pytest.param(
cp_csc_matrix, marks=pytest.mark.cupy_types, id="CuPy.csc_matrix"
cp_csc_matrix, marks=pytest.mark.matrix_types, id="CuPy.csc_matrix"
),
]

Expand Down