File tree 2 files changed +12
-9
lines changed
2 files changed +12
-9
lines changed Original file line number Diff line number Diff line change @@ -118,9 +118,13 @@ jobs:
118
118
matrix :
119
119
include :
120
120
- python : " 3.11"
121
- pyodide : " 0.25.0 "
121
+ pyodide : " 0.25.1 "
122
122
- 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"
124
128
steps :
125
129
- name : checkout
126
130
uses : actions/checkout@v3
@@ -140,17 +144,17 @@ jobs:
140
144
python -m pip install pyodide-build==${{ matrix.pyodide }}
141
145
git clone https://github.com/emscripten-core/emsdk.git
142
146
cd emsdk
147
+ pyodide config list
143
148
PYODIDE_EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version)
144
149
./emsdk install ${PYODIDE_EMSCRIPTEN_VERSION}
145
150
./emsdk activate ${PYODIDE_EMSCRIPTEN_VERSION}
146
151
- name : build
147
152
run : |
148
153
source emsdk/emsdk_env.sh
149
154
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="
151
156
export CMAKE_BUILD_PARALLEL_LEVEL=4
152
157
pyodide build --exports pyinit
153
- # pyodide auditwheel repair dist/*.whl --libdir .pyodide-xbuildenv/xbuildenv/pyodide-root/packages/.libs/lib
154
158
- name : test
155
159
run : |
156
160
cd PyTAT
Original file line number Diff line number Diff line change @@ -6,11 +6,6 @@ async function main() {
6
6
7
7
const pyodide = await require ( "pyodide" ) . loadPyodide ( ) ;
8
8
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.
14
9
15
10
const mount_dir = "/app" ;
16
11
pyodide . FS . mkdir ( mount_dir ) ;
@@ -22,6 +17,8 @@ async function main() {
22
17
async def main():
23
18
import micropip
24
19
20
+ await micropip.install("openblas")
21
+
25
22
import os
26
23
files = os.listdir("/app/dist")
27
24
await micropip.install(f"emfs:/app/dist/{files[0]}")
@@ -36,6 +33,8 @@ async def main():
36
33
37
34
main()
38
35
` ) ;
36
+
39
37
process . exit ( result ) ;
40
38
}
39
+
41
40
main ( ) ;
You can’t perform that action at this time.
0 commit comments