Skip to content
This repository was archived by the owner on Aug 15, 2019. It is now read-only.

Commit 6d77e43

Browse files
authored
Modularize: Remove pieces that are going in different repos (#876)
This change is part of the modularization and moving things to different repos. Remove deprecated/private API from `src/index.ts` Also remove: - `website/` (moving to another repo) - `docs/` (moving to another repo) - `starter/` (moving to another repo) - `src/data/` (deprecated) - `demos/` - `adder/` - `imagenet/` - `lstm/` - `mnist/` - `mnist_eager/` - `one_plus_one/` - `rune_recognition/`
1 parent 4d54e63 commit 6d77e43

File tree

121 files changed

+405
-12174
lines changed

Some content is hidden

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

121 files changed

+405
-12174
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ scripts/**/*.js
66
coverage/
77
package-lock.json
88
npm-debug.log
9+
yarn-error.log
910
.DS_Store
1011
dist/
1112
.idea/

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
language: node_js
22
node_js: "8"
3-
addons:
4-
apt:
5-
packages:
6-
- "python3"
7-
- "python3-pip"
83
script:
9-
- ./scripts/run_python_tests.sh
104
- ./scripts/build_and_lint_all
115
- if [ "$BROWSERSTACK_KEY" ]; then yarn test-travis; fi

README.md

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ the dev environment:
7979
```bash
8080
$ git clone https://github.com/PAIR-code/deeplearnjs.git
8181
$ cd deeplearnjs
82-
$ yarn prep # Installs dependencies.
82+
$ yarn # Installs dependencies.
8383
```
8484

8585
#### Yarn vs NPM
@@ -135,21 +135,11 @@ $ yarn test --single-run
135135
```
136136

137137
#### Packaging (browser and npm)
138-
To build a standalone ES5 library that can be imported in the browser with a
139-
`<script>` tag:
140138

141139
```bash
142-
$ ./scripts/build-standalone.sh # Builds standalone library.
143-
>> Stored standalone library at dist/deeplearn(.min).js
144-
```
145-
146-
To build an npm package:
147-
148-
```bash
149-
$ ./scripts/build-npm.sh
150-
...
151-
Stored standalone library at dist/deeplearn(.min).js
152-
deeplearn-VERSION.tgz
140+
$ yarn build-npm
141+
> Stored standalone library at dist/deeplearn(.min).js
142+
> deeplearn-VERSION.tgz
153143
```
154144

155145
To install it locally, run `npm install ./deeplearn-VERSION.tgz`.

demos/adder/adder.ts

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

demos/adder/index.html

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

demos/benchmarks/pool_benchmarks.ts

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,24 @@ export interface PoolBenchmarkParams {
2828
stride: number;
2929
}
3030

31-
function getPoolingOp(option: string):
32-
(x: dl.Tensor3D, filterSize: [number, number]|number,
33-
strides: [number, number]|number, pad: 'valid'|'same'|number) =>
34-
dl.Tensor3D {
31+
function getPoolingOp(option: string): (
32+
x: dl.Tensor3D, filterSize: [number, number]|number,
33+
strides: [number, number]|number) => dl.Tensor3D {
3534
switch (option) {
3635
case 'max':
3736
return (x: dl.Tensor3D, filterSize: [number, number]|number,
38-
strides: [number, number]|number, pad: 'valid'|'same'|number) => {
39-
return x.maxPool(filterSize, strides, pad);
37+
strides: [number, number]|number) => {
38+
return x.maxPool(filterSize, strides, 'same');
4039
};
4140
case 'min':
4241
return (x: dl.Tensor3D, filterSize: [number, number]|number,
43-
strides: [number, number]|number, pad: 'valid'|'same'|number) => {
44-
return x.minPool(filterSize, strides, pad);
42+
strides: [number, number]|number) => {
43+
return x.minPool(filterSize, strides, 'same');
4544
};
4645
case 'avg':
4746
return (x: dl.Tensor3D, filterSize: [number, number]|number,
48-
strides: [number, number]|number, pad: 'valid'|'same'|number) => {
49-
return x.avgPool(filterSize, strides, pad);
47+
strides: [number, number]|number) => {
48+
return x.avgPool(filterSize, strides, 'same');
5049
};
5150
default:
5251
throw new Error(`Not found such ops: ${option}`);
@@ -62,14 +61,13 @@ export class PoolCPUBenchmark implements BenchmarkTest {
6261
const xShape: [number, number, number] = [size, size, outputDepth];
6362
const fieldSize = params.fieldSize;
6463
const stride = params.stride;
65-
const zeroPad = dl.conv_util.computeDefaultPad(xShape, fieldSize, stride);
6664
const op = getPoolingOp(option);
6765

6866
const x: dl.Tensor3D = dl.randomUniform(xShape, -1, 1);
6967

7068
const start = performance.now();
7169
for (let i = 0; i < CPU_OP_RUNS; i++) {
72-
op(x, fieldSize, stride, zeroPad);
70+
op(x, fieldSize, stride);
7371
}
7472
const avgTime = (performance.now() - start) / CPU_OP_RUNS;
7573
return new Promise<number>((resolve, reject) => {
@@ -90,7 +88,7 @@ export class PoolGPUBenchmark implements BenchmarkTest {
9088
const x: dl.Tensor3D = dl.randomUniform(xShape, -1, 1);
9189
const op = getPoolingOp(option);
9290

93-
const benchmark = () => op(x, fieldSize, stride, 'same');
91+
const benchmark = () => op(x, fieldSize, stride);
9492
const time = await benchmark_util.warmupAndBenchmarkGPU(benchmark);
9593

9694
x.dispose();

demos/fast-style-transfer/fast-style-transfer.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717

1818
import * as dl from 'deeplearn';
19-
2019
import {PolymerElement, PolymerHTMLElement} from '../polymer-spec';
2120

2221
import {TransformNet} from './net';

demos/fast-style-transfer/net.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* =============================================================================
1616
*/
1717
import * as dl from 'deeplearn';
18+
import {CheckpointLoader} from 'deeplearn-legacy-loader';
1819

1920
const GOOGLE_CLOUD_STORAGE_DIR =
2021
'https://storage.googleapis.com/learnjs-data/checkpoint_zoo/transformnet/';
@@ -45,7 +46,7 @@ export class TransformNet {
4546
async load(): Promise<void> {
4647
if (this.variableDictionary[this.style] == null) {
4748
const checkpointLoader =
48-
new dl.CheckpointLoader(GOOGLE_CLOUD_STORAGE_DIR + this.style + '/');
49+
new CheckpointLoader(GOOGLE_CLOUD_STORAGE_DIR + this.style + '/');
4950
this.variableDictionary[this.style] =
5051
await checkpointLoader.getAllVariables();
5152
}

demos/imagenet/imagenet.html

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

0 commit comments

Comments
 (0)