Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 47 additions & 0 deletions conda/environments/cugraph_dev_cuda11.5.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: cugraph_dev
channels:
- rapidsai
- nvidia
- rapidsai-nightly
- conda-forge
dependencies:
- cudatoolkit=11.5
- cudf=21.12.*
- libcudf=21.12.*
- rmm=21.12.*
- librmm=21.12.*
- dask>=2021.09.1
- distributed>=2021.09.1
- dask-cuda=21.12.*
- dask-cudf=21.12.*
- nccl>=2.9.9
- ucx-py=0.23.*
- ucx-proc=*=gpu
- scipy
- networkx>=2.5.1
- clang=11.0.0
- clang-tools=11.0.0
- cmake>=3.20.1
- python>=3.6,<3.9
- notebook>=0.5.0
- boost
- cython>=0.29,<0.30
- pytest
- libfaiss=1.7.0
- faiss-proc=*=cuda
- scikit-learn>=0.23.1
- sphinx
- pydata-sphinx-theme
- sphinxcontrib-websupport
- sphinx-markdown-tables
- sphinx-copybutton
- nbsphinx
- numpydoc
- ipython
- recommonmark
- pip
- rapids-pytest-benchmark
- doxygen
- pytest-cov
- gtest
- gmock
9 changes: 3 additions & 6 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ endif()
# Remove the following archs from CMAKE_CUDA_ARCHITECTURES that
# cuhornet currently doesn't support
#
# >= 86
set(supported_archs "60" "62" "70" "72" "75" "80")
# >= 90
set(supported_archs "60" "62" "70" "72" "75" "80" "86")
foreach( arch IN LISTS CMAKE_CUDA_ARCHITECTURES)
string(REPLACE "-real" "" arch ${arch})
if( arch IN_LIST supported_archs )
Expand Down Expand Up @@ -147,8 +147,6 @@ include(cmake/thirdparty/get_raft.cmake)
include(cmake/thirdparty/get_cuco.cmake)
include(cmake/thirdparty/get_cuhornet.cmake)

include(cmake/thirdparty/get_gunrock.cmake)

if(BUILD_TESTS)
include(cmake/thirdparty/get_gtest.cmake)
endif()
Expand All @@ -165,7 +163,7 @@ add_library(cugraph SHARED
src/utilities/graph_bcast.cu
src/structure/legacy/graph.cu
src/linear_assignment/hungarian.cu
src/link_analysis/gunrock_hits.cpp
#src/link_analysis/gunrock_hits.cpp
src/traversal/legacy/bfs.cu
src/traversal/legacy/sssp.cu
src/link_prediction/jaccard.cu
Expand Down Expand Up @@ -293,7 +291,6 @@ target_link_libraries(cugraph
CUDA::cusparse
cugraph::cuHornet
FAISS::FAISS
gunrock
NCCL::NCCL
)

Expand Down
1 change: 1 addition & 0 deletions notebooks/link_analysis/HITS.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"metadata": {},
"source": [
"# HITS\n",
"# Skip notebook test\n",
"\n",
"In this notebook, we will use both NetworkX and cuGraph to compute HITS. \n",
"The NetworkX and cuGraph processes will be interleaved so that each step can be compared.\n",
Expand Down
14 changes: 9 additions & 5 deletions python/cugraph/cugraph/link_analysis/hits.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from cugraph.link_analysis import hits_wrapper
from cugraph.utilities import (ensure_cugraph_obj_for_nx,
df_score_to_dictionary,
)
# from cugraph.link_analysis import hits_wrapper

# from cugraph.utilities import (ensure_cugraph_obj_for_nx,
# df_score_to_dictionary,
# )


def hits(G, max_iter=100, tol=1.0e-5, nstart=None, normalized=True):
Expand Down Expand Up @@ -75,9 +76,10 @@ def hits(G, max_iter=100, tol=1.0e-5, nstart=None, normalized=True):
>>> hits = cugraph.hits(G, max_iter = 50)
"""

"""
G, isNx = ensure_cugraph_obj_for_nx(G)

df = hits_wrapper.hits(G, max_iter, tol)
df = hits_wrapper.hits(G, max_iter, tol) # noqa: F821

if G.renumbered:
df = G.unrenumber(df, "vertex")
Expand All @@ -89,3 +91,5 @@ def hits(G, max_iter=100, tol=1.0e-5, nstart=None, normalized=True):
df = (d1, d2)

return df
"""
raise NotImplementedError("Temporarily disabled. New version in 21.12")
1 change: 1 addition & 0 deletions python/cugraph/cugraph/tests/test_hits.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ def networkx_call(M, max_iter, tol):
TOLERANCE = [1.0e-06]


@pytest.mark.skip(reason="Waiting on new version")
@pytest.mark.parametrize("graph_file", utils.DATASETS_UNDIRECTED)
@pytest.mark.parametrize("max_iter", MAX_ITERATIONS)
@pytest.mark.parametrize("tol", TOLERANCE)
Expand Down