Skip to content

Commit c01c997

Browse files
acostadonacostadon
authored
removed deprecated calls and modified demo notebooks to run with 23.06 (#3561)
resolves #3555 resolves #3556 resolves #3557 Is part of epic [196](rapidsai/graph_dl#196) Authors: - Don Acosta (https://github.com/acostadon) - Brad Rees (https://github.com/BradReesWork) Approvers: - Brad Rees (https://github.com/BradReesWork) URL: #3561
1 parent 4ea838f commit c01c997

File tree

4 files changed

+124
-151
lines changed

4 files changed

+124
-151
lines changed

‎notebooks/cugraph_benchmarks/bfs_benchmark.ipynb‎

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"cells": [
33
{
4+
"attachments": {},
45
"cell_type": "markdown",
56
"metadata": {},
67
"source": [
@@ -9,22 +10,15 @@
910
"\n",
1011
"This notebook benchmarks performance of running BFS within cuGraph against NetworkX. \n",
1112
"\n",
12-
"Notebook Credits\n",
1313
"\n",
14-
" Original Authors: Bradley Rees\n",
15-
" Last Edit: 08/16/2020\n",
16-
" \n",
17-
"RAPIDS Versions: 0.15\n",
18-
"\n",
19-
"Test Hardware\n",
20-
"\n",
21-
" GV100 32G, CUDA 10.2\n",
22-
" Intel(R) Core(TM) CPU i7-7800X @ 3.50GHz\n",
23-
" 32GB system memory\n",
24-
" \n"
14+
"| Author Credit | Date | Update | cuGraph Version | Test Hardware |\n",
15+
"| --------------|------------|------------------|-----------------|----------------|\n",
16+
"| Brad Rees | 08/16/2020 | created | 0.15 | GV100 32G, CUDA 10.2\n",
17+
"| Don Acosta | 05/15/2023 | update and test | 23.06 | A6000 32G, CUDA 11.7"
2518
]
2619
},
2720
{
21+
"attachments": {},
2822
"cell_type": "markdown",
2923
"metadata": {},
3024
"source": [
@@ -45,6 +39,7 @@
4539
]
4640
},
4741
{
42+
"attachments": {},
4843
"cell_type": "markdown",
4944
"metadata": {},
5045
"source": [
@@ -54,6 +49,7 @@
5449
]
5550
},
5651
{
52+
"attachments": {},
5753
"cell_type": "markdown",
5854
"metadata": {},
5955
"source": [
@@ -64,6 +60,7 @@
6460
]
6561
},
6662
{
63+
"attachments": {},
6764
"cell_type": "markdown",
6865
"metadata": {},
6966
"source": [
@@ -81,7 +78,8 @@
8178
"import time\n",
8279
"import rmm\n",
8380
"import cugraph\n",
84-
"import cudf"
81+
"import cudf\n",
82+
"import os"
8583
]
8684
},
8785
{
@@ -118,10 +116,24 @@
118116
]
119117
},
120118
{
119+
"attachments": {},
121120
"cell_type": "markdown",
122121
"metadata": {},
123122
"source": [
124-
"### Define the test data"
123+
"### Define the test data\n",
124+
"\n",
125+
"README.md contains instructions on importing data using the dataPrep.sh script\n",
126+
"\n",
127+
"| File Name | Num of Vertices | Num of Edges |\n",
128+
"|:---------------------- | --------------: | -----------: |\n",
129+
"| preferentialAttachment | 100,000 | 999,970 |\n",
130+
"| caidaRouterLevel | 192,244 | 1,218,132 |\n",
131+
"| coAuthorsDBLP | 299,067 | 1,955,352 |\n",
132+
"| dblp-2010 | 326,186 | 1,615,400 |\n",
133+
"| citationCiteseer | 268,495 | 2,313,294 |\n",
134+
"| coPapersDBLP | 540,486 | 30,491,458 |\n",
135+
"| coPapersCiteseer | 434,102 | 32,073,440 |\n",
136+
"| as-Skitter | 1,696,415 | 22,190,596 |"
125137
]
126138
},
127139
{
@@ -144,6 +156,7 @@
144156
]
145157
},
146158
{
159+
"attachments": {},
147160
"cell_type": "markdown",
148161
"metadata": {},
149162
"source": [
@@ -183,7 +196,7 @@
183196
" t1 = time.time()\n",
184197
" \n",
185198
" # cugraph Pagerank Call\n",
186-
" G = cugraph.DiGraph()\n",
199+
" G = cugraph.Graph(directed=True)\n",
187200
" G.from_cudf_edgelist(gdf, source='src', destination='dst', renumber=False)\n",
188201
" \n",
189202
" df = cugraph.bfs(G, 1)\n",
@@ -236,6 +249,7 @@
236249
]
237250
},
238251
{
252+
"attachments": {},
239253
"cell_type": "markdown",
240254
"metadata": {},
241255
"source": [
@@ -316,6 +330,7 @@
316330
]
317331
},
318332
{
333+
"attachments": {},
319334
"cell_type": "markdown",
320335
"metadata": {},
321336
"source": [
@@ -353,11 +368,12 @@
353368
]
354369
},
355370
{
371+
"attachments": {},
356372
"cell_type": "markdown",
357373
"metadata": {},
358374
"source": [
359375
"___\n",
360-
"Copyright (c) 2020, NVIDIA CORPORATION.\n",
376+
"Copyright (c) 2020-2023, NVIDIA CORPORATION.\n",
361377
"\n",
362378
"Licensed under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0\n",
363379
"\n",
@@ -368,9 +384,9 @@
368384
],
369385
"metadata": {
370386
"kernelspec": {
371-
"display_name": "cugraph_dev",
387+
"display_name": "cugraph_0510",
372388
"language": "python",
373-
"name": "cugraph_dev"
389+
"name": "python3"
374390
},
375391
"language_info": {
376392
"codemirror_mode": {
@@ -382,7 +398,7 @@
382398
"name": "python",
383399
"nbconvert_exporter": "python",
384400
"pygments_lexer": "ipython3",
385-
"version": "3.8.5"
401+
"version": "3.10.10"
386402
}
387403
},
388404
"nbformat": 4,

‎notebooks/cugraph_benchmarks/louvain_benchmark.ipynb‎

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"cells": [
33
{
4+
"attachments": {},
45
"cell_type": "markdown",
56
"metadata": {},
67
"source": [
@@ -11,22 +12,10 @@
1112
"<p><p>\n",
1213
"\n",
1314
"\n",
14-
"#### Notebook Credits\n",
15-
"\n",
16-
" Original Authors: Bradley Rees\n",
17-
" Last Edit: 06/10/2020\n",
18-
"\n",
19-
"\n",
20-
"#### Test Environment\n",
21-
"\n",
22-
" RAPIDS Versions: 0.15\n",
23-
"\n",
24-
" Test Hardware:\n",
25-
" GV100 32G, CUDA 10,0\n",
26-
" Intel(R) Core(TM) CPU i7-7800X @ 3.50GHz\n",
27-
" 32GB system memory\n",
28-
"\n",
29-
"\n",
15+
"| Author Credit | Date | Update | cuGraph Version | Test Hardware |\n",
16+
"| --------------|------------|------------------|-----------------|----------------|\n",
17+
"| Brad Rees | 08/16/2020 | created | 0.15 | GV100 32G, CUDA 10.0\n",
18+
"| Don Acosta | 05/15/2023 | update and test | 23.06 | A6000 32G, CUDA 11.7\n",
3019
"\n",
3120
"#### Updates\n",
3221
"- moved loading ploting libraries to front so that dependencies can be checked before running algorithms\n",
@@ -36,7 +25,6 @@
3625
"\n",
3726
"\n",
3827
"#### Dependencies\n",
39-
"- RAPIDS cuDF and cuGraph version 0.6.0 \n",
4028
"- NetworkX \n",
4129
"- Matplotlib \n",
4230
"- Scipy \n",
@@ -47,14 +35,15 @@
4735
"#### Note: Comparison against published results\n",
4836
"\n",
4937
"\n",
50-
"The cuGraph blog post included performance numbers that were collected over a year ago. For the test graphs, int32 values are now used. That improves GPUs performance. Additionally, the initial benchamrks were measured on a P100 GPU. \n",
38+
"The cuGraph blog post included performance numbers that were collected over a year ago. For the test graphs, int32 values are now used. That improves GPUs performance.\n",
5139
"\n",
52-
"This test only comparse the modularity scores and a success is if the scores are within 15% of each other. That comparison is done by adjusting the NetworkX modularity score and then verifying that the cuGraph score is higher.\n",
40+
"This test only compares the modularity scores and a success if the scores are within 15% of each other. That comparison is done by adjusting the NetworkX modularity score and then verifying that the cuGraph score is higher.\n",
5341
"\n",
5442
"cuGraph did a full validation of NetworkX results against cuGraph results. That included cross-validation of every cluster. That test is very slow and not included here"
5543
]
5644
},
5745
{
46+
"attachments": {},
5847
"cell_type": "markdown",
5948
"metadata": {},
6049
"source": [
@@ -123,10 +112,24 @@
123112
]
124113
},
125114
{
115+
"attachments": {},
126116
"cell_type": "markdown",
127117
"metadata": {},
128118
"source": [
129-
"### Define the test data"
119+
"### Define the test data\n",
120+
"\n",
121+
"README.md contains instructions on downloading the data using the dataPrep.sh script\n",
122+
"\n",
123+
"| File Name | Num of Vertices | Num of Edges |\n",
124+
"|:---------------------- | --------------: | -----------: |\n",
125+
"| preferentialAttachment | 100,000 | 999,970 |\n",
126+
"| caidaRouterLevel | 192,244 | 1,218,132 |\n",
127+
"| coAuthorsDBLP | 299,067 | 1,955,352 |\n",
128+
"| dblp-2010 | 326,186 | 1,615,400 |\n",
129+
"| citationCiteseer | 268,495 | 2,313,294 |\n",
130+
"| coPapersDBLP | 540,486 | 30,491,458 |\n",
131+
"| coPapersCiteseer | 434,102 | 32,073,440 |\n",
132+
"| as-Skitter | 1,696,415 | 22,190,596 |"
130133
]
131134
},
132135
{
@@ -149,6 +152,7 @@
149152
]
150153
},
151154
{
155+
"attachments": {},
152156
"cell_type": "markdown",
153157
"metadata": {},
154158
"source": [
@@ -235,6 +239,7 @@
235239
]
236240
},
237241
{
242+
"attachments": {},
238243
"cell_type": "markdown",
239244
"metadata": {},
240245
"source": [
@@ -278,6 +283,7 @@
278283
]
279284
},
280285
{
286+
"attachments": {},
281287
"cell_type": "markdown",
282288
"metadata": {},
283289
"source": [
@@ -303,6 +309,7 @@
303309
]
304310
},
305311
{
312+
"attachments": {},
306313
"cell_type": "markdown",
307314
"metadata": {},
308315
"source": [
@@ -337,11 +344,12 @@
337344
]
338345
},
339346
{
347+
"attachments": {},
340348
"cell_type": "markdown",
341349
"metadata": {},
342350
"source": [
343351
"___\n",
344-
"Copyright (c) 2020, NVIDIA CORPORATION.\n",
352+
"Copyright (c) 2020-2023, NVIDIA CORPORATION.\n",
345353
"\n",
346354
"Licensed under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0\n",
347355
"\n",
@@ -352,9 +360,9 @@
352360
],
353361
"metadata": {
354362
"kernelspec": {
355-
"display_name": "cugraph_dev",
363+
"display_name": "cugraph_0510",
356364
"language": "python",
357-
"name": "cugraph_dev"
365+
"name": "python3"
358366
},
359367
"language_info": {
360368
"codemirror_mode": {
@@ -366,7 +374,7 @@
366374
"name": "python",
367375
"nbconvert_exporter": "python",
368376
"pygments_lexer": "ipython3",
369-
"version": "3.8.5"
377+
"version": "3.10.10"
370378
}
371379
},
372380
"nbformat": 4,

0 commit comments

Comments
 (0)