Skip to content
This repository has been archived by the owner on May 14, 2024. It is now read-only.

[Draft][Do-not-review] Experimental changes #1612

Closed
wants to merge 85 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
b01bb6b
Merge pull request #732 from ente-io/main
abhinavkgrd Oct 25, 2022
65c302a
Merge pull request #753 from ente-io/main
abhinavkgrd Oct 27, 2022
bfd86f2
Merge pull request #768 from ente-io/main
abhinavkgrd Nov 10, 2022
35bef17
Merge pull request #788 from ente-io/main
abhinavkgrd Nov 30, 2022
5e48643
Merge pull request #805 from ente-io/main
abhinavkgrd Dec 1, 2022
1f0caee
Merge pull request #830 from ente-io/main
abhinavkgrd Dec 17, 2022
a8c520a
Merge pull request #835 from ente-io/main
abhinavkgrd Dec 22, 2022
7676f85
Merge pull request #854 from ente-io/main
abhinavkgrd Jan 11, 2023
07be8d4
Merge pull request #870 from ente-io/main
abhinavkgrd Jan 17, 2023
c59d252
Merge pull request #875 from ente-io/main
abhinavkgrd Jan 18, 2023
06c5f81
Merge pull request #878 from ente-io/main
abhinavkgrd Jan 19, 2023
29cbba5
Merge pull request #886 from ente-io/main
abhinavkgrd Jan 30, 2023
f072348
Merge pull request #908 from ente-io/main
abhinavkgrd Feb 1, 2023
5938c4d
Merge pull request #911 from ente-io/main
abhinavkgrd Feb 1, 2023
a698d7c
Merge pull request #917 from ente-io/main
abhinavkgrd Feb 6, 2023
05751a7
Merge pull request #923 from ente-io/main
vishnukvmd Feb 6, 2023
ce57879
Merge pull request #926 from ente-io/main
abhinavkgrd Feb 6, 2023
570f96b
Merge pull request #928 from ente-io/main
ua741 Feb 6, 2023
27fc852
Merge pull request #931 from ente-io/main
abhinavkgrd Feb 8, 2023
90c72ac
Merge pull request #943 from ente-io/main
abhinavkgrd Feb 10, 2023
9622b83
Merge pull request #954 from ente-io/main
abhinavkgrd Feb 24, 2023
11259ea
release (#969)
abhinavkgrd Mar 13, 2023
af66c0e
Release (#994)
abhinavkgrd Mar 31, 2023
41fef25
release (#1010)
abhinavkgrd Apr 2, 2023
1eecf40
Release (#1014)
abhinavkgrd Apr 4, 2023
d88031d
release (#1023)
abhinavkgrd Apr 15, 2023
cc84600
Release (#1064)
abhinavkgrd Apr 15, 2023
9419aa7
Release (#1071)
abhinavkgrd Apr 20, 2023
627cad2
Release (#1083)
abhinavkgrd May 4, 2023
52c3247
Release (#1103)
abhinavkgrd May 15, 2023
9fdd82f
Release (#1118)
abhinavkgrd May 24, 2023
2c443ab
Release (#1141)
abhinavkgrd May 29, 2023
f35ade5
Release (#1168)
abhinavkgrd Jun 14, 2023
1863c89
Patch release (#1195)
abhinavkgrd Jun 21, 2023
d7adf25
Release (#1200)
abhinavkgrd Jun 24, 2023
66d015d
Release (#1214)
abhinavkgrd Jul 4, 2023
f823c78
Release (#1228)
ua741 Jul 4, 2023
f58fd50
Release (#1252)
abhinavkgrd Jul 25, 2023
1ebf111
Release (#1288)
abhinavkgrd Aug 3, 2023
43c6e54
Release (#1307)
abhinavkgrd Aug 10, 2023
bbb66c1
Release (#1315)
vishnukvmd Aug 14, 2023
8496c68
Release (#1320)
abhinavkgrd Aug 23, 2023
1628762
Release (#1328)
abhinavkgrd Sep 6, 2023
4686802
Revert "Release"
abhinavkgrd Sep 6, 2023
15f925f
Revert "Release" (#1347)
abhinavkgrd Sep 6, 2023
af36317
Revert "Revert "Release" (#1347)"
abhinavkgrd Sep 6, 2023
5492189
Merge branch 'main' into release-with-patch
abhinavkgrd Sep 6, 2023
e998561
refactor
abhinavkgrd Sep 6, 2023
d592cba
fix incorrect shrink ratio
abhinavkgrd Sep 6, 2023
65bcb65
Release with patch (#1350)
abhinavkgrd Sep 7, 2023
2c3fc77
Release (#1359)
abhinavkgrd Sep 21, 2023
b41633b
Release (#1370)
abhinavkgrd Sep 21, 2023
305a297
Release (#1374)
abhinavkgrd Sep 25, 2023
7ccad38
Release (#1380)
abhinavkgrd Oct 4, 2023
6ec237e
Release (#1395)
abhinavkgrd Oct 19, 2023
375d0d7
Release (#1405)
abhinavkgrd Oct 27, 2023
709341e
Release (#1409)
abhinavkgrd Oct 28, 2023
ca5fe74
Release (#1414)
abhinavkgrd Nov 7, 2023
823b35f
Enable ML on chrome for internal users
ua741 Nov 15, 2023
b062eef
Test
ua741 Nov 23, 2023
ec9c65e
Merge branch 'main' into test_faces_new
ua741 Dec 8, 2023
de6dd75
temp commit
ua741 Dec 8, 2023
725ecde
BlazeFaceService: Remove unused methods
ua741 Dec 15, 2023
f82b3ea
Add auto generated doc
ua741 Dec 16, 2023
d009a48
Add onnxruntime dependency + yolo model
ua741 Dec 16, 2023
ce6a926
Fix model path
ua741 Dec 16, 2023
c571798
Changes to support yolo5 landmark processing
ua741 Dec 17, 2023
ef9ae7b
Add yolo face detection service
ua741 Dec 17, 2023
ace30b2
Change min score for yolo
ua741 Dec 17, 2023
18dd465
Default to yolo + add ort files
ua741 Dec 17, 2023
5c7e680
Log time taken
ua741 Dec 17, 2023
c9980ab
Change time logging
ua741 Dec 17, 2023
f09603e
MLExport: Catch and log zip error
ua741 Jan 2, 2024
7ae36c1
Merge branch 'test_faces_new' of github.com:ente-io/photos-web into t…
ua741 Feb 5, 2024
35a0aba
Merge branch 'main' into test_faces_new
ua741 Feb 5, 2024
ab3cf4a
Load files from remote
ua741 Feb 13, 2024
21c2a50
Remove blazefaceDetectionService
ua741 Feb 13, 2024
cf37370
Remove unused file
ua741 Feb 13, 2024
53f803f
Remove unused code
ua741 Feb 16, 2024
b4e356e
Merge branch 'main' into test_faces_new
ua741 Feb 21, 2024
d77ecfd
Fixed build
ua741 Feb 21, 2024
822e71b
Lint fixes
ua741 Feb 21, 2024
7c3e13f
Merge branch 'main' into test_faces_new
ua741 Feb 22, 2024
ac7f762
Undo preview card change
ua741 Feb 22, 2024
8236d7c
Remove unused file
ua741 Feb 22, 2024
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
3 changes: 2 additions & 1 deletion apps/photos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@tensorflow/tfjs-backend-webgl": "^4.9.0",
"@tensorflow/tfjs-converter": "^4.10.0",
"@tensorflow/tfjs-core": "^4.10.0",
"@tensorflow/tfjs-tflite": "^0.0.1-alpha.7",
"@tensorflow/tfjs-tflite": "0.0.1-alpha.7",
"@zip.js/zip.js": "^2.4.2",
"bip39": "^3.0.4",
"blazeface-back": "^0.0.9",
Expand Down Expand Up @@ -49,6 +49,7 @@
"memoize-one": "^6.0.0",
"ml-matrix": "^6.10.4",
"next-transpile-modules": "^10.0.0",
"onnxruntime-web": "^1.16.3",
"otpauth": "^9.0.2",
"p-debounce": "^4.0.0",
"p-queue": "^7.1.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/photos/public/_headers
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
X-Frame-Options: deny
X-XSS-Protection: 1; mode=block
Referrer-Policy: same-origin
Content-Security-Policy-Report-Only: default-src 'self'; img-src 'self' blob: data:; media-src 'self' blob:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self' 'unsafe-eval' blob:; manifest-src 'self'; child-src 'self' blob:; object-src 'none'; connect-src 'self' https://*.ente.io data: blob: https://ente-prod-eu.s3.eu-central-003.backblazeb2.com https://ente-prod-v3.s3.eu-central-2.wasabisys.com/ ; base-uri 'self'; frame-ancestors 'none'; form-action 'none'; report-uri https://csp-reporter.ente.io; report-to https://csp-reporter.ente.io;
Content-Security-Policy-Report-Only: default-src 'self'; img-src 'self' blob: data:; media-src 'self' blob:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self' 'unsafe-eval' blob:; manifest-src 'self'; child-src 'self' blob:; object-src 'none'; connect-src 'self' https://*.ente.io data: blob: https://ente-prod-eu.s3.eu-central-003.backblazeb2.com https://ente-prod-v3.s3.eu-central-2.wasabisys.com/ http://localhost:8700/; base-uri 'self'; frame-ancestors 'none'; form-action 'none'; report-uri https://csp-reporter.ente.io; report-to https://csp-reporter.ente.io;

6 changes: 6 additions & 0 deletions apps/photos/public/js/onnx/ort-wasm-simd-threaded.jsep.js

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added apps/photos/public/js/onnx/ort-wasm-simd.wasm
Binary file not shown.
6 changes: 6 additions & 0 deletions apps/photos/public/js/onnx/ort-wasm-threaded.js

Large diffs are not rendered by default.

Binary file added apps/photos/public/js/onnx/ort-wasm-threaded.wasm
Binary file not shown.
6 changes: 6 additions & 0 deletions apps/photos/public/js/onnx/ort-wasm-threaded.worker.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added apps/photos/public/js/onnx/ort-wasm.wasm
Binary file not shown.
7 changes: 7 additions & 0 deletions apps/photos/public/js/onnx/ort-web.es5.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/photos/public/js/onnx/ort-web.es5.min.js.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions apps/photos/public/js/onnx/ort-web.es6.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/photos/public/js/onnx/ort-web.es6.min.js.map

Large diffs are not rendered by default.

31,640 changes: 31,640 additions & 0 deletions apps/photos/public/js/onnx/ort-web.js

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions apps/photos/public/js/onnx/ort-web.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/photos/public/js/onnx/ort-web.min.js.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions apps/photos/public/js/onnx/ort-web.node.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/photos/public/js/onnx/ort-web.node.js.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions apps/photos/public/js/onnx/ort.es5.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/photos/public/js/onnx/ort.es5.min.js.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions apps/photos/public/js/onnx/ort.es6.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/photos/public/js/onnx/ort.es6.min.js.map

Large diffs are not rendered by default.

32,808 changes: 32,808 additions & 0 deletions apps/photos/public/js/onnx/ort.js

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions apps/photos/public/js/onnx/ort.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/photos/public/js/onnx/ort.min.js.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions apps/photos/public/js/onnx/ort.wasm-core.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/photos/public/js/onnx/ort.wasm-core.min.js.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions apps/photos/public/js/onnx/ort.wasm.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/photos/public/js/onnx/ort.wasm.min.js.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions apps/photos/public/js/onnx/ort.webgl.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/photos/public/js/onnx/ort.webgl.min.js.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions apps/photos/public/js/onnx/ort.webgpu.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/photos/public/js/onnx/ort.webgpu.min.js.map

Large diffs are not rendered by default.

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import '@tensorflow/tfjs-backend-webgl';
import '@tensorflow/tfjs-backend-cpu';
import arcfaceAlignmentService from 'services/machineLearning/arcfaceAlignmentService';
import arcfaceCropService from 'services/machineLearning/arcfaceCropService';
import blazeFaceDetectionService from 'services/machineLearning/blazeFaceDetectionService';
import { AlignedFace, FaceCrop, ObjectDetection } from 'types/machineLearning';
import { getMLSyncConfig } from 'utils/machineLearning/config';
import {
Expand All @@ -17,6 +16,7 @@ import ssdMobileNetV2Service from 'services/machineLearning/ssdMobileNetV2Servic
import { DEFAULT_ML_SYNC_CONFIG } from 'constants/mlConfig';
import imageSceneService from 'services/machineLearning/imageSceneService';
import { addLogLine } from '@ente/shared/logging';
import yoloFaceDetectionService from 'services/machineLearning/yoloFaceDetectionService';

interface MLFileDebugViewProps {
file: File;
Expand Down Expand Up @@ -91,7 +91,7 @@ export default function MLFileDebugView(props: MLFileDebugViewProps) {
const loadFile = async () => {
// TODO: go through worker for these apis, to not include ml code in main bundle
const imageBitmap = await createImageBitmap(props.file);
const faceDetections = await blazeFaceDetectionService.detectFaces(
const faceDetections = await yoloFaceDetectionService.detectFaces(
imageBitmap
);
addLogLine('detectedFaces: ', faceDetections.length);
Expand Down
Loading
Loading