Skip to content

Commit 9602a6a

Browse files
committed
Removing unnecessary cffi submodule
1 parent ffbf324 commit 9602a6a

File tree

5 files changed

+9
-17
lines changed

5 files changed

+9
-17
lines changed

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
path = third-party/mxnet
2222
url = https://github.com/faasm/incubator-mxnet
2323
branch = faasm
24-
[submodule "third-party/cffi"]
25-
path = third-party/cffi
26-
url = https://github.com/faasm/cffi-mirror.git
27-
branch = faasm
2824
[submodule "third-party/libffi"]
2925
path = third-party/libffi
3026
url = https://github.com/faasm/libffi.git

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Faasm CPython WebAssembly build
22

33
This build cross-compiles CPython and a number of Python modules to WebAssembly
4-
for use in [Faasm](https://github.com/lsds/faasm).
4+
for use in [Faasm](https://github.com/faasm/faasm).
55

66
You can try to install arbitrary packages, but the ones that definitely work
77
can be listed with:
@@ -136,7 +136,7 @@ inv libs.install --experimental
136136
inv libs.install --name numpy
137137

138138
# (Attempt) to install arbitrary module
139-
inv libs.install <module_name>
139+
inv libs.install --name <module_name>
140140
```
141141

142142
Libraries will then be installed to
@@ -174,8 +174,8 @@ Then we can install mxnet and horovod:
174174

175175
```
176176
. ./cross_venv/bin/activate
177-
inv libs.install --name=mxnet
178-
inv libs.install --name=horovod
177+
inv libs.install --name mxnet
178+
inv libs.install --name horovod
179179
```
180180

181181
### Cleaning and uninstalling

bin/crossenv_setup.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,3 @@ echo "python3.8 is: $(which python3.8)"
4545

4646
popd >> /dev/null
4747

48-

tasks/libs.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
import os
22

33
from copy import copy
4+
from faasmcli.util.toolchain import (
5+
CMAKE_TOOLCHAIN_FILE,
6+
WASM_LIB_INSTALL,
7+
)
48
from os.path import join
59
from subprocess import run
610
from tasks.env import USABLE_CPUS, THIRD_PARTY_DIR, CROSSENV_DIR
711
from invoke import task, Failure
812

9-
MXNET_LIB = "/usr/local/faasm/llvm-sysroot/lib/wasm32-wasi/libmxnet.so"
10-
CMAKE_TOOLCHAIN_FILE = (
11-
"/usr/local/code/faasm/third-party/faasm-toolchain/WasiToolchain.cmake"
12-
)
13+
MXNET_LIB = join(WASM_LIB_INSTALL, "libmxnet.so")
1314

1415
# Modified libs
1516
MODIFIED_LIBS = {
1617
"numpy": {
1718
"env": {"NPY_NUM_BUILD_JOBS": USABLE_CPUS},
1819
},
19-
"cffi": {
20-
21-
},
2220
}
2321

2422
MODIFIED_LIBS_EXPERIMENTAL = {

third-party/cffi

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)