Merge branch 'master' into dist_part

tests/scripts/cugraph_unit_test.sh

+#!/bin/bash
+
+. /opt/conda/etc/profile.d/conda.sh
+
+function fail {
+    echo FAIL: $@
+    exit -1
+}
+
+export DGLBACKEND=$1
+export DGLTESTDEV=gpu
+export DGL_LIBRARY_PATH=${PWD}/build
+export PYTHONPATH=tests:${PWD}/python:$PYTHONPATH
+export DGL_DOWNLOAD_DIR=${PWD}
+export TF_FORCE_GPU_ALLOW_GROWTH=true
+
+export CUDA_VISIBLE_DEVICES=0
+
+python3 -m pip install pytest psutil pyyaml pydantic pandas rdflib ogb || fail "pip install"
+
+python3 -m pytest -v --junitxml=pytest_cugraph.xml --durations=20 tests/cugraph || fail "cugraph"

tests/scripts/task_distributed_test.sh

+#!/bin/bash
+
+. /opt/conda/etc/profile.d/conda.sh
+
+function fail {
+    echo FAIL: $@
+    exit -1
+}
+
+function usage {
+    echo "Usage: $0 backend device"
+}
+
+if [ $# -ne 2 ]; then
+    usage
+    fail "Error: must specify backend and device"
+fi
+
+[ $1 == "pytorch" ] || fail "Distrbuted tests run on pytorch backend only."
+[ $2 == "cpu" ] || fail "Distrbuted tests run on cpu only."
+
+export DGLBACKEND=$1
+export DGLTESTDEV=$2
+export DGL_LIBRARY_PATH=${PWD}/build
+export PYTHONPATH=tests:${PWD}/python:$PYTHONPATH
+export DGL_DOWNLOAD_DIR=${PWD}
+unset TORCH_ALLOW_TF32_CUBLAS_OVERRIDE
+
+export CUDA_VISIBLE_DEVICES=-1
+
+conda activate ${DGLBACKEND}-ci
+
+python3 -m pip install pytest psutil pyyaml pydantic pandas rdflib ogb filelock || fail "pip install"
+
+export PYTHONUNBUFFERED=1
+export OMP_NUM_THREADS=1
+export DMLC_LOG_DEBUG=1
+
+python3 -m pytest -v --capture=tee-sys --junitxml=pytest_distributed.xml --durations=100 tests/distributed/*.py || fail "distributed"
+
+PYTHONPATH=tools:$PYTHONPATH python3 -m pytest -v --capture=tee-sys --junitxml=pytest_tools.xml --durations=100 tests/tools/*.py || fail "tools"

tests/scripts/task_example_test.bat

@@ -24,7 +24,7 @@ SET DGL_DOWNLOAD_DIR=!CD!
 
 PUSHD !GCN_EXAMPLE_DIR!
 python pagerank.py || GOTO :FAIL
-python gcn\gcn.py --dataset cora --gpu !DEV! || GOTO :FAIL
+python gcn\train.py --dataset cora || GOTO :FAIL
 POPD
 ENDLOCAL
 EXIT /B

tests/scripts/task_example_test.sh

@@ -39,7 +39,7 @@ export DGL_DOWNLOAD_DIR=${PWD}
 pushd $GCN_EXAMPLE_DIR> /dev/null
 
 python3 pagerank.py || fail "run pagerank.py on $1"
-python3 gcn/gcn.py --dataset cora --gpu $dev || fail "run gcn/gcn.py on $1"
+python3 gcn/train.py --dataset cora || fail "run gcn/train.py on $1"
 python3 lda/lda_model.py || fail "run lda/lda_model.py on $1"
 
 popd > /dev/null

tests/scripts/task_unit_test.sh

@@ -22,6 +22,7 @@ export DGL_LIBRARY_PATH=${PWD}/build
 export PYTHONPATH=tests:${PWD}/python:$PYTHONPATH
 export DGL_DOWNLOAD_DIR=${PWD}
 export TF_FORCE_GPU_ALLOW_GROWTH=true
+unset TORCH_ALLOW_TF32_CUBLAS_OVERRIDE
 
 if [ $2 == "gpu" ] 
 then
@@ -35,13 +36,3 @@ conda activate ${DGLBACKEND}-ci
 python3 -m pip install pytest psutil pyyaml pydantic pandas rdflib ogb || fail "pip install"
 python3 -m pytest -v --junitxml=pytest_compute.xml --durations=100 tests/compute || fail "compute"
 python3 -m pytest -v --junitxml=pytest_backend.xml --durations=100 tests/$DGLBACKEND || fail "backend-specific"
-
-
-export PYTHONUNBUFFERED=1
-export OMP_NUM_THREADS=1
-export DMLC_LOG_DEBUG=1
-if [ $2 != "gpu" && $DGLBACKEND == "pytorch" ]; then
-    python3 -m pip install filelock
-    python3 -m pytest -v --capture=tee-sys --junitxml=pytest_distributed.xml --durations=100 tests/distributed/*.py || fail "distributed"
-    PYTHONPATH=tools:$PYTHONPATH python3 -m pytest -v --capture=tee-sys --junitxml=pytest_tools.xml --durations=100 tests/tools/*.py || fail "tools"
-fi

cub @ cdaa9558

-Subproject commit a3ee304a1f8e22f278df10600df2e4b333012592
+Subproject commit cdaa9558a85e45d849016e5fe7b6e4ee79113f95

thrust @ 6a3078c6

-Subproject commit 0ef5c509856e12cc408f0f00ed586b4c5b1a155c
+Subproject commit 6a3078c64cab0e2f276340fa5dcafa0d758ed890