Skip to content

Commit 5bfe42f

Browse files
committed
[build] Fix pyodide build failure.
close (#49) [force ci]
1 parent 67a8856 commit 5bfe42f

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.github/workflows/build.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,13 @@ jobs:
118118
matrix:
119119
include:
120120
- python: "3.11"
121-
pyodide: "0.25.0"
121+
pyodide: "0.25.1"
122122
- python: "3.12"
123-
pyodide: "0.26.0a2"
123+
pyodide: "0.26.2"
124+
- python: "3.12"
125+
pyodide: "0.27.3"
126+
- python: "3.12"
127+
pyodide: "0.28.0"
124128
steps:
125129
- name: checkout
126130
uses: actions/checkout@v3
@@ -140,17 +144,17 @@ jobs:
140144
python -m pip install pyodide-build==${{ matrix.pyodide }}
141145
git clone https://github.com/emscripten-core/emsdk.git
142146
cd emsdk
147+
pyodide config list
143148
PYODIDE_EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version)
144149
./emsdk install ${PYODIDE_EMSCRIPTEN_VERSION}
145150
./emsdk activate ${PYODIDE_EMSCRIPTEN_VERSION}
146151
- name: build
147152
run: |
148153
source emsdk/emsdk_env.sh
149154
cd PyTAT
150-
export SKBUILD_CMAKE_DEFINE=TAT_MATH_LIBRARIES=$PWD/.pyodide-xbuildenv/xbuildenv/pyodide-root/packages/.libs/lib/libopenblas.so
155+
export SKBUILD_CMAKE_DEFINE="PYBIND11_FINDPYTHON=ON;TAT_MATH_LIBRARIES="
151156
export CMAKE_BUILD_PARALLEL_LEVEL=4
152157
pyodide build --exports pyinit
153-
# pyodide auditwheel repair dist/*.whl --libdir .pyodide-xbuildenv/xbuildenv/pyodide-root/packages/.libs/lib
154158
- name: test
155159
run: |
156160
cd PyTAT

PyTAT/test_wasm.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ async function main() {
66

77
const pyodide = await require("pyodide").loadPyodide();
88
await pyodide.loadPackage("micropip");
9-
await pyodide.loadPackage("openblas");
10-
// openblas should be loaded manually before loading TAT
11-
// see https://github.com/ryanking13/auditwheel-emscripten/issues/24
12-
// when this been fixed, removing load openblas manually,
13-
// and uncomment pyodide auditwheel in github action.
149

1510
const mount_dir = "/app";
1611
pyodide.FS.mkdir(mount_dir);
@@ -22,6 +17,8 @@ async function main() {
2217
async def main():
2318
import micropip
2419
20+
await micropip.install("openblas")
21+
2522
import os
2623
files = os.listdir("/app/dist")
2724
await micropip.install(f"emfs:/app/dist/{files[0]}")
@@ -36,6 +33,8 @@ async def main():
3633
3734
main()
3835
`);
36+
3937
process.exit(result);
4038
}
39+
4140
main();

0 commit comments

Comments
 (0)