Skip to content

Commit 53cadc7

Browse files
authored
Debug Windows build (#397)
1 parent c6456b7 commit 53cadc7

File tree

5 files changed

+17
-34
lines changed

5 files changed

+17
-34
lines changed

.github/actions/setup/action.yml

+6
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ runs:
5757
sed -i '1s/^/#if defined(__linux__) \&\& defined(__x86_64__)\n__asm__(".symver pow,pow@GLIBC_2.2.5");\n#endif\n/' third_party/METIS/libmetis/metislib.h
5858
shell: bash
5959

60+
- name: Fix cuCollections
61+
if: ${{ (inputs.cuda-version != 'cpu') && (runner.os == 'Windows') }}
62+
run: |
63+
sed -i '37s|#define CUCO_CUDA_MINIMUM_ARCH .*|#define CUCO_CUDA_MINIMUM_ARCH 600|' third_party/cuCollections/include/cuco/detail/__config
64+
shell: bash
65+
6066
- name: Install additional dependencies
6167
run: |
6268
pip install setuptools ninja wheel

.github/workflows/building.yml

+1-13
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,16 @@ jobs:
1212
matrix:
1313
os: [ubuntu-20.04, macos-14, windows-2019]
1414
python-version: ['3.9', '3.10', '3.11', '3.12']
15-
# torch-version: [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0, 2.5.0]
15+
# torch-version: [1.13.0, 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0, 2.5.0]
1616
torch-version: [2.5.0]
1717
cuda-version: ['cpu', 'cu113', 'cu116', 'cu117', 'cu118', 'cu121', 'cu124']
1818
exclude:
19-
- torch-version: 1.12.0
20-
python-version: '3.12'
2119
- torch-version: 1.13.0
2220
python-version: '3.12'
2321
- torch-version: 2.0.0
2422
python-version: '3.12'
2523
- torch-version: 2.1.0
2624
python-version: '3.12'
27-
- torch-version: 1.12.0
28-
python-version: '3.11'
29-
- torch-version: 1.12.0
30-
cuda-version: 'cu117'
31-
- torch-version: 1.12.0
32-
cuda-version: 'cu118'
33-
- torch-version: 1.12.0
34-
cuda-version: 'cu121'
35-
- torch-version: 1.12.0
36-
cuda-version: 'cu124'
3725
- torch-version: 1.13.0
3826
python-version: '3.11'
3927
- torch-version: 1.13.0

.github/workflows/nightly.yml

+1-13
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,15 @@ jobs:
1616
matrix:
1717
os: [ubuntu-20.04, macos-14, windows-2019]
1818
python-version: ['3.9', '3.10', '3.11', '3.12']
19-
torch-version: [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0, 2.5.0]
19+
torch-version: [1.13.0, 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0, 2.5.0]
2020
cuda-version: ['cpu', 'cu113', 'cu116', 'cu117', 'cu118', 'cu121', 'cu124']
2121
exclude:
22-
- torch-version: 1.12.0
23-
python-version: '3.12'
2422
- torch-version: 1.13.0
2523
python-version: '3.12'
2624
- torch-version: 2.0.0
2725
python-version: '3.12'
2826
- torch-version: 2.1.0
2927
python-version: '3.12'
30-
- torch-version: 1.12.0
31-
python-version: '3.11'
32-
- torch-version: 1.12.0
33-
cuda-version: 'cu117'
34-
- torch-version: 1.12.0
35-
cuda-version: 'cu118'
36-
- torch-version: 1.12.0
37-
cuda-version: 'cu121'
38-
- torch-version: 1.12.0
39-
cuda-version: 'cu124'
4028
- torch-version: 1.13.0
4129
python-version: '3.11'
4230
- torch-version: 1.13.0

CMakeLists.txt

+8-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,14 @@ if(WITH_CUDA)
4343
enable_language(CUDA)
4444
add_definitions(-DWITH_CUDA)
4545
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --expt-relaxed-constexpr -allow-unsupported-compiler")
46-
set(CMAKE_CUDA_ARCHITECTURES "60;70;75;80;86;90")
46+
47+
if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 11.8)
48+
set(CMAKE_CUDA_ARCHITECTURES "60;70;75;80;86;90")
49+
elseif (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 11.3)
50+
set(CMAKE_CUDA_ARCHITECTURES "60;70;75;80;86")
51+
else()
52+
set(CMAKE_CUDA_ARCHITECTURES "60;70;75")
53+
endif()
4754

4855
if (NOT "$ENV{EXTERNAL_CUTLASS_INCLUDE_DIR}" STREQUAL "")
4956
include_directories($ENV{EXTERNAL_CUTLASS_INCLUDE_DIR})

README.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pip install pyg-lib -f https://data.pyg.org/whl/torch-${TORCH}+${CUDA}.html
2929

3030
where
3131

32-
* `${TORCH}` should be replaced by either `1.12.0`, `1.13.0`, `2.0.0`, `2.1.0`, `2.2.0`, `2.3.0`, `2.4.0` or `2.5.0`
32+
* `${TORCH}` should be replaced by either `1.13.0`, `2.0.0`, `2.1.0`, `2.2.0`, `2.3.0`, `2.4.0` or `2.5.0`
3333
* `${CUDA}` should be replaced by either `cpu`, `cu102`, `cu113`, `cu116`, `cu117`, `cu118`, `cu121`, or `cu124`
3434

3535
The following combinations are supported:
@@ -76,12 +76,6 @@ The following combinations are supported:
7676
| **Windows** || ||| | | |
7777
| **macOS** || | | | | | |
7878

79-
| PyTorch 1.12 | `cpu` | `cu113` | `cu116` | `cu117` | `cu118` | `cu121` | `cu124` |
80-
|--------------|-------|---------|---------|---------|---------| --------|---------|
81-
| **Linux** |||| | | | |
82-
| **Windows** |||| | | | |
83-
| **macOS** || | | | | | |
84-
8579
### Form nightly
8680

8781
Nightly wheels are provided for Linux from Python 3.9 till 3.12:

0 commit comments

Comments
 (0)