-
Notifications
You must be signed in to change notification settings - Fork 7
Conversation
@@ -132,3 +132,48 @@ for %%T in (bbbc mitocheck tubhiswt) do ( | |||
install\bin\pixels-performance 1 !input! %outdir%\!test!-cpp.ome.tiff %resultsdir%\!test!-pixeldata-win-cpp-%%I.tsv |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As mentioned on the trello card I think here it would be useful to put the new logic into a separate batch file (e.g. tiling.bat
), move the other logic into metadata.bat
and pixeldata.bat
, and then have jenkins-build.bat
call tiling.bat
. The common logic at the top of jenkins-build.bat
can stay as it is--this is just splitting out the test invocation so we can select the tests we want to run for each benchmarking run; for tiling we don't need to run the other tests.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same applies equally to the Unix shell script.
|
||
FormatWriter writer = new OMETiffWriter(); | ||
OMEXMLMetadata writerMeta = new OMEXMLMetadataImpl(); | ||
writerMeta.setImageID("Image:0", 0); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This section could all be replaced by conversion from CoreMetadata using MetadataTools. Not strictly necessary, but the helper will ensure the metadata contains the minimal necessary information.
System.out.print("pass " + i + ": init..."); | ||
System.out.flush(); | ||
OMEXMLMetadata meta = new OMEXMLMetadataImpl(); | ||
List<List<byte[]>> pixels = new ArrayList<List<byte[]>>(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would this be better named planes
, since it's a list of planes containing a list of tiles?
System.out.flush(); | ||
reader.setSeries(series); | ||
|
||
List<byte[]> planes = new ArrayList<byte[]>(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would this be better named tiles
, since it's a list of tiles within a plane?
After pulling the latest Docker image including this PR (from http://hub.docker.com/r/snoopycrimecop/ome-files-performance) and executing, the benchmarking went through except for the tiling execution because of the file name
|
Whats included in this PR:
What isn't included:
Tests:
Large Image
Series 1 - Bazla-14-100-brain - 2015-06-19 23.34.11.ndpi
Starting with a tile size of 30720x25856, then dividing the tile x and y by 2 until tile size reaches 16x16.
Medium Image
Series 2 - Bazla-14-100-brain - 2015-06-19 23.34.11.ndpi
Starting with a tile size of 7680x6464, then subtracting 64 from the tile x and y until tile size reaches 16x16.
Manual Tiling
tubhiswt_C0_TP0.ome.tif
Starting with a tile of size 512x512, then dividing the tile x and y by 2 until tile size reaches 16x16. Writes each tile individually.
Auto Tiling
tubhiswt_C0_TP0.ome.tif
Starting with a tile of size 512x512, then dividing the tile x and y by 2 until tile size reaches 16x16. Writes a full plane with the auto tiling.
Available parameters:
iterations
input
output
results
tileXStart
tileYStart
tileXEnd
tileYEnd
tileOperator (either / or -)
tileIncrement (how much to divide or subtract tile size by)
series
autoTile