From 4bd90fbc2d3fac1f55f425a8494a3e82d0e19d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20POIRET?= Date: Sat, 3 Feb 2024 10:30:11 +0100 Subject: [PATCH] feat: updated standard models --- .../segmentation/bagging_accurate.prev.yaml | 26 +++++++++++++++++++ hsf/conf/segmentation/bagging_accurate.yaml | 24 ++++++++--------- hsf/conf/segmentation/bagging_fast.prev.yaml | 26 +++++++++++++++++++ hsf/conf/segmentation/bagging_fast.yaml | 26 +++++++++---------- .../{bagging_sq.yaml => bagging_sq.prev.yaml} | 0 .../segmentation/single_accurate.prev.yaml | 14 ++++++++++ hsf/conf/segmentation/single_accurate.yaml | 8 +++--- hsf/conf/segmentation/single_fast.prev.yaml | 14 ++++++++++ hsf/conf/segmentation/single_fast.yaml | 12 ++++----- .../{single_sq.yaml => single_sq.prev.yaml} | 0 10 files changed, 115 insertions(+), 35 deletions(-) create mode 100644 hsf/conf/segmentation/bagging_accurate.prev.yaml create mode 100644 hsf/conf/segmentation/bagging_fast.prev.yaml rename hsf/conf/segmentation/{bagging_sq.yaml => bagging_sq.prev.yaml} (100%) create mode 100644 hsf/conf/segmentation/single_accurate.prev.yaml create mode 100644 hsf/conf/segmentation/single_fast.prev.yaml rename hsf/conf/segmentation/{single_sq.yaml => single_sq.prev.yaml} (100%) diff --git a/hsf/conf/segmentation/bagging_accurate.prev.yaml b/hsf/conf/segmentation/bagging_accurate.prev.yaml new file mode 100644 index 0000000..17f9d5e --- /dev/null +++ b/hsf/conf/segmentation/bagging_accurate.prev.yaml @@ -0,0 +1,26 @@ +# Original models from Poiret, et al., 2022. +# Uses bootstrap aggregating and test-time augmentation. +# Current version: 3.0.0 + +ca_mode: "1/2/3" +models_path: "~/.hsf/models/bagging/" +models: + arunet_bag_0.onnx: + url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag0.onnx?download=1" + xxh3_64: "3979a886022e3646" + arunet_bag_1.onnx: + url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag1.onnx?download=1" + xxh3_64: "3f2265542b63edce" + arunet_bag_2.onnx: + url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag2.onnx?download=1" + xxh3_64: "7b514bbbaa34c20c" + arunet_bag_3.onnx: + url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag3.onnx?download=1" + xxh3_64: "6ed1498726f52bd2" + arunet_bag_4.onnx: + url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag4.onnx?download=1" + xxh3_64: "b55d075b1211989c" + +segmentation: + test_time_augmentation: True + test_time_num_aug: 20 diff --git a/hsf/conf/segmentation/bagging_accurate.yaml b/hsf/conf/segmentation/bagging_accurate.yaml index 17f9d5e..85a2975 100644 --- a/hsf/conf/segmentation/bagging_accurate.yaml +++ b/hsf/conf/segmentation/bagging_accurate.yaml @@ -1,25 +1,25 @@ -# Original models from Poiret, et al., 2022. +# Original models from Poiret, et al., 2024. # Uses bootstrap aggregating and test-time augmentation. -# Current version: 3.0.0 +# Current version: 4.0.0 ca_mode: "1/2/3" models_path: "~/.hsf/models/bagging/" models: arunet_bag_0.onnx: - url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag0.onnx?download=1" - xxh3_64: "3979a886022e3646" + url: "https://huggingface.co/poiretclement/hsf/resolve/main/onnx/arunet_4.0.0b0_1706633574.onnx" + xxh3_64: "535af004dc7251af" arunet_bag_1.onnx: - url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag1.onnx?download=1" - xxh3_64: "3f2265542b63edce" + url: "https://huggingface.co/poiretclement/hsf/resolve/main/onnx/arunet_4.0.0b1_1706699484.onnx" + xxh3_64: "ca97ac4be073149f" arunet_bag_2.onnx: - url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag2.onnx?download=1" - xxh3_64: "7b514bbbaa34c20c" + url: "https://huggingface.co/poiretclement/hsf/resolve/main/onnx/arunet_4.0.0b2_1706714241.onnx" + xxh3_64: "f9de9d5392460c3a" arunet_bag_3.onnx: - url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag3.onnx?download=1" - xxh3_64: "6ed1498726f52bd2" + url: "https://huggingface.co/poiretclement/hsf/resolve/main/onnx/arunet_4.0.0b3_1706858428.onnx" + xxh3_64: "85259d3c0c8baa21" arunet_bag_4.onnx: - url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag4.onnx?download=1" - xxh3_64: "b55d075b1211989c" + url: "https://huggingface.co/poiretclement/hsf/resolve/main/onnx/arunet_4.0.0b4_1706874562.onnx" + xxh3_64: "cb04f34305ec33af" segmentation: test_time_augmentation: True diff --git a/hsf/conf/segmentation/bagging_fast.prev.yaml b/hsf/conf/segmentation/bagging_fast.prev.yaml new file mode 100644 index 0000000..d89f7ce --- /dev/null +++ b/hsf/conf/segmentation/bagging_fast.prev.yaml @@ -0,0 +1,26 @@ +# Original models from Poiret, et al., 2022. +# Uses bootstrap aggregating without test-time augmentation. +# Current version: 3.0.0 + +ca_mode: "1/2/3" +models_path: "~/.hsf/models/bagging/" +models: + arunet_bag_0.onnx: + url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag0.onnx?download=1" + xxh3_64: "3979a886022e3646" + arunet_bag_1.onnx: + url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag1.onnx?download=1" + xxh3_64: "3f2265542b63edce" + arunet_bag_2.onnx: + url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag2.onnx?download=1" + xxh3_64: "7b514bbbaa34c20c" + arunet_bag_3.onnx: + url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag3.onnx?download=1" + xxh3_64: "6ed1498726f52bd2" + arunet_bag_4.onnx: + url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag4.onnx?download=1" + xxh3_64: "b55d075b1211989c" + +segmentation: + test_time_augmentation: False + test_time_num_aug: 1 diff --git a/hsf/conf/segmentation/bagging_fast.yaml b/hsf/conf/segmentation/bagging_fast.yaml index d89f7ce..359984a 100644 --- a/hsf/conf/segmentation/bagging_fast.yaml +++ b/hsf/conf/segmentation/bagging_fast.yaml @@ -1,25 +1,25 @@ -# Original models from Poiret, et al., 2022. -# Uses bootstrap aggregating without test-time augmentation. -# Current version: 3.0.0 +# Original models from Poiret, et al., 2024. +# Uses bootstrap aggregating and test-time augmentation. +# Current version: 4.0.0 ca_mode: "1/2/3" models_path: "~/.hsf/models/bagging/" models: arunet_bag_0.onnx: - url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag0.onnx?download=1" - xxh3_64: "3979a886022e3646" + url: "https://huggingface.co/poiretclement/hsf/resolve/main/onnx/arunet_4.0.0b0_1706633574.onnx" + xxh3_64: "535af004dc7251af" arunet_bag_1.onnx: - url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag1.onnx?download=1" - xxh3_64: "3f2265542b63edce" + url: "https://huggingface.co/poiretclement/hsf/resolve/main/onnx/arunet_4.0.0b1_1706699484.onnx" + xxh3_64: "ca97ac4be073149f" arunet_bag_2.onnx: - url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag2.onnx?download=1" - xxh3_64: "7b514bbbaa34c20c" + url: "https://huggingface.co/poiretclement/hsf/resolve/main/onnx/arunet_4.0.0b2_1706714241.onnx" + xxh3_64: "f9de9d5392460c3a" arunet_bag_3.onnx: - url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag3.onnx?download=1" - xxh3_64: "6ed1498726f52bd2" + url: "https://huggingface.co/poiretclement/hsf/resolve/main/onnx/arunet_4.0.0b3_1706858428.onnx" + xxh3_64: "85259d3c0c8baa21" arunet_bag_4.onnx: - url: "https://zenodo.org/record/6470400/files/arunet_3.0.0_bag4.onnx?download=1" - xxh3_64: "b55d075b1211989c" + url: "https://huggingface.co/poiretclement/hsf/resolve/main/onnx/arunet_4.0.0b4_1706874562.onnx" + xxh3_64: "cb04f34305ec33af" segmentation: test_time_augmentation: False diff --git a/hsf/conf/segmentation/bagging_sq.yaml b/hsf/conf/segmentation/bagging_sq.prev.yaml similarity index 100% rename from hsf/conf/segmentation/bagging_sq.yaml rename to hsf/conf/segmentation/bagging_sq.prev.yaml diff --git a/hsf/conf/segmentation/single_accurate.prev.yaml b/hsf/conf/segmentation/single_accurate.prev.yaml new file mode 100644 index 0000000..9c29675 --- /dev/null +++ b/hsf/conf/segmentation/single_accurate.prev.yaml @@ -0,0 +1,14 @@ +# Original models from Poiret, et al., 2022. +# Uses a single model and test-time augmentation. +# Current version: 3.0.0 + +ca_mode: "1/2/3" +models_path: "~/.hsf/models/single/" +models: + arunet_bag_0.onnx: + url: "https://zenodo.org/record/6457484/files/arunet_3.0.0_single.onnx?download=1" + xxh3_64: "71edec9011f7f304" + +segmentation: + test_time_augmentation: True + test_time_num_aug: 20 diff --git a/hsf/conf/segmentation/single_accurate.yaml b/hsf/conf/segmentation/single_accurate.yaml index 9c29675..bb73c28 100644 --- a/hsf/conf/segmentation/single_accurate.yaml +++ b/hsf/conf/segmentation/single_accurate.yaml @@ -1,13 +1,13 @@ -# Original models from Poiret, et al., 2022. +# Original models from Poiret, et al., 2024. # Uses a single model and test-time augmentation. -# Current version: 3.0.0 +# Current version: 4.0.0 ca_mode: "1/2/3" models_path: "~/.hsf/models/single/" models: arunet_bag_0.onnx: - url: "https://zenodo.org/record/6457484/files/arunet_3.0.0_single.onnx?download=1" - xxh3_64: "71edec9011f7f304" + url: "https://huggingface.co/poiretclement/hsf/resolve/main/onnx/arunet_4.0.0single_1706895706.onnx" + xxh3_64: "da825a3911d09411" segmentation: test_time_augmentation: True diff --git a/hsf/conf/segmentation/single_fast.prev.yaml b/hsf/conf/segmentation/single_fast.prev.yaml new file mode 100644 index 0000000..48ffe12 --- /dev/null +++ b/hsf/conf/segmentation/single_fast.prev.yaml @@ -0,0 +1,14 @@ +# Original models from Poiret, et al., 2022. +# Uses a single model without test-time augmentation. +# Current version: 3.0.0 + +ca_mode: "1/2/3" +models_path: "~/.hsf/models/single/" +models: + arunet_single.onnx: + url: "https://zenodo.org/record/6457484/files/arunet_3.0.0_single.onnx?download=1" + xxh3_64: "71edec9011f7f304" + +segmentation: + test_time_augmentation: False + test_time_num_aug: 1 diff --git a/hsf/conf/segmentation/single_fast.yaml b/hsf/conf/segmentation/single_fast.yaml index 48ffe12..6bc4d58 100644 --- a/hsf/conf/segmentation/single_fast.yaml +++ b/hsf/conf/segmentation/single_fast.yaml @@ -1,13 +1,13 @@ -# Original models from Poiret, et al., 2022. -# Uses a single model without test-time augmentation. -# Current version: 3.0.0 +# Original models from Poiret, et al., 2024. +# Uses a single model and test-time augmentation. +# Current version: 4.0.0 ca_mode: "1/2/3" models_path: "~/.hsf/models/single/" models: - arunet_single.onnx: - url: "https://zenodo.org/record/6457484/files/arunet_3.0.0_single.onnx?download=1" - xxh3_64: "71edec9011f7f304" + arunet_bag_0.onnx: + url: "https://huggingface.co/poiretclement/hsf/resolve/main/onnx/arunet_4.0.0single_1706895706.onnx" + xxh3_64: "da825a3911d09411" segmentation: test_time_augmentation: False diff --git a/hsf/conf/segmentation/single_sq.yaml b/hsf/conf/segmentation/single_sq.prev.yaml similarity index 100% rename from hsf/conf/segmentation/single_sq.yaml rename to hsf/conf/segmentation/single_sq.prev.yaml