Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

toolchain bumps #581

Merged
merged 6 commits into from
Jun 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 24 additions & 24 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "itk-wasm",
"version": "1.0.0-b.14",
"version": "1.0.0-b.15",
"description": "High-performance spatial analysis in a web browser, Node.js, and reproducible execution across programming languages and hardware architectures.",
"main": "./dist/index.js",
"browser": {
Expand Down
2 changes: 1 addition & 1 deletion src/docker/itk-wasm-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE_IMAGE=dockcross/web-wasm
FROM $BASE_IMAGE:20220308-9764a2e
FROM $BASE_IMAGE:20220612-21326cc
ARG BASE_IMAGE

LABEL maintainer="Matt McCormick <matt.mccormick@kitware.com>"
Expand Down
2 changes: 1 addition & 1 deletion src/itk-wasm-cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Command, Option } from 'commander/esm.mjs'

const program = new Command()

const defaultImageTag = '20220523-82587720'
const defaultImageTag = '20220619-bedc594a'

function processCommonOptions() {
const options = program.opts()
Expand Down
2 changes: 1 addition & 1 deletion src/itkConfig.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const version = '1.0.0-b.14'
const version = '1.0.0-b.15'

const itkConfig = {
webWorkersUrl: undefined,
Expand Down
12 changes: 8 additions & 4 deletions src/web-workers/loadImageIOPipelineModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ async function loadImageIOPipelineModule(input: IOInput, postfix: string): Promi
const ioModule = await loadPipelineModule(io, input.config.imageIOUrl)
return ioModule
}

const extension = getFileExtension(input.fileName)
if (extensionToIO.has(extension)) {
const io = extensionToIO.get(extension) + postfix
Expand All @@ -32,9 +32,13 @@ async function loadImageIOPipelineModule(input: IOInput, postfix: string): Promi
for (let idx = 0; idx < ImageIOIndex.length; ++idx) {
let idx = 0
for await (const pipelineModule of availableIOModules(input)) {
const { returnValue, outputs } = await runPipelineEmscripten(pipelineModule, input.args, input.outputs, input.inputs)
if (returnValue === 0) {
return pipelineModule
try {
const { returnValue, outputs } = await runPipelineEmscripten(pipelineModule, input.args, input.outputs, input.inputs)
if (returnValue === 0) {
return pipelineModule
}
} catch (error) {
// continue
}
idx++
}
Expand Down
12 changes: 8 additions & 4 deletions src/web-workers/loadMeshIOPipelineModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ async function loadMeshIOPipelineModule(input: IOInput, postfix: string): Promis
const ioModule = await loadPipelineModule(io, input.config.meshIOUrl)
return ioModule
}

const extension = getFileExtension(input.fileName)
if (extensionToIO.has(extension)) {
const io = extensionToIO.get(extension) + postfix
Expand All @@ -32,9 +32,13 @@ async function loadMeshIOPipelineModule(input: IOInput, postfix: string): Promis
for (let idx = 0; idx < MeshIOIndex.length; ++idx) {
let idx = 0
for await (const pipelineModule of availableIOModules(input)) {
const { returnValue, outputs } = await runPipelineEmscripten(pipelineModule, input.args, input.outputs, input.inputs)
if (returnValue === 0) {
return pipelineModule
try {
const { returnValue, outputs } = await runPipelineEmscripten(pipelineModule, input.args, input.outputs, input.inputs)
if (returnValue === 0) {
return pipelineModule
}
} catch (error) {
// continue
}
idx++
}
Expand Down
9 changes: 0 additions & 9 deletions test/browser/io/readImageTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ for (let ii = 0; ii < byteString.length; ++ii) {
intArray[ii] = byteString.charCodeAt(ii)
}
const cthead1SmallBlob = new window.Blob([intArray], { type: mimeString })
const cthead1SmallBlob1 = new window.Blob([intArray], { type: mimeString })
const cthead1SmallFile = new window.File([cthead1SmallBlob], 'cthead1Small.png')

const verifyImage = (t, image) => {
Expand Down Expand Up @@ -54,14 +53,6 @@ export default function () {
})
})

test('readImageBlob reads a Blob without a file extension', (t) => {
return readImageBlob(null, cthead1SmallBlob1, 'cthead1Small')
.then(function ({ image, webWorker }) {
webWorker.terminate()
verifyImage(t, image)
})
})

test('readImageFile reads a File', (t) => {
return readImageFile(null, cthead1SmallFile)
.then(function ({ image, webWorker }) {
Expand Down