8000 resolved comment · numpy/numpy@e7202b3 · GitHub
[go: up one dir, main page]

Skip to content

Commit e7202b3

Browse files
resolved comment
1 parent 2d9d123 commit e7202b3

File tree

3 files changed

+14
-91
lines changed

3 files changed

+14
-91
lines changed

.github/workflows/linux.yml

Lines changed: 11 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ jobs:
7777
run: |
7878
pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple cython
7979
- uses: ./.github/meson_actions
80-
81-
# TODO pypy: uncomment when pypy3.11 becomes available
80+
81+
# TODO pypy: uncomment when pypy3.11 becomes available
8282
#pypy:
8383
#needs: [smoke_test]
8484
#runs-on: ubuntu-latest
@@ -171,80 +171,35 @@ jobs:
171171
if: github.repository == 'numpy/numpy'
172172
runs-on: ubuntu-22.04-arm
173173
steps:
174-
# PR handling
175174
- name: Checkout for PR
176175
if: github.event_name == 'pull_request'
177-
uses: actions/checkout@v4
178-
with:
179-
submodules: recursive
180-
fetch-depth: 0
181-
ref: ${{ github.event.pull_request.head.sha }}
182-
183-
- name: Configure Git for PR
184-
if: github.event_name == 'pull_request'
185-
run: |
186-
git config --global user.email "you@example.com"
187-
git config --global user.name "GitHub Actions Bot"
188-
git fetch origin ${{ github.base_ref }}
189-
git checkout ${{ github.base_ref }}
190-
git merge --no-commit ${{ github.event.pull_request.head.sha }}
191-
git submodule update --init --recursive
192-
193-
# Regular checkout for non-PR builds
194-
- name: Checkout for non-PR
195-
if: github.event_name != 'pull_request'
196-
uses: actions/checkout@v4
176+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
197177
with:
198178
submodules: recursive
199-
fetch-depth: 0
200-
201-
# Setup ccache using Cirrus CI approach
202-
- name: Setup ccache directory
203-
run: |
204-
mkdir -p .ccache
205-
206-
- uses: actions/cache@v4
207-
with:
208-
path: .ccache
209-
key: ccache-linux_aarch64-${{ github.sha }}
210-
restore-keys: |
211-
ccache-linux_aarch64-
212-
213-
# Install system dependencies
214-
- name: Install system dependencies
215-
run: |
216-
sudo apt-get update
217-
sudo apt-get install -y --no-install-recommends \
218-
software-properties-common \
219-
gcc g++ gfortran pkg-config ccache \
220-
libopenblas-dev libatlas-base-dev liblapack-dev
221-
222-
sudo /usr/sbin/update-ccache-symlinks
223-
export PATH=/usr/lib/ccache:$PATH
224-
echo "PATH=$PATH" >> $GITHUB_ENV
225-
echo "CCACHE_DIR=${{ github.workspace }}/.ccache" >> $GITHUB_ENV
179+
fetch-tags: true
180+
persist-credentials: false
226181

227-
# Setup Python
228-
- uses: actions/setup-python@v5
182+
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
229183
with:
230184
python-version: '3.11'
231185

232-
# Install Python dependencies
233186
- name: Install Python dependencies
234187
run: |
235188
python -m pip install -r requirements/build_requirements.txt
236189
python -m pip install -r requirements/test_requirements.txt
190+
python -m pip install -r requirements/ci32_requirements.txt
191+
mkdir -p ./.openblas
192+
python -c"import scipy_openblas32 as ob32; print(ob32.get_pkg_config())" > ./.openblas/scipy-openblas.pc
237193
238-
# Build
239194
- name: Build
195+
env:
196+
PKG_CONFIG_PATH: ${{ github.workspace }}/.openblas
240197
run: |
241198
spin build -- -Dallow-noblas=true
242199
243-
# Test
244200
- name: Test
245201
run: |
246202
spin test -j2 -- --timeout=600 --durations=10
247-
ccache -s
248203
249204
# Meson Log on failure
250205
- name: Meson Log

.github/workflows/linux_blas.yml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -53,39 +53,6 @@ permissions:
5353
contents: read # to fetch code (actions/checkout)
5454

5555
jobs:
56-
openblas_arm64:
57-
if: github.repository == 'numpy/numpy'
58-
runs-on: ubuntu-22.04-arm
59-
strategy:
60-
fail-fast: false
61-
matrix:
62-
config:
63-
- {name: "OpenBLAS 64-bit nightly", use_nightly: true, bits: 64}
64-
name: "Test ARM64 - ${{ matrix.config.name }}"
65-
steps:
66-
- uses: actions/checkout@v4
67-
with:
68-
submodules: recursive
69-
fetch-tags: true
70-
- uses: actions/setup-python@v5
71-
with:
72-
python-version: '3.11'
73-
- name: Install dependencies
74-
run: |
75-
python -m pip install -r requirements/build_requirements.txt
76-
python -m pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy-openblas64
77-
mkdir -p ./.openblas
78-
python -c"import scipy_openblas64 as ob; print(ob.get_pkg_config())" > ./.openblas/scipy-openblas.pc
79-
- name: Build
80-
env:
81-
PKG_CONFIG_PATH: ${{ github.workspace }}/.openblas
82-
run: |
83-
spin build -- -Duse-ilp64=true -Dallow-noblas=false
84-
- name: Test
85-
run: |
86-
pip install pytest pytest-xdist hypothesis typing_extensions pytest-timeout
87-
spin test -- --timeout=600 --durations=10
88-
8956
openblas32_stable_nightly:
9057
# To enable this workflow on a fork, comment out:
9158
if: github.repository == 'numpy/numpy'

.github/workflows/linux_simd.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ jobs:
109109
# Add ARM64-specific SIMD tests
110110
arm64_simd:
111111
if: github.repository == 'numpy/numpy'
112+
needs: [baseline_only]
112113
runs-on: ubuntu-22.04-arm
113114
strategy:
114115
fail-fast: false
@@ -124,11 +125,11 @@ jobs:
124125
args: "-Dallow-noblas=true -Dcpu-baseline=native -Dcpu-dispatch=none"
125126
name: "ARM64 SIMD - ${{ matrix.config.name }}"
126127
steps:
127-
- uses: actions/checkout@v4
128+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
128129
with:
129130
submodules: recursive
130131
fetch-tags: true
131-
- uses: actions/setup-python@v5
132+
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
132133
with:
133134
python-version: '3.11'
134135
- name: Install dependencies

0 commit comments

Comments
 (0)
0