Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
3351dab
save
annxingyuan May 28, 2020
3b919a1
clean
annxingyuan May 28, 2020
2d6f753
load
annxingyuan May 28, 2020
5cbbc64
bugfix
annxingyuan May 28, 2020
e83b185
Merge branch 'upgrade_emscripten' into upgrade_xnn
annxingyuan May 28, 2020
b8bc69b
add msg
annxingyuan May 28, 2020
6229532
Merge branch 'upgrade_emscripten' into upgrade_xnn
annxingyuan May 28, 2020
0d530c9
save
annxingyuan May 28, 2020
fdc2eca
Merge branch 'master' into upgrade_emscripten
annxingyuan May 28, 2020
e5c4a55
hbn?
annxingyuan May 28, 2020
99ea0d3
save
annxingyuan May 28, 2020
e8a8f1a
hbn
annxingyuan May 28, 2020
d73951b
remove fit
annxingyuan May 28, 2020
bcb7511
change v
annxingyuan May 28, 2020
d80e820
ad
annxingyuan May 28, 2020
d3378e5
save
annxingyuan May 28, 2020
cb45404
Merge branch 'master' into upgrade_emscripten
annxingyuan May 28, 2020
f78b613
Merge branch 'master' into upgrade_emscripten
annxingyuan May 28, 2020
ec48c70
hbn
annxingyuan May 28, 2020
93c6279
Merge branch 'upgrade_emscripten' of github.com:tensorflow/tfjs into …
annxingyuan May 28, 2020
28caf0c
hbn
annxingyuan May 29, 2020
81b61ac
Merge branch 'master' into upgrade_emscripten
annxingyuan May 29, 2020
5aefa96
hbn
annxingyuan May 29, 2020
5497ee4
hbn
annxingyuan May 29, 2020
a8a9f46
Merge branch 'master' into upgrade_emscripten
annxingyuan May 29, 2020
0090519
save
annxingyuan May 29, 2020
537b6c0
hbn
annxingyuan May 29, 2020
b6e63e5
hbn
annxingyuan May 29, 2020
e97843d
hbn
annxingyuan May 29, 2020
7819e34
Merge branch 'master' into upgrade_emscripten
annxingyuan May 29, 2020
ae5afde
hbn
annxingyuan May 29, 2020
331c61d
Merge branch 'upgrade_emscripten' of github.com:tensorflow/tfjs into …
annxingyuan May 29, 2020
e2058f4
save
annxingyuan May 29, 2020
ba8fcc3
save
annxingyuan May 30, 2020
ca7f44a
Merge branch 'master' into upgrade_emscripten
annxingyuan Jun 1, 2020
e225364
rm clean
annxingyuan Jun 1, 2020
66f2011
hbn
annxingyuan Jun 1, 2020
b6a60f3
hbn
annxingyuan Jun 1, 2020
9513ada
arg order
annxingyuan Jun 1, 2020
c6af31d
temp
annxingyuan Jun 1, 2020
83e90f7
Merge branch 'master' into upgrade_emscripten
annxingyuan Jun 1, 2020
d4804b2
hbn
annxingyuan Jun 1, 2020
a1ea968
disable test
annxingyuan Jun 1, 2020
1631297
fix
annxingyuan Jun 1, 2020
6f40f8d
Merge branch 'upgrade_emscripten' into upgrade_xnn
annxingyuan Jun 1, 2020
abba29f
update
annxingyuan Jun 1, 2020
9817a4f
Merge branch 'master' into upgrade_xnn
annxingyuan Jun 1, 2020
b0798e0
remove
annxingyuan Jun 1, 2020
7948c7e
upgrade
annxingyuan Jun 1, 2020
eef54e6
reenable
annxingyuan Jun 1, 2020
2626014
update
annxingyuan Jun 1, 2020
1fdee6a
space
annxingyuan Jun 1, 2020
d233b29
hbn
annxingyuan Jun 1, 2020
fc83c41
Merge branch 'master' into upgrade_xnn
annxingyuan Jun 1, 2020
ed25dcb
hbn
annxingyuan Jun 1, 2020
d66a317
save
annxingyuan Jun 1, 2020
404460c
hbn
annxingyuan Jun 1, 2020
8216abd
Merge branch 'master' into upgrade_xnn
annxingyuan Jun 1, 2020
3f4bf4c
hbn
annxingyuan Jun 2, 2020
d37c91f
Merge branch 'master' into upgrade_xnn
annxingyuan Jun 2, 2020
31ad1a8
hbn
annxingyuan Jun 2, 2020
9536538
hbn
annxingyuan Jun 2, 2020
49343e3
hbn
annxingyuan Jun 2, 2020
e1605cd
hbn
annxingyuan Jun 2, 2020
4f8bc05
hbn
annxingyuan Jun 2, 2020
5248227
hbn
annxingyuan Jun 2, 2020
7f33d76
hbn
annxingyuan Jun 2, 2020
5a5b9c3
hbn
annxingyuan Jun 2, 2020
e841f32
save
annxingyuan Jun 2, 2020
2daa542
hbn
annxingyuan Jun 2, 2020
ccba253
rm
annxingyuan Jun 2, 2020
0d7d50b
hbn
annxingyuan Jun 2, 2020
36a0195
upgrade workspace
annxingyuan Jun 2, 2020
769346a
ad v
annxingyuan Jun 2, 2020
6736de0
package
annxingyuan Jun 3, 2020
54f6c03
hbn
annxingyuan Jun 3, 2020
7ca0f68
hbn
annxingyuan Jun 3, 2020
c6ac8a1
hbn
annxingyuan Jun 3, 2020
62422c3
hbn
annxingyuan Jun 4, 2020
eb1f5be
hbn
annxingyuan Jun 4, 2020
7c9e3d4
hbn
annxingyuan Jun 4, 2020
c443a44
what version
annxingyuan Jun 4, 2020
31e7ad8
hbn
annxingyuan Jun 4, 2020
3519290
hbn
annxingyuan Jun 4, 2020
20c5176
hbn
annxingyuan Jun 4, 2020
0616be1
hbn
annxingyuan Jun 4, 2020
c1c9978
hbn
annxingyuan Jun 4, 2020
4736123
hbn
annxingyuan Jun 4, 2020
355287e
hbn
annxingyuan Jun 5, 2020
69eaa63
hbn
annxingyuan Jun 5, 2020
5b868f4
hbn
annxingyuan Jun 5, 2020
dbff250
hbn
annxingyuan Jun 5, 2020
cbb99cd
oops
annxingyuan Jun 5, 2020
8370774
hbn
annxingyuan Jun 5, 2020
3b2030c
save
annxingyuan Jun 5, 2020
52e0d50
save
annxingyuan Jun 5, 2020
83be41d
save
annxingyuan Jun 5, 2020
8fbafa6
hbn
annxingyuan Jun 5, 2020
ab117e1
hb n
annxingyuan Jun 5, 2020
1984ef8
hbn
annxingyuan Jun 5, 2020
4096aa2
hbn
annxingyuan Jun 5, 2020
c612fb6
Merge branch 'master' into upgrade_xnn
annxingyuan Jun 5, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions tfjs-backend-wasm/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ emsdk_configure(name = "emsdk")

git_repository(
name = "xnnpack",
commit = "15d1f511d37a8dad1ab7a80cfefd7014accf72ac",
commit = "5d67652eb23c2e94ffeeafd3e82a41745eb3ce41",
remote = "https://github.com/google/XNNPACK.git",
shallow_since = "1582560423 -0800",
shallow_since = "1591043392 -0700",
)

# The libraries below are transitive dependencies of XNNPACK that we need to
Expand All @@ -20,32 +20,30 @@ git_repository(
http_archive(
name = "FP16",
build_file = "@xnnpack//third_party:FP16.BUILD",
sha256 = "9764297a339ad73b0717331a2c3e9c42a52105cd04cab62cb160e2b4598d2ea6",
strip_prefix = "FP16-ba1d31f5eed2eb4a69e4dea3870a68c7c95f998f",
sha256 = "0d56bb92f649ec294dbccb13e04865e3c82933b6f6735d1d7145de45da700156",
strip_prefix = "FP16-3c54eacb74f6f5e39077300c5564156c424d77ba",
urls = [
"https://github.com/Maratyszcza/FP16/archive/ba1d31f5eed2eb4a69e4dea3870a68c7c95f998f.tar.gz",
"https://github.com/Maratyszcza/FP16/archive/3c54eacb74f6f5e39077300c5564156c424d77ba.zip",
],
)

# FXdiv library, used for repeated integer division by the same factor
http_archive(
name = "FXdiv",
build_file = "@xnnpack//third_party:FXdiv.BUILD",
sha256 = "7d3215bea832fe77091ec5666200b91156df6724da1e348205078346325fc45e",
strip_prefix = "FXdiv-f8c5354679ec2597792bc70a9e06eff50c508b9a",
sha256 = "ab7dfb08829bee33dca38405d647868fb214ac685e379ec7ef2bebcd234cd44d",
strip_prefix = "FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1",
urls = [
"https://github.com/Maratyszcza/FXdiv/archive/f8c5354679ec2597792bc70a9e06eff50c508b9a.tar.gz",
"https://github.com/Maratyszcza/FXdiv/archive/b408327ac2a15ec3e43352421954f5b1967701d1.zip",
],
)

# pthreadpool library, used for parallelization
http_archive(
name = "pthreadpool",
build_file = "@xnnpack//third_party:pthreadpool.BUILD",
sha256 = "c2328fdf9e48ac9b928953bcbc442eb14402d393e4cfae0541581a3d39efca9d",
strip_prefix = "pthreadpool-0e275fe56094626349c55a524ea8b71a85daa64b",
sha256 = "af8c518b6ec65dca216143ddf5ef9d2e6b133123f9a47a24841ef447c5d91bd1",
strip_prefix = "pthreadpool-6525d8bb736b323eb4df9e4f3afdd3a8458d1a20",
urls = [
"https://github.com/Maratyszcza/pthreadpool/archive/0e275fe56094626349c55a524ea8b71a85daa64b.tar.gz",
"https://github.com/Maratyszcza/pthreadpool/archive/6525d8bb736b323eb4df9e4f3afdd3a8458d1a20.zip",
],
)

Expand All @@ -65,21 +63,21 @@ http_archive(
name = "cpuinfo",
build_file = "@xnnpack//third_party:cpuinfo.BUILD",
patches = ["@xnnpack//third_party:cpuinfo.patch"],
sha256 = "3f2dc1970f397a0e59db72f9fca6ff144b216895c1d606f6c94a507c1e53a025",
strip_prefix = "cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970",
sha256 = "8ea076bcc4ff73cdff520ece01b776d2a778ced60956f5eb88697a78e22c389d",
strip_prefix = "cpuinfo-5cefcd6293e6881754c2c53f99e95b159d2d8aa5",
urls = [
"https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz",
"https://github.com/pytorch/cpuinfo/archive/5cefcd6293e6881754c2c53f99e95b159d2d8aa5.zip",
],
)

# psimd library, used for fallback 128-bit SIMD micro-kernels
http_archive(
name = "psimd",
build_file = "@xnnpack//third_party:psimd.BUILD",
sha256 = "c621f9bb1ff9ab8f0fa4a04f3239d13b345a6e865318d7b464aa80531a1abb2c",
strip_prefix = "psimd-88882f601f8179e1987b7e7cf4a8012c9080ad44",
sha256 = "dc615342bcbe51ca885323e51b68b90ed9bb9fa7df0f4419dbfa0297d5e837b7",
strip_prefix = "psimd-072586a71b55b7f8c584153d223e95687148a900",
urls = [
"https://github.com/Maratyszcza/psimd/archive/88882f601f8179e1987b7e7cf4a8012c9080ad44.tar.gz",
"https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e95687148a900.zip",
],
)

Expand Down
30 changes: 14 additions & 16 deletions tfjs-backend-wasm/cloudbuild.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
steps:
# Install common dependencies.
- name: 'node:10'
- name: 'bitnami/node:latest'
id: 'yarn-common'
entrypoint: 'yarn'
args: ['install']

# Install packages.
- name: 'node:10'
- name: 'bitnami/node:latest'
dir: 'tfjs-backend-wasm'
entrypoint: 'yarn'
id: 'yarn'
args: ['install']
waitFor: ['yarn-common']

# Install build-deps.
- name: 'node:10'
- name: 'bitnami/node:latest'
dir: 'tfjs-backend-wasm'
entrypoint: 'yarn'
id: 'build-deps'
args: ['build-deps-ci']
waitFor: ['yarn-common']

# Build.
- name: 'node:10'
- name: 'bitnami/node:latest'
dir: 'tfjs-backend-wasm'
entrypoint: 'yarn'
id: 'build'
args: ['build-ci']
waitFor: ['yarn', 'build-deps']

# Lint.
- name: 'node:10'
- name: 'bitnami/node:latest'
dir: 'tfjs-backend-wasm'
entrypoint: 'yarn'
id: 'lint'
args: ['lint']
waitFor: ['yarn', 'build-deps']

# Run JS tests.
- name: 'node:10'
- name: 'bitnami/node:latest'
dir: 'tfjs-backend-wasm'
entrypoint: 'yarn'
id: 'test-wasm'
Expand All @@ -48,25 +48,23 @@ steps:
secretEnv: ['BROWSERSTACK_KEY']

# Run C++ tests.
- name: 'node:10'
- name: 'bitnami/node:latest'
dir: 'tfjs-backend-wasm'
entrypoint: 'yarn'
id: 'test-cc'
args: ['test-cc']
waitFor: ['build']

# TODO(https://github.com/tensorflow/tfjs/pull/3343): reenable
# once https://github.com/tensorflow/tfjs/pull/3342 is merged.
# Check bundle size.
# - name: 'node:10'
# dir: 'tfjs-backend-wasm'
# id: 'test-bundle-size'
# entrypoint: 'yarn'
# args: ['test-bundle-size']
# waitFor: ['build']
- name: 'bitnami/node:latest'
dir: 'tfjs-backend-wasm'
id: 'test-bundle-size'
entrypoint: 'yarn'
args: ['test-bundle-size']
waitFor: ['yarn', 'build-deps', 'build']

# Lint bazel files.
- name: 'node:10'
- name: 'bitnami/node:latest'
dir: 'tfjs-backend-wasm'
id: 'buildifier'
entrypoint: 'yarn'
Expand Down