Skip to content

Commit 5dc1fe1

Browse files
React native update tfjs to 4.2.0 (#7451)
* Add missing 'override' statements * Update tfjs deps to 4.2.0 Add missing definitions for setTimeoutCustom and isTypedArray to the react native platform --------- Co-authored-by: Ping Yu <[email protected]>
1 parent 524cf69 commit 5dc1fe1

File tree

5 files changed

+59
-39
lines changed

5 files changed

+59
-39
lines changed

tfjs-backend-webgl/yarn.lock

+5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-2.4.30.tgz#d2efe425869b84163c2d56e779dddadb9372cbfa"
3030
integrity sha512-AnxLHewubLVzoF/A4qdxBGHCKifw8cY32iro3DQX9TPcetE95zBeVt3jnsvtvAUf1vwzMfwzp4t/L2yqPlnjkQ==
3131

32+
33+
version "0.0.30"
34+
resolved "https://registry.npmjs.org/@types/webgl-ext/-/webgl-ext-0.0.30.tgz#0ce498c16a41a23d15289e0b844d945b25f0fb9d"
35+
integrity sha512-LKVgNmBxN0BbljJrVUwkxwRYqzsAEPcZOe6S2T6ZaBDIrFp0qu4FNlpc5sM1tGbXUYFgdVQIoeLk1Y1UoblyEg==
36+
3237
core-js@^2.6.5:
3338
version "2.6.12"
3439
resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"

tfjs-react-native/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
},
3939
"devDependencies": {
4040
"@react-native-async-storage/async-storage": "^1.13.0",
41-
"@tensorflow/tfjs-backend-cpu": "~3.7.0",
42-
"@tensorflow/tfjs-backend-webgl": "~3.7.0",
43-
"@tensorflow/tfjs-core": "3.7.0",
41+
"@tensorflow/tfjs-backend-cpu": "~4.2.0",
42+
"@tensorflow/tfjs-backend-webgl": "~4.2.0",
43+
"@tensorflow/tfjs-core": "4.2.0",
4444
"@types/base64-js": "^1.2.5",
4545
"@types/jasmine": "~3.3.0",
4646
"@types/react-native": "0.60.2",

tfjs-react-native/src/camera/camera_stream.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ export function cameraWithTensors<T extends WrappedComponentProps>(
193193
};
194194
}
195195

196-
componentWillUnmount() {
196+
override componentWillUnmount() {
197197
cancelAnimationFrame(this.rafID);
198198
if (this.glContext) {
199199
GLView.destroyContextAsync(this.glContext);
@@ -345,7 +345,7 @@ export function cameraWithTensors<T extends WrappedComponentProps>(
345345
/**
346346
* Render the component
347347
*/
348-
render() {
348+
override render() {
349349
const { cameraLayout } = this.state;
350350

351351
// Before passing props into the original wrapped component we want to

tfjs-react-native/src/platform_react_native.ts

+10
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,16 @@ export class PlatformReactNative implements Platform {
158158
}
159159
return Date.now();
160160
}
161+
162+
setTimeoutCustom() {
163+
throw new Error('react native does not support setTimeoutCustom');
164+
}
165+
166+
isTypedArray(a: unknown): a is Uint8Array | Float32Array | Int32Array
167+
| Uint8ClampedArray {
168+
return a instanceof Float32Array || a instanceof Int32Array ||
169+
a instanceof Uint8Array || a instanceof Uint8ClampedArray;
170+
}
161171
}
162172

163173
function setupGlobals() {

tfjs-react-native/yarn.lock

+39-34
Original file line numberDiff line numberDiff line change
@@ -85,38 +85,38 @@
8585
dependencies:
8686
defer-to-connect "^1.0.1"
8787

88-
"@tensorflow/tfjs-backend-cpu@3.7.0", "@tensorflow/tfjs-backend-cpu@~3.7.0":
89-
version "3.7.0"
90-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-3.7.0.tgz#146ad00a8fffdf4794f9b1a0bfc080cddba96836"
91-
integrity "sha1-FGrQCo//30eU+bGgv8CAzdupaDY= sha512-ZTs2ak9UDL/1CgUDsWn1g711G2X4Crwivbj+KxBZahlcM/OADYS3I0LZb7Q0IGnlGZsVoAFDWuywYw62Pgj9Tg=="
88+
"@tensorflow/tfjs-backend-cpu@4.2.0", "@tensorflow/tfjs-backend-cpu@~4.2.0":
89+
version "4.2.0"
90+
resolved "https://registry.npmjs.org/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-4.2.0.tgz#24912f8ef20b04ca4056365d83e5cc5a1671581f"
91+
integrity sha512-8HWg9J69m0Ovc6w8TVhhixMOcwA3t/NPXLblOA/sgJ+/JD5gsbpLWJk4QISQyb1RnpSVzw6PX3BSMTJU7hWVOg==
9292
dependencies:
93-
"@types/seedrandom" "2.4.27"
94-
seedrandom "2.4.3"
93+
"@types/seedrandom" "^2.4.28"
94+
seedrandom "^3.0.5"
9595

96-
"@tensorflow/tfjs-backend-webgl@~3.7.0":
97-
version "3.7.0"
98-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-3.7.0.tgz#6f2ac996dbbb31bfe55c770afc21fc91cc4ba083"
99-
integrity "sha1-byrJltu7Mb/lXHcK/CH8kcxLoIM= sha512-D1B85XJgcuvpaGWH2gUjOzIW/cKiT4jQaZcu99g3tOpaMVO4Ctz4mmPKhflr+AoHRVfLQbIvf6LT6fmWxbgFqw=="
96+
"@tensorflow/tfjs-backend-webgl@~4.2.0":
97+
version "4.2.0"
98+
resolved "https://registry.npmjs.org/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-4.2.0.tgz#684368f9a2605511d6d6753bf6fe9a08c73f6791"
99+
integrity sha512-Qvf+hD5pSh+xi48kChSGzcDKJemkc4EKfoVVjuxl4k25ZUPwuEd7zZUAtinkLu1dzgHNyvePZY8k+9rVm59HJA==
100100
dependencies:
101-
"@tensorflow/tfjs-backend-cpu" "3.7.0"
101+
"@tensorflow/tfjs-backend-cpu" "4.2.0"
102102
"@types/offscreencanvas" "~2019.3.0"
103-
"@types/seedrandom" "2.4.27"
103+
"@types/seedrandom" "^2.4.28"
104104
"@types/webgl-ext" "0.0.30"
105-
"@types/webgl2" "0.0.5"
106-
seedrandom "2.4.3"
105+
seedrandom "^3.0.5"
107106

108-
"@tensorflow/tfjs-core@3.7.0":
109-
version "3.7.0"
110-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-3.7.0.tgz#2c215a57af28f148af43a7dc98919200a9d4c56b"
111-
integrity "sha1-LCFaV68o8UivQ6fcmJGSAKnUxWs= sha512-wG5d/oyjU9WC7E9ZhHxVyRyg/OTjwfbpBzjfRMCa93nxDTCTqf4h6ZHYsNHQ4NOP9yCltBnKIXOWk5aiy+oY1Q=="
107+
"@tensorflow/tfjs-core@4.2.0":
108+
version "4.2.0"
109+
resolved "https://registry.npmjs.org/@tensorflow/tfjs-core/-/tfjs-core-4.2.0.tgz#34dc455c0a00feac12015caec34a54414a404230"
110+
integrity sha512-uuHkiWVC8b00ngFbHvAV7J7haRlN/9PEdeenCi0CzBjgKd7aN25wPWaoN0TSQcU+GT4FJ8mofMZ9VBYZ/s/WLg==
112111
dependencies:
113112
"@types/long" "^4.0.1"
114-
"@types/offscreencanvas" "~2019.3.0"
115-
"@types/seedrandom" "2.4.27"
113+
"@types/offscreencanvas" "~2019.7.0"
114+
"@types/seedrandom" "^2.4.28"
116115
"@types/webgl-ext" "0.0.30"
116+
"@webgpu/types" "0.1.21"
117117
long "4.0.0"
118118
node-fetch "~2.6.1"
119-
seedrandom "2.4.3"
119+
seedrandom "^3.0.5"
120120

121121
"@types/base64-js@^1.2.5":
122122
version "1.3.0"
@@ -163,6 +163,11 @@
163163
resolved "https://registry.yarnpkg.com/@types/offscreencanvas/-/offscreencanvas-2019.3.0.tgz#3336428ec7e9180cf4566dfea5da04eb586a6553"
164164
integrity sha512-esIJx9bQg+QYF0ra8GnvfianIY8qWB0GBx54PK5Eps6m+xTj86KLavHv6qDhzKcu5UUOgNfJ2pWaIIV7TRUd9Q==
165165

166+
"@types/offscreencanvas@~2019.7.0":
167+
version "2019.7.0"
168+
resolved "https://registry.npmjs.org/@types/offscreencanvas/-/offscreencanvas-2019.7.0.tgz#e4a932069db47bb3eabeb0b305502d01586fa90d"
169+
integrity sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg==
170+
166171
"@types/prop-types@*":
167172
version "15.7.3"
168173
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
@@ -197,21 +202,16 @@
197202
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275"
198203
integrity "sha1-GIRSBehv8AOFF6q3oYpiprn3EnU= sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA=="
199204

200-
"@types/[email protected].27":
201-
version "2.4.27"
202-
resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-2.4.27.tgz#9db563937dd86915f69092bc43259d2f48578e41"
203-
integrity sha1-nbVjk33YaRX2kJK8QyWdL0hXjkE=
205+
"@types/seedrandom@^2.4.28":
206+
version "2.4.30"
207+
resolved "https://registry.npmjs.org/@types/seedrandom/-/seedrandom-2.4.30.tgz#d2efe425869b84163c2d56e779dddadb9372cbfa"
208+
integrity sha512-AnxLHewubLVzoF/A4qdxBGHCKifw8cY32iro3DQX9TPcetE95zBeVt3jnsvtvAUf1vwzMfwzp4t/L2yqPlnjkQ==
204209

205210
206211
version "0.0.30"
207212
resolved "https://registry.yarnpkg.com/@types/webgl-ext/-/webgl-ext-0.0.30.tgz#0ce498c16a41a23d15289e0b844d945b25f0fb9d"
208213
integrity sha512-LKVgNmBxN0BbljJrVUwkxwRYqzsAEPcZOe6S2T6ZaBDIrFp0qu4FNlpc5sM1tGbXUYFgdVQIoeLk1Y1UoblyEg==
209214

210-
211-
version "0.0.5"
212-
resolved "https://registry.yarnpkg.com/@types/webgl2/-/webgl2-0.0.5.tgz#dd925e20ab8ace80eb4b1e46fda5b109c508fb0d"
213-
integrity sha512-oGaKsBbxQOY5+aJFV3KECDhGaXt+yZJt2y/OZsnQGLRkH6Fvr7rv4pCt3SRH1somIHfej/c4u7NSpCyd9x+1Ow==
214-
215215
"@typescript-eslint/eslint-plugin@^4.2.0":
216216
version "4.19.0"
217217
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.19.0.tgz#56f8da9ee118fe9763af34d6a526967234f6a7f0"
@@ -282,6 +282,11 @@
282282
"@typescript-eslint/types" "4.19.0"
283283
eslint-visitor-keys "^2.0.0"
284284

285+
286+
version "0.1.21"
287+
resolved "https://registry.npmjs.org/@webgpu/types/-/types-0.1.21.tgz#b181202daec30d66ccd67264de23814cfd176d3a"
288+
integrity sha512-pUrWq3V5PiSGFLeLxoGqReTZmiiXwY3jRkIG5sLLKjyqNxrwm/04b4nw7LSmGWJcKk59XOM/YRTUwOzo4MMlow==
289+
285290
acorn-jsx@^5.3.1:
286291
version "5.3.1"
287292
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
@@ -2163,10 +2168,10 @@ rxjs@^6.6.0:
21632168
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
21642169
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
21652170

2166-
seedrandom@2.4.3:
2167-
version "2.4.3"
2168-
resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.3.tgz#2438504dad33917314bff18ac4d794f16d6aaecc"
2169-
integrity sha1-JDhQTa0zkXMUv/GKxNeU8W1qrsw=
2171+
seedrandom@^3.0.5:
2172+
version "3.0.5"
2173+
resolved "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7"
2174+
integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==
21702175

21712176
semver-diff@^3.1.1:
21722177
version "3.1.1"

0 commit comments

Comments
 (0)