Skip to content

Commit 03ed259

Browse files
justadudewhohacksjustadudewhohacks
committed
use tfjs-tiny-yolov2 codebase
1 parent b6baf8c commit 03ed259

38 files changed

+130
-615
lines changed

‎package-lock.json

Lines changed: 12 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"scripts": {
88
"rollup-min": "rollup -c rollup.config.js --environment minify:true",
99
"rollup": "rollup -c rollup.config.js",
10-
"build": "npm run rollup && npm run rollup-min && tsc",
10+
"build-tsc": "tsc",
11+
"build": "npm run rollup && npm run rollup-min && npm run build-tsc",
1112
"test": "karma start"
1213
},
1314
"keywords": [
@@ -21,7 +22,8 @@
2122
"license": "MIT",
2223
"dependencies": {
2324
"@tensorflow/tfjs-core": "^0.12.14",
24-
"tfjs-image-recognition-base": "git+https://github.com/justadudewhohacks/tfjs-image-recognition-base.git"
25+
"tfjs-image-recognition-base": "^0.0.0",
26+
"tfjs-tiny-yolov2": "0.0.2"
2527
},
2628
"devDependencies": {
2729
"@types/jasmine": "^2.8.8",
@@ -38,6 +40,6 @@
3840
"rollup-plugin-typescript2": "^0.16.1",
3941
"rollup-plugin-uglify": "^4.0.0",
4042
"tslib": "^1.9.3",
41-
"typescript": "^2.9.2"
43+
"typescript": "2.8.4"
4244
}
4345
}

‎src/allFacesFactory.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Point, Rect, TNetInput } from 'tfjs-image-recognition-base';
2+
import { TinyYolov2Types } from 'tfjs-tiny-yolov2';
23

34
import { TinyYolov2 } from '.';
45
import { FaceDetection } from './classes/FaceDetection';
@@ -10,7 +11,6 @@ import { FaceLandmarkNet } from './faceLandmarkNet/FaceLandmarkNet';
1011
import { FaceRecognitionNet } from './faceRecognitionNet/FaceRecognitionNet';
1112
import { Mtcnn } from './mtcnn/Mtcnn';
1213
import { MtcnnForwardParams } from './mtcnn/types';
13-
import { TinyYolov2ForwardParams } from './tinyYolov2/types';
1414

1515
function computeDescriptorsFactory(
1616
recognitionNet: FaceRecognitionNet
@@ -95,7 +95,7 @@ export function allFacesTinyYolov2Factory(
9595
) {
9696
return async function(
9797
input: TNetInput,
98-
forwardParams: TinyYolov2ForwardParams = {},
98+
forwardParams: TinyYolov2Types.TinyYolov2ForwardParams = {},
9999
useBatchProcessing: boolean = false
100100
): Promise<FullFaceDescription[]> {
101101
const detectFaces = (input: TNetInput) => tinyYolov2.locateFaces(input, forwardParams)

‎src/commons/convLayer.ts

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

‎src/commons/extractConvParamsFactory.ts

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

‎src/commons/extractFCParamsFactory.ts

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

‎src/commons/types.ts

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

‎src/faceDetectionNet/boxPredictionLayer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as tf from '@tensorflow/tfjs-core';
2+
import { convLayer } from 'tfjs-tiny-yolov2';
23

3-
import { convLayer } from '../commons/convLayer';
44
import { BoxPredictionParams } from './types';
55

66

‎src/faceDetectionNet/extractParams.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as tf from '@tensorflow/tfjs-core';
22
import { extractWeightsFactory, ExtractWeightsFunction, ParamMapping } from 'tfjs-image-recognition-base';
3+
import { ConvParams } from 'tfjs-tiny-yolov2';
34

4-
import { ConvParams } from '../commons/types';
55
import { MobileNetV1, NetParams, PointwiseConvParams, PredictionLayerParams } from './types';
66

77
function extractorsFactory(extractWeights: ExtractWeightsFunction, paramMappings: ParamMapping[]) {

‎src/faceDetectionNet/loadQuantizedParams.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import {
66
loadWeightMap,
77
ParamMapping,
88
} from 'tfjs-image-recognition-base';
9+
import { ConvParams } from 'tfjs-tiny-yolov2';
910

10-
import { ConvParams } from '../commons/types';
1111
import { BoxPredictionParams, MobileNetV1, NetParams, PointwiseConvParams, PredictionLayerParams } from './types';
1212

1313
const DEFAULT_MODEL_NAME = 'ssd_mobilenetv1_model'

0 commit comments

Comments
 (0)