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

Jump to bottom

Temporary workaround for CI issues with 11.0 #1883

Merged
merged 1 commit into from
Oct 14, 2021
Merged

Temporary workaround for CI issues with 11.0 #1883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions benchmarks/python_pytest_based/bench_algos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,6 @@ def setFixtureParamNames(*args, **kwargs):

from .params import FIXTURE_PARAMS

# FIXME: WCC currently crashes on Ampere. Detect the GPU arch here and use it
# for conditional skipping. Remove this code when the Ampere crash is resolved.
from numba import cuda
is_ampere = False
device = cuda.get_current_device()
# check for the attribute using both pre and post numba 0.53 names
cc = getattr(device, 'COMPUTE_CAPABILITY', None) or \
getattr(device, 'compute_capability')
if (cc[0] >= 8):
is_ampere = True

###############################################################################
# Helpers
def createGraph(csvFileName, graphType=None):
Expand Down Expand Up @@ -229,7 +218,6 @@ def bench_louvain(gpubenchmark, graphWithAdjListComputed):
gpubenchmark(cugraph.louvain, graphWithAdjListComputed)


@pytest.mark.skipif(is_ampere, reason="skipping on Ampere")
def bench_weakly_connected_components(gpubenchmark,
anyGraphWithAdjListComputed):
gpubenchmark(cugraph.weakly_connected_components,
Expand Down
2 changes: 2 additions & 0 deletions cpp/cmake/thirdparty/get_thrust.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
function(find_and_configure_thrust)
include(${rapids-cmake-dir}/cpm/thrust.cmake)

# FIXME: Temporary workaround to our current 11.0 CI problem
set(CPM_DOWNLOAD_ALL ON)
rapids_cpm_thrust(
NAMESPACE cugraph
BUILD_EXPORT_SET raft-exports
Expand Down
3 changes: 1 addition & 2 deletions cpp/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,7 @@ ConfigureTest(KATZ_CENTRALITY_TEST centrality/katz_centrality_test.cpp)

###################################################################################################
# - WEAKLY CONNECTED COMPONENTS tests -------------------------------------------------------------
# Temporarily disable this test, it seems to be failing on A100
#ConfigureTest(WEAKLY_CONNECTED_COMPONENTS_TEST components/weakly_connected_components_test.cpp)
ConfigureTest(WEAKLY_CONNECTED_COMPONENTS_TEST components/weakly_connected_components_test.cpp)

###################################################################################################
# - Experimental RANDOM_WALKS tests ---------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion notebooks/components/ConnectedComponents.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"metadata": {},
"source": [
"# Connected Components\n",
"# Does not run on Ampere\n",
"\n",
"In this notebook, we will use cuGraph to compute weakly and strongly connected components of a graph and display some useful information about the resulting components.\n",
"\n",
Expand Down
16 changes: 0 additions & 16 deletions python/cugraph/cugraph/tests/test_connectivity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,6 @@
import networkx as nx


# FIXME: WCC currently crashes on Ampere. Detect the GPU arch here and use it
# for conditional skipping. Remove this code when the Ampere crash is resolved.
from numba import cuda
is_ampere = False
device = cuda.get_current_device()
# check for the attribute using both pre and post numba 0.53 names
cc = getattr(device, 'COMPUTE_CAPABILITY', None) or \
getattr(device, 'compute_capability')
if (cc[0] >= 8):
is_ampere = True


print("Networkx version : {} ".format(nx.__version__))

# Map of cuGraph input types to the expected output type for cuGraph
Expand Down Expand Up @@ -302,7 +290,6 @@ def single_dataset_nxresults_strong(request):
# =============================================================================
# Tests
# =============================================================================
@pytest.mark.skipif(is_ampere, reason="skipping on Ampere")
@pytest.mark.parametrize("cugraph_input_type", utils.CUGRAPH_DIR_INPUT_TYPES)
def test_weak_cc(gpubenchmark, dataset_nxresults_weak, cugraph_input_type):
(graph_file, netx_labels,
Expand Down Expand Up @@ -342,7 +329,6 @@ def test_weak_cc(gpubenchmark, dataset_nxresults_weak, cugraph_input_type):
assert nx_vertices == cg_vertices


@pytest.mark.skipif(is_ampere, reason="skipping on Ampere")
@pytest.mark.parametrize("cugraph_input_type",
utils.NX_DIR_INPUT_TYPES + utils.MATRIX_INPUT_TYPES)
def test_weak_cc_nonnative_inputs(gpubenchmark,
Expand Down Expand Up @@ -406,7 +392,6 @@ def test_strong_cc_nonnative_inputs(gpubenchmark,
cugraph_input_type)


@pytest.mark.skipif(is_ampere, reason="skipping on Ampere")
def test_scipy_api_compat_weak(single_dataset_nxresults_weak):
(graph_file, _, _, _, api_type) = single_dataset_nxresults_weak
assert_scipy_api_compat(graph_file, api_type)
Expand All @@ -417,7 +402,6 @@ def test_scipy_api_compat_strong(single_dataset_nxresults_strong):
assert_scipy_api_compat(graph_file, api_type)


@pytest.mark.skipif(is_ampere, reason="skipping on Ampere")
@pytest.mark.parametrize("connection_type", ["strong", "weak"])
def test_scipy_api_compat(connection_type):
if connection_type == "strong":
Expand Down