Skip to content

Commit

Permalink
change all build back to windows-2019
Browse files Browse the repository at this point in the history
  • Loading branch information
FindDefinition committed Dec 15, 2024
1 parent 7694856 commit 263d6b4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 103 deletions.
102 changes: 2 additions & 100 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,109 +12,11 @@ on:

jobs:
build-windows:
runs-on: windows-latest
strategy:
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
cuda-version: ['11.8', '12.1', '12.4', '12.6']
steps:
- uses: actions/checkout@master
- uses: dorny/paths-filter@v2
id: changes
with:
filters: |
needbuild:
- '.github/workflows/**'
- 'setup.py'
- 'spconv/csrc/**'
- 'spconv/algo.py'
- 'spconv/core.py'
- 'pyproject.toml'
- name: Install Boost
env:
CUDA_VERSION: ${{ matrix.cuda-version }}
PYTHON_VERSION: ${{ matrix.python-version }}
cuda: ${{ matrix.cuda-version }}
BOOST_VERSION: boost_1_77_0
if: |
(
(github.event_name == 'push' && (startsWith(github.ref, 'refs/tags')) ) ||
(
(steps.changes.outputs.needbuild == 'true') &&
(env.PYTHON_VERSION == '3.12')
)
)
shell: powershell
run: |
$ProgressPreference = 'SilentlyContinue'
Invoke-WebRequest -Uri "https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.zip" -UseBasicParsing -OutFile $HOME/boost.zip
Expand-Archive $HOME/boost.zip -DestinationPath $HOME/boost
- name: Install CUDA
env:
CUDA_VERSION: ${{ matrix.cuda-version }}
PYTHON_VERSION: ${{ matrix.python-version }}
cuda: ${{ matrix.cuda-version }}
if: |
(env.CUDA_VERSION != '') && (
(github.event_name == 'push' && (startsWith(github.ref, 'refs/tags')) ) ||
(
(steps.changes.outputs.needbuild == 'true') &&
(env.PYTHON_VERSION == '3.12')
)
)
shell: powershell
run: |
.\tools\install_windows_cuda.ps1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- uses: ilammy/msvc-dev-cmd@v1
- name: Install pep build
run: |
python -m pip install build --user
python -m pip install --upgrade pip twine wheel
python -m pip install pytest setuptools
- name: Build a windows binary wheel
env:
CUDA_VERSION: ${{ matrix.cuda-version }}
PYTHON_VERSION: ${{ matrix.python-version }}
BOOST_VERSION: boost_1_77_0
CUMM_CUDA_VERSION: ${{ matrix.cuda-version }}
if: |
(env.CUDA_VERSION != '') && (
(github.event_name == 'push' && (startsWith(github.ref, 'refs/tags')) ) ||
(
(steps.changes.outputs.needbuild == 'true') &&
(env.PYTHON_VERSION == '3.12')
)
)
run: |
$Env:CUMM_CUDA_ARCH_LIST = "all"
$Env:SPCONV_DISABLE_JIT = "1"
pip install pccm pybind11
# download boost header only
$Env:BOOST_ROOT = "$HOME/boost/boost_1_77_0"
# ls "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${{ matrix.cuda-version }}\include\thrust"
python -m build --wheel --outdir dist/ .
shell: powershell

- name: Publish a Python distribution to PyPI
if: (github.event_name == 'push' && startsWith(github.ref, 'refs/tags'))
run: |
$Env:TWINE_USERNAME = "__token__"
$Env:TWINE_PASSWORD = "${{ secrets.pypi_password }}"
twine upload dist/*
shell: powershell
build-windows-cu114:
runs-on: windows-2019
strategy:
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
cuda-version: ['11.4']
cuda-version: ['11.4', '11.8', '12.1', '12.4', '12.6']
steps:
- uses: actions/checkout@master
- uses: dorny/paths-filter@v2
Expand Down Expand Up @@ -207,7 +109,7 @@ jobs:
$Env:TWINE_PASSWORD = "${{ secrets.pypi_password }}"
twine upload dist/*
shell: powershell

build:
# needs: build-windows
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools>=41.0", "wheel", "pccm>=0.4.16", "cumm>=0.7.10"]
requires = ["setuptools>=41.0", "wheel", "pccm>=0.4.16", "cumm>=0.7.11"]
# requires = ["setuptools>=41.0", "wheel", "pccm>=0.4.0", "cumm @ file:///io/dist/cumm_cu120-0.4.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"]
# requires = ["setuptools>=41.0", "wheel", "pccm>=0.4.0", "cumm-cu126 @ file:///io/dist/cumm_cu126-0.7.3-cp313-cp313-manylinux_2_28_x86_64.whl"]
build-backend = "setuptools.build_meta"
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
cuda_ver_str = cuda_ver.replace(".", "") # 10.2 to 102

RELEASE_NAME += "-cu{}".format(cuda_ver_str)
deps = ["cumm-cu{}>=0.7.10, <0.8.0".format(cuda_ver_str)]
deps = ["cumm-cu{}>=0.7.11, <0.8.0".format(cuda_ver_str)]
else:
deps = ["cumm>=0.7.10, <0.8.0"]
deps = ["cumm>=0.7.11, <0.8.0"]



Expand Down

0 comments on commit 263d6b4

Please sign in to comment.