Skip to content

Commit 6d80ba7

Browse files
mattsoulanillemattsoulanille
authored
Update react-native monorepo dependencies to 3.7.0 (#5217)
Update react-native monorepo dependencies to 3.70, increase test timeout to 10 minutes, and disable Otsu image threshold tests (#5245).
1 parent b6cac57 commit 6d80ba7

File tree

6 files changed

+85
-57
lines changed

6 files changed

+85
-57
lines changed

‎tfjs-react-native/integration_rn59/components/tfjs_unit_test_runner.tsx

+4
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ export class TestRunner extends Component<TestRunnerProps, TestRunnerState> {
111111
// Not implemented in webgl
112112
return false;
113113
}
114+
if (name.match('method otsu')) {
115+
// Image threshold is broken for Otsu's method. #5245
116+
return false;
117+
}
114118
return true;
115119
}
116120
});

‎tfjs-react-native/integration_rn59/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@tensorflow-models/blazeface": "^0.0.2",
2323
"@tensorflow-models/mobilenet": "^2.0.4",
2424
"@tensorflow-models/posenet": "^2.2.1",
25-
"@tensorflow/tfjs": "3.1.0",
25+
"@tensorflow/tfjs": "3.7.0",
2626
"@tensorflow/tfjs-react-native": "0.5.0",
2727
"expo-camera": "^7.0.0",
2828
"expo-gl": "^7.0.0",

‎tfjs-react-native/integration_rn59/test/integration_test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const MILLIS_PER_MIN = 60 * 1000;
22
const INITIAL_LOAD_TIMEOUT = 5 * MILLIS_PER_MIN;
3-
const TEST_RUN_TIMEOUT = 5 * MILLIS_PER_MIN;
3+
const TEST_RUN_TIMEOUT = 10 * MILLIS_PER_MIN;
44
const TEST_POLL_INTERVAL = 2000;
55
const DEFAULT_TIMEOUT = 30000;
66

‎tfjs-react-native/integration_rn59/yarn.lock

+48-36
Original file line numberDiff line numberDiff line change
@@ -863,54 +863,56 @@
863863
resolved "https://registry.yarnpkg.com/@tensorflow-models/posenet/-/posenet-2.2.1.tgz#2f0a68d909842f59eec195f23c6f3d4cebc53fa8"
864864
integrity sha512-n9/g6DfjAyrBTf/zt1haRCyWsgALxUCzg9/Ks3Y2mbYavRZVSCSTRPy/qlE5Hr4tLfyckGfDN14zmGTthNcg/g==
865865

866-
"@tensorflow/tfjs-backend-cpu@3.1.0":
867-
version "3.1.0"
868-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-3.1.0.tgz#eabe616df679d567b6b6b929c06e45c4f24771a8"
869-
integrity sha512-BsuDEg11z3QDuvjZSge/ssITl/GHUvHjvHgJOptz4lVwAMFxzNErkL/e8fUeWQp2SI2m7oWsx2vx/H1Y9cd3Gg==
866+
"@tensorflow/tfjs-backend-cpu@3.7.0":
867+
version "3.7.0"
868+
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-3.7.0.tgz#146ad00a8fffdf4794f9b1a0bfc080cddba96836"
869+
integrity sha512-ZTs2ak9UDL/1CgUDsWn1g711G2X4Crwivbj+KxBZahlcM/OADYS3I0LZb7Q0IGnlGZsVoAFDWuywYw62Pgj9Tg==
870870
dependencies:
871871
"@types/seedrandom" "2.4.27"
872872
seedrandom "2.4.3"
873873

874-
"@tensorflow/tfjs-backend-webgl@3.1.0":
875-
version "3.1.0"
876-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-3.1.0.tgz#c7ee2a9d146e1b08bdd32f467da09009d255d39b"
877-
integrity sha512-9J80sJR35Cg6BxTmQE8ljF4XLT3DXdvfLKF3C1xhRqV25PWsBvwlcvEuv6yCXp109topqJgbVnsmewS6vvVtDw==
874+
"@tensorflow/tfjs-backend-webgl@3.7.0":
875+
version "3.7.0"
876+
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-3.7.0.tgz#6f2ac996dbbb31bfe55c770afc21fc91cc4ba083"
877+
integrity sha512-D1B85XJgcuvpaGWH2gUjOzIW/cKiT4jQaZcu99g3tOpaMVO4Ctz4mmPKhflr+AoHRVfLQbIvf6LT6fmWxbgFqw==
878878
dependencies:
879-
"@tensorflow/tfjs-backend-cpu" "3.1.0"
879+
"@tensorflow/tfjs-backend-cpu" "3.7.0"
880880
"@types/offscreencanvas" "~2019.3.0"
881881
"@types/seedrandom" "2.4.27"
882882
"@types/webgl-ext" "0.0.30"
883883
"@types/webgl2" "0.0.5"
884884
seedrandom "2.4.3"
885885

886-
"@tensorflow/tfjs-converter@3.1.0":
887-
version "3.1.0"
888-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-3.1.0.tgz#9825d26eec177920ee2e184cb794d697066dd1c5"
889-
integrity sha512-V1DJ9ha9fy7pSXm6H6IGH4iF/5V32o32M8ZhFy7eydYUNWTJau8svpFI/i8AhJ1htVHKXtPTEPAo/T5XXsWN/g==
886+
"@tensorflow/tfjs-converter@3.7.0":
887+
version "3.7.0"
888+
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-3.7.0.tgz#86661837dafe1c863b374d87bf5801e19c169b22"
889+
integrity sha512-WpqTsOYwasu+ABLWeH4u5942oTRugH2dBGAYnOUuNMM8pu7LDWwC2qoZ1Q3+Ev2HWc7gyT8JPGqrKoULcCDdhw==
890890

891-
"@tensorflow/tfjs-core@3.1.0":
892-
version "3.1.0"
893-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-3.1.0.tgz#63884b124b38f8b2c00b8b4f88e36d3de7f07963"
894-
integrity sha512-KGSJEB6CTIk5YVgKbdpW0nAKuNtWaMdqYSrNYX43IAGdNrH0vDsipACH/bhrQyo9/NYiK/4Jbkr4k9pGwwiPJQ==
891+
"@tensorflow/tfjs-core@3.7.0":
892+
version "3.7.0"
893+
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-3.7.0.tgz#2c215a57af28f148af43a7dc98919200a9d4c56b"
894+
integrity sha512-wG5d/oyjU9WC7E9ZhHxVyRyg/OTjwfbpBzjfRMCa93nxDTCTqf4h6ZHYsNHQ4NOP9yCltBnKIXOWk5aiy+oY1Q==
895895
dependencies:
896+
"@types/long" "^4.0.1"
896897
"@types/offscreencanvas" "~2019.3.0"
897898
"@types/seedrandom" "2.4.27"
898899
"@types/webgl-ext" "0.0.30"
900+
long "4.0.0"
899901
node-fetch "~2.6.1"
900902
seedrandom "2.4.3"
901903

902-
"@tensorflow/tfjs-data@3.1.0":
903-
version "3.1.0"
904-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-3.1.0.tgz#3d9772bb9baae566ce7dd85c930335016e71b960"
905-
integrity sha512-ZxcOvgiTK/Q6DEwCJj7TxyonqA0eCkNkV+SVODU900CHwigpihlpguzRK6h20spa7YNliLDtPfALX+qyvl0isg==
904+
"@tensorflow/tfjs-data@3.7.0":
905+
version "3.7.0"
906+
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-3.7.0.tgz#ef1e9b104bbb92c60b680a9f4049cd2124d2b125"
907+
integrity sha512-cdX4XN5IMvSdBYVt0KaTw0+ypIgGFKvfcVSP4zYiY4vhRy1ltfSQFZlK1RD56WAoNMNGZeqaeHWx9KAedKtgPQ==
906908
dependencies:
907909
"@types/node-fetch" "^2.1.2"
908910
node-fetch "~2.6.1"
909911

910-
"@tensorflow/tfjs-layers@3.1.0":
911-
version "3.1.0"
912-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-3.1.0.tgz#e5b94a0d71716061052c82e89a14f6f0958595b1"
913-
integrity sha512-Qd5ZwdpaoKvH6Khq2U9mdeO7MArnRmKDC9/WWVfbss7+l8LC800pT9ESzIiO3P/qtDuHV1ssa0wOD31TadMOZQ==
912+
"@tensorflow/tfjs-layers@3.7.0":
913+
version "3.7.0"
914+
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-3.7.0.tgz#c8edf0130887395d6a45b28be476f131edc12e11"
915+
integrity sha512-53WwvCk+Bdppa+GsRCJ8dt/coyAVFCYo3gOmuN+lBFmoSRX/LsdNjanF88mmOAPmoRFXrVG6bkjEQKe0YOkYcw==
914916

915917
"@tensorflow/[email protected]":
916918
version "0.5.0"
@@ -921,17 +923,17 @@
921923
buffer "^5.2.1"
922924
jpeg-js "^0.3.6"
923925

924-
"@tensorflow/tfjs@3.1.0":
925-
version "3.1.0"
926-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-3.1.0.tgz#92226a5248012fdcab980f33af003b02a0a77f4c"
927-
integrity sha512-6w3LHpALAlBd8m3G+Gx/OvZeOYepvuBtu80+YbajSIEBp/gMJW2NCF4/mHyHcq1f1xJen0+LpwaCL7oho9v+FA==
928-
dependencies:
929-
"@tensorflow/tfjs-backend-cpu" "3.1.0"
930-
"@tensorflow/tfjs-backend-webgl" "3.1.0"
931-
"@tensorflow/tfjs-converter" "3.1.0"
932-
"@tensorflow/tfjs-core" "3.1.0"
933-
"@tensorflow/tfjs-data" "3.1.0"
934-
"@tensorflow/tfjs-layers" "3.1.0"
926+
"@tensorflow/tfjs@3.7.0":
927+
version "3.7.0"
928+
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-3.7.0.tgz#3bca3ff2580479283f17d2db16c3519fbcbc52c1"
929+
integrity sha512-JD88LplfZLZqavsPQn/DgIhiJSJPdjmIQ09rkqLAeyNB6LOm1TX7nUosnDJ8RQsLVrrryHdvReXSGik1NngZsQ==
930+
dependencies:
931+
"@tensorflow/tfjs-backend-cpu" "3.7.0"
932+
"@tensorflow/tfjs-backend-webgl" "3.7.0"
933+
"@tensorflow/tfjs-converter" "3.7.0"
934+
"@tensorflow/tfjs-core" "3.7.0"
935+
"@tensorflow/tfjs-data" "3.7.0"
936+
"@tensorflow/tfjs-layers" "3.7.0"
935937
argparse "^1.0.10"
936938
chalk "^4.1.0"
937939
core-js "3"
@@ -1008,6 +1010,11 @@
10081010
dependencies:
10091011
"@types/jest-diff" "*"
10101012

1013+
"@types/long@^4.0.1":
1014+
version "4.0.1"
1015+
resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
1016+
integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
1017+
10111018
"@types/node-fetch@^2.1.2":
10121019
version "2.5.0"
10131020
resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.0.tgz#1c55616a4591bdd15a389fbd0da4a55b9502add5"
@@ -4733,6 +4740,11 @@ loglevel@^1.6.0:
47334740
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.4.tgz#f408f4f006db8354d0577dcf6d33485b3cb90d56"
47344741
integrity sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==
47354742

4743+
[email protected]:
4744+
version "4.0.0"
4745+
resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
4746+
integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
4747+
47364748
loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
47374749
version "1.4.0"
47384750
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"

‎tfjs-react-native/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
},
3434
"devDependencies": {
3535
"@react-native-async-storage/async-storage": "^1.13.0",
36-
"@tensorflow/tfjs-backend-cpu": "~3.1.0",
37-
"@tensorflow/tfjs-backend-webgl": "~3.1.0",
38-
"@tensorflow/tfjs-core": "3.1.0",
36+
"@tensorflow/tfjs-backend-cpu": "~3.7.0",
37+
"@tensorflow/tfjs-backend-webgl": "~3.7.0",
38+
"@tensorflow/tfjs-core": "3.7.0",
3939
"@types/base64-js": "^1.2.5",
4040
"@types/jasmine": "~3.3.0",
4141
"@types/react-native": "0.60.2",
@@ -64,9 +64,9 @@
6464
},
6565
"peerDependencies": {
6666
"@react-native-async-storage/async-storage": "^1.13.0",
67-
"@tensorflow/tfjs-backend-cpu": "~3.1.0",
68-
"@tensorflow/tfjs-backend-webgl": "~3.1.0",
69-
"@tensorflow/tfjs-core": "~3.1.0",
67+
"@tensorflow/tfjs-backend-cpu": "~3.7.0",
68+
"@tensorflow/tfjs-backend-webgl": "~3.7.0",
69+
"@tensorflow/tfjs-core": "~3.7.0",
7070
"expo-asset": "^7.0.0",
7171
"expo-camera": "^7.0.0",
7272
"expo-gl": "^7.0.0",

‎tfjs-react-native/yarn.lock

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

88-
"@tensorflow/tfjs-backend-cpu@3.1.0", "@tensorflow/tfjs-backend-cpu@~3.1.0":
89-
version "3.1.0"
90-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-3.1.0.tgz#eabe616df679d567b6b6b929c06e45c4f24771a8"
91-
integrity sha512-BsuDEg11z3QDuvjZSge/ssITl/GHUvHjvHgJOptz4lVwAMFxzNErkL/e8fUeWQp2SI2m7oWsx2vx/H1Y9cd3Gg==
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 sha512-ZTs2ak9UDL/1CgUDsWn1g711G2X4Crwivbj+KxBZahlcM/OADYS3I0LZb7Q0IGnlGZsVoAFDWuywYw62Pgj9Tg==
9292
dependencies:
9393
"@types/seedrandom" "2.4.27"
9494
seedrandom "2.4.3"
9595

96-
"@tensorflow/tfjs-backend-webgl@~3.1.0":
97-
version "3.1.0"
98-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-3.1.0.tgz#c7ee2a9d146e1b08bdd32f467da09009d255d39b"
99-
integrity sha512-9J80sJR35Cg6BxTmQE8ljF4XLT3DXdvfLKF3C1xhRqV25PWsBvwlcvEuv6yCXp109topqJgbVnsmewS6vvVtDw==
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 sha512-D1B85XJgcuvpaGWH2gUjOzIW/cKiT4jQaZcu99g3tOpaMVO4Ctz4mmPKhflr+AoHRVfLQbIvf6LT6fmWxbgFqw==
100100
dependencies:
101-
"@tensorflow/tfjs-backend-cpu" "3.1.0"
101+
"@tensorflow/tfjs-backend-cpu" "3.7.0"
102102
"@types/offscreencanvas" "~2019.3.0"
103103
"@types/seedrandom" "2.4.27"
104104
"@types/webgl-ext" "0.0.30"
105105
"@types/webgl2" "0.0.5"
106106
seedrandom "2.4.3"
107107

108-
"@tensorflow/tfjs-core@3.1.0":
109-
version "3.1.0"
110-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-3.1.0.tgz#63884b124b38f8b2c00b8b4f88e36d3de7f07963"
111-
integrity sha512-KGSJEB6CTIk5YVgKbdpW0nAKuNtWaMdqYSrNYX43IAGdNrH0vDsipACH/bhrQyo9/NYiK/4Jbkr4k9pGwwiPJQ==
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 sha512-wG5d/oyjU9WC7E9ZhHxVyRyg/OTjwfbpBzjfRMCa93nxDTCTqf4h6ZHYsNHQ4NOP9yCltBnKIXOWk5aiy+oY1Q==
112112
dependencies:
113+
"@types/long" "^4.0.1"
113114
"@types/offscreencanvas" "~2019.3.0"
114115
"@types/seedrandom" "2.4.27"
115116
"@types/webgl-ext" "0.0.30"
117+
long "4.0.0"
116118
node-fetch "~2.6.1"
117119
seedrandom "2.4.3"
118120

@@ -136,6 +138,11 @@
136138
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
137139
integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
138140

141+
"@types/long@^4.0.1":
142+
version "4.0.1"
143+
resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
144+
integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
145+
139146
"@types/minimist@^1.2.0":
140147
version "1.2.1"
141148
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
@@ -1538,6 +1545,11 @@ lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.6.
15381545
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
15391546
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
15401547

1548+
[email protected]:
1549+
version "4.0.0"
1550+
resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
1551+
integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
1552+
15411553
loose-envify@^1.1.0, loose-envify@^1.4.0:
15421554
version "1.4.0"
15431555
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"

0 commit comments

Comments
 (0)