Conda builds (#7018)

pyg-team · Mar 23, 2023 · dd0610a · dd0610a
1 parent c78f358
commit dd0610a
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 25 deletions.
diff --git a/.github/workflows/building_pyg_conda.yml b/.github/workflows/building_pyg_conda.yml
@@ -10,9 +10,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # We have trouble building for Windows - drop for now.
-        os: [ubuntu-18.04, macos-10.15]  # windows-2019
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        os: [ubuntu-18.04, macos-10.15, windows-2019]
+        # We have troube building for Python 3.11 due to version conflicts.
+        python-version: ['3.7', '3.8', '3.9', '3.10']  # '3.11'
         torch-version: [1.12.0, 1.13.0, 2.0.0]
         cuda-version: ['cpu', 'cu102', 'cu113', 'cu116', 'cu117', 'cu118']
         exclude:

diff --git a/.github/workflows/building_rusty1s_conda.yml b/.github/workflows/building_rusty1s_conda.yml
@@ -10,9 +10,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # We have trouble building for Windows - drop for now.
-        os: [ubuntu-18.04, macos-10.15]  # windows-2019
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        os: [ubuntu-18.04, macos-10.15, windows-2019]
+        # We have troube building for Python 3.11 due to version conflicts.
+        python-version: ['3.7', '3.8', '3.9', '3.10']  # '3.11'
         torch-version: [1.12.0, 1.13.0, 2.0.0]
         cuda-version: ['cpu', 'cu102', 'cu113', 'cu116', 'cu117', 'cu118']
         exclude:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,15 @@
 All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
-## [2.3.0] - 2023-MM-DD
+## [2.4.0] - 2023-MM-DD
+
+### Added
+
+### Changed
+
+### Removed
+
+## [2.3.0] - 2023-03-23
 
 ### Added
 

diff --git a/conda/pyg/README.md b/conda/pyg/README.md
@@ -1,3 +1,3 @@
 ```
-./build_conda.sh 3.9 1.13.0 cu116  # python, pytorch and cuda version
+./build_conda.sh 3.9 2.0.0 cu117  # python, pytorch and cuda version
 ```
diff --git a/conda/pyg/build_conda.sh b/conda/pyg/build_conda.sh
@@ -10,6 +10,9 @@ if [ "${CUDA_VERSION}" = "cpu" ]; then
   export CONDA_CUDATOOLKIT_CONSTRAINT="cpuonly  # [not osx]"
 else
   case $CUDA_VERSION in
+    cu118)
+      export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda==11.8.*"
+      ;;
     cu117)
       export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda==11.7.*"
       ;;

diff --git a/conda/pyg/meta.yaml b/conda/pyg/meta.yaml
@@ -1,9 +1,9 @@
 package:
   name: pyg
-  version: 2.2.0
+  version: 2.3.0
 
 source:
-  url: https://files.pythonhosted.org/packages/de/29/dbefbb2b1349638bc9ec5a632d770e8e7fefc2455b8911d675b2ca82d9e1/torch_geometric-2.2.0.tar.gz
+  url: https://files.pythonhosted.org/packages/43/b5/be9795db7756e6c1fa2606c8145ec637552487e72c6428ed0b231f8bcbd3/torch_geometric-2.3.0.tar.gz
 
 requirements:
   host:
@@ -14,9 +14,6 @@ requirements:
     - python {{ environ.get('PYTHON_VERSION') }}
     - {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
     - {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}
-    - pytorch-scatter
-    - pytorch-sparse
-    - pytorch-cluster
     - psutil
     - tqdm
     - jinja2
@@ -32,9 +29,6 @@ build:
 
 test:
   imports:
-    - torch_scatter
-    - torch_sparse
-    - torch_cluster
     - torch_geometric
     - torch_geometric.nn
     - torch_geometric.data

diff --git a/conda/pytorch-geometric/README.md b/conda/pytorch-geometric/README.md
@@ -1,3 +1,3 @@
 ```
-./build_conda.sh 3.9 1.13.0 cu116  # python, pytorch and cuda version
+./build_conda.sh 3.9 2.0.0 cu117  # python, pytorch and cuda version
 ```
diff --git a/conda/pytorch-geometric/build_conda.sh b/conda/pytorch-geometric/build_conda.sh
@@ -10,6 +10,9 @@ if [ "${CUDA_VERSION}" = "cpu" ]; then
   export CONDA_CUDATOOLKIT_CONSTRAINT="cpuonly  # [not osx]"
 else
   case $CUDA_VERSION in
+    cu118)
+      export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda==11.8.*"
+      ;;
     cu117)
       export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda==11.7.*"
       ;;

diff --git a/conda/pytorch-geometric/meta.yaml b/conda/pytorch-geometric/meta.yaml
@@ -1,9 +1,9 @@
 package:
   name: pytorch-geometric
-  version: 2.2.0
+  version: 2.3.0
 
 source:
-  url: https://files.pythonhosted.org/packages/de/29/dbefbb2b1349638bc9ec5a632d770e8e7fefc2455b8911d675b2ca82d9e1/torch_geometric-2.2.0.tar.gz
+  url: https://files.pythonhosted.org/packages/43/b5/be9795db7756e6c1fa2606c8145ec637552487e72c6428ed0b231f8bcbd3/torch_geometric-2.3.0.tar.gz
 
 requirements:
   host:
@@ -14,9 +14,6 @@ requirements:
     - python {{ environ.get('PYTHON_VERSION') }}
     - {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
     - {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}
-    - pytorch-scatter
-    - pytorch-sparse
-    - pytorch-cluster
     - psutil
     - tqdm
     - jinja2
@@ -32,9 +29,6 @@ build:
 
 test:
   imports:
-    - torch_scatter
-    - torch_sparse
-    - torch_cluster
     - torch_geometric
     - torch_geometric.nn
     - torch_geometric.data