Skip to content

Commit

Permalink
meson 2
Browse files Browse the repository at this point in the history
  • Loading branch information
ameli committed Dec 6, 2023
1 parent f702a86 commit b288fc5
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 29 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: build-linux

on:
push:
branches:
- main
# push:
# branches:
# - main
release:
types:
- published
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: build-macos

on:
push:
branches:
- main
# push:
# branches:
# - main
release:
types:
- published
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/check-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,17 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.12'
python-version: '3.11'

- name: Install package
run: |
python -m pip install --upgrade pip
python -m pip install cython
python -m pip install --upgrade numpy
python -m pip install . -vvv
python setup.py sdist
python setup.py bdist_wheel
python setup.py install
# python -m pip install . -vvv
- name: Install test dependencies
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.11'

- name: Install package and dependencies
run: |
Expand Down
18 changes: 7 additions & 11 deletions .github/workflows/deploy-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
# does not need manylinux docker, thuns, CUDA can be installed in
# the github action's virtual machine using the Jimver's action
# in the previous action (see above).
- name: Build wheels in windows with CUDA support (X86_64)
- name: Build wheels in windows (X86_64)
if: matrix.os == 'windows-latest'
uses: pypa/[email protected]
env:
Expand All @@ -72,7 +72,7 @@ jobs:
# does not need manylinux docker, thuns, CUDA can be installed in
# the github action's virtual machine using the Jimver's action
# in the previous action (see above).
- name: Build wheels in windows without CUDA support (ARM64)
- name: Build wheels in windows (ARM64)
if: matrix.os == 'windows-latest'
uses: pypa/[email protected]
env:
Expand All @@ -85,7 +85,7 @@ jobs:

# Do not enable compiling with CUDA for macos since NIVDIA no
# longer supports CUDA in the macos.
- name: Build wheels in mac without CUDA support (X86_64 and arm64)
- name: Build wheels in mac (X86_64 and arm64)
if: matrix.os == 'macos-latest'
uses: pypa/[email protected]
env:
Expand All @@ -110,29 +110,25 @@ jobs:
# anaconda cloud upload size is 1GB, the large wheel size will not
# be a problem. The advantage of bundling cuda libraries to the
# wheel is that the end-user does not have to install cuda toolkit.
- name: Build wheels in linux with CUDA support (X86_64)
- name: Build wheels in linux (X86_64)
if: matrix.os == 'ubuntu-latest'
uses: pypa/[email protected]
env:
CIBW_MANYLINUX_X86_64_IMAGE: sameli/manylinux2014_x86_64_cuda_12.2
# CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
# CIBW_BEFORE_ALL_LINUX: chmod +x .github/scripts/install_cuda.sh && .github/scripts/install_cuda.sh
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
CIBW_ARCHS_LINUX: "x86_64"
CIBW_BUILD: "*-manylinux_x86_64"
CIBW_SKIP: "pp* cp36-* cp37-* cp38-*"
CIBW_BUILD_VERBOSITY: 1
CIBW_BEFORE_BUILD_LINUX: yum update; yum install gcc-gfortran openblas-devel.x86_64 lapack-devel.x86_64 -y; python -m pip install --upgrade pip; python -m pip install --upgrade numpy
# CIBW_BEFORE_BUILD_LINUX: yum update; yum install gcc-gfortran openblas-devel.x86_64 lapack-devel.x86_64 -y; python -m pip install --upgrade pip; python -m pip install --upgrade numpy
with:
output-dir: wheelhouse

# This does not work, the compilation takes several hours, then fails, even without enabling cuda.
# - name: Build wheels in linux without CUDA support (AARCH64)
# - name: Build wheels in linux (AARCH64)
# if: matrix.os == 'ubuntu-latest'
# uses: pypa/[email protected]
# env:
# # CIBW_MANYLINUX_X86_64_IMAGE: sameli/manylinux2014_x86_64_cuda_12.2
# CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
# # CIBW_BEFORE_ALL_LINUX: chmod +x .github/scripts/install_cuda.sh && .github/scripts/install_cuda.sh
# CIBW_ARCHS_LINUX: "aarch64"
# CIBW_BUILD: "*-manylinux_aarch64"
# CIBW_SKIP: "pp* cp36-* cp37-* cp38-*"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: docs

on:
push:
branches:
- main
# push:
# branches:
# - main
pull_request:
branches:
- main
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/deploy-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
# does not need manylinux docker, thuns, CUDA can be installed in
# the github action's virtual machine using the Jimver's action
# in the previous action (see above).
- name: Build wheels in windows with CUDA support (X86_64)
- name: Build wheels in windows (X86_64)
if: matrix.os == 'windows-latest'
uses: pypa/[email protected]
env:
Expand All @@ -72,7 +72,7 @@ jobs:
# does not need manylinux docker, thuns, CUDA can be installed in
# the github action's virtual machine using the Jimver's action
# in the previous action (see above).
- name: Build wheels in windows without CUDA support (ARM64)
- name: Build wheels in windows (ARM64)
if: matrix.os == 'windows-latest'
uses: pypa/[email protected]
env:
Expand All @@ -85,7 +85,7 @@ jobs:

# Do not enable compiling with CUDA for macos since NIVDIA no
# longer supports CUDA in the macos.
- name: Build wheels in mac without CUDA support (X86_64 and arm64)
- name: Build wheels in mac (X86_64 and arm64)
if: matrix.os == 'macos-latest'
uses: pypa/[email protected]
env:
Expand All @@ -110,7 +110,7 @@ jobs:
# anaconda cloud upload size is 1GB, the large wheel size will not
# be a problem. The advantage of bundling cuda libraries to the
# wheel is that the end-user does not have to install cuda toolkit.
- name: Build wheels in linux with CUDA support (X86_64)
- name: Build wheels in linux (X86_64)
if: matrix.os == 'ubuntu-latest'
uses: pypa/[email protected]
env:
Expand All @@ -121,12 +121,12 @@ jobs:
CIBW_BUILD: "*-manylinux_x86_64"
CIBW_SKIP: "pp* cp36-* cp37-* cp38-*"
CIBW_BUILD_VERBOSITY: 1
CIBW_BEFORE_BUILD_LINUX: yum update; yum install gcc-gfortran openblas-devel.x86_64 lapack-devel.x86_64 -y; python -m pip install --upgrade pip; python -m pip install --upgrade numpy
# CIBW_BEFORE_BUILD_LINUX: yum update; yum install gcc-gfortran openblas-devel.x86_64 lapack-devel.x86_64 -y; python -m pip install --upgrade pip; python -m pip install --upgrade numpy
with:
output-dir: wheelhouse

# This does not work, the compilation takes several hours, then fails, even without enabling cuda.
# - name: Build wheels in linux without CUDA support (AARCH64)
# - name: Build wheels in linux (AARCH64)
# if: matrix.os == 'ubuntu-latest'
# uses: pypa/[email protected]
# env:
Expand Down
2 changes: 1 addition & 1 deletion conda-recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ do

# Matched. Install with pip
echo "Try installing wheel file '${wheel_filename}'.";
python -m pip install --no-deps --force-reinstall $wheel_filename --verbose;
python -m pip install --no-deps --force-reinstall $wheel_filename -vvv;

# Check last error code
error_code=$?;
Expand Down

0 comments on commit b288fc5

Please sign in to comment.