diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 93567d2..0ea9cb8 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -93,15 +93,21 @@ jobs: run: | echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_${{ matrix.PLAT}})" >> $GITHUB_ENV; - - uses: maxim-lobanov/setup-xcode@v1.6.0 + - 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 @@ -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/setup-miniconda@v3.1.1 + - 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 @@ -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 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 69f70ae..7222905 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -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 @@ -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 diff --git a/OpenBLAS b/OpenBLAS index b5456c1..993fad6 160000 --- a/OpenBLAS +++ b/OpenBLAS @@ -1 +1 @@ -Subproject commit b5456c1b41ea88d4e0041778aa8ec09ee2a111a0 +Subproject commit 993fad6aebbce34a97d3f8c34d6d79d35b64cc48 diff --git a/pyproject.toml b/pyproject.toml index e260105..842951f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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" diff --git a/tools/build_steps.sh b/tools/build_steps.sh index b7268da..0b13e06 100644 --- a/tools/build_steps.sh +++ b/tools/build_steps.sh @@ -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 ;; *) @@ -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 \