Skip to content

Commit dd0610a

Browse files
rusty1srusty1s
authored
Conda builds (#7018)
1 parent c78f358 commit dd0610a

File tree

9 files changed

+27
-25
lines changed

9 files changed

+27
-25
lines changed

‎.github/workflows/building_pyg_conda.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
# We have trouble building for Windows - drop for now.
14-
os: [ubuntu-18.04, macos-10.15] # windows-2019
15-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
13+
os: [ubuntu-18.04, macos-10.15, windows-2019]
14+
# We have troube building for Python 3.11 due to version conflicts.
15+
python-version: ['3.7', '3.8', '3.9', '3.10'] # '3.11'
1616
torch-version: [1.12.0, 1.13.0, 2.0.0]
1717
cuda-version: ['cpu', 'cu102', 'cu113', 'cu116', 'cu117', 'cu118']
1818
exclude:

‎.github/workflows/building_rusty1s_conda.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
# We have trouble building for Windows - drop for now.
14-
os: [ubuntu-18.04, macos-10.15] # windows-2019
15-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
13+
os: [ubuntu-18.04, macos-10.15, windows-2019]
14+
# We have troube building for Python 3.11 due to version conflicts.
15+
python-version: ['3.7', '3.8', '3.9', '3.10'] # '3.11'
1616
torch-version: [1.12.0, 1.13.0, 2.0.0]
1717
cuda-version: ['cpu', 'cu102', 'cu113', 'cu116', 'cu117', 'cu118']
1818
exclude:

‎CHANGELOG.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@
33
All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
55

6-
## [2.3.0] - 2023-MM-DD
6+
## [2.4.0] - 2023-MM-DD
7+
8+
### Added
9+
10+
### Changed
11+
12+
### Removed
13+
14+
## [2.3.0] - 2023-03-23
715

816
### Added
917

‎conda/pyg/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
```
2-
./build_conda.sh 3.9 1.13.0 cu116 # python, pytorch and cuda version
2+
./build_conda.sh 3.9 2.0.0 cu117 # python, pytorch and cuda version
33
```

‎conda/pyg/build_conda.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ if [ "${CUDA_VERSION}" = "cpu" ]; then
1010
export CONDA_CUDATOOLKIT_CONSTRAINT="cpuonly # [not osx]"
1111
else
1212
case $CUDA_VERSION in
13+
cu118)
14+
export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda==11.8.*"
15+
;;
1316
cu117)
1417
export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda==11.7.*"
1518
;;

‎conda/pyg/meta.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package:
22
name: pyg
3-
version: 2.2.0
3+
version: 2.3.0
44

55
source:
6-
url: https://files.pythonhosted.org/packages/de/29/dbefbb2b1349638bc9ec5a632d770e8e7fefc2455b8911d675b2ca82d9e1/torch_geometric-2.2.0.tar.gz
6+
url: https://files.pythonhosted.org/packages/43/b5/be9795db7756e6c1fa2606c8145ec637552487e72c6428ed0b231f8bcbd3/torch_geometric-2.3.0.tar.gz
77

88
requirements:
99
host:
@@ -14,9 +14,6 @@ requirements:
1414
- python {{ environ.get('PYTHON_VERSION') }}
1515
- {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
1616
- {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}
17-
- pytorch-scatter
18-
- pytorch-sparse
19-
- pytorch-cluster
2017
- psutil
2118
- tqdm
2219
- jinja2
@@ -32,9 +29,6 @@ build:
3229

3330
test:
3431
imports:
35-
- torch_scatter
36-
- torch_sparse
37-
- torch_cluster
3832
- torch_geometric
3933
- torch_geometric.nn
4034
- torch_geometric.data

‎conda/pytorch-geometric/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
```
2-
./build_conda.sh 3.9 1.13.0 cu116 # python, pytorch and cuda version
2+
./build_conda.sh 3.9 2.0.0 cu117 # python, pytorch and cuda version
33
```

‎conda/pytorch-geometric/build_conda.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ if [ "${CUDA_VERSION}" = "cpu" ]; then
1010
export CONDA_CUDATOOLKIT_CONSTRAINT="cpuonly # [not osx]"
1111
else
1212
case $CUDA_VERSION in
13+
cu118)
14+
export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda==11.8.*"
15+
;;
1316
cu117)
1417
export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda==11.7.*"
1518
;;

‎conda/pytorch-geometric/meta.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package:
22
name: pytorch-geometric
3-
version: 2.2.0
3+
version: 2.3.0
44

55
source:
6-
url: https://files.pythonhosted.org/packages/de/29/dbefbb2b1349638bc9ec5a632d770e8e7fefc2455b8911d675b2ca82d9e1/torch_geometric-2.2.0.tar.gz
6+
url: https://files.pythonhosted.org/packages/43/b5/be9795db7756e6c1fa2606c8145ec637552487e72c6428ed0b231f8bcbd3/torch_geometric-2.3.0.tar.gz
77

88
requirements:
99
host:
@@ -14,9 +14,6 @@ requirements:
1414
- python {{ environ.get('PYTHON_VERSION') }}
1515
- {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
1616
- {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}
17-
- pytorch-scatter
18-
- pytorch-sparse
19-
- pytorch-cluster
2017
- psutil
2118
- tqdm
2219
- jinja2
@@ -32,9 +29,6 @@ build:
3229

3330
test:
3431
imports:
35-
- torch_scatter
36-
- torch_sparse
37-
- torch_cluster
3832
- torch_geometric
3933
- torch_geometric.nn
4034
- torch_geometric.data

0 commit comments

Comments
 (0)