From 244e8b454bd3e7fa03ee2a4f0b5aefac76e34326 Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@buzzsolutions.co>
Date: Sun, 9 Apr 2023 21:49:09 -0700
Subject: [PATCH 1/4] fix conda yaml files

---
 environment_cpu.yml | 70 ++++++++++++++++++++-----------------------
 environment_gpu.yml | 72 +++++++++++++++++++++------------------------
 2 files changed, 66 insertions(+), 76 deletions(-)

diff --git a/environment_cpu.yml b/environment_cpu.yml
index 1463651e1..63891f9d0 100755
--- a/environment_cpu.yml
+++ b/environment_cpu.yml
@@ -1,44 +1,38 @@
 name: benchmark_gnn
-channels:
-- pytorch 
-- dglteam
-- conda-forge
-- anaconda
-- defaults
 dependencies:
-- python=3.7.4
-- python-dateutil=2.8.0
-- pip=19.2.3
-- pytorch=1.6.0
-- torchvision==0.7.0
-- pillow==6.1
-- dgl=0.6.1
-- numpy=1.19.2
-- matplotlib=3.1.0
-- tensorboard=1.14.0
-- tensorboardx=1.8
-- future=0.18.2
-- absl-py
-- networkx=2.3
-- scikit-learn=0.21.2
-- scipy=1.3.0
-- notebook=6.0.0
-- h5py=2.9.0
-- mkl=2019.4
-- ipykernel=5.1.2
-- ipython=7.7.0
-- ipython_genutils=0.2.0
-- ipywidgets=7.5.1
-- jupyter=1.0.0
-- jupyter_client=5.3.1
-- jupyter_console=6.0.0
-- jupyter_core=4.5.0
-- plotly=4.1.1
-- scikit-image=0.15.0
-- requests==2.22.0
-- tqdm==4.43.0
+- python==3.7
+- pip
 - pip:
+  - python-dateutil==2.8.0
+  - torch==1.6.0
+  - torchvision==0.7.0
+  - pillow==6.1
+  - dgl==0.6.1
+  - numpy==1.19.2
+  - matplotlib==3.1.0
+  - future==0.18.2
+  - absl-py
+  - networkx==2.3
+  - scikit-learn==0.21.2
+  - scipy==1.4.1
+  - notebook==6.0.0
+  - h5py==2.9.0
+  - mkl==2019.0  # next version 2021.1.1
+  - ipykernel==5.1.2
+  - ipython==7.7.0
+  - ipython_genutils==0.2.0
+  - ipywidgets==7.5.1
+  - jupyter==1.0.0
+  - jupyter_client==5.3.1
+  - jupyter_console==6.0.0
+  - jupyter_core==4.5.0
+  - jupyterlab==2.3.2
+  - plotly==4.1.1
+  - scikit-image==0.15.0
+  - requests==2.22.0
+  - tqdm==4.43.0
   - tensorflow==2.1.0
   - tensorflow-estimator==2.1.0
   - tensorboard==2.1.1
-  - ogb==1.2.2
\ No newline at end of file
+  - tensorboardx==2.5.1
+  - ogb==1.2.6
\ No newline at end of file
diff --git a/environment_gpu.yml b/environment_gpu.yml
index ca3a5d53f..77477d78b 100755
--- a/environment_gpu.yml
+++ b/environment_gpu.yml
@@ -1,47 +1,43 @@
 name: benchmark_gnn
 channels:
-- pytorch 
-- dglteam
 - conda-forge
-- fragcolor
-- anaconda
 - defaults
 dependencies:
-- cudatoolkit=10.2
-- cudnn=7.6.5
-- python=3.7.4
-- python-dateutil=2.8.0
-- pip=19.2.3
-- pytorch=1.6.0
-- torchvision==0.7.0
-- pillow==6.1
-- dgl-cuda10.2=0.6.1
-- numpy=1.19.2
-- matplotlib=3.1.0
-- tensorboard=1.14.0
-- tensorboardx=1.8
-- future=0.18.2
-- absl-py
-- networkx=2.3
-- scikit-learn=0.21.2
-- scipy=1.3.0
-- notebook=6.0.0
-- h5py=2.9.0
-- mkl=2019.4
-- ipykernel=5.1.2
-- ipython=7.7.0
-- ipython_genutils=0.2.0
-- ipywidgets=7.5.1
-- jupyter=1.0.0
-- jupyter_client=5.3.1
-- jupyter_console=6.0.0
-- jupyter_core=4.5.0
-- plotly=4.1.1
-- scikit-image=0.15.0
-- requests==2.22.0
-- tqdm==4.43.0
+- python==3.7
+- pip
+- cudatoolkit==10.2
+- cudnn==7.6.5
 - pip:
+  - python-dateutil==2.8.0
+  - torch==1.6.0
+  - torchvision==0.7.0
+  - pillow==6.1
+  - dgl-cuda10.2==0.6.1
+  - numpy==1.19.2
+  - matplotlib==3.1.0
+  - future==0.18.2
+  - absl-py
+  - networkx==2.3
+  - scikit-learn==0.21.2
+  - scipy==1.4.1
+  - notebook==6.0.0
+  - h5py==2.9.0
+  - mkl==2019.0  # next version 2021.1.1
+  - ipykernel==5.1.2
+  - ipython==7.7.0
+  - ipython_genutils==0.2.0
+  - ipywidgets==7.5.1
+  - jupyter==1.0.0
+  - jupyter_client==5.3.1
+  - jupyter_console==6.0.0
+  - jupyter_core==4.5.0
+  - jupyterlab==2.3.2
+  - plotly==4.1.1
+  - scikit-image==0.15.0
+  - requests==2.22.0
+  - tqdm==4.43.0
   - tensorflow-gpu==2.1.0
   - tensorflow-estimator==2.1.0
   - tensorboard==2.1.1
-  - ogb==1.2.2
\ No newline at end of file
+  - tensorboardx==2.5.1
+  - ogb==1.2.6

From 92f388901a7a49fab0bdbfe589c4ad4a150fe7e7 Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@buzzsolutions.co>
Date: Sun, 9 Apr 2023 22:10:06 -0700
Subject: [PATCH 2/4] add github actionto test cpu env

---
 .github/workflows/cpu_setup.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/workflows/cpu_setup.yml

diff --git a/.github/workflows/cpu_setup.yml b/.github/workflows/cpu_setup.yml
new file mode 100644
index 000000000..865fee128
--- /dev/null
+++ b/.github/workflows/cpu_setup.yml
@@ -0,0 +1,26 @@
+name: cpu_setup
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -el {0}
+    steps:
+    - uses: actions/checkout@v3
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          activate-environment: benchmark_gnn
+          environment-file: environment_cpu.yml
+          python-version: 3.7
+      - run: |
+          conda info
+          conda list

From 4c0ff4ca7d9cdc4183193aab45f0cccd8703e85b Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@buzzsolutions.co>
Date: Sun, 9 Apr 2023 22:16:05 -0700
Subject: [PATCH 3/4] add github actionto test gpu env

---
 .github/workflows/gpu_setup.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/workflows/gpu_setup.yml

diff --git a/.github/workflows/gpu_setup.yml b/.github/workflows/gpu_setup.yml
new file mode 100644
index 000000000..c1b4787f2
--- /dev/null
+++ b/.github/workflows/gpu_setup.yml
@@ -0,0 +1,26 @@
+name: gpu_setup
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -el {0}
+    steps:
+    - uses: actions/checkout@v3
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          activate-environment: benchmark_gnn
+          environment-file: environment_gpu.yml
+          python-version: 3.7
+      - run: |
+          conda info
+          conda list

From 73b7900df3803f1e7d0ddb195dbf2fa2800273b4 Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@buzzsolutions.co>
Date: Sun, 9 Apr 2023 22:40:48 -0700
Subject: [PATCH 4/4] fix syntax error in github action yamls

---
 .github/workflows/cpu_setup.yml | 3 ++-
 .github/workflows/gpu_setup.yml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cpu_setup.yml b/.github/workflows/cpu_setup.yml
index 865fee128..64bf8a6de 100644
--- a/.github/workflows/cpu_setup.yml
+++ b/.github/workflows/cpu_setup.yml
@@ -15,7 +15,7 @@ jobs:
       run:
         shell: bash -el {0}
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: benchmark_gnn
@@ -24,3 +24,4 @@ jobs:
       - run: |
           conda info
           conda list
+  
\ No newline at end of file
diff --git a/.github/workflows/gpu_setup.yml b/.github/workflows/gpu_setup.yml
index c1b4787f2..3e69f4d8b 100644
--- a/.github/workflows/gpu_setup.yml
+++ b/.github/workflows/gpu_setup.yml
@@ -15,7 +15,7 @@ jobs:
       run:
         shell: bash -el {0}
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: benchmark_gnn
@@ -24,3 +24,4 @@ jobs:
       - run: |
           conda info
           conda list
+  
\ No newline at end of file