diff --git a/environment.yml b/environment.yml index 117263cb..8f651a0f 100644 --- a/environment.yml +++ b/environment.yml @@ -6,16 +6,14 @@ dependencies: - maven - make - cmake - - xtensor-zarr=0.0.4 + - xtensor-zarr >=0.0.8|=0.0.7=*_1 - openimageio - - zlib - - blosc - nodejs - z5py >= 2.0.10 - python == 3.7.9 - scikit-image - pytest - - zarr >= 2.8.0 + - zarr >= 2.8.3 - pip - pandas - tabulate diff --git a/generate_data/js/package-lock.json b/generate_data/js/package-lock.json index f95b52a6..c03611b7 100644 --- a/generate_data/js/package-lock.json +++ b/generate_data/js/package-lock.json @@ -1,85 +1,6 @@ { - "name": "js", - "version": "1.0.0", - "lockfileVersion": 2, "requires": true, - "packages": { - "": { - "dependencies": { - "pngjs": "^6.0.0", - "zarr": "^0.4.0" - } - }, - "node_modules/eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" - }, - "node_modules/numcodecs": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/numcodecs/-/numcodecs-0.1.1.tgz", - "integrity": "sha512-UjKulZ6GIFKLdBIczEbsoXNZQmiHafpoIdo39YcdecHVGyMKh0+azsfHTrybXm5RZwepqLZv24mkjqGdZGm24Q==", - "dependencies": { - "pako": "^1.0.11" - } - }, - "node_modules/p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "engines": { - "node": ">=4" - } - }, - "node_modules/p-queue": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.2.0.tgz", - "integrity": "sha512-B2LXNONcyn/G6uz2UBFsGjmSa0e/br3jznlzhEyCXg56c7VhEpiT2pZxGOfv32Q3FSyugAdys9KGpsv3kV+Sbg==", - "dependencies": { - "eventemitter3": "^4.0.0", - "p-timeout": "^3.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/p-timeout": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", - "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", - "dependencies": { - "p-finally": "^1.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" - }, - "node_modules/pngjs": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-6.0.0.tgz", - "integrity": "sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==", - "engines": { - "node": ">=12.13.0" - } - }, - "node_modules/zarr": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/zarr/-/zarr-0.4.0.tgz", - "integrity": "sha512-zvxdX3aRWxjy6H3OtA7R05NNZvRKxn/7bkNJhUsVKKbNoJ3DBqYERQfzI4WfAV1OTcclqvlYwkQ7DWsGJA5QEw==", - "dependencies": { - "numcodecs": "^0.1.0", - "p-queue": "6.2.0" - }, - "engines": { - "node": ">=8.0.0" - } - } - }, + "lockfileVersion": 1, "dependencies": { "eventemitter3": { "version": "4.0.7", diff --git a/generate_data/js/src/index.js b/generate_data/js/src/index.js index 455e0099..02998710 100644 --- a/generate_data/js/src/index.js +++ b/generate_data/js/src/index.js @@ -1,6 +1,7 @@ import fs from "fs"; import p from "path"; -import { PNG } from "pngjs"; +import pkg from "pngjs"; +const { PNG } = pkg; import { openGroup, NestedArray, slice } from "zarr"; import FSStore from "./fsstore.js"; @@ -37,7 +38,7 @@ async function generateZarrFormat(codecIds = ["gzip", "blosc", "zlib", null]) { const path = p.join("..", "..", "data", "js.zr"); const img = imread(p.join("..", "..", "data", "reference_image.png")); - fs.rmSync(path, { recursive: true, force: true }); + fs.rmdirSync(path, { recursive: true, force: true }); const grp = await open(path); for (const id of codecIds) { const config = id ? STR_TO_COMPRESSOR[id] : null; diff --git a/generate_data/xtensor_zarr/CMakeLists.txt b/generate_data/xtensor_zarr/CMakeLists.txt index f982d9bd..7ee11e5e 100644 --- a/generate_data/xtensor_zarr/CMakeLists.txt +++ b/generate_data/xtensor_zarr/CMakeLists.txt @@ -82,6 +82,7 @@ endif() target_link_libraries(run_xtensor_zarr PUBLIC xtensor-zarr + xtensor-zarr-gdal ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/generate_data/xtensor_zarr/generate_data.sh b/generate_data/xtensor_zarr/generate_data.sh index 9b8b60ee..b6e66582 100755 --- a/generate_data/xtensor_zarr/generate_data.sh +++ b/generate_data/xtensor_zarr/generate_data.sh @@ -5,5 +5,7 @@ cd "${0%/*}" rm -rf build mkdir build cd build +export LDFLAGS="${LDFLAGS} -Wl,-rpath,$CONDA_PREFIX/lib -Wl,-rpath,$PWD" +export LINKFLAGS="${LDFLAGS}" cmake .. -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DCMAKE_INSTALL_LIBDIR=lib make run