From b9cfe355c032aca44824f35c70d88b4fc05606e3 Mon Sep 17 00:00:00 2001 From: Grigori Fursin Date: Wed, 2 Oct 2024 13:54:51 +0200 Subject: [PATCH 1/2] fixed a few outdated URLs for Windows --- script/get-dataset-imagenet-val/_cm.json | 121 ----------------------- script/get-dataset-imagenet-val/_cm.yaml | 101 +++++++++++++++++++ script/get-sys-utils-cm/_cm.yaml | 4 +- script/get-sys-utils-min/_cm.json | 22 ----- script/get-sys-utils-min/_cm.yaml | 25 +++++ 5 files changed, 128 insertions(+), 145 deletions(-) delete mode 100644 script/get-dataset-imagenet-val/_cm.json create mode 100644 script/get-dataset-imagenet-val/_cm.yaml delete mode 100644 script/get-sys-utils-min/_cm.json create mode 100644 script/get-sys-utils-min/_cm.yaml diff --git a/script/get-dataset-imagenet-val/_cm.json b/script/get-dataset-imagenet-val/_cm.json deleted file mode 100644 index e41cf50cba..0000000000 --- a/script/get-dataset-imagenet-val/_cm.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "alias": "get-dataset-imagenet-val", - "automation_alias": "script", - "automation_uid": "5b4e0237da074764", - "cache": true, - "category": "AI/ML datasets", - "env": { - "CM_DATASET": "IMAGENET" - }, - "new_env_keys": [ - "CM_DATASET_PATH", - "CM_DATASET_IMAGENET_PATH", - "CM_DATASET_IMAGENET_VAL_PATH", - "CM_DATASET_SIZE", - "CM_DATASET_VER" - ], - "tags": [ - "get", - "val", - "validation", - "dataset", - "imagenet", - "ILSVRC", - "image-classification", - "original" - ], - "input_mapping": { - "imagenet_path": "IMAGENET_PATH", - "torrent": "CM_DATASET_IMAGENET_VAL_TORRENT_PATH" - }, - "uid": "7afd58d287fe4f11", - "deps": [ - { - "tags": "detect,os" - } - ], - "prehook_deps": [ - { - "tags": "download-and-extract,file,_extract", - "update_tags_from_env_with_prefix": { - "_url.": [ "CM_DAE_URL" ] - }, - "update_tags_from_env": [ - "CM_DAE_EXTRA_TAGS" - ], - "env": { - "CM_EXTRACT_TO_FOLDER": "imagenet-2012-val" - }, - "enable_if_env": { - "CM_DATASET_IMAGENET_VAL_REQUIRE_DAE": ["yes", "True"] - } - }, - { - "tags": "file,extract,_no-remove-extracted", - "update_tags_from_env_with_prefix": { - "_path.": [ "CM_EXTRACT_PATH" ] - }, - "env": { - "CM_EXTRACT_TO_FOLDER": "imagenet-2012-val" - }, - "enable_if_env": { - "CM_DAE_ONLY_EXTRACT": ["yes", "True"] - } - } - ], - "variations": { - "2012": { - "group": "dataset-version", - "default": true, - "env": { - "CM_DATASET_VER": "2012" - } - }, - "2012-500": { - "base": [ - "size.500", - "2012" - ] - }, - "2012-full": { - "base": [ - "full", - "2012" - ] - }, - "full": { - "group": "count", - "env": { - "CM_DATASET_SIZE": "50000", - "CM_IMAGENET_FULL": "yes", - "CM_DAE_FILENAME": "ILSVRC2012_img_val.tar", - "CM_DOWNLOAD_CHECKSUM": "29b22e2961454d5413ddabcf34fc5622" - } - }, - "size.500": { - "group": "count", - "default": true, - "env": { - "CM_DATASET_SIZE": "500", - "CM_DAE_FILENAME": "ILSVRC2012_img_val_500.tar", - "CM_DOWNLOAD_FILENAME": "ILSVRC2012_img_val_500.tar", - "CM_DAE_URL": "http://cKnowledge.org/ai/data/ILSVRC2012_img_val_500.tar", - "CM_DOWNLOAD_CHECKSUM": "8627befdd8c2bcf305729020e9db354e" - } - }, - "size.#": { - "group": "count", - "env": { - "CM_DATASET_SIZE": "#" - } - }, - "run-during-docker-build": { - "docker": { - "run": true - } - } - }, - "docker": { - "run": false - } -} diff --git a/script/get-dataset-imagenet-val/_cm.yaml b/script/get-dataset-imagenet-val/_cm.yaml new file mode 100644 index 0000000000..d21cdad2a5 --- /dev/null +++ b/script/get-dataset-imagenet-val/_cm.yaml @@ -0,0 +1,101 @@ +alias: get-dataset-imagenet-val +uid: 7afd58d287fe4f11 + +automation_alias: script +automation_uid: 5b4e0237da074764 + +cache: true +category: AI/ML datasets + +deps: +- tags: detect,os + +docker: + run: false + +env: + CM_DATASET: IMAGENET + +input_mapping: + imagenet_path: IMAGENET_PATH + torrent: CM_DATASET_IMAGENET_VAL_TORRENT_PATH + +new_env_keys: +- CM_DATASET_PATH +- CM_DATASET_IMAGENET_PATH +- CM_DATASET_IMAGENET_VAL_PATH +- CM_DATASET_SIZE +- CM_DATASET_VER + +prehook_deps: +- enable_if_env: + CM_DATASET_IMAGENET_VAL_REQUIRE_DAE: + - 'yes' + - 'True' + env: + CM_EXTRACT_TO_FOLDER: imagenet-2012-val + tags: download-and-extract,file,_extract + update_tags_from_env: + - CM_DAE_EXTRA_TAGS + update_tags_from_env_with_prefix: + _url.: + - CM_DAE_URL +- enable_if_env: + CM_DAE_ONLY_EXTRACT: + - 'yes' + - 'True' + env: + CM_EXTRACT_TO_FOLDER: imagenet-2012-val + tags: file,extract,_no-remove-extracted + update_tags_from_env_with_prefix: + _path.: + - CM_EXTRACT_PATH + +tags: +- get +- val +- validation +- dataset +- imagenet +- ILSVRC +- image-classification +- original + +variations: + '2012': + default: true + env: + CM_DATASET_VER: '2012' + group: dataset-version + 2012-500: + base: + - size.500 + - '2012' + 2012-full: + base: + - full + - '2012' + full: + env: + CM_DAE_FILENAME: ILSVRC2012_img_val.tar + CM_DATASET_SIZE: '50000' + CM_DOWNLOAD_CHECKSUM: 29b22e2961454d5413ddabcf34fc5622 + CM_IMAGENET_FULL: 'yes' + group: count + run-during-docker-build: + docker: + run: true + size.#: + env: + CM_DATASET_SIZE: '#' + group: count + size.500: + default: true + env: + CM_DAE_FILENAME: ILSVRC2012_img_val_500.tar +# CM_DAE_URL: http://cKnowledge.org/ai/data/ILSVRC2012_img_val_500.tar + CM_DAE_URL: https://www.dropbox.com/scl/fi/a7fhjnzxi6x3ceapxh5bm/ILSVRC2012_img_val_500.tar?rlkey=hz4rabo9ve43co3c303y9r6l7&st=ulcgb3av&dl=1 + CM_DATASET_SIZE: '500' + CM_DOWNLOAD_CHECKSUM: 8627befdd8c2bcf305729020e9db354e + CM_DOWNLOAD_FILENAME: ILSVRC2012_img_val_500.tar + group: count diff --git a/script/get-sys-utils-cm/_cm.yaml b/script/get-sys-utils-cm/_cm.yaml index 1bbfac9ee5..30939d556c 100644 --- a/script/get-sys-utils-cm/_cm.yaml +++ b/script/get-sys-utils-cm/_cm.yaml @@ -14,8 +14,8 @@ deps: env: CM_CLEAN_DIRS: bin CM_PACKAGE_WIN_URL: https://zenodo.org/records/13868077/files/cm-artifact-os-windows-32.zip?download=1 - ; https://www.dropbox.com/s/2y9r2mvtu8tpexk/zlib123dllx64-bin.zip?dl=1 - ; https://cKnowledge.org/ai/data/xz-5.2.9-win64.zip + ; https://www.dropbox.com/scl/fi/cj7xmgmk4wu1r0iuoedcq/zlib123dllx64-bin.zip?rlkey=sqmldotiste2zhk6nhmijg09e&st=i5w7esjx&dl=1 + ; https://www.dropbox.com/scl/fi/x94qvrmac55ht03257139/xz-5.2.9-win64.zip?rlkey=adzixlsqrapncrusy9ndd2qji&st=tqobzlfo&dl=1 CM_SUDO: sudo input_mapping: diff --git a/script/get-sys-utils-min/_cm.json b/script/get-sys-utils-min/_cm.json deleted file mode 100644 index 19ce3f21a3..0000000000 --- a/script/get-sys-utils-min/_cm.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "alias": "get-sys-utils-min", - "automation_alias": "script", - "automation_uid": "5b4e0237da074764", - "cache": true, - "category": "Detection or installation of tools and artifacts", - "deps": [ - ], - "env": { - "CM_CLEAN_DIRS": "bin", - "CM_PACKAGE_WIN_URL": "https://zenodo.org/records/13868077/files/cm-artifact-os-windows-32.zip?download=1 ; https://www.dropbox.com/s/2y9r2mvtu8tpexk/zlib123dllx64-bin.zip?dl=1 ; https://cKnowledge.org/ai/data/xz-5.2.9-win64.zip", - "CM_SUDO": "sudo" - }, - "new_env_keys": [ - "+PATH" - ], - "tags": [ - "get", - "sys-utils-min" - ], - "uid": "a9af7714d3d94779" -} diff --git a/script/get-sys-utils-min/_cm.yaml b/script/get-sys-utils-min/_cm.yaml new file mode 100644 index 0000000000..8f623e2c1c --- /dev/null +++ b/script/get-sys-utils-min/_cm.yaml @@ -0,0 +1,25 @@ +alias: get-sys-utils-min +uid: a9af7714d3d94779 + +automation_alias: script +automation_uid: 5b4e0237da074764 + +cache: true + +category: Detection or installation of tools and artifacts + +deps: [] + +env: + CM_CLEAN_DIRS: bin + CM_PACKAGE_WIN_URL: https://zenodo.org/records/13868077/files/cm-artifact-os-windows-32.zip?download=1 + ; https://www.dropbox.com/scl/fi/cj7xmgmk4wu1r0iuoedcq/zlib123dllx64-bin.zip?rlkey=sqmldotiste2zhk6nhmijg09e&st=i5w7esjx&dl=1 + ; https://www.dropbox.com/scl/fi/x94qvrmac55ht03257139/xz-5.2.9-win64.zip?rlkey=adzixlsqrapncrusy9ndd2qji&st=tqobzlfo&dl=1 + CM_SUDO: sudo + +new_env_keys: +- +PATH + +tags: +- get +- sys-utils-min From 535d0d5d0df8342824c227b201b7912f153694b9 Mon Sep 17 00:00:00 2001 From: Grigori Fursin Date: Wed, 2 Oct 2024 14:02:17 +0200 Subject: [PATCH 2/2] fix stable version --- cmr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmr.yaml b/cmr.yaml index f84a5d3458..226fd06b65 100644 --- a/cmr.yaml +++ b/cmr.yaml @@ -3,7 +3,7 @@ uid: 9e97bb72b0474657 git: true -version: 2.3.4 +version: 2.3.9 deps: - alias: mlcommons@ck