-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
3a314e8
commit 6080112
Showing
31 changed files
with
568 additions
and
1,027 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
|
||
let spec_files = ['**/*.test.ts'].concat( | ||
process.env.EXCLUDE_UNCOMPRESSED | ||
? ['!**/*.uncompressed.test.ts'] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import { NeuralNetwork } from 'tfjs-image-recognition-base'; | ||
|
||
export type TestEnv = { | ||
loadImage: (uri: string) => Promise<HTMLImageElement> | ||
loadJson: <T> (uri: string) => Promise<T> | ||
initNet: <TNet extends NeuralNetwork<any>>( | ||
net: TNet, | ||
uncompressedFilename?: string | boolean, | ||
isUnusedModel?: boolean | ||
) => any | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
import * as fs from 'fs'; | ||
import * as path from 'path'; | ||
import { NeuralNetwork } from 'tfjs-image-recognition-base'; | ||
|
||
import { env } from '../src'; | ||
import { TestEnv } from './Environment'; | ||
|
||
require('@tensorflow/tfjs-node') | ||
const canvas = require('canvas') | ||
|
||
const { Canvas, Image, ImageData } = canvas | ||
env.monkeyPatch({ Canvas, Image, ImageData }) | ||
|
||
async function loadImageNode(uri: string): Promise<HTMLImageElement> { | ||
return canvas.loadImage(path.resolve(__dirname, '../', uri)) | ||
} | ||
|
||
async function loadJsonNode<T>(uri: string): Promise<T> { | ||
return JSON.parse(fs.readFileSync(path.resolve(__dirname, '../', uri)).toString()) | ||
} | ||
|
||
export async function initNetNode<TNet extends NeuralNetwork<any>>(net: TNet) { | ||
await net.loadFromDisk(path.resolve(__dirname, '../weights')) | ||
} | ||
|
||
const nodeTestEnv: TestEnv = { | ||
loadImage: loadImageNode, | ||
loadJson: loadJsonNode, | ||
initNet: initNetNode | ||
} | ||
|
||
global['nodeTestEnv'] = nodeTestEnv |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,52 +1,41 @@ | ||
import * as tf from '@tensorflow/tfjs-core'; | ||
import { fetchNetWeights, NeuralNetwork } from 'tfjs-image-recognition-base'; | ||
|
||
import { env, fetchImage, fetchJson } from '../src'; | ||
|
||
export let fs: any, path: any, canvas: any | ||
import { fetchImage, fetchJson } from '../src'; | ||
import { TestEnv } from './Environment'; | ||
|
||
jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000 | ||
|
||
if (env.isNodejs()) { | ||
require('@tensorflow/tfjs-node') | ||
fs = require('fs') | ||
path = require('path') | ||
canvas = require('canvas') | ||
|
||
const { Canvas, Image, ImageData } = canvas | ||
env.monkeyPatch({ Canvas, Image, ImageData }) | ||
} else { | ||
if ((window['__karma__'].config.jasmine.args as string[]).some(arg => arg === 'backend_cpu')) { | ||
tf.setBackend('cpu') | ||
} | ||
if (typeof window !== 'undefined' && window['__karma__'] && (window['__karma__'].config.jasmine.args as string[]).some(arg => arg === 'backend_cpu')) { | ||
tf.setBackend('cpu') | ||
} | ||
|
||
export async function initNet<TNet extends NeuralNetwork<any>>( | ||
async function loadImageBrowser(uri: string): Promise<HTMLImageElement> { | ||
return fetchImage(`base${uri.startsWith('/') ? '' : '/'}${uri}`) | ||
} | ||
|
||
async function loadJsonBrowser<T>(uri: string): Promise<T> { | ||
return fetchJson<T>(`base${uri.startsWith('/') ? '' : '/'}${uri}`) | ||
} | ||
|
||
async function initNetBrowser<TNet extends NeuralNetwork<any>>( | ||
net: TNet, | ||
uncompressedFilename: string | boolean, | ||
isUnusedModel: boolean = false | ||
) { | ||
if (env.isNodejs()) { | ||
await net.loadFromDisk(path.resolve(__dirname, '../weights')) | ||
} else { | ||
const url = uncompressedFilename | ||
? await fetchNetWeights(`base/weights_uncompressed/${uncompressedFilename}`) | ||
: (isUnusedModel ? 'base/weights_unused' : 'base/weights') | ||
await net.load(url) | ||
} | ||
const url = uncompressedFilename | ||
? await fetchNetWeights(`base/weights_uncompressed/${uncompressedFilename}`) | ||
: (isUnusedModel ? 'base/weights_unused' : 'base/weights') | ||
await net.load(url) | ||
} | ||
|
||
export async function loadImage(uri: string): Promise<HTMLImageElement> { | ||
if (env.isNodejs()) { | ||
return canvas.loadImage(path.resolve(__dirname, '../', uri)) | ||
} | ||
return fetchImage(`base${uri.startsWith('/') ? '' : '/'}${uri}`) | ||
const browserTestEnv: TestEnv = { | ||
loadImage: loadImageBrowser, | ||
loadJson: loadJsonBrowser, | ||
initNet: initNetBrowser | ||
} | ||
|
||
export async function loadJson<T>(uri: string): Promise<T> { | ||
if (env.isNodejs()) { | ||
return JSON.parse(fs.readFileSync(path.resolve(__dirname, '../', uri)).toString()) | ||
} | ||
return fetchJson<T>(`base${uri.startsWith('/') ? '' : '/'}${uri}`) | ||
export function getTestEnv(): TestEnv { | ||
return global['nodeTestEnv'] || browserTestEnv | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.