Skip to content

Commit a4062f3

Browse files
thewtexthewtex
authored
Merge pull request #1234 from thewtex/downsample-native
build(downsample): add native pixi build-test configuration
2 parents b31b8f9 + 787c8e0 commit a4062f3

File tree

3 files changed

+65
-30
lines changed

3 files changed

+65
-30
lines changed

‎itk_wasm_env.bash

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ export ITK_WASM_ITK_BUILD_DIR=${ITK_WASM_ITK_BUILD_DIR:-${ITK_WASM_NATIVE_WORKSP
2525
mkdir -p ${ITK_WASM_ITK_BUILD_DIR} || die "Could not create ITK build directory"
2626

2727

28-
export ITK_WASM_DICOM_TEST_DATA_HASH=${ITK_WASM_DICOM_TEST_DATA_HASH:-$(cat packages/dicom/package.json | jq -e -r '."itk-wasm"."test-data-hash"')}
29-
export ITK_WASM_DICOM_TEST_DATA_URLS=${ITK_WASM_DICOM_TEST_DATA_URLS:-$(cat packages/dicom/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}
30-
3128
export ITK_WASM_COMPARE_IMAGES_TEST_DATA_HASH=${ITK_WASM_COMPARE_IMAGES_TEST_DATA_HASH:-$(cat packages/compare-images/package.json | jq -e -r '."itk-wasm"."test-data-hash"')}
3229
export ITK_WASM_COMPARE_IMAGES_TEST_DATA_URLS=${ITK_WASM_COMPARE_IMAGES_TEST_DATA_URLS:-$(cat packages/compare-images/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}
3330

@@ -37,5 +34,11 @@ export ITK_WASM_COMPARE_MESHES_TEST_DATA_URLS=${ITK_WASM_COMPARE_MESHES_TEST_DAT
3734
export ITK_WASM_COMPRESS_STRINGIFY_TEST_DATA_HASH=${ITK_WASM_COMPRESS_STRINGIFY_TEST_DATA_HASH:-$(cat packages/compress-stringify/package.json | jq -e -r '."itk-wasm"."test-data-hash"')}
3835
export ITK_WASM_COMPRESS_STRINGIFY_TEST_DATA_URLS=${ITK_WASM_COMPRESS_STRINGIFY_TEST_DATA_URLS:-$(cat packages/compress-stringify/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}
3936

37+
export ITK_WASM_DICOM_TEST_DATA_HASH=${ITK_WASM_DICOM_TEST_DATA_HASH:-$(cat packages/dicom/package.json | jq -e -r '."itk-wasm"."test-data-hash"')}
38+
export ITK_WASM_DICOM_TEST_DATA_URLS=${ITK_WASM_DICOM_TEST_DATA_URLS:-$(cat packages/dicom/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}
39+
40+
export ITK_WASM_DOWNSAMPLE_TEST_DATA_HASH=${ITK_WASM_DOWNSAMPLE_TEST_DATA_HASH:-$(cat packages/downsample/package.json | jq -e -r '."itk-wasm"."test-data-hash"')}
41+
export ITK_WASM_DOWNSAMPLE_TEST_DATA_URLS=${ITK_WASM_DOWNSAMPLE_TEST_DATA_URLS:-$(cat packages/downsample/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}
42+
4043
export ITK_WASM_MESH_IO_TEST_DATA_HASH=${ITK_WASM_MESH_IO_TEST_DATA_HASH:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-hash"')}
4144
export ITK_WASM_MESH_IO_TEST_DATA_URLS=${ITK_WASM_MESH_IO_TEST_DATA_URLS:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}

‎packages/downsample/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"itk-wasm": {
99
"emscripten-docker-image": "itkwasm/emscripten:latest",
1010
"wasi-docker-image": "itkwasm/wasi:latest",
11+
"test-data-hash": "bafkreic7utwwa32sc7ekhouzdlnla4kffytphcwc7qwam5ndhixwjulydq",
12+
"test-data-urls": [
13+
"https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.163/itkwasm-downsample-test-data.tar.gz https://w3s.link/ipfs/bafybeifwebok64osjl2i3zc6rkn3izgon333wsjotqzqlxorkkvrbldjcy/data.tar.gz",
14+
"https://w3s.link/ipfs/bafybeifwebok64osjl2i3zc6rkn3izgon333wsjotqzqlxorkkvrbldjcy/data.tar.gz"
15+
],
1116
"typescript-package-name": "@itk-wasm/downsample",
1217
"python-package-name": "itkwasm-downsample",
1318
"package-description": "Pipelines for downsampling images.",

‎pixi.toml

Lines changed: 54 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ scripts = ["itk_wasm_env.bash"]
1515
clean = "git clean -fdx"
1616
pnpm-install = { cmd = "pnpm install", description = "Install Node.js dependencies" }
1717

18-
[tasks.dicom-test-data-download]
19-
cmd = "npx dam download test/data test/data.tar.gz $ITK_WASM_DICOM_TEST_DATA_HASH $ITK_WASM_DICOM_TEST_DATA_URLS"
20-
cwd = "packages/dicom"
21-
depends-on = ["pnpm-install"]
22-
outputs = ["packages/dicom/test/data.tar.gz"]
23-
description = "Download DICOM test data"
24-
2518
[tasks.compare-images-test-data-download]
2619
cmd = "npx dam download test/data test/data.tar.gz $ITK_WASM_COMPARE_IMAGES_TEST_DATA_HASH $ITK_WASM_COMPARE_IMAGES_TEST_DATA_URLS"
2720
cwd = "packages/compare-images"
@@ -43,6 +36,20 @@ depends-on = ["pnpm-install"]
4336
outputs = ["packages/compress-stringify/test/data.tar.gz"]
4437
description = "Download compress-stringify test data"
4538

39+
[tasks.dicom-test-data-download]
40+
cmd = "npx dam download test/data test/data.tar.gz $ITK_WASM_DICOM_TEST_DATA_HASH $ITK_WASM_DICOM_TEST_DATA_URLS"
41+
cwd = "packages/dicom"
42+
depends-on = ["pnpm-install"]
43+
outputs = ["packages/dicom/test/data.tar.gz"]
44+
description = "Download DICOM test data"
45+
46+
[tasks.downsample-test-data-download]
47+
cmd = "npx dam download test/data test/data.tar.gz $ITK_WASM_DOWNSAMPLE_TEST_DATA_HASH $ITK_WASM_DOWNSAMPLE_TEST_DATA_URLS"
48+
cwd = "packages/downsample"
49+
depends-on = ["pnpm-install"]
50+
outputs = ["packages/downsample/test/data.tar.gz"]
51+
description = "Download downsample test data"
52+
4653
[tasks.mesh-io-test-data-download]
4754
cmd = "npx dam download test/data test/data.tar.gz $ITK_WASM_MESH_IO_TEST_DATA_HASH $ITK_WASM_MESH_IO_TEST_DATA_URLS"
4855
cwd = "packages/mesh-io"
@@ -162,26 +169,6 @@ cmd = "ctest --test-dir $ITK_WASM_NATIVE_WORKSPACE/ITK-Wasm-build"
162169
depends-on = ["build-itk-wasm"]
163170
description = "Test ITK-Wasm"
164171

165-
[feature.native.tasks.configure-native-dicom]
166-
cmd = '''cmake -B$ITK_WASM_NATIVE_WORKSPACE/dicom-build -Spackages/dicom -GNinja
167-
-DITK_DIR:PATH=$ITK_WASM_ITK_BUILD_DIR
168-
-DBUILD_TESTING:BOOL=ON
169-
-DCMAKE_CXX_STANDARD:STRING=20
170-
-DCMAKE_BUILD_TYPE:STRING=Debug'''
171-
depends-on = ["build-itk-wasm", "dicom-test-data-download"]
172-
outputs = ["native/dicom-build/CMakeFiles/"]
173-
description = "Configure dicom native binaries"
174-
175-
[feature.native.tasks.build-native-dicom]
176-
cmd = "cmake --build $ITK_WASM_NATIVE_WORKSPACE/dicom-build"
177-
depends-on = ["configure-native-dicom"]
178-
description = "Build dicom native binaries"
179-
180-
[feature.native.tasks.test-native-dicom]
181-
cmd = "ctest --test-dir $ITK_WASM_NATIVE_WORKSPACE/dicom-build"
182-
depends-on = ["build-native-dicom"]
183-
description = "Test dicom native binaries"
184-
185172
[feature.native.tasks.configure-native-compare-images]
186173
cmd = '''cmake -B$ITK_WASM_NATIVE_WORKSPACE/compare-images-build -Spackages/compare-images -GNinja
187174
-DITK_DIR:PATH=$ITK_WASM_ITK_BUILD_DIR
@@ -242,6 +229,46 @@ cmd = "ctest --test-dir $ITK_WASM_NATIVE_WORKSPACE/compress-stringify-build"
242229
depends-on = ["build-native-compress-stringify"]
243230
description = "Test compress-stringify native binaries"
244231

232+
[feature.native.tasks.configure-native-dicom]
233+
cmd = '''cmake -B$ITK_WASM_NATIVE_WORKSPACE/dicom-build -Spackages/dicom -GNinja
234+
-DITK_DIR:PATH=$ITK_WASM_ITK_BUILD_DIR
235+
-DBUILD_TESTING:BOOL=ON
236+
-DCMAKE_CXX_STANDARD:STRING=20
237+
-DCMAKE_BUILD_TYPE:STRING=Debug'''
238+
depends-on = ["build-itk-wasm", "dicom-test-data-download"]
239+
outputs = ["native/dicom-build/CMakeFiles/"]
240+
description = "Configure dicom native binaries"
241+
242+
[feature.native.tasks.build-native-dicom]
243+
cmd = "cmake --build $ITK_WASM_NATIVE_WORKSPACE/dicom-build"
244+
depends-on = ["configure-native-dicom"]
245+
description = "Build dicom native binaries"
246+
247+
[feature.native.tasks.test-native-dicom]
248+
cmd = "ctest --test-dir $ITK_WASM_NATIVE_WORKSPACE/dicom-build"
249+
depends-on = ["build-native-dicom"]
250+
description = "Test dicom native binaries"
251+
252+
[feature.native.tasks.configure-native-downsample]
253+
cmd = '''cmake -B$ITK_WASM_NATIVE_WORKSPACE/downsample-build -Spackages/downsample -GNinja
254+
-DITK_DIR:PATH=$ITK_WASM_ITK_BUILD_DIR
255+
-DBUILD_TESTING:BOOL=ON
256+
-DCMAKE_CXX_STANDARD:STRING=20
257+
-DCMAKE_BUILD_TYPE:STRING=Debug'''
258+
depends-on = ["build-itk-wasm", "downsample-test-data-download"]
259+
outputs = ["native/downsample-build/CMakeFiles/"]
260+
description = "Configure downsample native binaries"
261+
262+
[feature.native.tasks.build-native-downsample]
263+
cmd = "cmake --build $ITK_WASM_NATIVE_WORKSPACE/downsample-build"
264+
depends-on = ["configure-native-downsample"]
265+
description = "Build downsample native binaries"
266+
267+
[feature.native.tasks.test-native-downsample]
268+
cmd = "ctest --test-dir $ITK_WASM_NATIVE_WORKSPACE/downsample-build"
269+
depends-on = ["build-native-downsample"]
270+
description = "Test downsample native binaries"
271+
245272
[feature.native.tasks.configure-native-mesh-io]
246273
cmd = '''cmake -B$ITK_WASM_NATIVE_WORKSPACE/mesh-io-build -Spackages/mesh-io -GNinja
247274
-DITK_DIR:PATH=$ITK_WASM_ITK_BUILD_DIR

0 commit comments

Comments
 (0)