Skip to content

use gcc from homebrew #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,21 @@ jobs:
run: |
echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_${{ matrix.PLAT}})" >> $GITHUB_ENV;

- uses: maxim-lobanov/[email protected]
- name: Setup clang from homebrew
if: ${{ matrix.os == 'macos-13' }}
with:
xcode-version: '14.3'
run: |
brew reinstall gcc@14
ver=$(ls /usr/local/Cellar/gcc@14)
cc=$(ls /usr/local/Cellar/gcc@14/$ver/bin/gcc-1*)
echo "CC=$cc" >> $GITHUB_ENV;
echo "RANLIB=/usr/bin/ranlib" >> $GITHUB_ENV;


- name: Print some Environment variable
run: |
echo "PLAT: ${PLAT}"
echo "DOCKER_TEST_IMAGE: ${DOCKER_TEST_IMAGE}"
echo "CC: ${CC}"
- name: Install VirtualEnv
run: |
python3 -m pip install --upgrade pip
Expand Down Expand Up @@ -159,12 +165,19 @@ jobs:
name: openblas-${{ matrix.os }}-${{ matrix.PLAT }}-${{ matrix.INTERFACE64 }}-${{ matrix.MB_ML_LIBC }}-${{ matrix.MB_ML_VER }}
path: libs/openblas*.tar.gz

- uses: conda-incubator/[email protected]
- name: install micromamba
uses: mamba-org/setup-micromamba@b09ef9b599704322748535812ca03efb2625677b
with:
channels: conda-forge
channel-priority: true
activate-environment: upload
miniforge-version: latest
# for installation of anaconda-client, required for upload to
# anaconda.org
# Note that this step is *after* specific pythons have been used to
# build and test the wheel
# for installation of anaconda-client, for upload to anaconda.org
# environment will be activated after creation, and in future bash steps
init-shell: bash
environment-name: upload-env
create-args: >-
anaconda-client

- name: Upload
# see https://github.com/marketplace/actions/setup-miniconda for why
Expand All @@ -173,6 +186,5 @@ jobs:
env:
ANACONDA_SCIENTIFIC_PYTHON_UPLOAD: ${{ secrets.ANACONDA_SCIENTIFIC_PYTHON_UPLOAD }}
run: |
conda install -y anaconda-client
source tools/upload_to_anaconda_staging.sh
upload_wheels
9 changes: 3 additions & 6 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,9 @@ jobs:
python -m scipy_openblas32
python -c "import scipy_openblas32; print(scipy_openblas32.get_pkg_config())"

- uses: conda-incubator/setup-miniconda@v3.1.1
- uses: conda-incubator/setup-miniconda@v3.2.0
with:
channels: conda-forge
channel-priority: true
activate-environment: upload
miniforge-version: latest
conda-remove-defaults: true

- name: Upload
# see https://github.com/marketplace/actions/setup-miniconda for why
Expand All @@ -177,6 +174,6 @@ jobs:
env:
ANACONDA_SCIENTIFIC_PYTHON_UPLOAD: ${{ secrets.ANACONDA_SCIENTIFIC_PYTHON_UPLOAD }}
run: |
conda install -y anaconda-client
conda install -y -c conda-forge anaconda-client
source tools/upload_to_anaconda_staging.sh
upload_wheels
2 changes: 1 addition & 1 deletion OpenBLAS
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "scipy-openblas64"
# v0.3.30
version = "0.3.30.0.0"
version = "0.3.30.0.1"
requires-python = ">=3.7"
description = "Provides OpenBLAS for python packaging"
readme = "README.md"
Expand Down
6 changes: 3 additions & 3 deletions tools/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ function do_build_lib {
local interface_flags="INTERFACE64=1 SYMBOLSUFFIX=64_ LIBNAMESUFFIX=64_ OBJCONV=$PWD/objconv/objconv";
local symbolsuffix="64_";
if [ -n "$IS_OSX" ]; then
$PWD/objconv/objconv --help
$PWD/objconv/objconv -h
fi
;;
*)
Expand All @@ -200,14 +200,14 @@ function do_build_lib {
git config --global --add safe.directory '*'
pushd OpenBLAS
patch_source
echo start building
if [ "$plat" == "loongarch64" ]; then
# https://github.com/OpenMathLib/OpenBLAS/blob/develop/.github/workflows/loongarch64.yml#L65
echo -n > utest/test_dsdot.c
echo "Due to the qemu versions 7.2 causing utest cases to fail,"
echo "the utest dsdot:dsdot_n_1 have been temporarily disabled."
fi
if [ -v dynamic_list ]; then
echo start building
if [ "$dynamic_list" != "" ]; then
CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=1 \
USE_OPENMP=0 NUM_THREADS=64 \
Expand Down
Loading