Skip to content

Commit 7d45752

Browse files
committed
Move tfjs to first, average, worst scoring.
Since this test is relatively slow per iteration I reduced the iteration counts to: non-simd: 15 iterations with worst 2. simd: 80 iterations with worst 4 (default). Also, I moved all the benchmark files to a tfjs directory to help organize the wasm directory a bit.
1 parent 4e888f5 commit 7d45752

12 files changed

+41
-39
lines changed

JetStreamDriver.js

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1957,42 +1957,43 @@ const testPlans = [
19571957
{
19581958
name: "tfjs-wasm",
19591959
files: [
1960-
"./wasm/tfjs-model-helpers.js",
1961-
"./wasm/tfjs-model-mobilenet-v3.js",
1962-
"./wasm/tfjs-model-mobilenet-v1.js",
1963-
"./wasm/tfjs-model-coco-ssd.js",
1964-
"./wasm/tfjs-model-use.js",
1965-
"./wasm/tfjs-model-use-vocab.js",
1966-
"./wasm/tfjs-bundle.js",
1967-
"./wasm/tfjs.js",
1968-
"./wasm/tfjs-benchmark.js"
1960+
"./wasm/tfjs/tfjs-model-helpers.js",
1961+
"./wasm/tfjs/tfjs-model-mobilenet-v3.js",
1962+
"./wasm/tfjs/tfjs-model-mobilenet-v1.js",
1963+
"./wasm/tfjs/tfjs-model-coco-ssd.js",
1964+
"./wasm/tfjs/tfjs-model-use.js",
1965+
"./wasm/tfjs/tfjs-model-use-vocab.js",
1966+
"./wasm/tfjs/tfjs-bundle.js",
1967+
"./wasm/tfjs/tfjs.js",
1968+
"./wasm/tfjs/benchmark.js"
19691969
],
19701970
preload: {
1971-
tfjsBackendWasmBlob: "./wasm/tfjs-backend-wasm.wasm",
1971+
tfjsBackendWasmBlob: "./wasm/tfjs/tfjs-backend-wasm.wasm",
19721972
},
1973-
benchmarkClass: WasmLegacyBenchmark,
1974-
async: true,
1973+
benchmarkClass: WasmEMCCBenchmark,
1974+
iterations: 15,
1975+
worstCaseCount: 2,
19751976
deterministicRandom: true,
19761977
testGroup: WasmGroup
19771978
},
19781979
{
19791980
name: "tfjs-wasm-simd",
19801981
files: [
1981-
"./wasm/tfjs-model-helpers.js",
1982-
"./wasm/tfjs-model-mobilenet-v3.js",
1983-
"./wasm/tfjs-model-mobilenet-v1.js",
1984-
"./wasm/tfjs-model-coco-ssd.js",
1985-
"./wasm/tfjs-model-use.js",
1986-
"./wasm/tfjs-model-use-vocab.js",
1987-
"./wasm/tfjs-bundle.js",
1988-
"./wasm/tfjs.js",
1989-
"./wasm/tfjs-benchmark.js"
1982+
"./wasm/tfjs/tfjs-model-helpers.js",
1983+
"./wasm/tfjs/tfjs-model-mobilenet-v3.js",
1984+
"./wasm/tfjs/tfjs-model-mobilenet-v1.js",
1985+
"./wasm/tfjs/tfjs-model-coco-ssd.js",
1986+
"./wasm/tfjs/tfjs-model-use.js",
1987+
"./wasm/tfjs/tfjs-model-use-vocab.js",
1988+
"./wasm/tfjs/tfjs-bundle.js",
1989+
"./wasm/tfjs/tfjs.js",
1990+
"./wasm/tfjs/benchmark.js"
19901991
],
19911992
preload: {
1992-
tfjsBackendWasmSimdBlob: "./wasm/tfjs-backend-wasm-simd.wasm",
1993+
tfjsBackendWasmSimdBlob: "./wasm/tfjs/tfjs-backend-wasm-simd.wasm",
19931994
},
1994-
benchmarkClass: WasmLegacyBenchmark,
1995-
async: true,
1995+
benchmarkClass: WasmEMCCBenchmark,
1996+
iterations: 80,
19961997
deterministicRandom: true,
19971998
testGroup: WasmGroup
19981999
},

0 commit comments

Comments
 (0)