Skip to content

Commit

Permalink
meson 8
Browse files Browse the repository at this point in the history
  • Loading branch information
ameli committed Dec 7, 2023
1 parent e477214 commit c699d08
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 64 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ jobs:
- name: Test Before
run: |
cd /
pwd
ls
python -m pip show special_functions
ls C:\hostedtoolcache\windows\Python\3.11.6\x64\Lib\site-packages\special_functions
python -c "import special_functions; print(special_functions.besselk(1,1,1))"
Expand Down
32 changes: 23 additions & 9 deletions .github/workflows/deploy-conda.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: deploy-conda

on:
# push:
# branches:
# - main
push:
branches:
- main
release:
types:
types:
- published

jobs:
Expand Down Expand Up @@ -85,18 +85,32 @@ jobs:

# Do not enable compiling with CUDA for macos since NIVDIA no
# longer supports CUDA in the macos.
- name: Build wheels in mac (X86_64 and arm64)
- name: Build wheels in mac (X86_64)
if: matrix.os == 'macos-latest'
uses: pypa/[email protected]
env:
CIBW_ARCHS_MACOS: "x86_64 arm64"
CIBW_BUILD: "*-macosx_arm64 *-macosx_x86_64"
CIBW_ARCHS_MACOS: "x86_64"
CIBW_BUILD: "*-macosx_x86_64"
CIBW_SKIP: "pp* cp36-* cp37-* cp38-*"
CIBW_BUILD_VERBOSITY: 1
CIBW_BEFORE_BUILD: brew reinstall gcc
with:
output-dir: wheelhouse

# Do not enable compiling with CUDA for macos since NIVDIA no
# longer supports CUDA in the macos.
# - name: Build wheels in mac (arm64)
# if: matrix.os == 'macos-latest'
# uses: pypa/[email protected]
# env:
# CIBW_ARCHS_MACOS: "arm64"
# CIBW_BUILD: "*-macosx_arm64"
# CIBW_SKIP: "pp* cp36-* cp37-* cp38-*"
# CIBW_BUILD_VERBOSITY: 1
# CIBW_BEFORE_BUILD: brew reinstall gcc
# with:
# output-dir: wheelhouse

# Enable compiling with CUDA, only for linux. Note that cuda must
# be installed "inside" the manylinux docker image, not in the main
# github virtual machine. Also, we should use manylinux2014, but
Expand Down Expand Up @@ -128,12 +142,12 @@ jobs:
# if: matrix.os == 'ubuntu-latest'
# uses: pypa/[email protected]
# env:
# CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
# CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
# CIBW_ARCHS_LINUX: "aarch64"
# CIBW_BUILD: "*-manylinux_aarch64"
# 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

Expand Down
57 changes: 26 additions & 31 deletions .github/workflows/deploy-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest, macos-latest-xlarge]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- name: Checkout
Expand Down Expand Up @@ -99,17 +99,17 @@ jobs:

# Do not enable compiling with CUDA for macos since NIVDIA no
# longer supports CUDA in the macos.
- name: Build wheels in mac (arm64)
if: matrix.os == 'macos-latest'
uses: pypa/[email protected]
env:
CIBW_ARCHS_MACOS: "arm64"
CIBW_BUILD: "*-macosx_arm64"
CIBW_SKIP: "pp* cp36-* cp37-* cp38-*"
CIBW_BUILD_VERBOSITY: 1
CIBW_BEFORE_BUILD: brew reinstall gcc
with:
output-dir: wheelhouse
# - name: Build wheels in mac (arm64)
# if: matrix.os == 'macos-latest'
# uses: pypa/[email protected]
# env:
# CIBW_ARCHS_MACOS: "arm64"
# CIBW_BUILD: "*-macosx_arm64"
# CIBW_SKIP: "pp* cp36-* cp37-* cp38-*"
# CIBW_BUILD_VERBOSITY: 1
# CIBW_BEFORE_BUILD: brew reinstall gcc
# with:
# output-dir: wheelhouse

# Enable compiling with CUDA, only for linux. Note that cuda must
# be installed "inside" the manylinux docker image, not in the main
Expand All @@ -128,9 +128,7 @@ jobs:
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-*"
Expand All @@ -140,21 +138,18 @@ jobs:
output-dir: wheelhouse

# This does not work, the compilation takes several hours, then fails, even without enabling cuda.
- 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_MANYLINUX_AARCH64_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-*"
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
with:
output-dir: wheelhouse
# - name: Build wheels in linux (AARCH64)
# if: matrix.os == 'ubuntu-latest'
# uses: pypa/[email protected]
# env:
# CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
# CIBW_ARCHS_LINUX: "aarch64"
# CIBW_BUILD: "*-manylinux_aarch64"
# 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
# with:
# output-dir: wheelhouse

- name: Upload artifacts
uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -211,7 +206,7 @@ jobs:

test_pypi:
needs: [upload_pypi]
name: Test on ${{ matrix.os }} and Pyhton ${{ matrix.python-version }}
name: Test on ${{ matrix.os }} and Python ${{ matrix.python-version }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/test-large.yml

This file was deleted.

11 changes: 0 additions & 11 deletions .github/workflows/test-large2.yml

This file was deleted.

0 comments on commit c699d08

Please sign in to comment.