Merge branch 'master' into master

dmlc · Feb 11, 2023 · acfdfe0 · acfdfe0
2 parents c66cd17 + 465828c
commit acfdfe0
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 47 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -262,7 +262,7 @@ pipeline {
               agent {
                 docker {
                   label "linux-cpu-node"
-                  image "dgllib/dgl-ci-cpu:v221216"
+                  image "dgllib/dgl-ci-cpu:v230210"
                   args "-u root"
                   alwaysPull true
                 }
@@ -280,7 +280,7 @@ pipeline {
               agent {
                 docker {
                   label "linux-cpu-node"
-                  image "dgllib/dgl-ci-gpu:cu102_v221216"
+                  image "dgllib/dgl-ci-gpu:cu102_v230210"
                   args "-u root"
                   alwaysPull true
                 }
@@ -335,7 +335,7 @@ pipeline {
               agent {
                 docker {
                   label "linux-cpu-node"
-                  image "dgllib/dgl-ci-cpu:v221216"
+                  image "dgllib/dgl-ci-cpu:v230210"
                   alwaysPull true
                 }
               }
@@ -352,7 +352,7 @@ pipeline {
               agent {
                 docker {
                   label "linux-gpu-node"
-                  image "dgllib/dgl-ci-gpu:cu102_v221216"
+                  image "dgllib/dgl-ci-gpu:cu102_v230210"
                   args "--runtime nvidia"
                   alwaysPull true
                 }
@@ -381,7 +381,7 @@ pipeline {
               agent {
                 docker {
                   label "linux-cpu-node"
-                  image "dgllib/dgl-ci-cpu:v220816"
+                  image "dgllib/dgl-ci-cpu:v230210"
                   alwaysPull true
                 }
               }
@@ -402,7 +402,7 @@ pipeline {
               agent {
                 docker {
                   label "linux-gpu-node"
-                  image "dgllib/dgl-ci-gpu:cu101_v220816"
+                  image "dgllib/dgl-ci-gpu:cu101_v230210"
                   args "--runtime nvidia"
                   alwaysPull true
                 }
@@ -424,7 +424,7 @@ pipeline {
               agent {
                 docker {
                   label "linux-cpu-node"
-                  image "dgllib/dgl-ci-cpu:v221216"
+                  image "dgllib/dgl-ci-cpu:v230210"
                   args "--shm-size=4gb"
                   alwaysPull true
                 }
@@ -476,7 +476,7 @@ pipeline {
               agent {
                 docker {
                   label "linux-gpu-node"
-                  image "dgllib/dgl-ci-gpu:cu102_v221216"
+                  image "dgllib/dgl-ci-gpu:cu102_v230210"
                   args "--runtime nvidia --shm-size=8gb"
                   alwaysPull true
                 }
@@ -504,7 +504,7 @@ pipeline {
               agent {
                 docker {
                   label "linux-cpu-node"
-                  image "dgllib/dgl-ci-cpu:v221216"
+                  image "dgllib/dgl-ci-cpu:v230210"
                   args "--shm-size=4gb"
                   alwaysPull true
                 }
@@ -549,7 +549,7 @@ pipeline {
               agent {
                 docker {
                   label "linux-cpu-node"
-                  image "dgllib/dgl-ci-cpu:v221216"
+                  image "dgllib/dgl-ci-cpu:v230210"
                   alwaysPull true
                 }
               }

diff --git a/docker/Dockerfile.ci_gpu_220816 → docker/Dockerfile.ci_gpu_cu101 b/docker/Dockerfile.ci_gpu_220816 → docker/Dockerfile.ci_gpu_cu101
diff --git a/docker/install/conda_env/mxnet_cpu.yml b/docker/install/conda_env/mxnet_cpu.yml
@@ -14,3 +14,9 @@ dependencies:
     - nltk
     - requests[security]
     - tqdm
+    - psutil
+    - pyyaml
+    - pydantic
+    - pandas
+    - rdflib
+    - ogb
diff --git a/docker/install/conda_env/mxnet_gpu.yml b/docker/install/conda_env/mxnet_gpu.yml
@@ -14,3 +14,9 @@ dependencies:
     - nltk
     - requests[security]
     - tqdm
+    - psutil
+    - pyyaml
+    - pydantic
+    - pandas
+    - rdflib
+    - ogb
diff --git a/docker/install/conda_env/tensorflow_cpu.yml b/docker/install/conda_env/tensorflow_cpu.yml
@@ -14,3 +14,9 @@ dependencies:
     - nltk
     - requests[security]
     - tqdm
+    - psutil
+    - pyyaml
+    - pydantic
+    - pandas
+    - rdflib
+    - ogb
diff --git a/docker/install/conda_env/tensorflow_gpu.yml b/docker/install/conda_env/tensorflow_gpu.yml
@@ -14,3 +14,9 @@ dependencies:
     - nltk
     - requests[security]
     - tqdm
+    - psutil
+    - pyyaml
+    - pydantic
+    - pandas
+    - rdflib
+    - ogb
diff --git a/docker/install/conda_env/torch_cpu_pip.txt b/docker/install/conda_env/torch_cpu_pip.txt
@@ -1,5 +1,6 @@
 --find-links https://download.pytorch.org/whl/torch_stable.html
 torch==1.12.0+cpu
+torchmetrics
 pytest
 nose
 numpy
@@ -9,7 +10,13 @@ networkx
 matplotlib
 nltk
 requests[security]
-tqdm  
+tqdm
 pandas
 scikit-learn
 ogb
+psutil
+pyyaml
+pydantic
+rdflib
+filelock
+pyarrow
diff --git a/docker/install/conda_env/torch_gpu_pip.txt b/docker/install/conda_env/torch_gpu_pip.txt
@@ -1,5 +1,6 @@
 --find-links https://download.pytorch.org/whl/torch_stable.html
 torch==1.12.0+cu102
+torchmetrics
 pytest
 nose
 numpy
@@ -9,7 +10,11 @@ networkx
 matplotlib
 nltk
 requests[security]
-tqdm  
+tqdm
 pandas
 scikit-learn
 ogb
+psutil
+pyyaml
+pydantic
+rdflib
diff --git a/docker/install/ubuntu_install_conda.sh b/docker/install/ubuntu_install_conda.sh
@@ -10,7 +10,7 @@ apt-get update --fix-missing && \
 wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \
     /bin/bash ~/miniconda.sh -b -p /opt/conda && \
     rm ~/miniconda.sh && \
-    /opt/conda/bin/conda clean -tipsy && \
+    /opt/conda/bin/conda clean -tipy && \
     ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \
     echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \
     echo "conda activate base" >> ~/.bashrc

diff --git a/tests/scripts/task_distributed_test.sh b/tests/scripts/task_distributed_test.sh
@@ -30,8 +30,6 @@ export CUDA_VISIBLE_DEVICES=-1
 
 conda activate ${DGLBACKEND}-ci
 
-python3 -m pip install pytest psutil pyyaml pydantic pandas rdflib ogb filelock pyarrow || fail "pip install"
-
 export PYTHONUNBUFFERED=1
 export OMP_NUM_THREADS=1
 export DMLC_LOG_DEBUG=1

diff --git a/tests/scripts/task_go_test.sh b/tests/scripts/task_go_test.sh
@@ -23,5 +23,4 @@ popd
 export LC_ALL=C.UTF-8
 export LANG=C.UTF-8
 
-python -m pip install psutil || fail "pip install"
 python3 -m pytest -v --junitxml=pytest_go.xml --durations=100 tests/go/test_model.py || fail "go"
diff --git a/tests/scripts/task_mxnet_tutorial_test.sh b/tests/scripts/task_mxnet_tutorial_test.sh
diff --git a/tests/scripts/task_unit_test.sh b/tests/scripts/task_unit_test.sh
@@ -33,7 +33,6 @@ fi
 
 conda activate ${DGLBACKEND}-ci
 
-python3 -m pip install pytest psutil pyyaml pydantic pandas rdflib ogb torchmetrics || fail "pip install"
 if [ $DGLBACKEND == "mxnet" ]
 then
   python3 -m pytest -v --junitxml=pytest_compute.xml --durations=100 --ignore=tests/compute/test_ffi.py tests/compute || fail "compute"