Skip to content

Commit 003e04b

Browse files
authored
Merge branch 'master' into add/conv3d
2 parents 0fce6fb + ed0267d commit 003e04b

File tree

95 files changed

+8830
-1617
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+8830
-1617
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@ bazel-*
1717
/compiled_api.js
1818

1919
# Contains auto-generated json files produced by `yarn gen-json`
20-
python/tensorflowjs/op_list/
2120
**.yalc
2221
**yalc.lock

.npmignore

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
1+
.babelrc
2+
.DS_Store
3+
.idea/
4+
.pylintrc
15
.rpt2_cache
26
.travis.yml
3-
.pylintrc
47
.vscode
5-
.DS_Store
6-
.babelrc
7-
.idea/
8-
src/**/*_test.ts
8+
*.tgz
9+
*.txt
10+
**.yalc
11+
**yalc.lock
12+
cloudbuild.yml
13+
coverage/
914
demo/
15+
DEVELOPMENT.md
16+
dist/**/*_test.d.ts
17+
dist/**/*_test.js
1018
docs/
11-
scripts/
19+
ISSUE_TEMPLATE.md
20+
karma.conf.js
1221
node_modules/
13-
coverage/
14-
package-lock.json
1522
npm-debug.log
16-
*.tgz
17-
*.txt
18-
karma.conf.js
19-
dist/**/*_test.js
20-
dist/**/*_test.d.ts
21-
tslint.json
22-
tsconfig.json
23-
yarn.lock
24-
yarn-error.log
25-
python/
23+
package-lock.json
2624
package/
27-
DEVELOPMENT.md
28-
ISSUE_TEMPLATE.md
25+
python/
26+
rollup.config.google.js
2927
rollup.config.js
28+
scripts/
29+
src/**/*_test.ts
3030
test_results
31-
rollup.config.google.js
32-
**.yalc
33-
**yalc.lock
31+
tsconfig.json
32+
tslint.json
33+
yarn-error.log
34+
yarn.lock
35+
.git

.travis.yml

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

.vscode/settings.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
{
33
"search.exclude": {
44
"**/node_modules": true,
5-
"**/bower_components": true,
65
"coverage/": true,
76
"dist/": true,
87
"**/bundle.js": true,
9-
"**/yarn.lock": true
8+
"**/yarn.lock": true,
9+
".rpt2_cache/": true,
10+
".yalc/": true
1011
},
1112
"tslint.enable": true,
1213
"tslint.run": "onType",

0 commit comments

Comments
 (0)