fix tests + let typescript automatically figure out return values of composable tasks

src/globalApi/ComputeFaceDescriptorsTasks.ts

@@ -45,12 +45,12 @@ export class ComputeAllFaceDescriptorsTask<
     return descriptors.map((descriptor, i) => extendWithFaceDescriptor<TSource>(parentResults[i], descriptor))
   }
 
-  withFaceExpressions(): PredictAllFaceExpressionsWithFaceAlignmentTask<WithFaceLandmarks<TSource>> {
-    return new PredictAllFaceExpressionsWithFaceAlignmentTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withFaceExpressions() {
+    return new PredictAllFaceExpressionsWithFaceAlignmentTask(this, this.input)
   }
 
-  withAgeAndGender(): PredictAllAgeAndGenderWithFaceAlignmentTask<WithFaceLandmarks<TSource>> {
-    return new PredictAllAgeAndGenderWithFaceAlignmentTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withAgeAndGender() {
+    return new PredictAllAgeAndGenderWithFaceAlignmentTask(this, this.input)
   }
 }
 
@@ -75,11 +75,11 @@ export class ComputeSingleFaceDescriptorTask<
     return extendWithFaceDescriptor(parentResult, descriptor)
   }
 
-  withFaceExpressions(): PredictSingleFaceExpressionsWithFaceAlignmentTask<WithFaceLandmarks<TSource>> {
-    return new PredictSingleFaceExpressionsWithFaceAlignmentTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withFaceExpressions() {
+    return new PredictSingleFaceExpressionsWithFaceAlignmentTask(this, this.input)
   }
 
-  withAgeAndGender(): PredictSingleAgeAndGenderWithFaceAlignmentTask<WithFaceLandmarks<TSource>> {
-    return new PredictSingleAgeAndGenderWithFaceAlignmentTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withAgeAndGender() {
+    return new PredictSingleAgeAndGenderWithFaceAlignmentTask(this, this.input)
   }
 }
\ No newline at end of file

src/globalApi/DetectFaceLandmarksTasks.ts

@@ -59,16 +59,16 @@ export class DetectAllFaceLandmarksTask<
     )
   }
 
-  withFaceExpressions(): PredictAllFaceExpressionsWithFaceAlignmentTask<WithFaceLandmarks<TSource>> {
-    return new PredictAllFaceExpressionsWithFaceAlignmentTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withFaceExpressions() {
+    return new PredictAllFaceExpressionsWithFaceAlignmentTask(this, this.input)
   }
 
-  withAgeAndGender(): PredictAllAgeAndGenderWithFaceAlignmentTask<WithFaceLandmarks<TSource>> {
-    return new PredictAllAgeAndGenderWithFaceAlignmentTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withAgeAndGender() {
+    return new PredictAllAgeAndGenderWithFaceAlignmentTask(this, this.input)
   }
 
-  withFaceDescriptors(): ComputeAllFaceDescriptorsTask<WithFaceLandmarks<TSource>> {
-    return new ComputeAllFaceDescriptorsTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withFaceDescriptors() {
+    return new ComputeAllFaceDescriptorsTask(this, this.input)
   }
 }
 
@@ -95,15 +95,15 @@ export class DetectSingleFaceLandmarksTask<
     return extendWithFaceLandmarks<TSource>(parentResult, landmarks)
   }
 
-  withFaceExpressions(): PredictSingleFaceExpressionsWithFaceAlignmentTask<WithFaceLandmarks<TSource>> {
-    return new PredictSingleFaceExpressionsWithFaceAlignmentTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withFaceExpressions() {
+    return new PredictSingleFaceExpressionsWithFaceAlignmentTask(this, this.input)
   }
 
-  withAgeAndGender(): PredictSingleAgeAndGenderWithFaceAlignmentTask<WithFaceLandmarks<TSource>> {
-    return new PredictSingleAgeAndGenderWithFaceAlignmentTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withAgeAndGender() {
+    return new PredictSingleAgeAndGenderWithFaceAlignmentTask(this, this.input)
   }
 
-  withFaceDescriptor(): ComputeSingleFaceDescriptorTask<WithFaceLandmarks<TSource>> {
-    return new ComputeSingleFaceDescriptorTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withFaceDescriptor() {
+    return new ComputeSingleFaceDescriptorTask(this, this.input)
   }
 }
\ No newline at end of file

src/globalApi/DetectFacesTasks.ts

@@ -57,16 +57,16 @@ export class DetectAllFacesTask extends DetectFacesTaskBase<FaceDetection[]> {
     })
   }
 
-  withFaceLandmarks(useTinyLandmarkNet: boolean = false): DetectAllFaceLandmarksTask<WithFaceDetection<{}>> {
-    return new DetectAllFaceLandmarksTask<WithFaceDetection<{}>>(
+  withFaceLandmarks(useTinyLandmarkNet: boolean = false) {
+    return new DetectAllFaceLandmarksTask(
       this.runAndExtendWithFaceDetections(),
       this.input,
       useTinyLandmarkNet
     )
   }
 
-  withFaceExpressions(): PredictAllFaceExpressionsTask<WithFaceDetection<{}>> {
-    return new PredictAllFaceExpressionsTask<WithFaceDetection<{}>>(
+  withFaceExpressions() {
+    return new PredictAllFaceExpressionsTask (
       this.runAndExtendWithFaceDetections(),
       this.input
     )
@@ -93,16 +93,16 @@ export class DetectSingleFaceTask extends DetectFacesTaskBase<FaceDetection | un
     })
   }
 
-  withFaceLandmarks(useTinyLandmarkNet: boolean = false): DetectSingleFaceLandmarksTask<WithFaceDetection<{}>> {
-    return new DetectSingleFaceLandmarksTask<WithFaceDetection<{}>>(
+  withFaceLandmarks(useTinyLandmarkNet: boolean = false) {
+    return new DetectSingleFaceLandmarksTask(
       this.runAndExtendWithFaceDetection(),
       this.input,
       useTinyLandmarkNet
     )
   }
 
-  withFaceExpressions(): PredictSingleFaceExpressionsTask<WithFaceDetection<{}>> {
-    return new PredictSingleFaceExpressionsTask<WithFaceDetection<{}>>(
+  withFaceExpressions() {
+    return new PredictSingleFaceExpressionsTask(
       this.runAndExtendWithFaceDetection(),
       this.input
     )

src/globalApi/PredictAgeAndGenderTask.ts

@@ -75,12 +75,12 @@ export class PredictAllAgeAndGenderWithFaceAlignmentTask<
   TSource extends WithFaceLandmarks<WithFaceDetection<{}>>
 > extends PredictAllAgeAndGenderTask<TSource> {
 
-  withFaceExpressions(): PredictAllFaceExpressionsWithFaceAlignmentTask<WithFaceLandmarks<TSource>> {
-    return new PredictAllFaceExpressionsWithFaceAlignmentTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withFaceExpressions() {
+    return new PredictAllFaceExpressionsWithFaceAlignmentTask(this, this.input)
   }
 
-  withFaceDescriptors(): ComputeAllFaceDescriptorsTask<WithFaceLandmarks<TSource>> {
-    return new ComputeAllFaceDescriptorsTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withFaceDescriptors() {
+    return new ComputeAllFaceDescriptorsTask(this, this.input)
   }
 }
 
@@ -88,11 +88,11 @@ export class PredictSingleAgeAndGenderWithFaceAlignmentTask<
   TSource extends WithFaceLandmarks<WithFaceDetection<{}>>
 > extends PredictSingleAgeAndGenderTask<TSource> {
 
-  withFaceExpressions(): PredictSingleFaceExpressionsWithFaceAlignmentTask<WithFaceLandmarks<TSource>> {
-    return new PredictSingleFaceExpressionsWithFaceAlignmentTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withFaceExpressions() {
+    return new PredictSingleFaceExpressionsWithFaceAlignmentTask(this, this.input)
   }
 
-  withFaceDescriptor(): ComputeSingleFaceDescriptorTask<WithFaceLandmarks<TSource>> {
-    return new ComputeSingleFaceDescriptorTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withFaceDescriptor() {
+    return new ComputeSingleFaceDescriptorTask(this, this.input)
   }
 }
\ No newline at end of file

src/globalApi/PredictFaceExpressionsTask.ts

@@ -73,12 +73,12 @@ export class PredictAllFaceExpressionsWithFaceAlignmentTask<
   TSource extends WithFaceLandmarks<WithFaceDetection<{}>>
 > extends PredictAllFaceExpressionsTask<TSource> {
 
-  withAgeAndGender(): PredictAllAgeAndGenderWithFaceAlignmentTask<WithFaceLandmarks<TSource>> {
-    return new PredictAllAgeAndGenderWithFaceAlignmentTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withAgeAndGender() {
+    return new PredictAllAgeAndGenderWithFaceAlignmentTask(this, this.input)
   }
 
-  withFaceDescriptors(): ComputeAllFaceDescriptorsTask<WithFaceLandmarks<TSource>> {
-    return new ComputeAllFaceDescriptorsTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withFaceDescriptors() {
+    return new ComputeAllFaceDescriptorsTask(this, this.input)
   }
 }
 
@@ -86,11 +86,11 @@ export class PredictSingleFaceExpressionsWithFaceAlignmentTask<
   TSource extends WithFaceLandmarks<WithFaceDetection<{}>>
 > extends PredictSingleFaceExpressionsTask<TSource> {
 
-  withAgeAndGender(): PredictSingleAgeAndGenderWithFaceAlignmentTask<WithFaceLandmarks<TSource>> {
-    return new PredictSingleAgeAndGenderWithFaceAlignmentTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withAgeAndGender() {
+    return new PredictSingleAgeAndGenderWithFaceAlignmentTask(this, this.input)
   }
 
-  withFaceDescriptor(): ComputeSingleFaceDescriptorTask<WithFaceLandmarks<TSource>> {
-    return new ComputeSingleFaceDescriptorTask<WithFaceLandmarks<TSource>>(this, this.input)
+  withFaceDescriptor() {
+    return new ComputeSingleFaceDescriptorTask(this, this.input)
   }
 }
\ No newline at end of file

src/xception/TinyXception.ts

@@ -55,9 +55,8 @@ export class TinyXception extends NeuralNetwork<TinyXceptionParams> {
 
     return tf.tidy(() => {
       const batchTensor = input.toBatchTensor(112, true)
-      const batchTensorRgb = bgrToRgbTensor(batchTensor)
       const meanRgb = [122.782, 117.001, 104.298]
-      const normalized = normalize(batchTensorRgb, meanRgb).div(tf.scalar(256)) as tf.Tensor4D
+      const normalized = normalize(batchTensor, meanRgb).div(tf.scalar(256)) as tf.Tensor4D
 
       let out = tf.relu(conv(normalized, params.entry_flow.conv_in, [2, 2]))
       out = reductionBlock(out, params.entry_flow.reduction_block_0, false)

test/tests/tinyFaceDetector/tinyFaceDetector.test.ts

@@ -78,15 +78,15 @@ describeWithBackend('tinyFaceDetector', () => {
         expectFaceExpressions(results)
       })
 
-      it('detectAllFaces.withFaceExpressions().withFaceLandmarks()', async () => {
+      it('detectAllFaces.withFaceLandmarks().withFaceExpressions()', async () => {
         const options = new TinyFaceDetectorOptions({
           inputSize: 416
         })
 
         const results = await faceapi
           .detectAllFaces(imgEl, options)
-          .withFaceExpressions()
           .withFaceLandmarks()
+          .withFaceExpressions()
 
         expect(results.length).toEqual(6)
         expectFaceExpressions(results)
@@ -114,8 +114,8 @@ describeWithBackend('tinyFaceDetector', () => {
 
         const results = await faceapi
           .detectAllFaces(imgEl, options)
-          .withFaceExpressions()
           .withFaceLandmarks()
+          .withFaceExpressions()
           .withFaceDescriptors()
 
         expect(results.length).toEqual(6)
@@ -183,15 +183,15 @@ describeWithBackend('tinyFaceDetector', () => {
         result && expect(result.expressions.happy).toBeGreaterThanOrEqual(0.95)
       })
 
-      it('detectSingleFace.withFaceExpressions().withFaceLandmarks()', async () => {
+      it('detectSingleFace.withFaceLandmarks().withFaceExpressions()', async () => {
         const options = new TinyFaceDetectorOptions({
           inputSize: 416
         })
 
         const result = await faceapi
           .detectSingleFace(imgEl, options)
-          .withFaceExpressions()
           .withFaceLandmarks()
+          .withFaceExpressions()
 
         expect(!!result).toBeTruthy()
         expectFaceDetectionsWithLandmarks(
@@ -222,15 +222,15 @@ describeWithBackend('tinyFaceDetector', () => {
         )
       })
 
-      it('detectSingleFace.withFaceExpressions().withFaceLandmarks().withFaceDescriptor()', async () => {
+      it('detectSingleFace.withFaceLandmarks().withFaceExpressions().withFaceDescriptor()', async () => {
         const options = new TinyFaceDetectorOptions({
           inputSize: 416
         })
 
         const result = await faceapi
           .detectSingleFace(imgEl, options)
-          .withFaceExpressions()
           .withFaceLandmarks()
+          .withFaceExpressions()
           .withFaceDescriptor()
 
         expect(!!result).toBeTruthy()