Skip to content

Commit 7bc05d1

Browse files
mattipmattip
authored
Merge pull request #131 from mattip/update-action-versions
update versions of github actions and fix install_name on macos
2 parents 4a1cb5d + 81ac802 commit 7bc05d1

File tree

4 files changed

+35
-33
lines changed

4 files changed

+35
-33
lines changed

‎.github/workflows/posix.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
PLAT: [i686, x86_64]
2323
INTERFACE64: ['0', '1']
2424
MB_ML_VER: ['2014']
25+
MB_ML_LIBC: ['manylinux']
2526
include:
2627
- os: macos-11
2728
PLAT: arm64
@@ -58,14 +59,14 @@ jobs:
5859
PLAT: ${{ matrix.PLAT }}
5960

6061
steps:
61-
- uses: actions/checkout@v3
62+
- uses: actions/checkout@v4.1.1
6263
with:
6364
submodules: recursive
6465
fetch-depth: 0
6566
- name: Set up Python
66-
uses: actions/setup-python@v4
67+
uses: actions/setup-python@v5
6768
with:
68-
python-version: 3.7
69+
python-version: 3.9
6970
- name: Set extra env
7071
run: |
7172
# if [ "macos-11" == "${{ matrix.os }}" ]; then
@@ -124,17 +125,17 @@ jobs:
124125
/bin/bash -xe /openblas/tools/build_wheel.sh
125126
fi
126127
127-
- uses: actions/upload-artifact@v3
128+
- uses: actions/upload-artifact@v4.3.0
128129
with:
129-
name: openblas
130+
name: openblas-${{ matrix.os }}-${{ matrix.PLAT }}-${{ matrix.INTERFACE64 }}-${{ matrix.MB_ML_LIBC }}
130131
path: libs/openblas*.tar.gz
131132

132-
- uses: actions/upload-artifact@v3
133+
- uses: actions/upload-artifact@v4.3.0
133134
with:
134-
name: wheels
135+
name: wheels-${{ matrix.os }}-${{ matrix.PLAT }}-${{ matrix.INTERFACE64 }}-${{ matrix.MB_ML_LIBC }}
135136
path: dist/scipy_openblas*.whl
136137

137-
- uses: conda-incubator/setup-miniconda@v2
138+
- uses: conda-incubator/setup-miniconda@v3.0.1
138139
with:
139140
activate-environment: upload
140141

‎.github/workflows/windows.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ${{ matrix.os }}
2929

3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4.1.1
3232
- name: install-rtools
3333
run: |
3434
# rtools 42+ does not support 32 bits builds.
@@ -74,9 +74,9 @@ jobs:
7474
cp for_test\test*.exe builds
7575
7676
- name: Set up Python
77-
uses: actions/setup-python@v4
77+
uses: actions/setup-python@v5
7878
with:
79-
python-version: 3.7
79+
python-version: 3.9
8080
architecture: ${{ matrix.plat }}
8181

8282

@@ -119,19 +119,19 @@ jobs:
119119
for f in dist/*.whl; do mv $f "${f/%any.whl/$WHEEL_PLAT.whl}"; done
120120
121121
- name: Set up different Python
122-
uses: actions/setup-python@v4
122+
uses: actions/setup-python@v5
123123
with:
124124
python-version: 3.11
125125
architecture: ${{ matrix.plat }}
126126

127-
- uses: actions/upload-artifact@v3
127+
- uses: actions/upload-artifact@v4.3.0
128128
with:
129-
name: openblas
129+
name: openblas-${{matrix.plat }}-${{ matrix.INTERFACE64 }}
130130
path: builds/openblas*.zip
131131

132-
- uses: actions/upload-artifact@v3
132+
- uses: actions/upload-artifact@v4.3.0
133133
with:
134-
name: wheels
134+
name: wheels-${{matrix.plat }}-${{ matrix.INTERFACE64 }}
135135
path: dist/scipy_openblas*.whl
136136

137137
- name: Test 64-bit interface wheel
@@ -148,7 +148,7 @@ jobs:
148148
python -m pip install --no-index --find-links dist scipy_openblas32
149149
python -m scipy_openblas32
150150
151-
- uses: conda-incubator/setup-miniconda@v2
151+
- uses: conda-incubator/setup-miniconda@v3.0.1
152152
with:
153153
activate-environment: upload
154154

‎patches/0001-create-a-single-shared-object.patch

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
From 258ad2ccebe93fa9c5ad74a17c603b3fb8925190 Mon Sep 17 00:00:00 2001
1+
From 04b50aef6bca52238afeb627e51a855f9172eea4 Mon Sep 17 00:00:00 2001
22
From: mattip <[email protected]>
33
Date: Sun, 21 Jan 2024 22:34:48 +0200
44
Subject: [PATCH] create a single shared object
55

66
---
77
Makefile | 10 ----------
8-
Makefile.install | 16 +---------------
8+
Makefile.install | 18 ++----------------
99
Makefile.system | 3 +++
1010
exports/Makefile | 4 ++--
1111
openblas.pc.in | 2 +-
12-
5 files changed, 7 insertions(+), 28 deletions(-)
12+
5 files changed, 8 insertions(+), 29 deletions(-)
1313

1414
diff --git a/Makefile b/Makefile
15-
index 8621a8b3f..56a449306 100644
15+
index b344abcd2..ae989ac26 100644
1616
--- a/Makefile
1717
+++ b/Makefile
1818
@@ -134,17 +134,12 @@ shared : libs netlib $(RELA)
@@ -33,7 +33,7 @@ index 8621a8b3f..56a449306 100644
3333
endif
3434
ifeq ($(OSNAME), WINNT)
3535
@$(MAKE) -C exports dll
36-
@@ -229,13 +225,11 @@ endif
36+
@@ -229,13 +224,11 @@ ifeq ($(INTERFACE64),1)
3737
endif
3838
@echo THELIBNAME=$(LIBNAME) >> Makefile.conf_last
3939
@echo THELIBSONAME=$(LIBSONAME) >> Makefile.conf_last
@@ -47,23 +47,23 @@ index 8621a8b3f..56a449306 100644
4747
for d in $(SUBDIRS) ; \
4848
do if test -d $$d; then \
4949
$(MAKE) -C $$d prof || exit 1 ; \
50-
@@ -230,7 +223,6 @@ ifeq ($(DYNAMIC_ARCH), 1)
50+
@@ -246,7 +239,6 @@ ifeq ($(DYNAMIC_ARCH), 1)
5151
endif
5252

5353
blas :
5454
- ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
5555
for d in $(BLASDIRS) ; \
5656
do if test -d $$d; then \
5757
$(MAKE) -C $$d libs || exit 1 ; \
58-
@@ -238,7 +230,6 @@ blas :
58+
@@ -254,7 +246,6 @@ blas :
5959
done
6060

6161
hpl :
6262
- ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
6363
for d in $(BLASDIRS) ../laswp exports ; \
6464
do if test -d $$d; then \
6565
$(MAKE) -C $$d $(@F) || exit 1 ; \
66-
@@ -252,7 +243,6 @@ ifeq ($(DYNAMIC_ARCH), 1)
66+
@@ -268,7 +259,6 @@ ifeq ($(DYNAMIC_ARCH), 1)
6767
endif
6868

6969
hpl_p :
@@ -72,10 +72,10 @@ index 8621a8b3f..56a449306 100644
7272
do if test -d $$d; then \
7373
$(MAKE) -C $$d $(@F) || exit 1 ; \
7474
diff --git a/Makefile.install b/Makefile.install
75-
index 01899b970..cf3c8acce 100644
75+
index 81f959177..e5c7ef5be 100644
7676
--- a/Makefile.install
7777
+++ b/Makefile.install
78-
@@ -90,30 +90,20 @@ endif
78+
@@ -98,30 +98,20 @@ endif
7979
ifneq ($(NO_STATIC),1)
8080
@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
8181
@install -m644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
@@ -99,14 +99,15 @@ index 01899b970..cf3c8acce 100644
9999
endif
100100
ifeq ($(OSNAME), Darwin)
101101
@-cp $(LIBDYNNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
102-
@-install_name_tool -id "$(OPENBLAS_LIBRARY_DIR)/$(LIBPREFIX).$(MAJOR_VERSION).dylib" "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)"
102+
- @-install_name_tool -id "$(OPENBLAS_LIBRARY_DIR)/$(LIBPREFIX).$(MAJOR_VERSION).dylib" "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)"
103103
- @cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
104104
- ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib ; \
105105
- ln -fs $(LIBDYNNAME) $(LIBPREFIX).$(MAJOR_VERSION).dylib
106+
+ @-install_name_tool -id "$(OPENBLAS_LIBRARY_DIR)/$(LIBPREFIX).dylib" "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)"
106107
endif
107108
ifeq ($(OSNAME), WINNT)
108109
@-cp $(LIBDLLNAME) "$(DESTDIR)$(OPENBLAS_BINARY_DIR)"
109-
@@ -140,16 +130,11 @@ endif
110+
@@ -148,16 +138,11 @@ endif
110111
ifneq ($(NO_STATIC),1)
111112
@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
112113
@installbsd -c -m 644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
@@ -123,7 +124,7 @@ index 01899b970..cf3c8acce 100644
123124
endif
124125

125126
endif
126-
@@ -162,6 +147,7 @@ endif
127+
@@ -170,6 +155,7 @@ endif
127128

128129
@echo Generating $(LIBSONAMEBASE)$(SUFFIX64).pc in "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)"
129130
@echo 'libdir='$(OPENBLAS_LIBRARY_DIR) > "$(PKGFILE)"
@@ -132,10 +133,10 @@ index 01899b970..cf3c8acce 100644
132133
@echo 'includedir='$(OPENBLAS_INCLUDE_DIR) >> "$(PKGFILE)"
133134
@echo 'openblas_config= USE_64BITINT='$(INTERFACE64) 'DYNAMIC_ARCH='$(DYNAMIC_ARCH) 'DYNAMIC_OLDER='$(DYNAMIC_OLDER) 'NO_CBLAS='$(NO_CBLAS) 'NO_LAPACK='$(NO_LAPACK) 'NO_LAPACKE='$(NO_LAPACKE) 'NO_AFFINITY='$(NO_AFFINITY) 'USE_OPENMP='$(USE_OPENMP) $(CORE) 'MAX_THREADS='$(NUM_THREADS)>> "$(PKGFILE)"
134135
diff --git a/Makefile.system b/Makefile.system
135-
index 30b0ddec2..b2c92b99a 100644
136+
index e602eaf05..b4f7c70b6 100644
136137
--- a/Makefile.system
137138
+++ b/Makefile.system
138-
@@ -1695,6 +1695,9 @@ LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
139+
@@ -1699,6 +1699,9 @@ LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
139140
endif
140141
endif
141142

‎tools/build_wheel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if [ "$?" != "0" ]; then
1010
# inside docker
1111
cd /openblas
1212
fi
13-
PYTHON=python3.7
13+
PYTHON=python3.9
1414

1515
mkdir -p local/openblas
1616
mkdir -p dist

0 commit comments

Comments
 (0)