Merge branch 'branch-23.10' into branch-23.10-large-datasets

betochimas · Sep 22, 2023 · a85cb7e · a85cb7e
2 parents 045597a + f53bb56
commit a85cb7e
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 4 deletions.
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -126,3 +126,5 @@ for FILE in .github/workflows/*.yaml; do
  sed_runner "s/dask-cuda.git@branch-[0-9][0-9].[0-9][0-9]/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
 done
 sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh
+
+sed_runner "s/branch-.*/branch-${NEXT_SHORT_TAG}/g" python/nx-cugraph/README.md
diff --git a/python/cugraph-dgl/tests/nn/test_gatconv.py b/python/cugraph-dgl/tests/nn/test_gatconv.py
@@ -35,6 +35,7 @@ def test_gatconv_equality(
 ):
  from dgl.nn.pytorch import GATConv
 
+ torch.manual_seed(12345)
  g = create_graph1().to("cuda")
 
  if idtype_int:
@@ -121,6 +122,7 @@ def test_gatconv_equality(
 def test_gatconv_edge_feats(
  bias, bipartite, concat, max_in_degree, num_heads, to_block, use_edge_feats
 ):
+ torch.manual_seed(12345)
  g = create_graph1().to("cuda")
 
  if to_block:

diff --git a/python/cugraph-dgl/tests/nn/test_gatv2conv.py b/python/cugraph-dgl/tests/nn/test_gatv2conv.py
@@ -35,6 +35,7 @@ def test_gatv2conv_equality(
 ):
  from dgl.nn.pytorch import GATv2Conv
 
+ torch.manual_seed(12345)
  g = create_graph1().to("cuda")
 
  if idtype_int:
@@ -109,6 +110,7 @@ def test_gatv2conv_equality(
 def test_gatv2conv_edge_feats(
  bias, bipartite, concat, max_in_degree, num_heads, to_block, use_edge_feats
 ):
+ torch.manual_seed(12345)
  g = create_graph1().to("cuda")
 
  if to_block:

diff --git a/python/cugraph-dgl/tests/nn/test_relgraphconv.py b/python/cugraph-dgl/tests/nn/test_relgraphconv.py
@@ -41,6 +41,7 @@ def test_relgraphconv_equality(
 ):
  from dgl.nn.pytorch import RelGraphConv
 
+ torch.manual_seed(12345)
  in_feat, out_feat, num_rels = 10, 2, 3
  args = (in_feat, out_feat, num_rels)
  kwargs = {
@@ -75,12 +76,18 @@ def test_relgraphconv_equality(
  size=size, src_ids=indices, cdst_ids=offsets, values=etypes, formats="csc"
  )
 
- torch.manual_seed(0)
  conv1 = RelGraphConv(*args, **kwargs).cuda()
+ conv2 = CuGraphRelGraphConv(*args, **kwargs, apply_norm=False).cuda()
 
- torch.manual_seed(0)
- kwargs["apply_norm"] = False
- conv2 = CuGraphRelGraphConv(*args, **kwargs).cuda()
+ with torch.no_grad():
+ if self_loop:
+ conv2.W.data[:-1] = conv1.linear_r.W.data
+ conv2.W.data[-1] = conv1.loop_weight.data
+ else:
+ conv2.W.data = conv1.linear_r.W.data.detach().clone()
+
+ if regularizer is not None:
+ conv2.coeff.data = conv1.linear_r.coeff.data.detach().clone()
 
  out1 = conv1(g, feat, g.edata[dgl.ETYPE])
 

diff --git a/python/cugraph-dgl/tests/nn/test_sageconv.py b/python/cugraph-dgl/tests/nn/test_sageconv.py
@@ -35,6 +35,7 @@ def test_sageconv_equality(
 ):
  from dgl.nn.pytorch import SAGEConv
 
+ torch.manual_seed(12345)
  kwargs = {"aggregator_type": aggr, "bias": bias}
  g = create_graph1().to("cuda")
 

diff --git a/python/cugraph-dgl/tests/nn/test_transformerconv.py b/python/cugraph-dgl/tests/nn/test_transformerconv.py
@@ -41,6 +41,7 @@ def test_transformerconv(
  use_edge_feats,
  sparse_format,
 ):
+ torch.manual_seed(12345)
  device = "cuda"
  g = create_graph1().to(device)
 

diff --git a/python/cugraph-pyg/cugraph_pyg/tests/nn/test_gat_conv.py b/python/cugraph-pyg/cugraph_pyg/tests/nn/test_gat_conv.py
@@ -32,6 +32,7 @@ def test_gat_conv_equality(
  import torch
  from torch_geometric.nn import GATConv
 
+ torch.manual_seed(12345)
  edge_index, size = request.getfixturevalue(graph)
  edge_index = edge_index.cuda()
 

diff --git a/python/cugraph-pyg/cugraph_pyg/tests/nn/test_gatv2_conv.py b/python/cugraph-pyg/cugraph_pyg/tests/nn/test_gatv2_conv.py
@@ -28,6 +28,7 @@ def test_gatv2_conv_equality(bipartite, concat, heads, use_edge_attr, graph, req
  import torch
  from torch_geometric.nn import GATv2Conv
 
+ torch.manual_seed(12345)
  edge_index, size = request.getfixturevalue(graph)
  edge_index = edge_index.cuda()
 

diff --git a/python/cugraph-pyg/cugraph_pyg/tests/nn/test_rgcn_conv.py b/python/cugraph-pyg/cugraph_pyg/tests/nn/test_rgcn_conv.py
@@ -31,6 +31,7 @@ def test_rgcn_conv_equality(
  import torch
  from torch_geometric.nn import FastRGCNConv as RGCNConv
 
+ torch.manual_seed(12345)
  in_channels, out_channels, num_relations = (4, 2, 3)
  kwargs = dict(aggr=aggr, bias=bias, num_bases=num_bases, root_weight=root_weight)
 

diff --git a/python/cugraph-pyg/cugraph_pyg/tests/nn/test_sage_conv.py b/python/cugraph-pyg/cugraph_pyg/tests/nn/test_sage_conv.py
@@ -32,6 +32,7 @@ def test_sage_conv_equality(
  import torch
  from torch_geometric.nn import SAGEConv
 
+ torch.manual_seed(12345)
  edge_index, size = request.getfixturevalue(graph)
  edge_index = edge_index.cuda()
  csc = CuGraphSAGEConv.to_csc(edge_index, size)

diff --git a/python/cugraph-pyg/cugraph_pyg/tests/nn/test_transformer_conv.py b/python/cugraph-pyg/cugraph_pyg/tests/nn/test_transformer_conv.py
@@ -27,6 +27,7 @@ def test_transformer_conv_equality(bipartite, concat, heads, graph, request):
  import torch
  from torch_geometric.nn import TransformerConv
 
+ torch.manual_seed(12345)
  edge_index, size = request.getfixturevalue(graph)
  edge_index = edge_index.cuda()
  csc = CuGraphTransformerConv.to_csc(edge_index, size)