Skip to content

Commit defcc61

Browse files
jslee02jslee02
committed
[ci][dartpy] Clean up publishing dartpy
(cherry picked from commit 8cefb0b) (cherry picked from commit 2dd94ab)
1 parent a0a9fe9 commit defcc61

12 files changed

+40
-546
lines changed

‎.github/workflows/cache_docker.yml‎

Lines changed: 12 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -153,61 +153,33 @@ jobs:
153153
strategy:
154154
fail-fast: false
155155
matrix:
156-
dockerfile: [Dockerfile.manylinux2014_x86_64]
157-
base_image: [quay.io/pypa/manylinux2014_x86_64]
158-
image: [manylinux2014_x86_64]
156+
dockerfile: [Dockerfile.manylinux_2_28_x86_64]
157+
base_image: [quay.io/pypa/manylinux_2_28_x86_64]
158+
image: [manylinux_2_28_x86_64]
159159
platforms: ["linux/amd64"]
160160
dart_version: [v6.14]
161161
experimental: [false]
162162
include:
163-
- dockerfile: Dockerfile.manylinux2014_aarch64-min
164-
base_image: quay.io/pypa/manylinux2014_aarch64
165-
image: manylinux2014_aarch64-min
166-
platforms: "linux/arm64"
167-
dart_version: v6.14
168-
experimental: true
169-
170-
- dockerfile: Dockerfile.manylinux2014_ppc64le-min
171-
base_image: quay.io/pypa/manylinux2014_ppc64le
172-
image: manylinux2014_ppc64le-min
173-
platforms: "linux/ppc64le"
174-
dart_version: v6.14
175-
experimental: true
176-
177-
- dockerfile: Dockerfile.manylinux2014_s390x-min
178-
base_image: quay.io/pypa/manylinux2014_s390x
179-
image: manylinux2014_s390x-min
180-
platforms: "linux/s390x"
181-
dart_version: v6.14
182-
experimental: true
183-
184-
- dockerfile: Dockerfile.manylinux_2_28_x86_64
185-
base_image: quay.io/pypa/manylinux_2_28_x86_64
186-
image: manylinux_2_28_x86_64
187-
platforms: "linux/amd64"
188-
dart_version: v6.14
189-
experimental: false
190-
191163
- dockerfile: Dockerfile.manylinux_2_28_aarch64-min
192164
base_image: quay.io/pypa/manylinux_2_28_aarch64
193165
image: manylinux_2_28_aarch64-min
194166
platforms: "linux/arm64"
195167
dart_version: v6.14
196-
experimental: true
168+
experimental: false
197169

198170
- dockerfile: Dockerfile.manylinux_2_28_ppc64le-min
199171
base_image: quay.io/pypa/manylinux_2_28_ppc64le
200172
image: manylinux_2_28_ppc64le-min
201173
platforms: "linux/ppc64le"
202174
dart_version: v6.14
203-
experimental: true
175+
experimental: false
204176

205177
- dockerfile: Dockerfile.manylinux_2_28_s390x-min
206178
base_image: quay.io/pypa/manylinux_2_28_s390x
207179
image: manylinux_2_28_s390x-min
208180
platforms: "linux/s390x"
209181
dart_version: v6.14
210-
experimental: true
182+
experimental: false
211183
steps:
212184
# https://github.com/marketplace/actions/docker-setup-qemu
213185
- name: Set up QEMU
@@ -243,54 +215,26 @@ jobs:
243215
strategy:
244216
fail-fast: false
245217
matrix:
246-
dockerfile: [Dockerfile.manylinux2014_x86_64]
247-
base_image: [quay.io/pypa/manylinux2014_x86_64]
248-
image: [manylinux2014_x86_64]
249-
platforms: ["linux/amd64"]
218+
dockerfile: [Dockerfile.manylinux_2_28_aarch64]
219+
base_image: ["jslee02/dart-dev:manylinux_2_28_aarch64-min-v6.14"]
220+
image: [manylinux_2_28_aarch64]
221+
platforms: ["linux/arm64"]
250222
dart_version: [v6.14]
251223
experimental: [false]
252224
include:
253-
- dockerfile: Dockerfile.manylinux2014_aarch64
254-
base_image: jslee02/dart-dev:manylinux2014_aarch64-min-v6.14
255-
image: manylinux2014_aarch64
256-
platforms: "linux/arm64"
257-
dart_version: v6.14
258-
experimental: true
259-
260-
- dockerfile: Dockerfile.manylinux2014_ppc64le
261-
base_image: jslee02/dart-dev:manylinux2014_ppc64le-min-v6.14
262-
image: manylinux2014_ppc64le
263-
platforms: "linux/ppc64le"
264-
dart_version: v6.14
265-
experimental: true
266-
267-
- dockerfile: Dockerfile.manylinux2014_s390x
268-
base_image: jslee02/dart-dev:manylinux2014_s390x-min-v6.14
269-
image: manylinux2014_s390x
270-
platforms: "linux/s390x"
271-
dart_version: v6.14
272-
experimental: true
273-
274-
- dockerfile: Dockerfile.manylinux_2_28_aarch64
275-
base_image: jslee02/dart-dev:manylinux_2_28_aarch64-min-v6.14
276-
image: manylinux_2_28_aarch64
277-
platforms: "linux/arm64"
278-
dart_version: v6.14
279-
experimental: true
280-
281225
- dockerfile: Dockerfile.manylinux_2_28_ppc64le
282226
base_image: jslee02/dart-dev:manylinux_2_28_ppc64le-min-v6.14
283227
image: manylinux_2_28_ppc64le
284228
platforms: "linux/ppc64le"
285229
dart_version: v6.14
286-
experimental: true
230+
experimental: false
287231

288232
- dockerfile: Dockerfile.manylinux_2_28_s390x
289233
base_image: jslee02/dart-dev:manylinux_2_28_s390x-min-v6.14
290234
image: manylinux_2_28_s390x
291235
platforms: "linux/s390x"
292236
dart_version: v6.14
293-
experimental: true
237+
experimental: false
294238
steps:
295239
# https://github.com/marketplace/actions/docker-setup-qemu
296240
- name: Set up QEMU

‎.github/workflows/publish_dartpy.yml‎

Lines changed: 6 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -48,89 +48,44 @@ jobs:
4848
fail-fast: false
4949
matrix:
5050
os: [ubuntu-latest]
51-
build: ["cp37-manylinux_x86_64"]
51+
build: ["cp38-manylinux_x86_64"]
5252
experimental: [false]
53-
release_only: [true]
53+
release_only: [false]
5454

5555
include:
56-
- os: ubuntu-latest
57-
build: "cp38-manylinux_x86_64"
58-
experimental: false
59-
release_only: true
60-
6156
- os: ubuntu-latest
6257
build: "cp39-manylinux_x86_64"
6358
experimental: false
64-
release_only: true
59+
release_only: false
6560

6661
- os: ubuntu-latest
6762
build: "cp310-manylinux_x86_64"
6863
experimental: false
69-
release_only: true
64+
release_only: false
7065

7166
- os: ubuntu-latest
7267
build: "cp311-manylinux_x86_64"
7368
experimental: false
74-
release_only: true
69+
release_only: false
7570

7671
- os: ubuntu-latest
7772
build: "cp312-manylinux_x86_64"
7873
experimental: false
7974
release_only: false
8075

81-
- os: macos-latest
82-
build: "cp38-macosx_x86_64"
83-
experimental: false
84-
release_only: true
85-
86-
- os: macos-latest
87-
build: "cp39-macosx_x86_64"
88-
experimental: false
89-
release_only: true
90-
91-
- os: macos-latest
92-
build: "cp310-macosx_x86_64"
93-
experimental: false
94-
release_only: true
95-
96-
- os: macos-latest
97-
build: "cp311-macosx_x86_64"
98-
experimental: false
99-
release_only: true
100-
10176
- os: macos-latest
10277
build: "cp312-macosx_x86_64"
10378
experimental: false
10479
release_only: false
10580

106-
- os: windows-latest
107-
build: "cp38-win_amd64"
108-
experimental: false
109-
release_only: true
110-
111-
- os: windows-latest
112-
build: "cp39-win_amd64"
113-
experimental: false
114-
release_only: true
115-
116-
- os: windows-latest
117-
build: "cp310-win_amd64"
118-
experimental: false
119-
release_only: true
120-
121-
- os: windows-latest
122-
build: "cp311-win_amd64"
123-
experimental: false
124-
release_only: true
125-
12681
- os: windows-latest
12782
build: "cp312-win_amd64"
12883
experimental: false
12984
release_only: false
13085

13186
- os: windows-latest
13287
build: "cp312-win_arm64"
133-
experimental: true
88+
experimental: false
13489
release_only: false
13590

13691
env:
@@ -162,7 +117,6 @@ jobs:
162117
# Windows
163118
CMAKE_TOOLCHAIN_FILE: ""
164119

165-
166120
- name: Build wheels (Windows)
167121
if: ${{ matrix.os == 'windows-latest' && (matrix.release_only == false || github.ref == 'refs/heads/main') }}
168122
uses: pypa/cibuildwheel@v2.17.0

‎dart/CMakeLists.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,17 @@ if(DART_ENABLE_SIMD)
182182
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
183183
target_compile_options(dart PUBLIC -march=native -faligned-new)
184184
endif()
185+
else()
186+
# TODO: Improve this part to detect the system's architecture and apply the
187+
# appropriate SIMD instructions.
188+
if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
189+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=neon")
190+
# Remove SSE flags if set elsewhere
191+
string(REPLACE "-msse" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
192+
string(REPLACE "-msse2" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
193+
string(REPLACE "-msse3" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
194+
string(REPLACE "-mssse3" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
195+
endif()
185196
endif()
186197

187198
# Active log level

‎docker/dev/v6.14/Dockerfile.manylinux2014_aarch64‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎docker/dev/v6.14/Dockerfile.manylinux2014_aarch64-min‎

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎docker/dev/v6.14/Dockerfile.manylinux2014_ppc64le‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)