From 1141a33c1c96fad1e1da56842cbfcdf6d884a8de Mon Sep 17 00:00:00 2001 From: Jean-Francois Panisset Date: Mon, 5 May 2025 23:38:52 -0700 Subject: [PATCH] 2025.1 images - 2025.1 images - transition to oneTBB 2021.13.0 - support for Conan Center Index style config.yml to support separate recipes per package version - common images much slimmer, no longer include the following CUDA components - #183: Nsight Compute profiler - libcublas-devel-x-y - libcusparse-devel-x-y - libcufft-devel-x-y - libnpp-devel-x-y - libcusolver-devel-x-y - leverage [new NVIDIA repo](https://github.com/NVIDIA/optix-dev) to install OptiX headers - #255: fix build depenedency between tcl and tk wrappers - partio build correctly sets C++ standard - OpenSubDiv build preserves static libraries since its CMake files expect both static and dynamic libs to be present - Version updates - CMake 3.31.7 (was 3.31.6) - CUDA 12.6.3 (was 12.6.1) - oneTBB 2021.13.0 (was 2020_u3) - OpenImageIO 3.0.6.1 (was 3.0.5.0) - OpenShadingLanguage 1.14.5.1 (was 1.14.5.0) - Optix 9.0 headers (previous most recent was 8.1) - PartIO 1.19.0 (was 1.17.3) - USD 25.05 (was 25.02a.eae7e67) Signed-off-by: Jean-Francois Panisset --- .github/workflows/docker-builds.yml | 15 +- CHANGELOG.md | 26 + CONTRIBUTING.md | 3 +- Pipfile.lock | 743 ++++++++++-------- ci-base/Dockerfile | 10 +- ci-base/README.md | 16 +- ci-base/image.yaml | 2 +- ci-baseqt/Dockerfile | 10 +- ci-baseqt/README.md | 16 +- ci-baseqt/image.yaml | 2 +- ci-common/Dockerfile | 23 +- ci-common/README.md | 16 +- ci-common/image.yaml | 20 +- ci-materialx/Dockerfile | 10 +- ci-materialx/README.md | 12 +- ci-materialx/image.yaml | 2 +- ci-ocio/Dockerfile | 10 +- ci-ocio/README.md | 16 +- ci-ocio/image.yaml | 2 +- ci-oiio/Dockerfile | 10 +- ci-oiio/README.md | 6 +- ci-oiio/image.yaml | 2 +- ci-opencue/README.md | 2 +- ci-openexr/README.md | 2 +- ci-openrv/README.md | 2 +- ci-openvdb/Dockerfile | 10 +- ci-openvdb/README.md | 50 +- ci-openvdb/image.yaml | 2 +- ci-osl/Dockerfile | 10 +- ci-osl/README.md | 54 +- ci-osl/image.yaml | 2 +- ci-otio/Dockerfile | 10 +- ci-otio/README.md | 16 +- ci-otio/image.yaml | 2 +- ci-usd/Dockerfile | 10 +- ci-usd/README.md | 22 +- ci-usd/image.yaml | 2 +- ci-vfxall/Dockerfile | 10 +- ci-vfxall/README.md | 58 +- ci-vfxall/image.yaml | 2 +- packages/base1/Dockerfile | 2 +- packages/common/Dockerfile | 48 +- packages/conan/recipes/cmake/conandata.yml | 5 +- packages/conan/recipes/cpython/conandata.yml | 3 + packages/conan/recipes/oiio/conandata.yml | 13 + .../oiio/patches/3.0.6.1-cmake-fmt.patch | 15 + .../oiio/patches/3.0.6.1-imath-includes.txt | 62 ++ .../{tbb => onetbb/2020.x}/conandata.yml | 0 .../{tbb => onetbb/2020.x}/conanfile.py | 2 +- .../2020.x}/test_package/CMakeLists.txt | 0 .../2020.x}/test_package/conanfile.py | 0 .../2020.x}/test_package/test_package.cpp | 0 .../conan/recipes/onetbb/all/conandata.yml | 66 ++ .../conan/recipes/onetbb/all/conanfile.py | 254 ++++++ .../onetbb/all/patches/android-ndk25.patch | 46 ++ ...x-overeager-stripping-of-compile-flag.diff | 13 + .../all/patches/onetbb-wait-namespace.patch | 38 + ...pkg-search-module-use-imported-target.diff | 97 +++ .../onetbb/all/test_package/CMakeLists.txt | 14 + .../onetbb/all/test_package/conanfile.py | 32 + .../onetbb/all/test_package/test_package.cpp | 16 + packages/conan/recipes/onetbb/config.yml | 41 + .../conan/recipes/opensubdiv/conanfile.py | 15 +- packages/conan/recipes/partio/conandata.yml | 7 + packages/conan/recipes/partio/conanfile.py | 16 +- packages/conan/recipes/pyside/conandata.yml | 3 + packages/conan/recipes/qt/conandata.yml | 20 + packages/conan/settings/profiles_aswf/vfx2025 | 3 +- .../settings/profiles_aswftesting/ci_common5 | 2 +- .../settings/profiles_aswftesting/vfx2025 | 3 +- packages/review/Dockerfile | 8 +- packages/vfx1/Dockerfile | 8 +- packages/vfx2/Dockerfile | 14 +- python/aswfdocker/data/versions.yaml | 292 +++---- python/aswfdocker/tests/test_builder.py | 22 +- scripts/common/install_cudadevel.sh | 68 ++ scripts/common/install_optix.sh | 54 +- scripts/common/install_yq.sh | 12 + scripts/vfx/build_usd.sh | 2 +- 79 files changed, 1762 insertions(+), 792 deletions(-) create mode 100644 packages/conan/recipes/oiio/patches/3.0.6.1-cmake-fmt.patch create mode 100644 packages/conan/recipes/oiio/patches/3.0.6.1-imath-includes.txt rename packages/conan/recipes/{tbb => onetbb/2020.x}/conandata.yml (100%) rename packages/conan/recipes/{tbb => onetbb/2020.x}/conanfile.py (99%) rename packages/conan/recipes/{tbb => onetbb/2020.x}/test_package/CMakeLists.txt (100%) rename packages/conan/recipes/{tbb => onetbb/2020.x}/test_package/conanfile.py (100%) rename packages/conan/recipes/{tbb => onetbb/2020.x}/test_package/test_package.cpp (100%) create mode 100644 packages/conan/recipes/onetbb/all/conandata.yml create mode 100644 packages/conan/recipes/onetbb/all/conanfile.py create mode 100644 packages/conan/recipes/onetbb/all/patches/android-ndk25.patch create mode 100644 packages/conan/recipes/onetbb/all/patches/fix-overeager-stripping-of-compile-flag.diff create mode 100644 packages/conan/recipes/onetbb/all/patches/onetbb-wait-namespace.patch create mode 100644 packages/conan/recipes/onetbb/all/patches/pkg-search-module-use-imported-target.diff create mode 100644 packages/conan/recipes/onetbb/all/test_package/CMakeLists.txt create mode 100644 packages/conan/recipes/onetbb/all/test_package/conanfile.py create mode 100644 packages/conan/recipes/onetbb/all/test_package/test_package.cpp create mode 100644 packages/conan/recipes/onetbb/config.yml create mode 100755 scripts/common/install_cudadevel.sh create mode 100755 scripts/common/install_yq.sh diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index bc882709..416c0f0d 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -119,7 +119,7 @@ jobs: --version ${{ matrix.common_version }}\ --push NO - - name: Build base1 system wrapper and level 1 Conan packages + - name: Build base1 system wrapper packages run: | set -ex pipenv run aswfdocker \ @@ -129,6 +129,19 @@ jobs: build \ --ci-image-type PACKAGE \ --group base1-wrappers \ + --version ${{ matrix.version_noclang }} \ + --use-conan \ + --build-missing + + - name: Build base1 level 1 Conan packages + run: | + set -ex + pipenv run aswfdocker \ + --repo-uri $GITHUB_REPOSITORY \ + --source-branch $GITHUB_REF \ + --verbose \ + build \ + --ci-image-type PACKAGE \ --group base1-1 \ --version ${{ matrix.version_noclang }} \ --use-conan \ diff --git a/CHANGELOG.md b/CHANGELOG.md index bd2d6e76..11472576 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,32 @@ All notable changes to this project will be documented in this file. +# 2025-05-04 + +- 2025.1 images + - transition to oneTBB 2021.13.0 + - support for Conan Center Index style config.yml to support separate recipes per package version + - common images much slimmer, no longer include the following CUDA components + - #183: Nsight Compute profiler + - libcublas-devel-x-y + - libcusparse-devel-x-y + - libcufft-devel-x-y + - libnpp-devel-x-y + - libcusolver-devel-x-y + - leverage [new NVIDIA repo](https://github.com/NVIDIA/optix-dev) to install OptiX headers + - #255: fix build depenedency between tcl and tk wrappers + - partio build correctly sets C++ standard + - OpenSubDiv build preserves static libraries since its CMake files expect both static and dynamic libs to be present +- Version updates + - CMake 3.31.7 (was 3.31.6) + - CUDA 12.6.3 (was 12.6.1) + - oneTBB 2021.13.0 (was 2020_u3) + - OpenImageIO 3.0.6.1 (was 3.0.5.0) + - OpenShadingLanguage 1.14.5.1 (was 1.14.5.0) + - Optix 9.0 headers (previous most recent was 8.1) + - PartIO 1.19.0 (was 1.17.3) + - USD 25.05 (was 25.02a.eae7e67) + # 2025-04-08 - 2025.0 images diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f777b975..7464d07b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -587,7 +587,8 @@ aswfdocker release -t PACKAGE -g common -v 1-clang6 -v 1-clang7 -v 1-clang8 -v 1 aswfdocker release -t IMAGE -g common -v 1-clang6 -v 1-clang7 -v 1-clang8 -v 1-clang9 -v 1-clang10 -v 2-clang10 -v 2-clang11 -v 2-clang12 -v 2-clang13-v 2-clang14 -v 3-clang14 -v 3-clang15 -v 4-clang16 -v 4-clang17 -v 5-clang18 -v 5-clang19 --docker-org aswf -m "RELEASE_NOTES!" # Base packages -aswfdocker release -t PACKAGE -g base1-wrappers -g base1-1 -v 2018 -v 2019 -v 2020 -v 2021 -v 2022 -v 2023 -v 2024 -v 2025 --docker-org aswf -m "RELEASE_NOTES!" +aswfdocker release -t PACKAGE -g base1-wrappers -v 2018 -v 2019 -v 2020 -v 2021 -v 2022 -v 2023 -v 2024 -v 2025 --docker-org aswf -m "RELEASE_NOTES!" +aswfdocker release -t PACKAGE -g base1-1 -v 2018 -v 2019 -v 2020 -v 2021 -v 2022 -v 2023 -v 2024 -v 2025 --docker-org aswf -m "RELEASE_NOTES!" aswfdocker release -t PACKAGE -g base1-2 -v 2018 -v 2019 -v 2020 -v 2021 -v 2022 -v 2023 -v 2024 -v 2025 --docker-org aswf -m "RELEASE_NOTES!" aswfdocker release -t PACKAGE -g base1-3 -v 2018 -v 2019 -v 2020 -v 2021 -v 2022 -v 2023 -v 2024 -v 2025 --docker-org aswf -m "RELEASE_NOTES!" diff --git a/Pipfile.lock b/Pipfile.lock index fc00b253..f5349b82 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -33,7 +33,7 @@ "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b", "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90" ], - "markers": "python_version >= '3.7'", + "markers": "python_version >= '3.6'", "version": "==2024.7.4" }, "cffi": { @@ -202,7 +202,7 @@ "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519", "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561" ], - "markers": "python_version >= '3'", + "markers": "python_full_version >= '3.7.0'", "version": "==3.3.2" }, "click": { @@ -232,35 +232,43 @@ }, "cryptography": { "hashes": [ - "sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494", - "sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806", - "sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d", - "sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062", - "sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2", - "sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4", - "sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1", - "sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85", - "sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84", - "sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042", - "sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d", - "sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962", - "sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2", - "sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa", - "sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d", - "sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365", - "sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96", - "sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47", - "sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d", - "sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d", - "sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c", - "sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb", - "sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277", - "sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172", - "sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034", - "sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a", - "sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289" - ], - "version": "==43.0.1" + "sha256:04abd71114848aa25edb28e225ab5f268096f44cf0127f3d36975bdf1bdf3390", + "sha256:0529b1d5a0105dd3731fa65680b45ce49da4d8115ea76e9da77a875396727b41", + "sha256:1bc312dfb7a6e5d66082c87c34c8a62176e684b6fe3d90fcfe1568de675e6688", + "sha256:268e4e9b177c76d569e8a145a6939eca9a5fec658c932348598818acf31ae9a5", + "sha256:29ecec49f3ba3f3849362854b7253a9f59799e3763b0c9d0826259a88efa02f1", + "sha256:2bf7bf75f7df9715f810d1b038870309342bff3069c5bd8c6b96128cb158668d", + "sha256:3b721b8b4d948b218c88cb8c45a01793483821e709afe5f622861fc6182b20a7", + "sha256:3c00b6b757b32ce0f62c574b78b939afab9eecaf597c4d624caca4f9e71e7843", + "sha256:3dc62975e31617badc19a906481deacdeb80b4bb454394b4098e3f2525a488c5", + "sha256:4973da6ca3db4405c54cd0b26d328be54c7747e89e284fcff166132eb7bccc9c", + "sha256:4e389622b6927d8133f314949a9812972711a111d577a5d1f4bee5e58736b80a", + "sha256:51e4de3af4ec3899d6d178a8c005226491c27c4ba84101bfb59c901e10ca9f79", + "sha256:5f6f90b72d8ccadb9c6e311c775c8305381db88374c65fa1a68250aa8a9cb3a6", + "sha256:6210c05941994290f3f7f175a4a57dbbb2afd9273657614c506d5976db061181", + "sha256:6f101b1f780f7fc613d040ca4bdf835c6ef3b00e9bd7125a4255ec574c7916e4", + "sha256:7bdcd82189759aba3816d1f729ce42ffded1ac304c151d0a8e89b9996ab863d5", + "sha256:7ca25849404be2f8e4b3c59483d9d3c51298a22c1c61a0e84415104dacaf5562", + "sha256:81276f0ea79a208d961c433a947029e1a15948966658cf6710bbabb60fcc2639", + "sha256:8cadc6e3b5a1f144a039ea08a0bdb03a2a92e19c46be3285123d32029f40a922", + "sha256:8e0ddd63e6bf1161800592c71ac794d3fb8001f2caebe0966e77c5234fa9efc3", + "sha256:909c97ab43a9c0c0b0ada7a1281430e4e5ec0458e6d9244c0e821bbf152f061d", + "sha256:96e7a5e9d6e71f9f4fca8eebfd603f8e86c5225bb18eb621b2c1e50b290a9471", + "sha256:9a1e657c0f4ea2a23304ee3f964db058c9e9e635cc7019c4aa21c330755ef6fd", + "sha256:9eb9d22b0a5d8fd9925a7764a054dca914000607dff201a24c791ff5c799e1fa", + "sha256:af4ff3e388f2fa7bff9f7f2b31b87d5651c45731d3e8cfa0944be43dff5cfbdb", + "sha256:b042d2a275c8cee83a4b7ae30c45a15e6a4baa65a179a0ec2d78ebb90e4f6699", + "sha256:bc821e161ae88bfe8088d11bb39caf2916562e0a2dc7b6d56714a48b784ef0bb", + "sha256:c505d61b6176aaf982c5717ce04e87da5abc9a36a5b39ac03905c4aafe8de7aa", + "sha256:c63454aa261a0cf0c5b4718349629793e9e634993538db841165b3df74f37ec0", + "sha256:c7362add18b416b69d58c910caa217f980c5ef39b23a38a0880dfd87bdf8cd23", + "sha256:d03806036b4f89e3b13b6218fefea8d5312e450935b1a2d55f0524e2ed7c59d9", + "sha256:d1b3031093a366ac767b3feb8bcddb596671b3aaff82d4050f984da0c248b615", + "sha256:d1c3572526997b36f245a96a2b1713bf79ce99b271bbcf084beb6b9b075f29ea", + "sha256:efcfe97d1b3c79e486554efddeb8f6f53a4cdd4cf6086642784fa31fc384e1d7", + "sha256:f514ef4cd14bb6fb484b4a60203e912cfcb64f2ab139e88c2274511514bf7308" + ], + "version": "==44.0.2" }, "deprecated": { "hashes": [ @@ -299,7 +307,7 @@ "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc", "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0" ], - "markers": "python_version >= '3'", + "markers": "python_version >= '3.5'", "version": "==3.7" }, "importlib-resources": { @@ -313,11 +321,11 @@ }, "iniconfig": { "hashes": [ - "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3", - "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374" + "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7", + "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760" ], - "markers": "python_version >= '3.7'", - "version": "==2.0.0" + "markers": "python_version >= '3.8'", + "version": "==2.1.0" }, "jinja2": { "hashes": [ @@ -396,45 +404,50 @@ }, "mypy": { "hashes": [ - "sha256:06d26c277962f3fb50e13044674aa10553981ae514288cb7d0a738f495550b36", - "sha256:2ff93107f01968ed834f4256bc1fc4475e2fecf6c661260066a985b52741ddce", - "sha256:36383a4fcbad95f2657642a07ba22ff797de26277158f1cc7bd234821468b1b6", - "sha256:37c7fa6121c1cdfcaac97ce3d3b5588e847aa79b580c1e922bb5d5d2902df19b", - "sha256:3a66169b92452f72117e2da3a576087025449018afc2d8e9bfe5ffab865709ca", - "sha256:3f14cd3d386ac4d05c5a39a51b84387403dadbd936e17cb35882134d4f8f0d24", - "sha256:41ea707d036a5307ac674ea172875f40c9d55c5394f888b168033177fce47383", - "sha256:478db5f5036817fe45adb7332d927daa62417159d49783041338921dcf646fc7", - "sha256:4a8a53bc3ffbd161b5b2a4fff2f0f1e23a33b0168f1c0778ec70e1a3d66deb86", - "sha256:539c570477a96a4e6fb718b8d5c3e0c0eba1f485df13f86d2970c91f0673148d", - "sha256:57555a7715c0a34421013144a33d280e73c08df70f3a18a552938587ce9274f4", - "sha256:6e658bd2d20565ea86da7d91331b0eed6d2eee22dc031579e6297f3e12c758c8", - "sha256:6e7184632d89d677973a14d00ae4d03214c8bc301ceefcdaf5c474866814c987", - "sha256:75746e06d5fa1e91bfd5432448d00d34593b52e7e91a187d981d08d1f33d4385", - "sha256:7f9993ad3e0ffdc95c2a14b66dee63729f021968bff8ad911867579c65d13a79", - "sha256:801780c56d1cdb896eacd5619a83e427ce436d86a3bdf9112527f24a66618fef", - "sha256:801ca29f43d5acce85f8e999b1e431fb479cb02d0e11deb7d2abb56bdaf24fd6", - "sha256:969ea3ef09617aff826885a22ece0ddef69d95852cdad2f60c8bb06bf1f71f70", - "sha256:a976775ab2256aadc6add633d44f100a2517d2388906ec4f13231fafbb0eccca", - "sha256:af8d155170fcf87a2afb55b35dc1a0ac21df4431e7d96717621962e4b9192e70", - "sha256:b499bc07dbdcd3de92b0a8b29fdf592c111276f6a12fe29c30f6c417dd546d12", - "sha256:cd953f221ac1379050a8a646585a29574488974f79d8082cedef62744f0a0104", - "sha256:d42a6dd818ffce7be66cce644f1dff482f1d97c53ca70908dff0b9ddc120b77a", - "sha256:e8960dbbbf36906c5c0b7f4fbf2f0c7ffb20f4898e6a879fcf56a41a08b0d318", - "sha256:edb91dded4df17eae4537668b23f0ff6baf3707683734b6a818d5b9d0c0c31a1", - "sha256:ee23de8530d99b6db0573c4ef4bd8f39a2a6f9b60655bf7a1357e585a3486f2b", - "sha256:f7821776e5c4286b6a13138cc935e2e9b6fde05e081bdebf5cdb2bb97c9df81d" + "sha256:1124a18bc11a6a62887e3e137f37f53fbae476dc36c185d549d4f837a2a6a14e", + "sha256:171a9ca9a40cd1843abeca0e405bc1940cd9b305eaeea2dda769ba096932bb22", + "sha256:1905f494bfd7d85a23a88c5d97840888a7bd516545fc5aaedff0267e0bb54e2f", + "sha256:1fbb8da62dc352133d7d7ca90ed2fb0e9d42bb1a32724c287d3c76c58cbaa9c2", + "sha256:2922d42e16d6de288022e5ca321cd0618b238cfc5570e0263e5ba0a77dbef56f", + "sha256:2e2c2e6d3593f6451b18588848e66260ff62ccca522dd231cd4dd59b0160668b", + "sha256:2ee2d57e01a7c35de00f4634ba1bbf015185b219e4dc5909e281016df43f5ee5", + "sha256:2f2147ab812b75e5b5499b01ade1f4a81489a147c01585cda36019102538615f", + "sha256:404534629d51d3efea5c800ee7c42b72a6554d6c400e6a79eafe15d11341fd43", + "sha256:5469affef548bd1895d86d3bf10ce2b44e33d86923c29e4d675b3e323437ea3e", + "sha256:5a95fb17c13e29d2d5195869262f8125dfdb5c134dc8d9a9d0aecf7525b10c2c", + "sha256:6983aae8b2f653e098edb77f893f7b6aca69f6cffb19b2cc7443f23cce5f4828", + "sha256:712e962a6357634fef20412699a3655c610110e01cdaa6180acec7fc9f8513ba", + "sha256:8023ff13985661b50a5928fc7a5ca15f3d1affb41e5f0a9952cb68ef090b31ee", + "sha256:811aeccadfb730024c5d3e326b2fbe9249bb7413553f15499a4050f7c30e801d", + "sha256:8f8722560a14cde92fdb1e31597760dc35f9f5524cce17836c0d22841830fd5b", + "sha256:93faf3fdb04768d44bf28693293f3904bbb555d076b781ad2530214ee53e3445", + "sha256:973500e0774b85d9689715feeffcc980193086551110fd678ebe1f4342fb7c5e", + "sha256:979e4e1a006511dacf628e36fadfecbcc0160a8af6ca7dad2f5025529e082c13", + "sha256:98b7b9b9aedb65fe628c62a6dc57f6d5088ef2dfca37903a7d9ee374d03acca5", + "sha256:aea39e0583d05124836ea645f412e88a5c7d0fd77a6d694b60d9b6b2d9f184fd", + "sha256:b9378e2c00146c44793c98b8d5a61039a048e31f429fb0eb546d93f4b000bedf", + "sha256:baefc32840a9f00babd83251560e0ae1573e2f9d1b067719479bfb0e987c6357", + "sha256:be68172e9fd9ad8fb876c6389f16d1c1b5f100ffa779f77b1fb2176fcc9ab95b", + "sha256:c43a7682e24b4f576d93072216bf56eeff70d9140241f9edec0c104d0c515036", + "sha256:c4bb0e1bd29f7d34efcccd71cf733580191e9a264a2202b0239da95984c5b559", + "sha256:c7be1e46525adfa0d97681432ee9fcd61a3964c2446795714699a998d193f1a3", + "sha256:c9817fa23833ff189db061e6d2eff49b2f3b6ed9856b4a0a73046e41932d744f", + "sha256:ce436f4c6d218a070048ed6a44c0bbb10cd2cc5e272b29e7845f6a2f57ee4464", + "sha256:d10d994b41fb3497719bbf866f227b3489048ea4bbbb5015357db306249f7980", + "sha256:e601a7fa172c2131bff456bb3ee08a88360760d0d2f8cbd7a75a65497e2df078", + "sha256:f95579473af29ab73a10bada2f9722856792a36ec5af5399b653aa28360290a5" ], "index": "pypi", - "markers": "python_version >= '3.8'", - "version": "==1.11.2" + "markers": "python_version >= '3.9'", + "version": "==1.15.0" }, "mypy-extensions": { "hashes": [ - "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", - "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782" + "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505", + "sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558" ], - "markers": "python_version >= '3.5'", - "version": "==1.0.0" + "markers": "python_version >= '3.8'", + "version": "==1.1.0" }, "node-semver": { "hashes": [ @@ -445,11 +458,11 @@ }, "packaging": { "hashes": [ - "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", - "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124" + "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", + "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f" ], "markers": "python_version >= '3.8'", - "version": "==24.1" + "version": "==25.0" }, "patch-ng": { "hashes": [ @@ -525,12 +538,12 @@ }, "pytest": { "hashes": [ - "sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181", - "sha256:a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2" + "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820", + "sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==8.3.3" + "version": "==8.3.5" }, "python-dateutil": { "hashes": [ @@ -595,11 +608,41 @@ }, "tomli": { "hashes": [ - "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", - "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" + "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6", + "sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd", + "sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c", + "sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b", + "sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8", + "sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6", + "sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77", + "sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff", + "sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea", + "sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192", + "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249", + "sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee", + "sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4", + "sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98", + "sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8", + "sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4", + "sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281", + "sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744", + "sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69", + "sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13", + "sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140", + "sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e", + "sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e", + "sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc", + "sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff", + "sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec", + "sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2", + "sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222", + "sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106", + "sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272", + "sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a", + "sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7" ], "markers": "python_version < '3.11'", - "version": "==2.0.1" + "version": "==2.2.1" }, "tqdm": { "hashes": [ @@ -733,11 +776,11 @@ }, "attrs": { "hashes": [ - "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346", - "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2" + "sha256:427318ce031701fea540783410126f03899a97ffc6f61596ad581ac2e40e3bc3", + "sha256:75d7cefc7fb576747b2c81b4442d4d4a1ce0900973527c011d1030fd3bf4af1b" ], - "markers": "python_version >= '3.7'", - "version": "==24.2.0" + "markers": "python_version >= '3.8'", + "version": "==25.3.0" }, "backports.tarfile": { "hashes": [ @@ -775,24 +818,25 @@ }, "cached-property": { "hashes": [ - "sha256:9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130", - "sha256:df4f613cf7ad9a588cc381aaf4a512d26265ecebd5eb9e1ba12f1319eb85a6a0" + "sha256:484d617105e3ee0e4f1f58725e72a8ef9e93deee462222dbd51cd91230897641", + "sha256:f617d70ab1100b7bcf6e42228f9ddcb78c676ffa167278d9f730d1c2fba69ccb" ], - "version": "==1.5.2" + "markers": "python_version >= '3.8'", + "version": "==2.0.1" }, "cerberus": { "hashes": [ - "sha256:7649a5815024d18eb7c6aa5e7a95355c649a53aacfc9b050e9d0bf6bfa2af372", - "sha256:81011e10266ef71b6ec6d50e60171258a5b134d69f8fb387d16e4936d0d47642" + "sha256:180e7d1fa1a5765cbff7b5c716e52fddddfab859dc8f625b0d563ace4b7a7ab3", + "sha256:ecf249665400a0b7a9d5e4ee1ffc234fd5d003186d3e1904f70bc14038642c13" ], - "version": "==1.3.5" + "version": "==1.3.7" }, "certifi": { "hashes": [ "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b", "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90" ], - "markers": "python_version >= '3.7'", + "markers": "python_version >= '3.6'", "version": "==2024.7.4" }, "cffi": { @@ -977,7 +1021,7 @@ "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519", "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561" ], - "markers": "python_version >= '3'", + "markers": "python_full_version >= '3.7.0'", "version": "==3.3.2" }, "click": { @@ -1010,113 +1054,112 @@ "toml" ], "hashes": [ - "sha256:06a737c882bd26d0d6ee7269b20b12f14a8704807a01056c80bb881a4b2ce6ca", - "sha256:07e2ca0ad381b91350c0ed49d52699b625aab2b44b65e1b4e02fa9df0e92ad2d", - "sha256:0c0420b573964c760df9e9e86d1a9a622d0d27f417e1a949a8a66dd7bcee7bc6", - "sha256:0dbde0f4aa9a16fa4d754356a8f2e36296ff4d83994b2c9d8398aa32f222f989", - "sha256:1125ca0e5fd475cbbba3bb67ae20bd2c23a98fac4e32412883f9bcbaa81c314c", - "sha256:13b0a73a0896988f053e4fbb7de6d93388e6dd292b0d87ee51d106f2c11b465b", - "sha256:166811d20dfea725e2e4baa71fffd6c968a958577848d2131f39b60043400223", - "sha256:170d444ab405852903b7d04ea9ae9b98f98ab6d7e63e1115e82620807519797f", - "sha256:1f4aa8219db826ce6be7099d559f8ec311549bfc4046f7f9fe9b5cea5c581c56", - "sha256:225667980479a17db1048cb2bf8bfb39b8e5be8f164b8f6628b64f78a72cf9d3", - "sha256:260933720fdcd75340e7dbe9060655aff3af1f0c5d20f46b57f262ab6c86a5e8", - "sha256:2bdb062ea438f22d99cba0d7829c2ef0af1d768d1e4a4f528087224c90b132cb", - "sha256:2c09f4ce52cb99dd7505cd0fc8e0e37c77b87f46bc9c1eb03fe3bc9991085388", - "sha256:3115a95daa9bdba70aea750db7b96b37259a81a709223c8448fa97727d546fe0", - "sha256:3e0cadcf6733c09154b461f1ca72d5416635e5e4ec4e536192180d34ec160f8a", - "sha256:3f1156e3e8f2872197af3840d8ad307a9dd18e615dc64d9ee41696f287c57ad8", - "sha256:4421712dbfc5562150f7554f13dde997a2e932a6b5f352edcce948a815efee6f", - "sha256:44df346d5215a8c0e360307d46ffaabe0f5d3502c8a1cefd700b34baf31d411a", - "sha256:502753043567491d3ff6d08629270127e0c31d4184c4c8d98f92c26f65019962", - "sha256:547f45fa1a93154bd82050a7f3cddbc1a7a4dd2a9bf5cb7d06f4ae29fe94eaf8", - "sha256:5621a9175cf9d0b0c84c2ef2b12e9f5f5071357c4d2ea6ca1cf01814f45d2391", - "sha256:609b06f178fe8e9f89ef676532760ec0b4deea15e9969bf754b37f7c40326dbc", - "sha256:645786266c8f18a931b65bfcefdbf6952dd0dea98feee39bd188607a9d307ed2", - "sha256:6878ef48d4227aace338d88c48738a4258213cd7b74fd9a3d4d7582bb1d8a155", - "sha256:6a89ecca80709d4076b95f89f308544ec8f7b4727e8a547913a35f16717856cb", - "sha256:6db04803b6c7291985a761004e9060b2bca08da6d04f26a7f2294b8623a0c1a0", - "sha256:6e2cd258d7d927d09493c8df1ce9174ad01b381d4729a9d8d4e38670ca24774c", - "sha256:6e81d7a3e58882450ec4186ca59a3f20a5d4440f25b1cff6f0902ad890e6748a", - "sha256:702855feff378050ae4f741045e19a32d57d19f3e0676d589df0575008ea5004", - "sha256:78b260de9790fd81e69401c2dc8b17da47c8038176a79092a89cb2b7d945d060", - "sha256:7bb65125fcbef8d989fa1dd0e8a060999497629ca5b0efbca209588a73356232", - "sha256:7dea0889685db8550f839fa202744652e87c60015029ce3f60e006f8c4462c93", - "sha256:8284cf8c0dd272a247bc154eb6c95548722dce90d098c17a883ed36e67cdb129", - "sha256:877abb17e6339d96bf08e7a622d05095e72b71f8afd8a9fefc82cf30ed944163", - "sha256:8929543a7192c13d177b770008bc4e8119f2e1f881d563fc6b6305d2d0ebe9de", - "sha256:8ae539519c4c040c5ffd0632784e21b2f03fc1340752af711f33e5be83a9d6c6", - "sha256:8f59d57baca39b32db42b83b2a7ba6f47ad9c394ec2076b084c3f029b7afca23", - "sha256:9054a0754de38d9dbd01a46621636689124d666bad1936d76c0341f7d71bf569", - "sha256:953510dfb7b12ab69d20135a0662397f077c59b1e6379a768e97c59d852ee51d", - "sha256:95cae0efeb032af8458fc27d191f85d1717b1d4e49f7cb226cf526ff28179778", - "sha256:9bc572be474cafb617672c43fe989d6e48d3c83af02ce8de73fff1c6bb3c198d", - "sha256:9c56863d44bd1c4fe2abb8a4d6f5371d197f1ac0ebdee542f07f35895fc07f36", - "sha256:9e0b2df163b8ed01d515807af24f63de04bebcecbd6c3bfeff88385789fdf75a", - "sha256:a09ece4a69cf399510c8ab25e0950d9cf2b42f7b3cb0374f95d2e2ff594478a6", - "sha256:a1ac0ae2b8bd743b88ed0502544847c3053d7171a3cff9228af618a068ed9c34", - "sha256:a318d68e92e80af8b00fa99609796fdbcdfef3629c77c6283566c6f02c6d6704", - "sha256:a4acd025ecc06185ba2b801f2de85546e0b8ac787cf9d3b06e7e2a69f925b106", - "sha256:a6d3adcf24b624a7b778533480e32434a39ad8fa30c315208f6d3e5542aeb6e9", - "sha256:a78d169acd38300060b28d600344a803628c3fd585c912cacc9ea8790fe96862", - "sha256:a95324a9de9650a729239daea117df21f4b9868ce32e63f8b650ebe6cef5595b", - "sha256:abd5fd0db5f4dc9289408aaf34908072f805ff7792632250dcb36dc591d24255", - "sha256:b06079abebbc0e89e6163b8e8f0e16270124c154dc6e4a47b413dd538859af16", - "sha256:b43c03669dc4618ec25270b06ecd3ee4fa94c7f9b3c14bae6571ca00ef98b0d3", - "sha256:b48f312cca9621272ae49008c7f613337c53fadca647d6384cc129d2996d1133", - "sha256:b5d7b556859dd85f3a541db6a4e0167b86e7273e1cdc973e5b175166bb634fdb", - "sha256:b9f222de8cded79c49bf184bdbc06630d4c58eec9459b939b4a690c82ed05657", - "sha256:c3c02d12f837d9683e5ab2f3d9844dc57655b92c74e286c262e0fc54213c216d", - "sha256:c44fee9975f04b33331cb8eb272827111efc8930cfd582e0320613263ca849ca", - "sha256:cf4b19715bccd7ee27b6b120e7e9dd56037b9c0681dcc1adc9ba9db3d417fa36", - "sha256:d0c212c49b6c10e6951362f7c6df3329f04c2b1c28499563d4035d964ab8e08c", - "sha256:d3296782ca4eab572a1a4eca686d8bfb00226300dcefdf43faa25b5242ab8a3e", - "sha256:d85f5e9a5f8b73e2350097c3756ef7e785f55bd71205defa0bfdaf96c31616ff", - "sha256:da511e6ad4f7323ee5702e6633085fb76c2f893aaf8ce4c51a0ba4fc07580ea7", - "sha256:e05882b70b87a18d937ca6768ff33cc3f72847cbc4de4491c8e73880766718e5", - "sha256:e61c0abb4c85b095a784ef23fdd4aede7a2628478e7baba7c5e3deba61070a02", - "sha256:e6a08c0be454c3b3beb105c0596ebdc2371fab6bb90c0c0297f4e58fd7e1012c", - "sha256:e9a6e0eb86070e8ccaedfbd9d38fec54864f3125ab95419970575b42af7541df", - "sha256:ed37bd3c3b063412f7620464a9ac1314d33100329f39799255fb8d3027da50d3", - "sha256:f1adfc8ac319e1a348af294106bc6a8458a0f1633cc62a1446aebc30c5fa186a", - "sha256:f5796e664fe802da4f57a168c85359a8fbf3eab5e55cd4e4569fbacecc903959", - "sha256:fc5a77d0c516700ebad189b587de289a20a78324bc54baee03dd486f0855d234", - "sha256:fd21f6ae3f08b41004dfb433fa895d858f3f5979e7762d052b12aef444e29afc" + "sha256:042e7841a26498fff7a37d6fda770d17519982f5b7d8bf5278d140b67b61095f", + "sha256:04bfec25a8ef1c5f41f5e7e5c842f6b615599ca8ba8391ec33a9290d9d2db3a3", + "sha256:0915742f4c82208ebf47a2b154a5334155ed9ef9fe6190674b8a46c2fb89cb05", + "sha256:18c5ae6d061ad5b3e7eef4363fb27a0576012a7447af48be6c75b88494c6cf25", + "sha256:2931f66991175369859b5fd58529cd4b73582461877ecfd859b6549869287ffe", + "sha256:2e4b6b87bb0c846a9315e3ab4be2d52fac905100565f4b92f02c445c8799e257", + "sha256:3043ba1c88b2139126fc72cb48574b90e2e0546d4c78b5299317f61b7f718b78", + "sha256:379fe315e206b14e21db5240f89dc0774bdd3e25c3c58c2c733c99eca96f1ada", + "sha256:42421e04069fb2cbcbca5a696c4050b84a43b05392679d4068acbe65449b5c64", + "sha256:4dfd9a93db9e78666d178d4f08a5408aa3f2474ad4d0e0378ed5f2ef71640cb6", + "sha256:52a523153c568d2c0ef8826f6cc23031dc86cffb8c6aeab92c4ff776e7951b28", + "sha256:554fec1199d93ab30adaa751db68acec2b41c5602ac944bb19187cb9a41a8067", + "sha256:581a40c7b94921fffd6457ffe532259813fc68eb2bdda60fa8cc343414ce3733", + "sha256:5a26c0c795c3e0b63ec7da6efded5f0bc856d7c0b24b2ac84b4d1d7bc578d676", + "sha256:5a570cd9bd20b85d1a0d7b009aaf6c110b52b5755c17be6962f8ccd65d1dbd23", + "sha256:5aaeb00761f985007b38cf463b1d160a14a22c34eb3f6a39d9ad6fc27cb73008", + "sha256:5ac46d0c2dd5820ce93943a501ac5f6548ea81594777ca585bf002aa8854cacd", + "sha256:5c8a5c139aae4c35cbd7cadca1df02ea8cf28a911534fc1b0456acb0b14234f3", + "sha256:6b8af63b9afa1031c0ef05b217faa598f3069148eeee6bb24b79da9012423b82", + "sha256:769773614e676f9d8e8a0980dd7740f09a6ea386d0f383db6821df07d0f08545", + "sha256:771eb7587a0563ca5bb6f622b9ed7f9d07bd08900f7589b4febff05f469bea00", + "sha256:77af0f6447a582fdc7de5e06fa3757a3ef87769fbb0fdbdeba78c23049140a47", + "sha256:7a3d62b3b03b4b6fd41a085f3574874cf946cb4604d2b4d3e8dca8cd570ca501", + "sha256:821f7bcbaa84318287115d54becb1915eece6918136c6f91045bb84e2f88739d", + "sha256:89b1f4af0d4afe495cd4787a68e00f30f1d15939f550e869de90a86efa7e0814", + "sha256:8a1d96e780bdb2d0cbb297325711701f7c0b6f89199a57f2049e90064c29f6bd", + "sha256:8a40fcf208e021eb14b0fac6bdb045c0e0cab53105f93ba0d03fd934c956143a", + "sha256:8f99eb72bf27cbb167b636eb1726f590c00e1ad375002230607a844d9e9a2318", + "sha256:90e7fbc6216ecaffa5a880cdc9c77b7418c1dcb166166b78dbc630d07f278cc3", + "sha256:94ec0be97723ae72d63d3aa41961a0b9a6f5a53ff599813c324548d18e3b9e8c", + "sha256:95aa6ae391a22bbbce1b77ddac846c98c5473de0372ba5c463480043a07bff42", + "sha256:96121edfa4c2dfdda409877ea8608dd01de816a4dc4a0523356067b305e4e17a", + "sha256:a1f406a8e0995d654b2ad87c62caf6befa767885301f3b8f6f73e6f3c31ec3a6", + "sha256:a321c61477ff8ee705b8a5fed370b5710c56b3a52d17b983d9215861e37b642a", + "sha256:a5761c70c017c1b0d21b0815a920ffb94a670c8d5d409d9b38857874c21f70d7", + "sha256:a9abbccd778d98e9c7e85038e35e91e67f5b520776781d9a1e2ee9d400869487", + "sha256:ad80e6b4a0c3cb6f10f29ae4c60e991f424e6b14219d46f1e7d442b938ee68a4", + "sha256:b44674870709017e4b4036e3d0d6c17f06a0e6d4436422e0ad29b882c40697d2", + "sha256:b571bf5341ba8c6bc02e0baeaf3b061ab993bf372d982ae509807e7f112554e9", + "sha256:b8194fb8e50d556d5849753de991d390c5a1edeeba50f68e3a9253fbd8bf8ccd", + "sha256:b87eb6fc9e1bb8f98892a2458781348fa37e6925f35bb6ceb9d4afd54ba36c73", + "sha256:bbb5cc845a0292e0c520656d19d7ce40e18d0e19b22cb3e0409135a575bf79fc", + "sha256:be945402e03de47ba1872cd5236395e0f4ad635526185a930735f66710e1bd3f", + "sha256:bf13d564d310c156d1c8e53877baf2993fb3073b2fc9f69790ca6a732eb4bfea", + "sha256:cf60dd2696b457b710dd40bf17ad269d5f5457b96442f7f85722bdb16fa6c899", + "sha256:d1ba00ae33be84066cfbe7361d4e04dec78445b2b88bdb734d0d1cbab916025a", + "sha256:d39fc4817fd67b3915256af5dda75fd4ee10621a3d484524487e33416c6f3543", + "sha256:d766a4f0e5aa1ba056ec3496243150698dc0481902e2b8559314368717be82b1", + "sha256:dbf364b4c5e7bae9250528167dfe40219b62e2d573c854d74be213e1e52069f7", + "sha256:dd19608788b50eed889e13a5d71d832edc34fc9dfce606f66e8f9f917eef910d", + "sha256:e013b07ba1c748dacc2a80e69a46286ff145935f260eb8c72df7185bf048f502", + "sha256:e5d2b9be5b0693cf21eb4ce0ec8d211efb43966f6657807f6859aab3814f946b", + "sha256:e5ff52d790c7e1628241ffbcaeb33e07d14b007b6eb00a19320c7b8a7024c040", + "sha256:e75a2ad7b647fd8046d58c3132d7eaf31b12d8a53c0e4b21fa9c4d23d6ee6d3c", + "sha256:e7ac22a0bb2c7c49f441f7a6d46c9c80d96e56f5a8bc6972529ed43c8b694e27", + "sha256:ed2144b8a78f9d94d9515963ed273d620e07846acd5d4b0a642d4849e8d91a0c", + "sha256:f017a61399f13aa6d1039f75cd467be388d157cd81f1a119b9d9a68ba6f2830d", + "sha256:f1d8a2a57b47142b10374902777e798784abf400a004b14f1b0b9eaf1e528ba4", + "sha256:f2d32f95922927186c6dbc8bc60df0d186b6edb828d299ab10898ef3f40052fe", + "sha256:f319bae0321bc838e205bf9e5bc28f0a3165f30c203b610f17ab5552cff90323", + "sha256:f3c38e4e5ccbdc9198aecc766cedbb134b2d89bf64533973678dfcf07effd883", + "sha256:f9983d01d7705b2d1f7a95e10bbe4091fabc03a46881a256c2787637b087003f", + "sha256:fa260de59dfb143af06dcf30c2be0b200bed2a73737a8a59248fcb9fa601ef0f" ], - "markers": "python_version >= '3.8'", - "version": "==7.6.1" + "markers": "python_version >= '3.9'", + "version": "==7.8.0" }, "cryptography": { "hashes": [ - "sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494", - "sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806", - "sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d", - "sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062", - "sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2", - "sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4", - "sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1", - "sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85", - "sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84", - "sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042", - "sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d", - "sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962", - "sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2", - "sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa", - "sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d", - "sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365", - "sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96", - "sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47", - "sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d", - "sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d", - "sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c", - "sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb", - "sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277", - "sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172", - "sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034", - "sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a", - "sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289" - ], - "version": "==43.0.1" + "sha256:04abd71114848aa25edb28e225ab5f268096f44cf0127f3d36975bdf1bdf3390", + "sha256:0529b1d5a0105dd3731fa65680b45ce49da4d8115ea76e9da77a875396727b41", + "sha256:1bc312dfb7a6e5d66082c87c34c8a62176e684b6fe3d90fcfe1568de675e6688", + "sha256:268e4e9b177c76d569e8a145a6939eca9a5fec658c932348598818acf31ae9a5", + "sha256:29ecec49f3ba3f3849362854b7253a9f59799e3763b0c9d0826259a88efa02f1", + "sha256:2bf7bf75f7df9715f810d1b038870309342bff3069c5bd8c6b96128cb158668d", + "sha256:3b721b8b4d948b218c88cb8c45a01793483821e709afe5f622861fc6182b20a7", + "sha256:3c00b6b757b32ce0f62c574b78b939afab9eecaf597c4d624caca4f9e71e7843", + "sha256:3dc62975e31617badc19a906481deacdeb80b4bb454394b4098e3f2525a488c5", + "sha256:4973da6ca3db4405c54cd0b26d328be54c7747e89e284fcff166132eb7bccc9c", + "sha256:4e389622b6927d8133f314949a9812972711a111d577a5d1f4bee5e58736b80a", + "sha256:51e4de3af4ec3899d6d178a8c005226491c27c4ba84101bfb59c901e10ca9f79", + "sha256:5f6f90b72d8ccadb9c6e311c775c8305381db88374c65fa1a68250aa8a9cb3a6", + "sha256:6210c05941994290f3f7f175a4a57dbbb2afd9273657614c506d5976db061181", + "sha256:6f101b1f780f7fc613d040ca4bdf835c6ef3b00e9bd7125a4255ec574c7916e4", + "sha256:7bdcd82189759aba3816d1f729ce42ffded1ac304c151d0a8e89b9996ab863d5", + "sha256:7ca25849404be2f8e4b3c59483d9d3c51298a22c1c61a0e84415104dacaf5562", + "sha256:81276f0ea79a208d961c433a947029e1a15948966658cf6710bbabb60fcc2639", + "sha256:8cadc6e3b5a1f144a039ea08a0bdb03a2a92e19c46be3285123d32029f40a922", + "sha256:8e0ddd63e6bf1161800592c71ac794d3fb8001f2caebe0966e77c5234fa9efc3", + "sha256:909c97ab43a9c0c0b0ada7a1281430e4e5ec0458e6d9244c0e821bbf152f061d", + "sha256:96e7a5e9d6e71f9f4fca8eebfd603f8e86c5225bb18eb621b2c1e50b290a9471", + "sha256:9a1e657c0f4ea2a23304ee3f964db058c9e9e635cc7019c4aa21c330755ef6fd", + "sha256:9eb9d22b0a5d8fd9925a7764a054dca914000607dff201a24c791ff5c799e1fa", + "sha256:af4ff3e388f2fa7bff9f7f2b31b87d5651c45731d3e8cfa0944be43dff5cfbdb", + "sha256:b042d2a275c8cee83a4b7ae30c45a15e6a4baa65a179a0ec2d78ebb90e4f6699", + "sha256:bc821e161ae88bfe8088d11bb39caf2916562e0a2dc7b6d56714a48b784ef0bb", + "sha256:c505d61b6176aaf982c5717ce04e87da5abc9a36a5b39ac03905c4aafe8de7aa", + "sha256:c63454aa261a0cf0c5b4718349629793e9e634993538db841165b3df74f37ec0", + "sha256:c7362add18b416b69d58c910caa217f980c5ef39b23a38a0880dfd87bdf8cd23", + "sha256:d03806036b4f89e3b13b6218fefea8d5312e450935b1a2d55f0524e2ed7c59d9", + "sha256:d1b3031093a366ac767b3feb8bcddb596671b3aaff82d4050f984da0c248b615", + "sha256:d1c3572526997b36f245a96a2b1713bf79ce99b271bbcf084beb6b9b075f29ea", + "sha256:efcfe97d1b3c79e486554efddeb8f6f53a4cdd4cf6086642784fa31fc384e1d7", + "sha256:f514ef4cd14bb6fb484b4a60203e912cfcb64f2ab139e88c2274511514bf7308" + ], + "version": "==44.0.2" }, "deprecated": { "hashes": [ @@ -1128,18 +1171,18 @@ }, "dill": { "hashes": [ - "sha256:3ebe3c479ad625c4553aca177444d89b486b1d84982eeacded644afc0cf797ca", - "sha256:c36ca9ffb54365bdd2f8eb3eff7d2a21237f8452b57ace88b1ac615b7e815bd7" + "sha256:0633f1d2df477324f53a895b02c901fb961bdbf65a17122586ea7019292cbcf0", + "sha256:44f54bf6412c2c8464c14e8243eb163690a9800dbe2c367330883b19c7561049" ], "markers": "python_version < '3.11'", - "version": "==0.3.8" + "version": "==0.4.0" }, "distlib": { "hashes": [ - "sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784", - "sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64" + "sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87", + "sha256:a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403" ], - "version": "==0.3.8" + "version": "==0.3.9" }, "distro": { "hashes": [ @@ -1175,26 +1218,26 @@ }, "filelock": { "hashes": [ - "sha256:2082e5703d51fbf98ea75855d9d5527e33d8ff23099bec374a134febee6946b0", - "sha256:c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435" + "sha256:adbc88eabb99d2fec8c9c1b229b171f18afa655400173ddc653d5d01501fb9f2", + "sha256:c401f4f8377c4464e6db25fff06205fd89bdd83b65eb0488ed1b160f780e21de" ], - "markers": "python_version >= '3.8'", - "version": "==3.16.1" + "markers": "python_version >= '3.9'", + "version": "==3.18.0" }, "identify": { "hashes": [ - "sha256:53863bcac7caf8d2ed85bd20312ea5dcfc22226800f6d6881f232d861db5a8f0", - "sha256:91478c5fb7c3aac5ff7bf9b4344f803843dc586832d5f110d672b19aa1984c98" + "sha256:45e92fd704f3da71cc3880036633f48b4b7265fd4de2b57627cb157216eb7eb8", + "sha256:5f34248f54136beed1a7ba6a6b5c4b6cf21ff495aac7c359e1ef831ae3b8ab25" ], - "markers": "python_version >= '3.8'", - "version": "==2.6.1" + "markers": "python_version >= '3.9'", + "version": "==2.6.10" }, "idna": { "hashes": [ "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc", "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0" ], - "markers": "python_version >= '3'", + "markers": "python_version >= '3.5'", "version": "==3.7" }, "importlib-metadata": { @@ -1202,7 +1245,7 @@ "sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1", "sha256:9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5" ], - "markers": "python_version >= '3.8'", + "markers": "python_version < '3.10'", "version": "==8.4.0" }, "importlib-resources": { @@ -1216,11 +1259,11 @@ }, "iniconfig": { "hashes": [ - "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3", - "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374" + "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7", + "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760" ], - "markers": "python_version >= '3.7'", - "version": "==2.0.0" + "markers": "python_version >= '3.8'", + "version": "==2.1.0" }, "isort": { "hashes": [ @@ -1248,19 +1291,19 @@ }, "jaraco.functools": { "hashes": [ - "sha256:3460c74cd0d32bf82b9576bbb3527c4364d5b27a21f5158a62aed6c4b42e23f5", - "sha256:c9d16a3ed4ccb5a889ad8e0b7a343401ee5b2a71cee6ed192d3f68bc351e94e3" + "sha256:70f7e0e2ae076498e212562325e805204fc092d7b4c17e0e86c959e249701a9d", + "sha256:ad159f13428bc4acbf5541ad6dec511f91573b90fba04df61dafa2a1231cf649" ], "markers": "python_version >= '3.8'", - "version": "==4.0.2" + "version": "==4.1.0" }, "jeepney": { "hashes": [ - "sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806", - "sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755" + "sha256:97e5714520c16fc0a45695e5365a2e11b81ea79bba796e26f9f1d178cb182683", + "sha256:cf0e9e845622b81e4a28df94c40345400256ec608d0e55bb8a3feaa9163f5732" ], "markers": "sys_platform == 'linux'", - "version": "==0.8.0" + "version": "==0.9.0" }, "jinja2": { "hashes": [ @@ -1273,11 +1316,11 @@ }, "keyring": { "hashes": [ - "sha256:a2a630d5c9bef5d3f0968d15ef4e42b894a83e17494edcb67b154c36491c9920", - "sha256:ae8263fd9264c94f91ad82d098f8a5bb1b7fa71ce0a72388dc4fc0be3f6a034e" + "sha256:0b39998aa941431eb3d9b0d4b2460bc773b9df6fed7621c2dfb291a7e0187a66", + "sha256:552a3f7af126ece7ed5c89753650eec89c7eaae8617d0aa4d9ad2b75111266bd" ], - "markers": "python_version >= '3.8'", - "version": "==25.4.0" + "markers": "platform_machine != 'ppc64le' and platform_machine != 's390x'", + "version": "==25.6.0" }, "markdown-it-py": { "hashes": [ @@ -1371,74 +1414,88 @@ }, "more-itertools": { "hashes": [ - "sha256:037b0d3203ce90cca8ab1defbbdac29d5f993fc20131f3664dc8d6acfa872aef", - "sha256:5482bfef7849c25dc3c6dd53a6173ae4795da2a41a80faea6700d9f5846c5da6" + "sha256:9fddd5403be01a94b204faadcff459ec3568cf110265d3c54323e1e866ad29d3", + "sha256:d43980384673cb07d2f7d2d918c616b30c659c089ee23953f601d6609c67510e" ], - "markers": "python_version >= '3.8'", - "version": "==10.5.0" + "markers": "python_version >= '3.9'", + "version": "==10.7.0" }, "mypy": { "hashes": [ - "sha256:06d26c277962f3fb50e13044674aa10553981ae514288cb7d0a738f495550b36", - "sha256:2ff93107f01968ed834f4256bc1fc4475e2fecf6c661260066a985b52741ddce", - "sha256:36383a4fcbad95f2657642a07ba22ff797de26277158f1cc7bd234821468b1b6", - "sha256:37c7fa6121c1cdfcaac97ce3d3b5588e847aa79b580c1e922bb5d5d2902df19b", - "sha256:3a66169b92452f72117e2da3a576087025449018afc2d8e9bfe5ffab865709ca", - "sha256:3f14cd3d386ac4d05c5a39a51b84387403dadbd936e17cb35882134d4f8f0d24", - "sha256:41ea707d036a5307ac674ea172875f40c9d55c5394f888b168033177fce47383", - "sha256:478db5f5036817fe45adb7332d927daa62417159d49783041338921dcf646fc7", - "sha256:4a8a53bc3ffbd161b5b2a4fff2f0f1e23a33b0168f1c0778ec70e1a3d66deb86", - "sha256:539c570477a96a4e6fb718b8d5c3e0c0eba1f485df13f86d2970c91f0673148d", - "sha256:57555a7715c0a34421013144a33d280e73c08df70f3a18a552938587ce9274f4", - "sha256:6e658bd2d20565ea86da7d91331b0eed6d2eee22dc031579e6297f3e12c758c8", - "sha256:6e7184632d89d677973a14d00ae4d03214c8bc301ceefcdaf5c474866814c987", - "sha256:75746e06d5fa1e91bfd5432448d00d34593b52e7e91a187d981d08d1f33d4385", - "sha256:7f9993ad3e0ffdc95c2a14b66dee63729f021968bff8ad911867579c65d13a79", - "sha256:801780c56d1cdb896eacd5619a83e427ce436d86a3bdf9112527f24a66618fef", - "sha256:801ca29f43d5acce85f8e999b1e431fb479cb02d0e11deb7d2abb56bdaf24fd6", - "sha256:969ea3ef09617aff826885a22ece0ddef69d95852cdad2f60c8bb06bf1f71f70", - "sha256:a976775ab2256aadc6add633d44f100a2517d2388906ec4f13231fafbb0eccca", - "sha256:af8d155170fcf87a2afb55b35dc1a0ac21df4431e7d96717621962e4b9192e70", - "sha256:b499bc07dbdcd3de92b0a8b29fdf592c111276f6a12fe29c30f6c417dd546d12", - "sha256:cd953f221ac1379050a8a646585a29574488974f79d8082cedef62744f0a0104", - "sha256:d42a6dd818ffce7be66cce644f1dff482f1d97c53ca70908dff0b9ddc120b77a", - "sha256:e8960dbbbf36906c5c0b7f4fbf2f0c7ffb20f4898e6a879fcf56a41a08b0d318", - "sha256:edb91dded4df17eae4537668b23f0ff6baf3707683734b6a818d5b9d0c0c31a1", - "sha256:ee23de8530d99b6db0573c4ef4bd8f39a2a6f9b60655bf7a1357e585a3486f2b", - "sha256:f7821776e5c4286b6a13138cc935e2e9b6fde05e081bdebf5cdb2bb97c9df81d" + "sha256:1124a18bc11a6a62887e3e137f37f53fbae476dc36c185d549d4f837a2a6a14e", + "sha256:171a9ca9a40cd1843abeca0e405bc1940cd9b305eaeea2dda769ba096932bb22", + "sha256:1905f494bfd7d85a23a88c5d97840888a7bd516545fc5aaedff0267e0bb54e2f", + "sha256:1fbb8da62dc352133d7d7ca90ed2fb0e9d42bb1a32724c287d3c76c58cbaa9c2", + "sha256:2922d42e16d6de288022e5ca321cd0618b238cfc5570e0263e5ba0a77dbef56f", + "sha256:2e2c2e6d3593f6451b18588848e66260ff62ccca522dd231cd4dd59b0160668b", + "sha256:2ee2d57e01a7c35de00f4634ba1bbf015185b219e4dc5909e281016df43f5ee5", + "sha256:2f2147ab812b75e5b5499b01ade1f4a81489a147c01585cda36019102538615f", + "sha256:404534629d51d3efea5c800ee7c42b72a6554d6c400e6a79eafe15d11341fd43", + "sha256:5469affef548bd1895d86d3bf10ce2b44e33d86923c29e4d675b3e323437ea3e", + "sha256:5a95fb17c13e29d2d5195869262f8125dfdb5c134dc8d9a9d0aecf7525b10c2c", + "sha256:6983aae8b2f653e098edb77f893f7b6aca69f6cffb19b2cc7443f23cce5f4828", + "sha256:712e962a6357634fef20412699a3655c610110e01cdaa6180acec7fc9f8513ba", + "sha256:8023ff13985661b50a5928fc7a5ca15f3d1affb41e5f0a9952cb68ef090b31ee", + "sha256:811aeccadfb730024c5d3e326b2fbe9249bb7413553f15499a4050f7c30e801d", + "sha256:8f8722560a14cde92fdb1e31597760dc35f9f5524cce17836c0d22841830fd5b", + "sha256:93faf3fdb04768d44bf28693293f3904bbb555d076b781ad2530214ee53e3445", + "sha256:973500e0774b85d9689715feeffcc980193086551110fd678ebe1f4342fb7c5e", + "sha256:979e4e1a006511dacf628e36fadfecbcc0160a8af6ca7dad2f5025529e082c13", + "sha256:98b7b9b9aedb65fe628c62a6dc57f6d5088ef2dfca37903a7d9ee374d03acca5", + "sha256:aea39e0583d05124836ea645f412e88a5c7d0fd77a6d694b60d9b6b2d9f184fd", + "sha256:b9378e2c00146c44793c98b8d5a61039a048e31f429fb0eb546d93f4b000bedf", + "sha256:baefc32840a9f00babd83251560e0ae1573e2f9d1b067719479bfb0e987c6357", + "sha256:be68172e9fd9ad8fb876c6389f16d1c1b5f100ffa779f77b1fb2176fcc9ab95b", + "sha256:c43a7682e24b4f576d93072216bf56eeff70d9140241f9edec0c104d0c515036", + "sha256:c4bb0e1bd29f7d34efcccd71cf733580191e9a264a2202b0239da95984c5b559", + "sha256:c7be1e46525adfa0d97681432ee9fcd61a3964c2446795714699a998d193f1a3", + "sha256:c9817fa23833ff189db061e6d2eff49b2f3b6ed9856b4a0a73046e41932d744f", + "sha256:ce436f4c6d218a070048ed6a44c0bbb10cd2cc5e272b29e7845f6a2f57ee4464", + "sha256:d10d994b41fb3497719bbf866f227b3489048ea4bbbb5015357db306249f7980", + "sha256:e601a7fa172c2131bff456bb3ee08a88360760d0d2f8cbd7a75a65497e2df078", + "sha256:f95579473af29ab73a10bada2f9722856792a36ec5af5399b653aa28360290a5" ], "index": "pypi", - "markers": "python_version >= '3.8'", - "version": "==1.11.2" + "markers": "python_version >= '3.9'", + "version": "==1.15.0" }, "mypy-extensions": { "hashes": [ - "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", - "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782" + "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505", + "sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558" ], - "markers": "python_version >= '3.5'", - "version": "==1.0.0" + "markers": "python_version >= '3.8'", + "version": "==1.1.0" }, "nh3": { "hashes": [ - "sha256:0411beb0589eacb6734f28d5497ca2ed379eafab8ad8c84b31bb5c34072b7164", - "sha256:14c5a72e9fe82aea5fe3072116ad4661af5cf8e8ff8fc5ad3450f123e4925e86", - "sha256:19aaba96e0f795bd0a6c56291495ff59364f4300d4a39b29a0abc9cb3774a84b", - "sha256:34c03fa78e328c691f982b7c03d4423bdfd7da69cd707fe572f544cf74ac23ad", - "sha256:36c95d4b70530b320b365659bb5034341316e6a9b30f0b25fa9c9eff4c27a204", - "sha256:3a157ab149e591bb638a55c8c6bcb8cdb559c8b12c13a8affaba6cedfe51713a", - "sha256:42c64511469005058cd17cc1537578eac40ae9f7200bedcfd1fc1a05f4f8c200", - "sha256:5f36b271dae35c465ef5e9090e1fdaba4a60a56f0bb0ba03e0932a66f28b9189", - "sha256:6955369e4d9f48f41e3f238a9e60f9410645db7e07435e62c6a9ea6135a4907f", - "sha256:7b7c2a3c9eb1a827d42539aa64091640bd275b81e097cd1d8d82ef91ffa2e811", - "sha256:8ce0f819d2f1933953fca255db2471ad58184a60508f03e6285e5114b6254844", - "sha256:94a166927e53972a9698af9542ace4e38b9de50c34352b962f4d9a7d4c927af4", - "sha256:a7f1b5b2c15866f2db413a3649a8fe4fd7b428ae58be2c0f6bca5eefd53ca2be", - "sha256:c8b3a1cebcba9b3669ed1a84cc65bf005728d2f0bc1ed2a6594a992e817f3a50", - "sha256:de3ceed6e661954871d6cd78b410213bdcb136f79aafe22aa7182e028b8c7307", - "sha256:f0eca9ca8628dbb4e916ae2491d72957fdd35f7a5d326b7032a345f111ac07fe" - ], - "version": "==0.2.18" + "sha256:087ffadfdcd497658c3adc797258ce0f06be8a537786a7217649fc1c0c60c293", + "sha256:20979783526641c81d2f5bfa6ca5ccca3d1e4472474b162c6256745fbfe31cd1", + "sha256:2a5174551f95f2836f2ad6a8074560f261cf9740a48437d6151fd2d4d7d617ab", + "sha256:31eedcd7d08b0eae28ba47f43fd33a653b4cdb271d64f1aeda47001618348fde", + "sha256:4990e7ee6a55490dbf00d61a6f476c9a3258e31e711e13713b2ea7d6616f670e", + "sha256:55823c5ea1f6b267a4fad5de39bc0524d49a47783e1fe094bcf9c537a37df251", + "sha256:6141caabe00bbddc869665b35fc56a478eb774a8c1dfd6fba9fe1dfdf29e6efa", + "sha256:637d4a10c834e1b7d9548592c7aad760611415fcd5bd346f77fd8a064309ae6d", + "sha256:63ca02ac6f27fc80f9894409eb61de2cb20ef0a23740c7e29f9ec827139fa578", + "sha256:6ae319f17cd8960d0612f0f0ddff5a90700fa71926ca800e9028e7851ce44a6f", + "sha256:6c9c30b8b0d291a7c5ab0967ab200598ba33208f754f2f4920e9343bdd88f79a", + "sha256:713d16686596e556b65e7f8c58328c2df63f1a7abe1277d87625dcbbc012ef82", + "sha256:818f2b6df3763e058efa9e69677b5a92f9bc0acff3295af5ed013da544250d5b", + "sha256:9d67709bc0d7d1f5797b21db26e7a8b3d15d21c9c5f58ccfe48b5328483b685b", + "sha256:a5f77e62aed5c4acad635239ac1290404c7e940c81abe561fd2af011ff59f585", + "sha256:a772dec5b7b7325780922dd904709f0f5f3a79fbf756de5291c01370f6df0967", + "sha256:a7ea28cd49293749d67e4fcf326c554c83ec912cd09cd94aa7ec3ab1921c8283", + "sha256:ac7006c3abd097790e611fe4646ecb19a8d7f2184b882f6093293b8d9b887431", + "sha256:b3b5c58161e08549904ac4abd450dacd94ff648916f7c376ae4b2c0652b98ff9", + "sha256:b8d55ea1fc7ae3633d758a92aafa3505cd3cc5a6e40470c9164d54dff6f96d42", + "sha256:bb0014948f04d7976aabae43fcd4cb7f551f9f8ce785a4c9ef66e6c2590f8629", + "sha256:d002b648592bf3033adfd875a48f09b8ecc000abd7f6a8769ed86b6ccc70c759", + "sha256:d426d7be1a2f3d896950fe263332ed1662f6c78525b4520c8e9861f8d7f0d243", + "sha256:fcff321bd60c6c5c9cb4ddf2554e22772bb41ebd93ad88171bbbb6f271255286" + ], + "markers": "python_version >= '3.8'", + "version": "==0.2.21" }, "node-semver": { "hashes": [ @@ -1464,11 +1521,11 @@ }, "packaging": { "hashes": [ - "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", - "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124" + "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", + "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f" ], "markers": "python_version >= '3.8'", - "version": "==24.1" + "version": "==25.0" }, "patch-ng": { "hashes": [ @@ -1494,11 +1551,11 @@ }, "pip": { "hashes": [ - "sha256:2cd581cf58ab7fcfca4ce8efa6dcacd0de5bf8d0a3eb9ec927e07405f4d9e2a2", - "sha256:5b5e490b5e9cb275c879595064adce9ebd31b854e3e803740b72f9ccf34a45b8" + "sha256:13b4aa0aaad055020a11bec8a1c2a70a2b2d080e12d89b962266029fff0a16ba", + "sha256:272bdd1289f80165e9070a4f881e8f9e1001bbb50378561d1af20e49bf5a2200" ], - "markers": "python_version >= '3.8'", - "version": "==24.2" + "markers": "python_version >= '3.9'", + "version": "==25.1" }, "pip-shims": { "hashes": [ @@ -1525,19 +1582,19 @@ }, "pkginfo": { "hashes": [ - "sha256:5df73835398d10db79f8eecd5cd86b1f6d29317589ea70796994d49399af6297", - "sha256:889a6da2ed7ffc58ab5b900d888ddce90bce912f2d2de1dc1c26f4cb9fe65097" + "sha256:5cd957824ac36f140260964eba3c6be6442a8359b8c48f4adf90210f33a04b7b", + "sha256:c783ac885519cab2c34927ccfa6bf64b5a704d7c69afaea583dd9b7afe969343" ], - "markers": "python_version >= '3.6'", - "version": "==1.10.0" + "markers": "python_version >= '3.8'", + "version": "==1.12.1.2" }, "platformdirs": { "hashes": [ - "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907", - "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb" + "sha256:a03875334331946f13c549dbd8f4bac7a13a50a895a0eb1e8c6a8ace80d40a94", + "sha256:eb437d586b6a0986388f0d6f74aa0cde27b48d0e3d66843640bfb6bdcdb6e351" ], - "markers": "python_version >= '3.8'", - "version": "==4.3.6" + "markers": "python_version >= '3.9'", + "version": "==4.3.7" }, "plette": { "extras": [ @@ -1566,12 +1623,12 @@ }, "pre-commit": { "hashes": [ - "sha256:8bb6494d4a20423842e198980c9ecf9f96607a07ea29549e180eef9ae80fe7af", - "sha256:9a90a53bf82fdd8778d58085faf8d83df56e40dfe18f45b19446e26bf1b3a63f" + "sha256:601283b9757afd87d40c4c4a9b2b5de9637a8ea02eaff7adc2d0fb4e04841146", + "sha256:a009ca7205f1eb497d10b845e52c838a98b6cdd2102a6c8e4540e94ee75c58bd" ], "index": "pypi", "markers": "python_version >= '3.9'", - "version": "==3.8.0" + "version": "==4.2.0" }, "pycparser": { "hashes": [ @@ -1644,21 +1701,21 @@ }, "pytest": { "hashes": [ - "sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181", - "sha256:a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2" + "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820", + "sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==8.3.3" + "version": "==8.3.5" }, "pytest-cov": { "hashes": [ - "sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652", - "sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857" + "sha256:46935f7aaefba760e716c2ebfbe1c216240b9592966e7da99ea8292d4d3e2a0a", + "sha256:bddf29ed2d0ab6f4df17b4c55b0a657287db8684af9c42ea546b21b1041b3dde" ], "index": "pypi", - "markers": "python_version >= '3.8'", - "version": "==5.0.0" + "markers": "python_version >= '3.9'", + "version": "==6.1.1" }, "pytest-pylint": { "hashes": [ @@ -1756,11 +1813,11 @@ }, "rich": { "hashes": [ - "sha256:1760a3c0848469b97b558fc61c85233e3dafb69c7a071b4d60c38099d3cd4c06", - "sha256:8260cda28e3db6bf04d2d1ef4dbc03ba80a824c88b0e7668a0f23126a424844a" + "sha256:1c9491e1951aac09caffd42f448ee3d04e58923ffe14993f6e83068dc395d7e0", + "sha256:82f1bc23a6a21ebca4ae0c45af9bdbc492ed20231dcb63f297d6d1021a9d5725" ], - "markers": "python_full_version >= '3.7.0'", - "version": "==13.8.1" + "markers": "python_full_version >= '3.8.0'", + "version": "==14.0.0" }, "secretstorage": { "hashes": [ @@ -1772,11 +1829,11 @@ }, "setuptools": { "hashes": [ - "sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2", - "sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538" + "sha256:128ce7b8f33c3079fd1b067ecbb4051a66e8526e7b65f6cec075dfc650ddfa88", + "sha256:e147c0549f27767ba362f9da434eab9c5dc0045d5304feb602a0af001089fc51" ], - "markers": "python_version >= '3.8'", - "version": "==75.1.0" + "markers": "python_version >= '3.9'", + "version": "==79.0.1" }, "six": { "hashes": [ @@ -1796,11 +1853,41 @@ }, "tomli": { "hashes": [ - "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", - "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" + "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6", + "sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd", + "sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c", + "sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b", + "sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8", + "sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6", + "sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77", + "sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff", + "sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea", + "sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192", + "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249", + "sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee", + "sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4", + "sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98", + "sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8", + "sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4", + "sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281", + "sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744", + "sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69", + "sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13", + "sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140", + "sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e", + "sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e", + "sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc", + "sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff", + "sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec", + "sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2", + "sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222", + "sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106", + "sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272", + "sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a", + "sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7" ], "markers": "python_version < '3.11'", - "version": "==2.0.1" + "version": "==2.2.1" }, "tomlkit": { "hashes": [ @@ -1820,12 +1907,12 @@ }, "twine": { "hashes": [ - "sha256:215dbe7b4b94c2c50a7315c0275d2258399280fbb7d04182c7e55e24b5f93997", - "sha256:9aa0825139c02b3434d913545c7b847a21c835e11597f5255842d457da2322db" + "sha256:36158b09df5406e1c9c1fb8edb24fc2be387709443e7376689b938531582ee27", + "sha256:9c6025b203b51521d53e200f4a08b116dee7500a38591668c6a6033117bdc218" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==5.1.1" + "version": "==6.0.1" }, "types-click": { "hashes": [ @@ -1852,12 +1939,12 @@ }, "types-pyyaml": { "hashes": [ - "sha256:392b267f1c0fe6022952462bf5d6523f31e37f6cea49b14cee7ad634b6301570", - "sha256:d1405a86f9576682234ef83bcb4e6fff7c9305c8b1fbad5e0bcd4f7dbdc9c587" + "sha256:652348fa9e7a203d4b0d21066dfb00760d3cbd5a15ebb7cf8d33c88a49546681", + "sha256:d7c13c3e6d335b6af4b0122a01ff1d270aba84ab96d1a1a1063ecba3e13ec075" ], "index": "pypi", - "markers": "python_version >= '3.8'", - "version": "==6.0.12.20240917" + "markers": "python_version >= '3.9'", + "version": "==6.0.12.20250402" }, "types-requests": { "hashes": [ @@ -1893,11 +1980,11 @@ }, "virtualenv": { "hashes": [ - "sha256:4f3ac17b81fba3ce3bd6f4ead2749a72da5929c01774948e243db9ba41df4ff6", - "sha256:ce489cac131aa58f4b25e321d6d186171f78e6cb13fafbf32a840cee67733ff4" + "sha256:800863162bcaa5450a6e4d721049730e7f2dae07720e0902b0e4040bd6f9ada8", + "sha256:e34302959180fca3af42d1800df014b35019490b119eba981af27f2fa486e5d6" ], - "markers": "python_version >= '3.7'", - "version": "==20.26.5" + "markers": "python_version >= '3.8'", + "version": "==20.30.0" }, "vistir": { "hashes": [ @@ -1909,11 +1996,11 @@ }, "wheel": { "hashes": [ - "sha256:2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f", - "sha256:a29c3f2817e95ab89aa4660681ad547c0e9547f20e75b0562fe7723c9a2a9d49" + "sha256:661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729", + "sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248" ], "markers": "python_version >= '3.8'", - "version": "==0.44.0" + "version": "==0.45.1" }, "wrapt": { "hashes": [ diff --git a/ci-base/Dockerfile b/ci-base/Dockerfile index 708be8e5..3a39db1b 100644 --- a/ci-base/Dockerfile +++ b/ci-base/Dockerfile @@ -28,7 +28,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -77,7 +77,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -123,7 +123,7 @@ LABEL io.aswf.docker.versions.lz4="$ASWF_LZ4_VERSION" LABEL io.aswf.docker.versions.pugixml="$ASWF_PUGIXML_VERSION" LABEL io.aswf.docker.versions.pystring="$ASWF_PYSTRING_VERSION" LABEL io.aswf.docker.versions.snappy="$ASWF_SNAPPY_VERSION" -LABEL io.aswf.docker.versions.tbb="$ASWF_TBB_VERSION" +LABEL io.aswf.docker.versions.onetbb="$ASWF_ONETBB_VERSION" LABEL io.aswf.docker.versions.tsl-robin-map="$ASWF_TSL_ROBIN_MAP_VERSION" LABEL io.aswf.docker.versions.yaml-cpp="$ASWF_YAML_CPP_VERSION" LABEL io.aswf.docker.versions.zlib="$ASWF_ZLIB_VERSION" @@ -166,7 +166,7 @@ ENV ASWF_LZ4_VERSION=$ASWF_LZ4_VERSION ENV ASWF_PUGIXML_VERSION=$ASWF_PUGIXML_VERSION ENV ASWF_PYSTRING_VERSION=$ASWF_PYSTRING_VERSION ENV ASWF_SNAPPY_VERSION=$ASWF_SNAPPY_VERSION -ENV ASWF_TBB_VERSION=$ASWF_TBB_VERSION +ENV ASWF_ONETBB_VERSION=$ASWF_ONETBB_VERSION ENV ASWF_TSL_ROBIN_MAP_VERSION=$ASWF_TSL_ROBIN_MAP_VERSION ENV ASWF_YAML_CPP_VERSION=$ASWF_YAML_CPP_VERSION ENV ASWF_ZLIB_VERSION=$ASWF_ZLIB_VERSION @@ -214,7 +214,7 @@ lz4/${ASWF_LZ4_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pugixml/${ASWF_PUGIXML_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pystring/${ASWF_PYSTRING_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} snappy/${ASWF_SNAPPY_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} -tbb/${ASWF_TBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +onetbb/${ASWF_ONETBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} tsl-robin-map/${ASWF_TSL_ROBIN_MAP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} yaml-cpp/${ASWF_YAML_CPP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} zlib/${ASWF_ZLIB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} diff --git a/ci-base/README.md b/ci-base/README.md index e55bb4fd..af55d49f 100644 --- a/ci-base/README.md +++ b/ci-base/README.md @@ -22,7 +22,7 @@ Contains: Python, TBB, Boost and other base libraries Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -38,7 +38,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.10.0 -* tbb-2019_u6 +* onetbb-2019_u6 * blosc-1.5.0 * cpython-3.7.3 * glew-2.1.0 @@ -54,7 +54,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u2 +* onetbb-2020_u2 * blosc-1.5.0 * cpython-3.7.9 * glew-2.1.0 @@ -70,7 +70,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -86,7 +86,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.10.11 * glew-2.1.0 @@ -114,7 +114,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2020_u3 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.5 @@ -129,7 +129,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-base:2025.0](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2025.0) +## [aswf/ci-base:2025.1](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2025.1) Contains: * b2-5.2.1 @@ -146,7 +146,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2021.13.0 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.6 diff --git a/ci-base/image.yaml b/ci-base/image.yaml index 11432980..d6885971 100644 --- a/ci-base/image.yaml +++ b/ci-base/image.yaml @@ -17,7 +17,7 @@ packages: - pugixml - pystring - snappy - - tbb + - onetbb - tsl-robin-map - yaml-cpp - zlib diff --git a/ci-baseqt/Dockerfile b/ci-baseqt/Dockerfile index 5514c1a3..02c27aa9 100644 --- a/ci-baseqt/Dockerfile +++ b/ci-baseqt/Dockerfile @@ -28,7 +28,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -82,7 +82,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -133,7 +133,7 @@ LABEL io.aswf.docker.versions.lz4="$ASWF_LZ4_VERSION" LABEL io.aswf.docker.versions.pugixml="$ASWF_PUGIXML_VERSION" LABEL io.aswf.docker.versions.pystring="$ASWF_PYSTRING_VERSION" LABEL io.aswf.docker.versions.snappy="$ASWF_SNAPPY_VERSION" -LABEL io.aswf.docker.versions.tbb="$ASWF_TBB_VERSION" +LABEL io.aswf.docker.versions.onetbb="$ASWF_ONETBB_VERSION" LABEL io.aswf.docker.versions.tsl-robin-map="$ASWF_TSL_ROBIN_MAP_VERSION" LABEL io.aswf.docker.versions.yaml-cpp="$ASWF_YAML_CPP_VERSION" LABEL io.aswf.docker.versions.zlib="$ASWF_ZLIB_VERSION" @@ -181,7 +181,7 @@ ENV ASWF_LZ4_VERSION=$ASWF_LZ4_VERSION ENV ASWF_PUGIXML_VERSION=$ASWF_PUGIXML_VERSION ENV ASWF_PYSTRING_VERSION=$ASWF_PYSTRING_VERSION ENV ASWF_SNAPPY_VERSION=$ASWF_SNAPPY_VERSION -ENV ASWF_TBB_VERSION=$ASWF_TBB_VERSION +ENV ASWF_ONETBB_VERSION=$ASWF_ONETBB_VERSION ENV ASWF_TSL_ROBIN_MAP_VERSION=$ASWF_TSL_ROBIN_MAP_VERSION ENV ASWF_YAML_CPP_VERSION=$ASWF_YAML_CPP_VERSION ENV ASWF_ZLIB_VERSION=$ASWF_ZLIB_VERSION @@ -234,7 +234,7 @@ lz4/${ASWF_LZ4_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pugixml/${ASWF_PUGIXML_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pystring/${ASWF_PYSTRING_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} snappy/${ASWF_SNAPPY_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} -tbb/${ASWF_TBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +onetbb/${ASWF_ONETBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} tsl-robin-map/${ASWF_TSL_ROBIN_MAP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} yaml-cpp/${ASWF_YAML_CPP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} zlib/${ASWF_ZLIB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} diff --git a/ci-baseqt/README.md b/ci-baseqt/README.md index 75475b81..e5a6e298 100644 --- a/ci-baseqt/README.md +++ b/ci-baseqt/README.md @@ -22,7 +22,7 @@ Contains: Python, TBB, Boost, Qt, PySide and other base libraries Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -40,7 +40,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.10.0 -* tbb-2019_u6 +* onetbb-2019_u6 * blosc-1.5.0 * cpython-3.7.3 * glew-2.1.0 @@ -58,7 +58,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u2 +* onetbb-2020_u2 * blosc-1.5.0 * cpython-3.7.9 * glew-2.1.0 @@ -76,7 +76,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -94,7 +94,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.10.11 * glew-2.1.0 @@ -124,7 +124,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2020_u3 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.5 @@ -143,7 +143,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-baseqt:2025.0](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2025.0) +## [aswf/ci-baseqt:2025.1](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2025.1) Contains: * b2-5.2.1 @@ -160,7 +160,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2021.13.0 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.6 diff --git a/ci-baseqt/image.yaml b/ci-baseqt/image.yaml index 04eddb06..fd2a2aa8 100644 --- a/ci-baseqt/image.yaml +++ b/ci-baseqt/image.yaml @@ -17,7 +17,7 @@ packages: - pugixml - pystring - snappy - - tbb + - onetbb - tsl-robin-map - yaml-cpp - zlib diff --git a/ci-common/Dockerfile b/ci-common/Dockerfile index 9c545fdb..f2036a9d 100644 --- a/ci-common/Dockerfile +++ b/ci-common/Dockerfile @@ -21,6 +21,7 @@ ARG ASWF_CCACHE_VERSION ARG ASWF_DTS_VERSION ARG ASWF_SONAR_VERSION ARG ASWF_CONAN_VERSION +ARG ASWF_YQ_VERSION ARG ASWF_CONAN_PYTHON_VERSION @@ -30,7 +31,7 @@ ARG ASWF_BASEOS_DISTRO # Comment out this block to use Conan packages -FROM ${ASWF_BASEOS_IMAGE}:${ASWF_CUDA_VERSION}-devel-${ASWF_BASEOS_DISTRO} AS ci-common +FROM ${ASWF_BASEOS_IMAGE}:${ASWF_CUDA_VERSION}-runtime-${ASWF_BASEOS_DISTRO} AS ci-common ARG ASWF_ORG @@ -54,6 +55,7 @@ ARG ASWF_CCACHE_VERSION ARG ASWF_DTS_VERSION ARG ASWF_SONAR_VERSION ARG ASWF_CONAN_VERSION +ARG ASWF_YQ_VERSION ARG ASWF_CONAN_PYTHON_VERSION @@ -77,6 +79,7 @@ LABEL io.aswf.docker.versions.ccache="$ASWF_CCACHE_VERSION" LABEL io.aswf.docker.versions.dts="$ASWF_DTS_VERSION" LABEL io.aswf.docker.versions.sonar="$ASWF_SONAR_VERSION" LABEL io.aswf.docker.versions.conan="$ASWF_CONAN_VERSION" +LABEL io.aswf.docker.versions.yq="$ASWF_YQ_VERSION" ENV ASWF_ORG=${ASWF_ORG} @@ -98,6 +101,7 @@ ENV ASWF_CCACHE_VERSION=$ASWF_CCACHE_VERSION ENV ASWF_DTS_VERSION=$ASWF_DTS_VERSION ENV ASWF_SONAR_VERSION=$ASWF_SONAR_VERSION ENV ASWF_CONAN_VERSION=$ASWF_CONAN_VERSION +ENV ASWF_YQ_VERSION=$ASWF_YQ_VERSION ENV ASWF_CONAN_PYTHON_VERSION=$ASWF_CONAN_PYTHON_VERSION @@ -105,13 +109,15 @@ COPY ci-common/README.md ci-common/image.yaml /usr/local/aswf/ USER root -COPY scripts/common/install_yumpackages.sh \ - /tmp/ +COPY ../scripts/common/install_cudadevel.sh /tmp/ + +RUN /tmp/install_cudadevel.sh + +COPY scripts/common/install_yumpackages.sh /tmp/ RUN /tmp/install_yumpackages.sh -COPY scripts/common/install_opengl.sh \ - /tmp/ +COPY scripts/common/install_opengl.sh /tmp/ ARG ASWF_BASEOS_DISTRO ENV ASWF_BASEOS_DISTRO=${ASWF_BASEOS_DISTRO} @@ -124,11 +130,14 @@ ENV NVIDIA_DRIVER_CAPABILITIES \ ENV PKG_CONFIG_PATH \ /usr/local/lib/pkgconfig -COPY scripts/common/install_optix.sh \ - /tmp/ +COPY scripts/common/install_optix.sh /tmp/ RUN /tmp/install_optix.sh +COPY scripts/common/install_yq.sh /tmp/ + +RUN /tmp/install_yq.sh + RUN mkdir /opt/aswf WORKDIR /opt/aswf diff --git a/ci-common/README.md b/ci-common/README.md index e0307cbe..03207eb3 100644 --- a/ci-common/README.md +++ b/ci-common/README.md @@ -173,6 +173,7 @@ Contains: * dts-11 * sonar-6.2.1.4610 * conan-2.14.0 +* yq-4.45.2 ## [aswf/ci-common:4-clang17.2](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=4-clang17.2) @@ -186,30 +187,33 @@ Contains: * dts-11 * sonar-6.2.1.4610 * conan-2.14.0 +* yq-4.45.2 -## [aswf/ci-common:5-clang18.0](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=5-clang18.0) +## [aswf/ci-common:5-clang18.1](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=5-clang18.1) Contains: * clang-18.1.8 -* cmake-3.31.6 +* cmake-3.31.7 * ninja-1.12.1 -* cuda-12.6.1 +* cuda-12.6.3 * glvnd-1.7.0 * ccache-4.9.1 * dts-11 * sonar-6.2.1.4610 * conan-2.14.0 +* yq-4.45.2 -## [aswf/ci-common:5-clang19.0](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=5-clang19.0) +## [aswf/ci-common:5-clang19.1](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=5-clang19.1) Contains: * clang-19.1.1 -* cmake-3.31.6 +* cmake-3.31.7 * ninja-1.12.1 -* cuda-12.6.1 +* cuda-12.6.3 * glvnd-1.7.0 * ccache-4.9.1 * dts-11 * sonar-6.2.1.4610 * conan-2.14.0 +* yq-4.45.2 diff --git a/ci-common/image.yaml b/ci-common/image.yaml index 3255e2d5..2f563740 100644 --- a/ci-common/image.yaml +++ b/ci-common/image.yaml @@ -13,18 +13,21 @@ implicit_packages: - dts - sonar - conan -docker_from: ${ASWF_BASEOS_IMAGE}:${ASWF_CUDA_VERSION}-devel-${ASWF_BASEOS_DISTRO} + - yq +docker_from: ${ASWF_BASEOS_IMAGE}:${ASWF_CUDA_VERSION}-runtime-${ASWF_BASEOS_DISTRO} docker_package_version: $CI_COMMON_VERSION docker_commands: | USER root - COPY scripts/common/install_yumpackages.sh \ - /tmp/ + COPY ../scripts/common/install_cudadevel.sh /tmp/ + + RUN /tmp/install_cudadevel.sh + + COPY scripts/common/install_yumpackages.sh /tmp/ RUN /tmp/install_yumpackages.sh - COPY scripts/common/install_opengl.sh \ - /tmp/ + COPY scripts/common/install_opengl.sh /tmp/ ARG ASWF_BASEOS_DISTRO ENV ASWF_BASEOS_DISTRO=${ASWF_BASEOS_DISTRO} @@ -37,11 +40,14 @@ docker_commands: | ENV PKG_CONFIG_PATH \ /usr/local/lib/pkgconfig - COPY scripts/common/install_optix.sh \ - /tmp/ + COPY scripts/common/install_optix.sh /tmp/ RUN /tmp/install_optix.sh + COPY scripts/common/install_yq.sh /tmp/ + + RUN /tmp/install_yq.sh + RUN mkdir /opt/aswf WORKDIR /opt/aswf diff --git a/ci-materialx/Dockerfile b/ci-materialx/Dockerfile index 095d3d53..649dc94a 100644 --- a/ci-materialx/Dockerfile +++ b/ci-materialx/Dockerfile @@ -28,7 +28,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -90,7 +90,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -150,7 +150,7 @@ LABEL io.aswf.docker.versions.lz4="$ASWF_LZ4_VERSION" LABEL io.aswf.docker.versions.pugixml="$ASWF_PUGIXML_VERSION" LABEL io.aswf.docker.versions.pystring="$ASWF_PYSTRING_VERSION" LABEL io.aswf.docker.versions.snappy="$ASWF_SNAPPY_VERSION" -LABEL io.aswf.docker.versions.tbb="$ASWF_TBB_VERSION" +LABEL io.aswf.docker.versions.onetbb="$ASWF_ONETBB_VERSION" LABEL io.aswf.docker.versions.tsl-robin-map="$ASWF_TSL_ROBIN_MAP_VERSION" LABEL io.aswf.docker.versions.yaml-cpp="$ASWF_YAML_CPP_VERSION" LABEL io.aswf.docker.versions.zlib="$ASWF_ZLIB_VERSION" @@ -206,7 +206,7 @@ ENV ASWF_LZ4_VERSION=$ASWF_LZ4_VERSION ENV ASWF_PUGIXML_VERSION=$ASWF_PUGIXML_VERSION ENV ASWF_PYSTRING_VERSION=$ASWF_PYSTRING_VERSION ENV ASWF_SNAPPY_VERSION=$ASWF_SNAPPY_VERSION -ENV ASWF_TBB_VERSION=$ASWF_TBB_VERSION +ENV ASWF_ONETBB_VERSION=$ASWF_ONETBB_VERSION ENV ASWF_TSL_ROBIN_MAP_VERSION=$ASWF_TSL_ROBIN_MAP_VERSION ENV ASWF_YAML_CPP_VERSION=$ASWF_YAML_CPP_VERSION ENV ASWF_ZLIB_VERSION=$ASWF_ZLIB_VERSION @@ -267,7 +267,7 @@ lz4/${ASWF_LZ4_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pugixml/${ASWF_PUGIXML_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pystring/${ASWF_PYSTRING_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} snappy/${ASWF_SNAPPY_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} -tbb/${ASWF_TBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +onetbb/${ASWF_ONETBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} tsl-robin-map/${ASWF_TSL_ROBIN_MAP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} yaml-cpp/${ASWF_YAML_CPP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} zlib/${ASWF_ZLIB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} diff --git a/ci-materialx/README.md b/ci-materialx/README.md index e1bff1c2..9fc5984e 100644 --- a/ci-materialx/README.md +++ b/ci-materialx/README.md @@ -23,7 +23,7 @@ Warning: this image does *not* contain MaterialX itself as it is used to *build* Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -45,7 +45,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.10.11 * glew-2.1.0 @@ -79,7 +79,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2020_u3 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.5 @@ -106,7 +106,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-materialx:2025.0](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2025.0) +## [aswf/ci-materialx:2025.1](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2025.1) Contains: * b2-5.2.1 @@ -123,7 +123,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2021.13.0 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.6 @@ -146,7 +146,7 @@ Contains: * libjxl-0.11.1 * openexr-3.3.3 * ocio-2.4.2 -* oiio-3.0.5.0 +* oiio-3.0.6.1 * numpy-1.26.4 * vfxplatform-2025 diff --git a/ci-materialx/image.yaml b/ci-materialx/image.yaml index 431e26be..17002f02 100644 --- a/ci-materialx/image.yaml +++ b/ci-materialx/image.yaml @@ -18,7 +18,7 @@ packages: - pugixml - pystring - snappy - - tbb + - onetbb - tsl-robin-map - yaml-cpp - zlib diff --git a/ci-ocio/Dockerfile b/ci-ocio/Dockerfile index ba284643..f7a85dc8 100644 --- a/ci-ocio/Dockerfile +++ b/ci-ocio/Dockerfile @@ -28,7 +28,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -80,7 +80,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -130,7 +130,7 @@ LABEL io.aswf.docker.versions.lz4="$ASWF_LZ4_VERSION" LABEL io.aswf.docker.versions.pugixml="$ASWF_PUGIXML_VERSION" LABEL io.aswf.docker.versions.pystring="$ASWF_PYSTRING_VERSION" LABEL io.aswf.docker.versions.snappy="$ASWF_SNAPPY_VERSION" -LABEL io.aswf.docker.versions.tbb="$ASWF_TBB_VERSION" +LABEL io.aswf.docker.versions.onetbb="$ASWF_ONETBB_VERSION" LABEL io.aswf.docker.versions.tsl-robin-map="$ASWF_TSL_ROBIN_MAP_VERSION" LABEL io.aswf.docker.versions.yaml-cpp="$ASWF_YAML_CPP_VERSION" LABEL io.aswf.docker.versions.zlib="$ASWF_ZLIB_VERSION" @@ -176,7 +176,7 @@ ENV ASWF_LZ4_VERSION=$ASWF_LZ4_VERSION ENV ASWF_PUGIXML_VERSION=$ASWF_PUGIXML_VERSION ENV ASWF_PYSTRING_VERSION=$ASWF_PYSTRING_VERSION ENV ASWF_SNAPPY_VERSION=$ASWF_SNAPPY_VERSION -ENV ASWF_TBB_VERSION=$ASWF_TBB_VERSION +ENV ASWF_ONETBB_VERSION=$ASWF_ONETBB_VERSION ENV ASWF_TSL_ROBIN_MAP_VERSION=$ASWF_TSL_ROBIN_MAP_VERSION ENV ASWF_YAML_CPP_VERSION=$ASWF_YAML_CPP_VERSION ENV ASWF_ZLIB_VERSION=$ASWF_ZLIB_VERSION @@ -227,7 +227,7 @@ lz4/${ASWF_LZ4_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pugixml/${ASWF_PUGIXML_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pystring/${ASWF_PYSTRING_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} snappy/${ASWF_SNAPPY_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} -tbb/${ASWF_TBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +onetbb/${ASWF_ONETBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} tsl-robin-map/${ASWF_TSL_ROBIN_MAP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} yaml-cpp/${ASWF_YAML_CPP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} zlib/${ASWF_ZLIB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} diff --git a/ci-ocio/README.md b/ci-ocio/README.md index 8cff2853..b2878b4c 100644 --- a/ci-ocio/README.md +++ b/ci-ocio/README.md @@ -23,7 +23,7 @@ Warning: this image does *not* contain OpenColorIO itself as it is used to *buil Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -41,7 +41,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.10.0 -* tbb-2019_u6 +* onetbb-2019_u6 * blosc-1.5.0 * cpython-3.7.3 * glew-2.1.0 @@ -59,7 +59,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u2 +* onetbb-2020_u2 * blosc-1.5.0 * cpython-3.7.9 * glew-2.1.0 @@ -77,7 +77,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -95,7 +95,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.10.11 * glew-2.1.0 @@ -125,7 +125,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2020_u3 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.5 @@ -143,7 +143,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-ocio:2025.0](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2025.0) +## [aswf/ci-ocio:2025.1](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2025.1) Contains: * b2-5.2.1 @@ -160,7 +160,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2021.13.0 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.6 diff --git a/ci-ocio/image.yaml b/ci-ocio/image.yaml index 23860ced..e39bf5b9 100644 --- a/ci-ocio/image.yaml +++ b/ci-ocio/image.yaml @@ -18,7 +18,7 @@ packages: - pugixml - pystring - snappy - - tbb + - onetbb - tsl-robin-map - yaml-cpp - zlib diff --git a/ci-oiio/Dockerfile b/ci-oiio/Dockerfile index add527ed..61602c34 100644 --- a/ci-oiio/Dockerfile +++ b/ci-oiio/Dockerfile @@ -28,7 +28,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -91,7 +91,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -151,7 +151,7 @@ LABEL io.aswf.docker.versions.lz4="$ASWF_LZ4_VERSION" LABEL io.aswf.docker.versions.pugixml="$ASWF_PUGIXML_VERSION" LABEL io.aswf.docker.versions.pystring="$ASWF_PYSTRING_VERSION" LABEL io.aswf.docker.versions.snappy="$ASWF_SNAPPY_VERSION" -LABEL io.aswf.docker.versions.tbb="$ASWF_TBB_VERSION" +LABEL io.aswf.docker.versions.onetbb="$ASWF_ONETBB_VERSION" LABEL io.aswf.docker.versions.tsl-robin-map="$ASWF_TSL_ROBIN_MAP_VERSION" LABEL io.aswf.docker.versions.yaml-cpp="$ASWF_YAML_CPP_VERSION" LABEL io.aswf.docker.versions.zlib="$ASWF_ZLIB_VERSION" @@ -207,7 +207,7 @@ ENV ASWF_LZ4_VERSION=$ASWF_LZ4_VERSION ENV ASWF_PUGIXML_VERSION=$ASWF_PUGIXML_VERSION ENV ASWF_PYSTRING_VERSION=$ASWF_PYSTRING_VERSION ENV ASWF_SNAPPY_VERSION=$ASWF_SNAPPY_VERSION -ENV ASWF_TBB_VERSION=$ASWF_TBB_VERSION +ENV ASWF_ONETBB_VERSION=$ASWF_ONETBB_VERSION ENV ASWF_TSL_ROBIN_MAP_VERSION=$ASWF_TSL_ROBIN_MAP_VERSION ENV ASWF_YAML_CPP_VERSION=$ASWF_YAML_CPP_VERSION ENV ASWF_ZLIB_VERSION=$ASWF_ZLIB_VERSION @@ -269,7 +269,7 @@ lz4/${ASWF_LZ4_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pugixml/${ASWF_PUGIXML_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pystring/${ASWF_PYSTRING_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} snappy/${ASWF_SNAPPY_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} -tbb/${ASWF_TBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +onetbb/${ASWF_ONETBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} tsl-robin-map/${ASWF_TSL_ROBIN_MAP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} yaml-cpp/${ASWF_YAML_CPP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} zlib/${ASWF_ZLIB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} diff --git a/ci-oiio/README.md b/ci-oiio/README.md index 3642ee5b..e41c539d 100644 --- a/ci-oiio/README.md +++ b/ci-oiio/README.md @@ -35,7 +35,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2020_u3 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.5 @@ -62,7 +62,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-oiio:2025.0](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2025.0) +## [aswf/ci-oiio:2025.1](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2025.1) Contains: * b2-5.2.1 @@ -79,7 +79,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2021.13.0 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.6 diff --git a/ci-oiio/image.yaml b/ci-oiio/image.yaml index f023ce45..61c9a899 100644 --- a/ci-oiio/image.yaml +++ b/ci-oiio/image.yaml @@ -18,7 +18,7 @@ packages: - pugixml - pystring - snappy - - tbb + - onetbb - tsl-robin-map - yaml-cpp - zlib diff --git a/ci-opencue/README.md b/ci-opencue/README.md index 5d2bf4cf..52da5556 100644 --- a/ci-opencue/README.md +++ b/ci-opencue/README.md @@ -60,7 +60,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-opencue:2025.0](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2025.0) +## [aswf/ci-opencue:2025.1](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2025.1) Contains: * cpython-3.11.11 diff --git a/ci-openexr/README.md b/ci-openexr/README.md index a4f9ed56..84cbdedd 100644 --- a/ci-openexr/README.md +++ b/ci-openexr/README.md @@ -75,7 +75,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-openexr:2025.0](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2025.0) +## [aswf/ci-openexr:2025.1](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2025.1) Contains: * boost-1.85.0 diff --git a/ci-openrv/README.md b/ci-openrv/README.md index b5be4918..4b35ad43 100644 --- a/ci-openrv/README.md +++ b/ci-openrv/README.md @@ -27,7 +27,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-openrv:2025.0](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2025.0) +## [aswf/ci-openrv:2025.1](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2025.1) Contains: * cpython-3.11.11 diff --git a/ci-openvdb/Dockerfile b/ci-openvdb/Dockerfile index db3e3024..5f91a650 100644 --- a/ci-openvdb/Dockerfile +++ b/ci-openvdb/Dockerfile @@ -28,7 +28,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -92,7 +92,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -154,7 +154,7 @@ LABEL io.aswf.docker.versions.lz4="$ASWF_LZ4_VERSION" LABEL io.aswf.docker.versions.pugixml="$ASWF_PUGIXML_VERSION" LABEL io.aswf.docker.versions.pystring="$ASWF_PYSTRING_VERSION" LABEL io.aswf.docker.versions.snappy="$ASWF_SNAPPY_VERSION" -LABEL io.aswf.docker.versions.tbb="$ASWF_TBB_VERSION" +LABEL io.aswf.docker.versions.onetbb="$ASWF_ONETBB_VERSION" LABEL io.aswf.docker.versions.tsl-robin-map="$ASWF_TSL_ROBIN_MAP_VERSION" LABEL io.aswf.docker.versions.yaml-cpp="$ASWF_YAML_CPP_VERSION" LABEL io.aswf.docker.versions.zlib="$ASWF_ZLIB_VERSION" @@ -212,7 +212,7 @@ ENV ASWF_LZ4_VERSION=$ASWF_LZ4_VERSION ENV ASWF_PUGIXML_VERSION=$ASWF_PUGIXML_VERSION ENV ASWF_PYSTRING_VERSION=$ASWF_PYSTRING_VERSION ENV ASWF_SNAPPY_VERSION=$ASWF_SNAPPY_VERSION -ENV ASWF_TBB_VERSION=$ASWF_TBB_VERSION +ENV ASWF_ONETBB_VERSION=$ASWF_ONETBB_VERSION ENV ASWF_TSL_ROBIN_MAP_VERSION=$ASWF_TSL_ROBIN_MAP_VERSION ENV ASWF_YAML_CPP_VERSION=$ASWF_YAML_CPP_VERSION ENV ASWF_ZLIB_VERSION=$ASWF_ZLIB_VERSION @@ -275,7 +275,7 @@ lz4/${ASWF_LZ4_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pugixml/${ASWF_PUGIXML_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pystring/${ASWF_PYSTRING_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} snappy/${ASWF_SNAPPY_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} -tbb/${ASWF_TBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +onetbb/${ASWF_ONETBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} tsl-robin-map/${ASWF_TSL_ROBIN_MAP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} yaml-cpp/${ASWF_YAML_CPP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} zlib/${ASWF_ZLIB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} diff --git a/ci-openvdb/README.md b/ci-openvdb/README.md index e2c4bf70..304666fb 100644 --- a/ci-openvdb/README.md +++ b/ci-openvdb/README.md @@ -23,7 +23,7 @@ Warning: this image does *not* contain OpenVDB itself as it is used to *build* O Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -47,7 +47,7 @@ Contains: Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -71,7 +71,7 @@ Contains: Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -95,7 +95,7 @@ Contains: Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -119,7 +119,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.10.0 -* tbb-2019_u6 +* onetbb-2019_u6 * blosc-1.5.0 * cpython-3.7.3 * glew-2.1.0 @@ -143,7 +143,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u2 +* onetbb-2020_u2 * blosc-1.5.0 * cpython-3.7.9 * glew-2.1.0 @@ -167,7 +167,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -191,7 +191,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -215,7 +215,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -239,7 +239,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -263,7 +263,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -287,7 +287,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.10.11 * glew-2.1.0 @@ -311,7 +311,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.10.11 * glew-2.1.0 @@ -347,7 +347,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2020_u3 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.5 @@ -372,7 +372,7 @@ Contains: * openexr-3.2.4 * ocio-2.3.2 * oiio-2.5.18.0 -* partio-1.17.1 +* partio-1.19.0 * numpy-1.24.3 * vfxplatform-2024 @@ -393,7 +393,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2020_u3 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.5 @@ -418,11 +418,11 @@ Contains: * openexr-3.2.4 * ocio-2.3.2 * oiio-2.5.18.0 -* partio-1.17.1 +* partio-1.19.0 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-openvdb:2025-clang18.0](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2025-clang18.0) +## [aswf/ci-openvdb:2025-clang18.1](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2025-clang18.1) Contains: * b2-5.2.1 @@ -439,7 +439,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2021.13.0 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.6 @@ -463,12 +463,12 @@ Contains: * libjxl-0.11.1 * openexr-3.3.3 * ocio-2.4.2 -* oiio-3.0.5.0 -* partio-1.17.3 +* oiio-3.0.6.1 +* partio-1.19.0 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-openvdb:2025-clang19.0](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2025-clang19.0) +## [aswf/ci-openvdb:2025-clang19.1](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2025-clang19.1) Contains: * b2-5.2.1 @@ -485,7 +485,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2021.13.0 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.6 @@ -509,8 +509,8 @@ Contains: * libjxl-0.11.1 * openexr-3.3.3 * ocio-2.4.2 -* oiio-3.0.5.0 -* partio-1.17.3 +* oiio-3.0.6.1 +* partio-1.19.0 * numpy-1.26.4 * vfxplatform-2025 diff --git a/ci-openvdb/image.yaml b/ci-openvdb/image.yaml index eee94053..4d5ecf51 100644 --- a/ci-openvdb/image.yaml +++ b/ci-openvdb/image.yaml @@ -18,7 +18,7 @@ packages: - pugixml - pystring - snappy - - tbb + - onetbb - tsl-robin-map - yaml-cpp - zlib diff --git a/ci-osl/Dockerfile b/ci-osl/Dockerfile index 228ea1ed..60397363 100644 --- a/ci-osl/Dockerfile +++ b/ci-osl/Dockerfile @@ -28,7 +28,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -94,7 +94,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -157,7 +157,7 @@ LABEL io.aswf.docker.versions.lz4="$ASWF_LZ4_VERSION" LABEL io.aswf.docker.versions.pugixml="$ASWF_PUGIXML_VERSION" LABEL io.aswf.docker.versions.pystring="$ASWF_PYSTRING_VERSION" LABEL io.aswf.docker.versions.snappy="$ASWF_SNAPPY_VERSION" -LABEL io.aswf.docker.versions.tbb="$ASWF_TBB_VERSION" +LABEL io.aswf.docker.versions.onetbb="$ASWF_ONETBB_VERSION" LABEL io.aswf.docker.versions.tsl-robin-map="$ASWF_TSL_ROBIN_MAP_VERSION" LABEL io.aswf.docker.versions.yaml-cpp="$ASWF_YAML_CPP_VERSION" LABEL io.aswf.docker.versions.zlib="$ASWF_ZLIB_VERSION" @@ -216,7 +216,7 @@ ENV ASWF_LZ4_VERSION=$ASWF_LZ4_VERSION ENV ASWF_PUGIXML_VERSION=$ASWF_PUGIXML_VERSION ENV ASWF_PYSTRING_VERSION=$ASWF_PYSTRING_VERSION ENV ASWF_SNAPPY_VERSION=$ASWF_SNAPPY_VERSION -ENV ASWF_TBB_VERSION=$ASWF_TBB_VERSION +ENV ASWF_ONETBB_VERSION=$ASWF_ONETBB_VERSION ENV ASWF_TSL_ROBIN_MAP_VERSION=$ASWF_TSL_ROBIN_MAP_VERSION ENV ASWF_YAML_CPP_VERSION=$ASWF_YAML_CPP_VERSION ENV ASWF_ZLIB_VERSION=$ASWF_ZLIB_VERSION @@ -281,7 +281,7 @@ lz4/${ASWF_LZ4_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pugixml/${ASWF_PUGIXML_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pystring/${ASWF_PYSTRING_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} snappy/${ASWF_SNAPPY_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} -tbb/${ASWF_TBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +onetbb/${ASWF_ONETBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} tsl-robin-map/${ASWF_TSL_ROBIN_MAP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} yaml-cpp/${ASWF_YAML_CPP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} zlib/${ASWF_ZLIB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} diff --git a/ci-osl/README.md b/ci-osl/README.md index 9792db62..687a366b 100644 --- a/ci-osl/README.md +++ b/ci-osl/README.md @@ -23,7 +23,7 @@ Warning: this image does *not* contain OpenShadingLanguage itself as it is used Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -48,7 +48,7 @@ Contains: Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -73,7 +73,7 @@ Contains: Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -98,7 +98,7 @@ Contains: Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -123,7 +123,7 @@ Contains: Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -148,7 +148,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.10.0 -* tbb-2019_u6 +* onetbb-2019_u6 * blosc-1.5.0 * cpython-3.7.3 * glew-2.1.0 @@ -173,7 +173,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u2 +* onetbb-2020_u2 * blosc-1.5.0 * cpython-3.7.9 * glew-2.1.0 @@ -198,7 +198,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u2 +* onetbb-2020_u2 * blosc-1.5.0 * cpython-3.7.9 * glew-2.1.0 @@ -223,7 +223,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -248,7 +248,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -273,7 +273,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -298,7 +298,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -323,7 +323,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -348,7 +348,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.10.11 * glew-2.1.0 @@ -373,7 +373,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.10.11 * glew-2.1.0 @@ -410,7 +410,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2020_u3 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.5 @@ -436,7 +436,7 @@ Contains: * ocio-2.3.2 * oiio-2.5.18.0 * openvdb-11.0.0 -* partio-1.17.1 +* partio-1.19.0 * numpy-1.24.3 * vfxplatform-2024 @@ -457,7 +457,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2020_u3 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.5 @@ -483,11 +483,11 @@ Contains: * ocio-2.3.2 * oiio-2.5.18.0 * openvdb-11.0.0 -* partio-1.17.1 +* partio-1.19.0 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-osl:2025-clang18.0](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2025-clang18.0) +## [aswf/ci-osl:2025-clang18.1](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2025-clang18.1) Contains: * b2-5.2.1 @@ -504,7 +504,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2021.13.0 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.6 @@ -528,13 +528,13 @@ Contains: * libjxl-0.11.1 * openexr-3.3.3 * ocio-2.4.2 -* oiio-3.0.5.0 +* oiio-3.0.6.1 * openvdb-12.0.0 -* partio-1.17.3 +* partio-1.19.0 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-osl:2025-clang19.0](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2025-clang19.0) +## [aswf/ci-osl:2025-clang19.1](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2025-clang19.1) Contains: * b2-5.2.1 @@ -551,7 +551,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2021.13.0 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.6 @@ -575,9 +575,9 @@ Contains: * libjxl-0.11.1 * openexr-3.3.3 * ocio-2.4.2 -* oiio-3.0.5.0 +* oiio-3.0.6.1 * openvdb-12.0.0 -* partio-1.17.3 +* partio-1.19.0 * numpy-1.26.4 * vfxplatform-2025 diff --git a/ci-osl/image.yaml b/ci-osl/image.yaml index 73f57a55..a4c21a51 100644 --- a/ci-osl/image.yaml +++ b/ci-osl/image.yaml @@ -18,7 +18,7 @@ packages: - pugixml - pystring - snappy - - tbb + - onetbb - tsl-robin-map - yaml-cpp - zlib diff --git a/ci-otio/Dockerfile b/ci-otio/Dockerfile index f07e6060..dc70e654 100644 --- a/ci-otio/Dockerfile +++ b/ci-otio/Dockerfile @@ -28,7 +28,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -82,7 +82,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -134,7 +134,7 @@ LABEL io.aswf.docker.versions.lz4="$ASWF_LZ4_VERSION" LABEL io.aswf.docker.versions.pugixml="$ASWF_PUGIXML_VERSION" LABEL io.aswf.docker.versions.pystring="$ASWF_PYSTRING_VERSION" LABEL io.aswf.docker.versions.snappy="$ASWF_SNAPPY_VERSION" -LABEL io.aswf.docker.versions.tbb="$ASWF_TBB_VERSION" +LABEL io.aswf.docker.versions.onetbb="$ASWF_ONETBB_VERSION" LABEL io.aswf.docker.versions.tsl-robin-map="$ASWF_TSL_ROBIN_MAP_VERSION" LABEL io.aswf.docker.versions.yaml-cpp="$ASWF_YAML_CPP_VERSION" LABEL io.aswf.docker.versions.zlib="$ASWF_ZLIB_VERSION" @@ -182,7 +182,7 @@ ENV ASWF_LZ4_VERSION=$ASWF_LZ4_VERSION ENV ASWF_PUGIXML_VERSION=$ASWF_PUGIXML_VERSION ENV ASWF_PYSTRING_VERSION=$ASWF_PYSTRING_VERSION ENV ASWF_SNAPPY_VERSION=$ASWF_SNAPPY_VERSION -ENV ASWF_TBB_VERSION=$ASWF_TBB_VERSION +ENV ASWF_ONETBB_VERSION=$ASWF_ONETBB_VERSION ENV ASWF_TSL_ROBIN_MAP_VERSION=$ASWF_TSL_ROBIN_MAP_VERSION ENV ASWF_YAML_CPP_VERSION=$ASWF_YAML_CPP_VERSION ENV ASWF_ZLIB_VERSION=$ASWF_ZLIB_VERSION @@ -235,7 +235,7 @@ lz4/${ASWF_LZ4_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pugixml/${ASWF_PUGIXML_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pystring/${ASWF_PYSTRING_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} snappy/${ASWF_SNAPPY_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} -tbb/${ASWF_TBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +onetbb/${ASWF_ONETBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} tsl-robin-map/${ASWF_TSL_ROBIN_MAP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} yaml-cpp/${ASWF_YAML_CPP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} zlib/${ASWF_ZLIB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} diff --git a/ci-otio/README.md b/ci-otio/README.md index e229232c..c402fb17 100644 --- a/ci-otio/README.md +++ b/ci-otio/README.md @@ -23,7 +23,7 @@ Warning: this image does *not* contain OpenTimelineIO itself as it is used to *b Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -42,7 +42,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.10.0 -* tbb-2019_u6 +* onetbb-2019_u6 * blosc-1.5.0 * cpython-3.7.3 * glew-2.1.0 @@ -61,7 +61,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u2 +* onetbb-2020_u2 * blosc-1.5.0 * cpython-3.7.9 * glew-2.1.0 @@ -80,7 +80,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -99,7 +99,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.10.11 * glew-2.1.0 @@ -130,7 +130,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2020_u3 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.5 @@ -149,7 +149,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-otio:2025.0](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2025.0) +## [aswf/ci-otio:2025.1](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2025.1) Contains: * b2-5.2.1 @@ -166,7 +166,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2021.13.0 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.6 diff --git a/ci-otio/image.yaml b/ci-otio/image.yaml index 41ea8127..045000e0 100644 --- a/ci-otio/image.yaml +++ b/ci-otio/image.yaml @@ -18,7 +18,7 @@ packages: - pugixml - pystring - snappy - - tbb + - onetbb - tsl-robin-map - yaml-cpp - zlib diff --git a/ci-usd/Dockerfile b/ci-usd/Dockerfile index 681e15d2..0f552a2c 100644 --- a/ci-usd/Dockerfile +++ b/ci-usd/Dockerfile @@ -28,7 +28,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -95,7 +95,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_PUGIXML_VERSION ARG ASWF_PYSTRING_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_TSL_ROBIN_MAP_VERSION ARG ASWF_YAML_CPP_VERSION ARG ASWF_ZLIB_VERSION @@ -160,7 +160,7 @@ LABEL io.aswf.docker.versions.lz4="$ASWF_LZ4_VERSION" LABEL io.aswf.docker.versions.pugixml="$ASWF_PUGIXML_VERSION" LABEL io.aswf.docker.versions.pystring="$ASWF_PYSTRING_VERSION" LABEL io.aswf.docker.versions.snappy="$ASWF_SNAPPY_VERSION" -LABEL io.aswf.docker.versions.tbb="$ASWF_TBB_VERSION" +LABEL io.aswf.docker.versions.onetbb="$ASWF_ONETBB_VERSION" LABEL io.aswf.docker.versions.tsl-robin-map="$ASWF_TSL_ROBIN_MAP_VERSION" LABEL io.aswf.docker.versions.yaml-cpp="$ASWF_YAML_CPP_VERSION" LABEL io.aswf.docker.versions.zlib="$ASWF_ZLIB_VERSION" @@ -221,7 +221,7 @@ ENV ASWF_LZ4_VERSION=$ASWF_LZ4_VERSION ENV ASWF_PUGIXML_VERSION=$ASWF_PUGIXML_VERSION ENV ASWF_PYSTRING_VERSION=$ASWF_PYSTRING_VERSION ENV ASWF_SNAPPY_VERSION=$ASWF_SNAPPY_VERSION -ENV ASWF_TBB_VERSION=$ASWF_TBB_VERSION +ENV ASWF_ONETBB_VERSION=$ASWF_ONETBB_VERSION ENV ASWF_TSL_ROBIN_MAP_VERSION=$ASWF_TSL_ROBIN_MAP_VERSION ENV ASWF_YAML_CPP_VERSION=$ASWF_YAML_CPP_VERSION ENV ASWF_ZLIB_VERSION=$ASWF_ZLIB_VERSION @@ -287,7 +287,7 @@ lz4/${ASWF_LZ4_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pugixml/${ASWF_PUGIXML_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pystring/${ASWF_PYSTRING_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} snappy/${ASWF_SNAPPY_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} -tbb/${ASWF_TBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +onetbb/${ASWF_ONETBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} tsl-robin-map/${ASWF_TSL_ROBIN_MAP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} yaml-cpp/${ASWF_YAML_CPP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} zlib/${ASWF_ZLIB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} diff --git a/ci-usd/README.md b/ci-usd/README.md index 71e6047b..3632c7a3 100644 --- a/ci-usd/README.md +++ b/ci-usd/README.md @@ -23,7 +23,7 @@ Warning: this image does *not* contain USD itself as it is used to *build* USD! Contains: * cppunit-1.14.0 * gtest-1.8.1 -* tbb-2018 +* onetbb-2018 * blosc-1.5.0 * cpython-2.7.15 * glew-2.1.0 @@ -50,7 +50,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.10.0 -* tbb-2019_u6 +* onetbb-2019_u6 * blosc-1.5.0 * cpython-3.7.3 * glew-2.1.0 @@ -77,7 +77,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u2 +* onetbb-2020_u2 * blosc-1.5.0 * cpython-3.7.9 * glew-2.1.0 @@ -104,7 +104,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.9.15 * glew-2.1.0 @@ -132,7 +132,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* tbb-2020_u3 +* onetbb-2020_u3 * blosc-1.17.0 * cpython-3.10.11 * glew-2.1.0 @@ -172,7 +172,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2020_u3 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.5 @@ -198,13 +198,13 @@ Contains: * ocio-2.3.2 * oiio-2.5.18.0 * opensubdiv-3.6.0 -* partio-1.17.1 +* partio-1.19.0 * materialx-1.39.2 * numpy-1.24.3 * hdf5-1.8.23 * vfxplatform-2024 -## [aswf/ci-usd:2025.0](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2025.0) +## [aswf/ci-usd:2025.1](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2025.1) Contains: * b2-5.2.1 @@ -221,7 +221,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2021.13.0 * zlib-1.3.1 * zstd-1.5.6 * blosc-1.21.6 @@ -245,9 +245,9 @@ Contains: * openexr-3.3.3 * alembic-1.8.8 * ocio-2.4.2 -* oiio-3.0.5.0 +* oiio-3.0.6.1 * opensubdiv-3.6.0 -* partio-1.17.3 +* partio-1.19.0 * materialx-1.39.3 * numpy-1.26.4 * hdf5-1.8.23 diff --git a/ci-usd/image.yaml b/ci-usd/image.yaml index eb6fcd8e..eabe3fd3 100644 --- a/ci-usd/image.yaml +++ b/ci-usd/image.yaml @@ -18,7 +18,7 @@ packages: - pugixml - pystring - snappy - - tbb + - onetbb - tsl-robin-map - yaml-cpp - zlib diff --git a/ci-vfxall/Dockerfile b/ci-vfxall/Dockerfile index 72108a06..eea2985b 100644 --- a/ci-vfxall/Dockerfile +++ b/ci-vfxall/Dockerfile @@ -28,7 +28,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_MD4C_VERSION ARG ASWF_PYBIND11_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_ZLIB_VERSION ARG ASWF_ZSTD_VERSION ARG ASWF_DBUS_VERSION @@ -103,7 +103,7 @@ ARG ASWF_LZ4_VERSION ARG ASWF_MD4C_VERSION ARG ASWF_PYBIND11_VERSION ARG ASWF_SNAPPY_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_ZLIB_VERSION ARG ASWF_ZSTD_VERSION ARG ASWF_DBUS_VERSION @@ -171,7 +171,7 @@ LABEL io.aswf.docker.versions.lz4="$ASWF_LZ4_VERSION" LABEL io.aswf.docker.versions.md4c="$ASWF_MD4C_VERSION" LABEL io.aswf.docker.versions.pybind11="$ASWF_PYBIND11_VERSION" LABEL io.aswf.docker.versions.snappy="$ASWF_SNAPPY_VERSION" -LABEL io.aswf.docker.versions.tbb="$ASWF_TBB_VERSION" +LABEL io.aswf.docker.versions.onetbb="$ASWF_ONETBB_VERSION" LABEL io.aswf.docker.versions.zlib="$ASWF_ZLIB_VERSION" LABEL io.aswf.docker.versions.zstd="$ASWF_ZSTD_VERSION" LABEL io.aswf.docker.versions.dbus="$ASWF_DBUS_VERSION" @@ -236,7 +236,7 @@ ENV ASWF_LZ4_VERSION=$ASWF_LZ4_VERSION ENV ASWF_MD4C_VERSION=$ASWF_MD4C_VERSION ENV ASWF_PYBIND11_VERSION=$ASWF_PYBIND11_VERSION ENV ASWF_SNAPPY_VERSION=$ASWF_SNAPPY_VERSION -ENV ASWF_TBB_VERSION=$ASWF_TBB_VERSION +ENV ASWF_ONETBB_VERSION=$ASWF_ONETBB_VERSION ENV ASWF_ZLIB_VERSION=$ASWF_ZLIB_VERSION ENV ASWF_ZSTD_VERSION=$ASWF_ZSTD_VERSION ENV ASWF_DBUS_VERSION=$ASWF_DBUS_VERSION @@ -310,7 +310,7 @@ lz4/${ASWF_LZ4_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} md4c/${ASWF_MD4C_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pybind11/${ASWF_PYBIND11_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} snappy/${ASWF_SNAPPY_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} -tbb/${ASWF_TBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +onetbb/${ASWF_ONETBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} zlib/${ASWF_ZLIB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} zstd/${ASWF_ZSTD_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} dbus/${ASWF_DBUS_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} diff --git a/ci-vfxall/README.md b/ci-vfxall/README.md index 2a59b2b6..83c3474f 100644 --- a/ci-vfxall/README.md +++ b/ci-vfxall/README.md @@ -28,7 +28,7 @@ Contains: * glfw-3.1.2 * log4cplus-1.1.2 * pybind11-2.4.3 -* tbb-2018 +* onetbb-2018 * qt-5.12.6 * pyside-5.12.6 * imath-2.3.0 @@ -58,7 +58,7 @@ Contains: * glfw-3.1.2 * log4cplus-1.1.2 * pybind11-2.4.3 -* tbb-2018 +* onetbb-2018 * qt-5.12.6 * pyside-5.12.6 * imath-2.3.0 @@ -88,7 +88,7 @@ Contains: * glfw-3.1.2 * log4cplus-1.1.2 * pybind11-2.4.3 -* tbb-2018 +* onetbb-2018 * qt-5.12.6 * pyside-5.12.6 * imath-2.3.0 @@ -118,7 +118,7 @@ Contains: * glfw-3.1.2 * log4cplus-1.1.2 * pybind11-2.4.3 -* tbb-2018 +* onetbb-2018 * qt-5.12.6 * pyside-5.12.6 * imath-2.3.0 @@ -148,7 +148,7 @@ Contains: * glfw-3.1.2 * log4cplus-1.1.2 * pybind11-2.4.3 -* tbb-2019_u6 +* onetbb-2019_u6 * qt-5.12.6 * pyside-5.12.6 * imath-2.4.0 @@ -178,7 +178,7 @@ Contains: * glfw-3.1.2 * log4cplus-1.1.2 * pybind11-2.6.2 -* tbb-2020_u2 +* onetbb-2020_u2 * qt-5.15.2 * pyside-5.15.2 * imath-2.5.5 @@ -208,7 +208,7 @@ Contains: * glfw-3.1.2 * log4cplus-1.1.2 * pybind11-2.8.1 -* tbb-2020_u3 +* onetbb-2020_u3 * qt-5.15.2 * pyside-5.15.2 * imath-3.1.5 @@ -239,7 +239,7 @@ Contains: * glfw-3.1.2 * log4cplus-1.1.2 * pybind11-2.8.1 -* tbb-2020_u3 +* onetbb-2020_u3 * qt-5.15.2 * pyside-5.15.2 * imath-3.1.5 @@ -270,7 +270,7 @@ Contains: * glfw-3.1.2 * log4cplus-1.1.2 * pybind11-2.8.1 -* tbb-2020_u3 +* onetbb-2020_u3 * qt-5.15.2 * pyside-5.15.2 * imath-3.1.5 @@ -301,7 +301,7 @@ Contains: * glfw-3.1.2 * log4cplus-1.1.2 * pybind11-2.8.1 -* tbb-2020_u3 +* onetbb-2020_u3 * qt-5.15.2 * pyside-5.15.2 * imath-3.1.5 @@ -332,7 +332,7 @@ Contains: * glfw-3.1.2 * log4cplus-1.1.2 * pybind11-2.8.1 -* tbb-2020_u3 +* onetbb-2020_u3 * qt-5.15.2 * pyside-5.15.2 * imath-3.1.5 @@ -363,7 +363,7 @@ Contains: * glfw-3.1.2 * log4cplus-1.1.2 * pybind11-2.9.2 -* tbb-2020_u3 +* onetbb-2020_u3 * qt-5.15.9 * pyside-5.15.9 * imath-3.1.9 @@ -394,7 +394,7 @@ Contains: * glfw-3.1.2 * log4cplus-1.1.2 * pybind11-2.9.2 -* tbb-2020_u3 +* onetbb-2020_u3 * qt-5.15.9 * pyside-5.15.9 * imath-3.1.9 @@ -431,7 +431,7 @@ Contains: * md4c-0.4.8 * pybind11-2.12.0 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2020_u3 * zlib-1.3.1 * zstd-1.5.6 * dbus-system @@ -461,7 +461,7 @@ Contains: * openvdb-11.0.0 * materialx-1.39.2 * usd-24.08 -* partio-1.17.1 +* partio-1.19.0 * osl-1.13.11.0 * otio-0.17.0 * numpy-1.24.3 @@ -485,7 +485,7 @@ Contains: * md4c-0.4.8 * pybind11-2.12.0 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2020_u3 * zlib-1.3.1 * zstd-1.5.6 * dbus-system @@ -515,14 +515,14 @@ Contains: * openvdb-11.0.0 * materialx-1.39.2 * usd-24.08 -* partio-1.17.1 +* partio-1.19.0 * osl-1.13.11.0 * otio-0.17.0 * numpy-1.24.3 * hdf5-1.8.23 * vfxplatform-2024 -## [aswf/ci-vfxall:2025-clang18.0](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2025-clang18.0) +## [aswf/ci-vfxall:2025-clang18.1](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2025-clang18.1) Contains: * blosc-1.21.6 @@ -539,7 +539,7 @@ Contains: * md4c-0.4.8 * pybind11-2.13.6 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2021.13.0 * zlib-1.3.1 * zstd-1.5.6 * dbus-system @@ -562,21 +562,21 @@ Contains: * imath-3.1.12 * openexr-3.3.3 * alembic-1.8.8 -* oiio-3.0.5.0 +* oiio-3.0.6.1 * ocio-2.4.2 * opensubdiv-3.6.0 * ptex-2.4.3 * openvdb-12.0.0 * materialx-1.39.3 -* usd-25.02a.eae7e67 -* partio-1.17.3 -* osl-1.14.5.0 +* usd-25.05 +* partio-1.19.0 +* osl-1.14.5.1 * otio-0.17.0 * numpy-1.26.4 * hdf5-1.8.23 * vfxplatform-2025 -## [aswf/ci-vfxall:2025-clang19.0](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2025-clang19.0) +## [aswf/ci-vfxall:2025-clang19.1](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2025-clang19.1) Contains: * blosc-1.21.6 @@ -593,7 +593,7 @@ Contains: * md4c-0.4.8 * pybind11-2.13.6 * snappy-1.1.10 -* tbb-2020_u3 +* onetbb-2021.13.0 * zlib-1.3.1 * zstd-1.5.6 * dbus-system @@ -616,15 +616,15 @@ Contains: * imath-3.1.12 * openexr-3.3.3 * alembic-1.8.8 -* oiio-3.0.5.0 +* oiio-3.0.6.1 * ocio-2.4.2 * opensubdiv-3.6.0 * ptex-2.4.3 * openvdb-12.0.0 * materialx-1.39.3 -* usd-25.02a.eae7e67 -* partio-1.17.3 -* osl-1.14.5.0 +* usd-25.05 +* partio-1.19.0 +* osl-1.14.5.1 * otio-0.17.0 * numpy-1.26.4 * hdf5-1.8.23 diff --git a/ci-vfxall/image.yaml b/ci-vfxall/image.yaml index 78f2b53f..145ce418 100644 --- a/ci-vfxall/image.yaml +++ b/ci-vfxall/image.yaml @@ -17,7 +17,7 @@ packages: - md4c - pybind11 - snappy - - tbb + - onetbb - zlib - zstd - dbus diff --git a/packages/base1/Dockerfile b/packages/base1/Dockerfile index dca3c837..fa89529c 100644 --- a/packages/base1/Dockerfile +++ b/packages/base1/Dockerfile @@ -21,7 +21,7 @@ ARG ASWF_NUMPY_VERSION ARG ASWF_PYBIND11_VERSION ARG ASWF_CPYTHON_VERSION ARG ASWF_PYTHON_MAJOR_MINOR_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_VFXPLATFORM_VERSION diff --git a/packages/common/Dockerfile b/packages/common/Dockerfile index d5d229d4..b3a2b5fc 100644 --- a/packages/common/Dockerfile +++ b/packages/common/Dockerfile @@ -19,27 +19,51 @@ ARG ASWF_BASEOS_IMAGE #################### ci-baseos-gl-os #################### -FROM ${ASWF_BASEOS_IMAGE}:${ASWF_CUDA_VERSION}-devel-${ASWF_BASEOS_DISTRO} AS ci-baseos-gl-os +FROM ${ASWF_BASEOS_IMAGE}:${ASWF_CUDA_VERSION}-runtime-${ASWF_BASEOS_DISTRO} AS ci-baseos-gl-os ARG CI_COMMON_VERSION ENV CI_COMMON_VERSION=${CI_COMMON_VERSION} ARG ASWF_CUDA_VERSION ENV ASWF_CUDA_VERSION=${ASWF_CUDA_VERSION} +ARG ASWF_GLVND_VERSION +ENV ASWF_GLVND_VERSION=${ASWF_GLVND_VERSION} ARG ASWF_DTS_VERSION ENV ASWF_DTS_VERSION=${ASWF_DTS_VERSION} ARG ASWF_DTS_PREFIX ENV ASWF_DTS_PREFIX=${ASWF_DTS_PREFIX} ARG ASWF_CMAKE_VERSION ENV ASWF_CMAKE_VERSION=${ASWF_CMAKE_VERSION} +ARG ASWF_YQ_VERSION +ENV ASWF_YQ_VERSION=${ASWF_YQ_VERSION} -COPY ../scripts/common/install_yumpackages.sh \ - /tmp/ +COPY ../scripts/common/install_cudadevel.sh /tmp/ + +RUN --mount=type=cache,sharing=private,target=/var/cache/yum \ + /tmp/install_cudadevel.sh + +COPY ../scripts/common/install_yumpackages.sh /tmp/ RUN --mount=type=cache,sharing=private,target=/var/cache/yum \ /tmp/install_yumpackages.sh -COPY scripts/common/install_pippackages.sh \ - /tmp/ +COPY scripts/common/install_opengl.sh /tmp/ + +ARG ASWF_BASEOS_DISTRO +ENV ASWF_BASEOS_DISTRO=${ASWF_BASEOS_DISTRO} +RUN /tmp/install_opengl.sh + +ENV NVIDIA_VISIBLE_DEVICES \ + ${NVIDIA_VISIBLE_DEVICES:-all} +ENV NVIDIA_DRIVER_CAPABILITIES \ + ${NVIDIA_DRIVER_CAPABILITIES:+$NVIDIA_DRIVER_CAPABILITIES,}graphics +ENV PKG_CONFIG_PATH \ + /usr/local/lib/pkgconfig + +COPY scripts/common/install_optix.sh /tmp/ + +RUN /tmp/install_optix.sh + +COPY scripts/common/install_pippackages.sh /tmp/ RUN --mount=type=cache,sharing=private,target=/root/.cache/pip \ /tmp/install_pippackages.sh @@ -60,6 +84,9 @@ RUN --mount=type=cache,sharing=private,target=/tmp/downloads \ /tmp/install_dev_cmake.sh && \ /tmp/install_dev_ccache.sh +COPY scripts/common/install_yq.sh /tmp/ + +RUN /tmp/install_yq.sh #################### ci-baseos-gl-conan #################### FROM ci-baseos-gl-os AS ci-baseos-gl-conan @@ -124,8 +151,8 @@ ARG ASWF_GLEW_VERSION ENV ASWF_GLEW_VERSION=${ASWF_GLEW_VERSION} ARG ASWF_GLFW_VERSION ENV ASWF_GLFW_VERSION=${ASWF_GLFW_VERSION} -ARG ASWF_TBB_VERSION -ENV ASWF_TBB_VERSION=${ASWF_TBB_VERSION} +ARG ASWF_ONETBB_VERSION +ENV ASWF_ONETBB_VERSION=${ASWF_ONETBB_VERSION} ARG ASWF_MD4C_VERSION ENV ASWF_MD4C_VERSION=${ASWF_MD4C_VERSION} ARG ASWF_FREETYPE_VERSION @@ -162,6 +189,11 @@ ENV GCC_INSTALL_PREFIX=/opt/rh/${ASWF_DTS_PREFIX}-${ASWF_DTS_VERSION}/root/usr # With "conan create --profile" we no longer need to set a default profile ENV CONAN_HOME=${ASWF_CONAN_HOME}/.conan2 +# In case we have a Conan Center Index style config.yaml to support different +# recipes per package. +ENV ASWF_PKG_DIR=${ASWF_CONAN_HOME}/recipes/${ASWF_PKG_NAME} +ENV ASWF_PKG_YML=${ASWF_PKG_DIR}/config.yml + RUN --mount=type=cache,target=${ASWF_CONAN_HOME}/d \ --mount=type=cache,target=${CCACHE_DIR} \ --mount=type=bind,rw,target=${ASWF_CONAN_HOME}/.conan2,source=packages/conan/settings \ @@ -175,7 +207,7 @@ RUN --mount=type=cache,target=${ASWF_CONAN_HOME}/d \ --version ${ASWF_PKG_VERSION} \ --user ${ASWF_PKG_ORG} \ --channel ${ASWF_CONAN_CHANNEL} \ - ${ASWF_CONAN_HOME}/recipes/${ASWF_PKG_NAME} + ${ASWF_PKG_DIR}/$(if [ -f ${ASWF_PKG_YML} ] ; then yq '.versions["'"${ASWF_PKG_VERSION}"'"].folder' ${ASWF_PKG_YML} ; fi) # Upload build to repository if called for RUN --mount=type=cache,target=${ASWF_CONAN_HOME}/d \ diff --git a/packages/conan/recipes/cmake/conandata.yml b/packages/conan/recipes/cmake/conandata.yml index 587c7ac7..c9bc80ec 100644 --- a/packages/conan/recipes/cmake/conandata.yml +++ b/packages/conan/recipes/cmake/conandata.yml @@ -58,4 +58,7 @@ sources: sha256: "42abb3f48f37dbd739cdfeb19d3712db0c5935ed5c2aef6c340f9ae9114238a2" "3.31.6": url: "https://github.com/Kitware/CMake/releases/download/v3.31.6/cmake-3.31.6.tar.gz" - sha256: 653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0 + sha256: "653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0" + "3.31.7": + url: "https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7.tar.gz" + sha256: "a6d2eb1ebeb99130dfe63ef5a340c3fdb11431cce3d7ca148524c125924cea68" diff --git a/packages/conan/recipes/cpython/conandata.yml b/packages/conan/recipes/cpython/conandata.yml index eeb346d0..e6f4a520 100644 --- a/packages/conan/recipes/cpython/conandata.yml +++ b/packages/conan/recipes/cpython/conandata.yml @@ -16,6 +16,9 @@ sources: "3.12.2": url: "https://www.python.org/ftp/python/3.12.2/Python-3.12.2.tgz" sha256: "a7c4f6a9dc423d8c328003254ab0c9338b83037bd787d680826a5bf84308116e" + "3.11.12": + url: "https://www.python.org/ftp/python/3.11.12/Python-3.11.12.tgz" + sha256: "379c9929a989a9d65a1f5d854e011f4872b142259f4fc0a8c4062d2815ed7fba" "3.11.11": url: "https://www.python.org/ftp/python/3.11.11/Python-3.11.11.tgz" sha256: "883bddee3c92fcb91cf9c09c5343196953cbb9ced826213545849693970868ed" diff --git a/packages/conan/recipes/oiio/conandata.yml b/packages/conan/recipes/oiio/conandata.yml index 60512366..fb0029dc 100644 --- a/packages/conan/recipes/oiio/conandata.yml +++ b/packages/conan/recipes/oiio/conandata.yml @@ -5,6 +5,12 @@ # From: https://github.com/conan-io/conan-center-index/blob/9a66422e07df06d2c502501de6e00b8b1213b563/recipes/openimageio/all/conandata.yml sources: + "3.0.6.1": + url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/refs/tags/v3.0.6.1.tar.gz" + sha256: "4d0fb92e4964f79dfaed77ac73f1a7f754c671a9f5ad29c7950c0844916ce5f5" + "3.0.6.0": + url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/refs/tags/v3.0.6.0.tar.gz" + sha256: "670f8753d5604beb4a17e5279fb1948fa978bc72d8e0991103ddbbfea54df1b5" "3.0.5.0": url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/refs/tags/v3.0.5.0.tar.gz" sha256: "340bb14a084d94918de8d46af14e361168215430f3dd6c336b2ffb895fe9d5cb" @@ -80,3 +86,10 @@ patches: - patch_file: "patches/3.0.5.0-imath-includes.txt" patch_description: "Missing includes when Imath from Conan package" patch_type: "conan" + "3.0.6.1": + - patch_file: "patches/3.0.6.1-cmake-fmt.patch" + patch_description: "Deal with generator expression from fmt Conan package" + patch_type: "conan" + - patch_file: "patches/3.0.6.1-imath-includes.txt" + patch_description: "Missing includes when Imath from Conan package" + patch_type: "conan" diff --git a/packages/conan/recipes/oiio/patches/3.0.6.1-cmake-fmt.patch b/packages/conan/recipes/oiio/patches/3.0.6.1-cmake-fmt.patch new file mode 100644 index 00000000..40c23729 --- /dev/null +++ b/packages/conan/recipes/oiio/patches/3.0.6.1-cmake-fmt.patch @@ -0,0 +1,15 @@ +diff --git src/cmake/externalpackages.cmake src/cmake/externalpackages.cmake +index d99dd79ac..bfda2778a 100644 +--- src/cmake/externalpackages.cmake ++++ src/cmake/externalpackages.cmake +@@ -234,7 +234,9 @@ + VERSION_MIN 7.0 + BUILD_LOCAL missing + ) +-get_target_property(FMT_INCLUDE_DIR fmt::fmt-header-only INTERFACE_INCLUDE_DIRECTORIES) ++get_target_property(FMT_INCLUDE_DIR fmt::fmt INTERFACE_INCLUDE_DIRECTORIES) ++# Get rid of generator expression from Conan ++string(REGEX REPLACE "^\\$<\\$:(.*)>$" "\\1" FMT_INCLUDE_DIR "${FMT_INCLUDE_DIR}") + + + ########################################################################### diff --git a/packages/conan/recipes/oiio/patches/3.0.6.1-imath-includes.txt b/packages/conan/recipes/oiio/patches/3.0.6.1-imath-includes.txt new file mode 100644 index 00000000..dd0b13d6 --- /dev/null +++ b/packages/conan/recipes/oiio/patches/3.0.6.1-imath-includes.txt @@ -0,0 +1,62 @@ +diff --git src/iconvert/CMakeLists.txt src/iconvert/CMakeLists.txt +index d99dd79ac..bfda2778a 100644 +--- src/iconvert/CMakeLists.txt ++++ src/iconvert/CMakeLists.txt +@@ -2,4 +2,6 @@ + # SPDX-License-Identifier: Apache-2.0 + # https://github.com/AcademySoftwareFoundation/OpenImageIO + +-fancy_add_executable (LINK_LIBRARIES OpenImageIO) +\ No newline at end of file ++fancy_add_executable (INCLUDE_DIRS ${Imath_INCLUDE_DIR} ++ LINK_LIBRARIES OpenImageIO ++ ) +diff --git src/idiff/CMakeLists.txt src/idiff/CMakeLists.txt +index d99dd79ac..bfda2778a 100644 +--- src/idiff/CMakeLists.txt ++++ src/idiff/CMakeLists.txt +@@ -2,4 +2,6 @@ + # SPDX-License-Identifier: Apache-2.0 + # https://github.com/AcademySoftwareFoundation/OpenImageIO + +-fancy_add_executable (LINK_LIBRARIES OpenImageIO) +\ No newline at end of file ++fancy_add_executable (INCLUDE_DIRS ${Imath_INCLUDE_DIR} ++ LINK_LIBRARIES OpenImageIO ++ ) +diff --git src/iinfo/CMakeLists.txt src/iinfo/CMakeLists.txt +index d99dd79ac..bfda2778a 100644 +--- src/iinfo/CMakeLists.txt ++++ src/iinfo/CMakeLists.txt +@@ -2,4 +2,6 @@ + # SPDX-License-Identifier: Apache-2.0 + # https://github.com/AcademySoftwareFoundation/OpenImageIO + +-fancy_add_executable (LINK_LIBRARIES OpenImageIO) ++fancy_add_executable (INCLUDE_DIRS ${Imath_INCLUDE_DIR} ++ LINK_LIBRARIES OpenImageIO ++ ) +diff --git src/maketx/CMakeLists.txt src/maketx/CMakeLists.txt +index d99dd79ac..bfda2778a 100644 +--- src/maketx/CMakeLists.txt ++++ src/maketx/CMakeLists.txt +@@ -2,4 +2,6 @@ + # SPDX-License-Identifier: Apache-2.0 + # https://github.com/AcademySoftwareFoundation/OpenImageIO + +-fancy_add_executable (LINK_LIBRARIES OpenImageIO) ++fancy_add_executable (INCLUDE_DIRS ${Imath_INCLUDE_DIR} ++ LINK_LIBRARIES OpenImageIO ++ ) +diff --git src/testtex/CMakeLists.txt src/testtex/CMakeLists.txt +index d99dd79ac..bfda2778a 100644 +--- src/testtex/CMakeLists.txt ++++ src/testtex/CMakeLists.txt +@@ -9,5 +9,5 @@ + set (ENABLE_INSTALL_testtex OFF PARENT_SCOPE) + + fancy_add_executable (NAME testtex +- INCLUDE_DIRS ${ROBINMAP_INCLUDES} ++ INCLUDE_DIRS ${ROBINMAP_INCLUDES} ${Imath_INCLUDE_DIR} + LINK_LIBRARIES OpenImageIO ) + diff --git a/packages/conan/recipes/tbb/conandata.yml b/packages/conan/recipes/onetbb/2020.x/conandata.yml similarity index 100% rename from packages/conan/recipes/tbb/conandata.yml rename to packages/conan/recipes/onetbb/2020.x/conandata.yml diff --git a/packages/conan/recipes/tbb/conanfile.py b/packages/conan/recipes/onetbb/2020.x/conanfile.py similarity index 99% rename from packages/conan/recipes/tbb/conanfile.py rename to packages/conan/recipes/onetbb/2020.x/conanfile.py index f26aff6f..2f8de95c 100644 --- a/packages/conan/recipes/tbb/conanfile.py +++ b/packages/conan/recipes/onetbb/2020.x/conanfile.py @@ -23,7 +23,7 @@ class OneTBBConan(ConanFile): - name = "tbb" # ASWF: stick to tbb instead of onetbb for now + name = "onetbb" description = ( "oneAPI Threading Building Blocks (oneTBB) lets you easily write parallel " "C++ programs that take full advantage of multicore performance, that " diff --git a/packages/conan/recipes/tbb/test_package/CMakeLists.txt b/packages/conan/recipes/onetbb/2020.x/test_package/CMakeLists.txt similarity index 100% rename from packages/conan/recipes/tbb/test_package/CMakeLists.txt rename to packages/conan/recipes/onetbb/2020.x/test_package/CMakeLists.txt diff --git a/packages/conan/recipes/tbb/test_package/conanfile.py b/packages/conan/recipes/onetbb/2020.x/test_package/conanfile.py similarity index 100% rename from packages/conan/recipes/tbb/test_package/conanfile.py rename to packages/conan/recipes/onetbb/2020.x/test_package/conanfile.py diff --git a/packages/conan/recipes/tbb/test_package/test_package.cpp b/packages/conan/recipes/onetbb/2020.x/test_package/test_package.cpp similarity index 100% rename from packages/conan/recipes/tbb/test_package/test_package.cpp rename to packages/conan/recipes/onetbb/2020.x/test_package/test_package.cpp diff --git a/packages/conan/recipes/onetbb/all/conandata.yml b/packages/conan/recipes/onetbb/all/conandata.yml new file mode 100644 index 00000000..2d2b49a7 --- /dev/null +++ b/packages/conan/recipes/onetbb/all/conandata.yml @@ -0,0 +1,66 @@ +# Copyright (c) Contributors to the conan-center-index Project. All rights reserved. +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: MIT +# +# From: https://github.com/conan-io/conan-center-index/blob/c29c3a06d0c5d4fd98529a34586c4f60ab00f659/recipes/onetbb/all/conandata.yml + +sources: + "2022.0.0": + url: "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2022.0.0.tar.gz" + sha256: "e8e89c9c345415b17b30a2db3095ba9d47647611662073f7fbf54ad48b7f3c2a" + "2021.13.0": + url: "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.13.0.tar.gz" + sha256: "3ad5dd08954b39d113dc5b3f8a8dc6dc1fd5250032b7c491eb07aed5c94133e1" + "2021.12.0": + url: "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.12.0.tar.gz" + sha256: "c7bb7aa69c254d91b8f0041a71c5bcc3936acb64408a1719aec0b2b7639dd84f" + "2021.10.0": + url: "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.10.0.tar.gz" + sha256: "487023a955e5a3cc6d3a0d5f89179f9b6c0ae7222613a7185b0227ba0c83700b" + "2021.9.0": + url: "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.9.0.tar.gz" + sha256: "1ce48f34dada7837f510735ff1172f6e2c261b09460e3bf773b49791d247d24e" + "2021.8.0": + url: "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.8.0.tar.gz" + sha256: "eee380323bb7ce864355ed9431f85c43955faaae9e9bce35c62b372d7ffd9f8b" + "2021.7.0": + url: "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.7.0.tar.gz" + sha256: "2cae2a80cda7d45dc7c072e4295c675fff5ad8316691f26f40539f7e7e54c0cc" + "2021.6.0": + url: "https://github.com/oneapi-src/oneTBB/archive/v2021.6.0.tar.gz" + sha256: "4897dd106d573e9dacda8509ca5af1a0e008755bf9c383ef6777ac490223031f" + "2021.3.0": + url: "https://github.com/oneapi-src/oneTBB/archive/v2021.3.0.tar.gz" + sha256: "8f616561603695bbb83871875d2c6051ea28f8187dbe59299961369904d1d49e" +patches: + "2022.0.0": + - patch_description: "Fix flow_graph tests build when compiling with GCC 13.3 or older" + patch_type: "official" + patch_source: "https://github.com/uxlfoundation/oneTBB/commit/9c9ace26863cf50853f39b2d0b78146d20a981a6" + patch_file: "patches/onetbb-wait-namespace.patch" + "2021.8.0": + - patch_description: "fix building for android with NDK >= 25" + patch_type: "portability" + patch_source: "https://github.com/oneapi-src/oneTBB/pull/953.patch" + patch_file: "patches/android-ndk25.patch" + "2021.7.0": + - patch_description: "fix building for android with NDK >= 25" + patch_type: "portability" + patch_source: "https://github.com/oneapi-src/oneTBB/pull/953.patch" + patch_file: "patches/android-ndk25.patch" + "2021.6.0": + - patch_description: "cherry-pick upstream patch: avoid android compile errors for current NDKs on releases <= 2021.6.0" + patch_type: "portability" + patch_source: "https://github.com/oneapi-src/oneTBB/pull/716.diff" + patch_file: "patches/fix-overeager-stripping-of-compile-flag.diff" + "2021.3.0": + - patch_description: "cherry-pick upstream patch: avoid android compile errors for current NDKs on releases <= 2021.6.0" + patch_type: "portability" + patch_source: "https://github.com/oneapi-src/oneTBB/pull/716.diff" + patch_file: "patches/fix-overeager-stripping-of-compile-flag.diff" + - patch_description: "Use pkg_search_module with IMPORTED_TARGET" + patch_type: "portability" + patch_source: + - "https://github.com/oneapi-src/oneTBB/pull/448.diff" + - "https://github.com/oneapi-src/oneTBB/commit/df3096075a00942acbdd3ce9347f5298cc153fd6.diff" + patch_file: "patches/pkg-search-module-use-imported-target.diff" diff --git a/packages/conan/recipes/onetbb/all/conanfile.py b/packages/conan/recipes/onetbb/all/conanfile.py new file mode 100644 index 00000000..40759085 --- /dev/null +++ b/packages/conan/recipes/onetbb/all/conanfile.py @@ -0,0 +1,254 @@ +# Copyright (c) Contributors to the conan-center-index Project. All rights reserved. +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: MIT +# +# From: https://github.com/conan-io/conan-center-index/blob/c29c3a06d0c5d4fd98529a34586c4f60ab00f659/recipes/onetbb/all/conanfile.py + +from conan import ConanFile +from conan.errors import ConanInvalidConfiguration +from conan.tools.apple import is_apple_os +from conan.tools.build import cross_building +from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout +from conan.tools.env import VirtualBuildEnv +from conan.tools.files import apply_conandata_patches, export_conandata_patches, copy, get, load, rmdir, rm +from conan.tools.gnu import PkgConfigDeps +from conan.tools.scm import Version +import os +import re + +required_conan_version = ">=1.53.0" + + +class OneTBBConan(ConanFile): + name = "onetbb" + license = "Apache-2.0" + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://github.com/oneapi-src/oneTBB" + description = ( + "oneAPI Threading Building Blocks (oneTBB) lets you easily write parallel C++" + " programs that take full advantage of multicore performance, that are portable, composable" + " and have future-proof scalability.") + topics = ("tbb", "threading", "parallelism", "tbbmalloc") + package_type = "shared-library" + settings = "os", "arch", "compiler", "build_type" + options = { + "tbbmalloc": [True, False], + "tbbproxy": [True, False], + "tbbbind": [True, False], + "interprocedural_optimization": [True, False], + "build_apple_frameworks": [True, False], + } + default_options = { + "tbbmalloc": True, + "tbbproxy": True, + "tbbbind": False, # ASWF: avoid hwloc dependency + "interprocedural_optimization": True, + "build_apple_frameworks": False, + } + + @property + def _has_tbbmalloc(self): + return Version(self.version) < "2021.5.0" or self.options.get_safe("tbbmalloc") + + @property + def _has_tbbproxy(self): + return Version(self.version) < "2021.6.0" or self.options.get_safe("tbbproxy") + + @property + def _tbbbind_hwloc_version(self): + # TBB expects different variables depending on the version + return "2_5" if Version(self.version) >= "2021.4.0" else "2_4" + + @property + def _tbbbind_supported(self): + if is_apple_os(self): + return self.settings.os == "Macos" and Version(self.version) >= "2021.11.0" + return True + + @property + def _tbb_apple_frameworks_supported(self): + if is_apple_os(self): + # if the version is 2021.13.0 or later, the build_apple_frameworks option is supported on macOS + return Version(self.version) >= "2021.13.0" + return False + + @property + def _tbbbind_build(self): + return self.options.get_safe("tbbbind", False) and self._tbbbind_supported + + @property + def _tbbbind_explicit_hwloc(self): + # during cross-compilation, oneTBB does not search for HWLOC and we need to specify it explicitly + # but then oneTBB creates an imported SHARED target from provided paths, so we have to set shared=True + return self._tbbbind_build and cross_building(self) + + def export_sources(self): + export_conandata_patches(self) + + def config_options(self): + if Version(self.version) < "2021.5.0": + del self.options.tbbmalloc + if Version(self.version) < "2021.6.0": + del self.options.tbbproxy + if not self._tbbbind_supported: + del self.options.tbbbind + if Version(self.version) < "2021.6.0" or self.settings.os == "Android": + del self.options.interprocedural_optimization + if not self._tbb_apple_frameworks_supported: + del self.options.build_apple_frameworks + + def configure(self): + if Version(self.version) >= "2021.6.0" and not self.options.tbbmalloc: + self.options.rm_safe("tbbproxy") + + def layout(self): + cmake_layout(self, src_folder="src") + # ASWF: we want DSOs in lib64 + self.cpp.package.libdirs = ["lib64"] + + def requirements(self): + if self._tbbbind_build: + self.requires("hwloc/2.9.3") + + def validate(self): + if self.settings.compiler == "apple-clang" and Version(self.settings.compiler.version) < "11.0": + raise ConanInvalidConfiguration(f"{self.ref} couldn't be built by apple-clang < 11.0") + + # Old versions used to have shared option before hwloc dependency was moved to shared only + if self._tbbbind_explicit_hwloc and not self.dependencies["hwloc"].options.get_safe("shared", True): + raise ConanInvalidConfiguration(f"{self.ref} requires hwloc:shared=True to be built.") + + def build_requirements(self): + if self._tbbbind_build and not self._tbbbind_explicit_hwloc: + if not self.conf.get("tools.gnu:pkg_config", check_type=str): + self.tool_requires("pkgconf/2.1.0") + + def source(self): + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + def generate(self): + env = VirtualBuildEnv(self) + env.generate() + + toolchain = CMakeToolchain(self) + toolchain.variables["TBB_TEST"] = False + toolchain.variables["TBB_STRICT"] = False + if Version(self.version) >= "2021.5.0": + toolchain.variables["TBBMALLOC_BUILD"] = self.options.tbbmalloc + if self.options.get_safe("interprocedural_optimization") is not None: + toolchain.variables["TBB_ENABLE_IPO"] = self.options.interprocedural_optimization + if Version(self.version) >= "2021.6.0" and self.options.get_safe("tbbmalloc"): + toolchain.variables["TBBMALLOC_PROXY_BUILD"] = self.options.tbbproxy + toolchain.variables["TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH"] = not self._tbbbind_build + if self._tbbbind_explicit_hwloc: + hwloc_package_folder = self.dependencies["hwloc"].package_folder + hwloc_lib_name = ("hwloc.lib" if self.settings.os == "Windows" else + "libhwloc.dylib" if self.settings.os == "Macos" else + "libhwloc.so") + toolchain.variables[f"CMAKE_HWLOC_{self._tbbbind_hwloc_version}_LIBRARY_PATH"] = \ + os.path.join(hwloc_package_folder, "lib", hwloc_lib_name).replace("\\", "/") + toolchain.variables[f"CMAKE_HWLOC_{self._tbbbind_hwloc_version}_INCLUDE_PATH"] = \ + os.path.join(hwloc_package_folder, "include").replace("\\", "/") + if self.settings.os == "Windows": + toolchain.variables[f"CMAKE_HWLOC_{self._tbbbind_hwloc_version}_DLL_PATH"] = \ + os.path.join(hwloc_package_folder, "bin", "hwloc.dll").replace("\\", "/") + if self.options.get_safe("build_apple_frameworks"): + toolchain.variables["TBB_BUILD_APPLE_FRAMEWORKS"] = True + if Version(self.version) <= "2021.10.0": + toolchain.cache_variables["CMAKE_POLICY_VERSION_MINIMUM"] = "3.5" # CMake 4 support + + toolchain.generate() + + if self._tbbbind_build and not self._tbbbind_explicit_hwloc: + deps = PkgConfigDeps(self) + deps.generate() + + def build(self): + apply_conandata_patches(self) + cmake = CMake(self) + cmake.configure() + cmake.build() + + def package(self): + cmake = CMake(self) + cmake.install() + # ASWF: separate license files per package + copy(self, "LICENSE.txt", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses", self.name)) + # ASWF: cmake in lib64, keep for outside Conan use + # rmdir(self, os.path.join(self.package_folder, "lib64", "cmake")) + rmdir(self, os.path.join(self.package_folder, "lib64", "pkgconfig")) + rmdir(self, os.path.join(self.package_folder, "share")) + rm(self, "*.pdb", os.path.join(self.package_folder, "bin")) + + def package_info(self): + self.cpp_info.set_property("cmake_file_name", "TBB") + self.cpp_info.set_property("pkg_config_name", "tbb") + self.cpp_info.set_property("cmake_config_version_compat", "AnyNewerVersion") + + def lib_name(name): + if self.settings.build_type == "Debug": + return name + "_debug" + return name + + # tbb + tbb = self.cpp_info.components["libtbb"] + + tbb.set_property("cmake_target_name", "TBB::tbb") + if self.options.get_safe("build_apple_frameworks"): + tbb.frameworkdirs.append(os.path.join(self.package_folder, "lib")) + tbb.frameworks.append("tbb") + else: + tbb.libs = [lib_name("tbb")] + if self.settings.os == "Windows": + version_info = load(self, + os.path.join(self.package_folder, "include", "oneapi", "tbb", + "version.h")) + binary_version = re.sub( + r".*" + re.escape("#define __TBB_BINARY_VERSION ") + + r"(\d+).*", + r"\1", + version_info, + flags=re.MULTILINE | re.DOTALL, + ) + tbb.libs.append(lib_name(f"tbb{binary_version}")) + if self.settings.os in ["Linux", "FreeBSD"]: + tbb.system_libs = ["m", "dl", "rt", "pthread"] + + # tbbmalloc + if self._has_tbbmalloc: + tbbmalloc = self.cpp_info.components["tbbmalloc"] + + tbbmalloc.set_property("cmake_target_name", "TBB::tbbmalloc") + + if self.options.get_safe("build_apple_frameworks"): + tbbmalloc.frameworkdirs.append(os.path.join(self.package_folder, "lib")) + tbbmalloc.frameworks.append("tbbmalloc") + else: + tbbmalloc.libs = [lib_name("tbbmalloc")] + + if self.settings.os in ["Linux", "FreeBSD"]: + tbbmalloc.system_libs = ["dl", "pthread"] + + # tbbmalloc_proxy + if self._has_tbbproxy: + tbbproxy = self.cpp_info.components["tbbmalloc_proxy"] + + tbbproxy.set_property("cmake_target_name", "TBB::tbbmalloc_proxy") + + if self.options.get_safe("build_apple_frameworks"): + tbbproxy.frameworkdirs.append(os.path.join(self.package_folder, "lib")) + tbbproxy.frameworks.append("tbbmalloc_proxy") + else: + tbbproxy.libs = [lib_name("tbbmalloc_proxy")] + + tbbproxy.requires = ["tbbmalloc"] + if self.settings.os in ["Linux", "FreeBSD"]: + tbbproxy.system_libs = ["m", "dl", "pthread"] + + # TODO: to remove in conan v2 once cmake_find_package* & pkg_config generators removed + # ASWF: Conan 2 only + # self.cpp_info.names["cmake_find_package"] = "TBB" + # self.cpp_info.names["cmake_find_package_multi"] = "TBB" + # self.cpp_info.names["pkg_config"] = "tbb" + # tbb.names["cmake_find_package"] = "tbb" + # tbb.names["cmake_find_package_multi"] = "tbb" diff --git a/packages/conan/recipes/onetbb/all/patches/android-ndk25.patch b/packages/conan/recipes/onetbb/all/patches/android-ndk25.patch new file mode 100644 index 00000000..4b3cad08 --- /dev/null +++ b/packages/conan/recipes/onetbb/all/patches/android-ndk25.patch @@ -0,0 +1,46 @@ +From 4ce5d767df83ac4396eef4964c6df6c3dcfef234 Mon Sep 17 00:00:00 2001 +From: Dmitry Kurtaev +Date: Fri, 4 Nov 2022 09:33:33 +0300 +Subject: [PATCH] Fixes for Android NDK 25 + +Signed-off-by: Dmitry Kurtaev +--- + CMakeLists.txt | 25 +++++++++++++++++++++---- + 1 file changed, 21 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b8bb7c8be..6c479fe4dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -279,10 +279,27 @@ endif() + + if (ANDROID_PLATFORM) + if ("${ANDROID_STL}" STREQUAL "c++_shared") +- configure_file( +- "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libc++_shared.so" +- "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libc++_shared.so" +- COPYONLY) ++ if (${ANDROID_NDK_MAJOR} GREATER_EQUAL "25") ++ if(ANDROID_ABI STREQUAL "arm64-v8a") ++ set(ANDROID_TOOLCHAIN_NAME "aarch64-linux-android") ++ elseif(ANDROID_ABI STREQUAL "x86_64") ++ set(ANDROID_TOOLCHAIN_NAME "x86_64-linux-android") ++ elseif(ANDROID_ABI STREQUAL "armeabi-v7a") ++ set(ANDROID_TOOLCHAIN_NAME "arm-linux-androideabi") ++ elseif(ANDROID_ABI STREQUAL "x86") ++ set(ANDROID_TOOLCHAIN_NAME "i686-linux-android") ++ endif() ++ ++ configure_file( ++ "${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr/lib/${ANDROID_TOOLCHAIN_NAME}/libc++_shared.so" ++ "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libc++_shared.so" ++ COPYONLY) ++ else() ++ configure_file( ++ "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libc++_shared.so" ++ "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libc++_shared.so" ++ COPYONLY) ++ endif() + endif() + # This custom target may be implemented without separate CMake script, but it requires + # ADB(Android Debug Bridge) executable file availability, so to incapsulate this requirement diff --git a/packages/conan/recipes/onetbb/all/patches/fix-overeager-stripping-of-compile-flag.diff b/packages/conan/recipes/onetbb/all/patches/fix-overeager-stripping-of-compile-flag.diff new file mode 100644 index 00000000..355a5ce0 --- /dev/null +++ b/packages/conan/recipes/onetbb/all/patches/fix-overeager-stripping-of-compile-flag.diff @@ -0,0 +1,13 @@ +diff --git a/cmake/utils.cmake b/cmake/utils.cmake +index f74abfcf9..a090bacbb 100644 +--- a/cmake/utils.cmake ++++ b/cmake/utils.cmake +@@ -18,7 +18,7 @@ macro(tbb_remove_compile_flag flag) + set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_OPTIONS ${_tbb_compile_options}) + unset(_tbb_compile_options) + if (CMAKE_CXX_FLAGS) +- string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) ++ string(REGEX REPLACE "(^|[ \t\r\n]+)${flag}($|[ \t\r\n]+)" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + endif() + endmacro() + diff --git a/packages/conan/recipes/onetbb/all/patches/onetbb-wait-namespace.patch b/packages/conan/recipes/onetbb/all/patches/onetbb-wait-namespace.patch new file mode 100644 index 00000000..5a6ed8f6 --- /dev/null +++ b/packages/conan/recipes/onetbb/all/patches/onetbb-wait-namespace.patch @@ -0,0 +1,38 @@ +From 9c9ace26863cf50853f39b2d0b78146d20a981a6 Mon Sep 17 00:00:00 2001 +From: Ilya Isaev +Date: Fri, 1 Nov 2024 10:52:18 +0100 +Subject: [PATCH] Fix flow_graph tests build when compiling with GCC 13.3 + (#1543) + +Signed-off-by: Isaev, Ilya +--- + include/oneapi/tbb/detail/_flow_graph_impl.h | 2 +- + include/oneapi/tbb/flow_graph.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/oneapi/tbb/detail/_flow_graph_impl.h b/include/oneapi/tbb/detail/_flow_graph_impl.h +index 19e00a8ef1..55063b93e1 100644 +--- a/include/oneapi/tbb/detail/_flow_graph_impl.h ++++ b/include/oneapi/tbb/detail/_flow_graph_impl.h +@@ -347,7 +347,7 @@ class graph : no_copy, public graph_proxy { + caught_exception = false; + try_call([this] { + my_task_arena->execute([this] { +- wait(my_wait_context_vertex.get_context(), *my_context); ++ d1::wait(my_wait_context_vertex.get_context(), *my_context); + }); + cancelled = my_context->is_group_execution_cancelled(); + }).on_exception([this] { +diff --git a/include/oneapi/tbb/flow_graph.h b/include/oneapi/tbb/flow_graph.h +index 20916fa7c2..5b438faabf 100644 +--- a/include/oneapi/tbb/flow_graph.h ++++ b/include/oneapi/tbb/flow_graph.h +@@ -305,7 +305,7 @@ class receiver { + bool res = internal_try_put(t, message_metainfo{message_metainfo::waiters_type{&msg_wait_vertex}}); + if (res) { + __TBB_ASSERT(graph_reference().my_context != nullptr, "No wait_context associated with the Flow Graph"); +- wait(msg_wait_vertex.get_context(), *graph_reference().my_context); ++ d1::wait(msg_wait_vertex.get_context(), *graph_reference().my_context); + } + return res; + } diff --git a/packages/conan/recipes/onetbb/all/patches/pkg-search-module-use-imported-target.diff b/packages/conan/recipes/onetbb/all/patches/pkg-search-module-use-imported-target.diff new file mode 100644 index 00000000..e1a35057 --- /dev/null +++ b/packages/conan/recipes/onetbb/all/patches/pkg-search-module-use-imported-target.diff @@ -0,0 +1,97 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 34a23d40..d569d57e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -100,6 +100,8 @@ option(TBB_NO_APPCONTAINER "Apply /APPCONTAINER:NO (for testing binaries for Win + option(TBB4PY_BUILD "Enable tbb4py build" OFF) + option(TBB_CPF "Enable preview features of the library" OFF) + option(TBB_FIND_PACKAGE "Enable search for external oneTBB using find_package instead of build from sources" OFF) ++option(TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH "Disable HWLOC automatic search by pkg-config tool" OFF) ++ + + if (NOT DEFINED BUILD_SHARED_LIBS) + set(BUILD_SHARED_LIBS ON) +@@ -194,7 +196,7 @@ else() + if (NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "mips") + add_subdirectory(src/tbbmalloc) + add_subdirectory(src/tbbmalloc_proxy) +- if (APPLE) ++ if (APPLE OR NOT BUILD_SHARED_LIBS) + message(STATUS "TBBBind build target is disabled due to unsupported environment") + else() + add_subdirectory(src/tbbbind) +diff --git a/cmake/hwloc_detection.cmake b/cmake/hwloc_detection.cmake +index f1740662..e1806a0f 100644 +--- a/cmake/hwloc_detection.cmake ++++ b/cmake/hwloc_detection.cmake +@@ -45,11 +45,15 @@ endforeach() + + unset(HWLOC_TARGET_NAME) + +-if (NOT HWLOC_TARGET_EXPLICITLY_DEFINED) ++if (NOT HWLOC_TARGET_EXPLICITLY_DEFINED AND ++ # No hwloc auto detection for cross compilation ++ NOT CMAKE_CROSSCOMPILING AND ++ NOT TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH ++) + find_package(PkgConfig QUIET) +- if (PKG_CONFIG_FOUND) +- pkg_search_module(HWLOC hwloc) +- if (HWLOC_FOUND) ++ if (PKG_CONFIG_FOUND AND NOT CMAKE_VERSION VERSION_LESS 3.6) ++ pkg_search_module(HWLOC hwloc IMPORTED_TARGET) ++ if (TARGET PkgConfig::HWLOC) + if (HWLOC_VERSION VERSION_LESS 2) + set(TBBBIND_LIBRARY_NAME tbbbind) + elseif(HWLOC_VERSION VERSION_LESS 2.4) +@@ -60,4 +64,3 @@ if (NOT HWLOC_TARGET_EXPLICITLY_DEFINED) + endif() + endif() + endif() +- +diff --git a/src/tbbbind/CMakeLists.txt b/src/tbbbind/CMakeLists.txt +index da9dabfe..1a4c6ca0 100644 +--- a/src/tbbbind/CMakeLists.txt ++++ b/src/tbbbind/CMakeLists.txt +@@ -18,12 +18,13 @@ endif() + set(CMAKE_SKIP_BUILD_RPATH TRUE) + + function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET) +- if (NOT TARGET ${REQUIRED_HWLOC_TARGET} AND NOT DEFINED HWLOC_LIBRARIES) ++ if (NOT TARGET ${REQUIRED_HWLOC_TARGET}) + message(STATUS "HWLOC target ${REQUIRED_HWLOC_TARGET} doesn't exist." + " The ${TBBBIND_NAME} target cannot be created") + return() + endif() + add_library(${TBBBIND_NAME} tbb_bind.cpp) ++ + add_library(TBB::${TBBBIND_NAME} ALIAS ${TBBBIND_NAME}) + + target_compile_definitions(${TBBBIND_NAME} +@@ -64,14 +65,12 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET) + PRIVATE + ${TBB_LIB_LINK_FLAGS} + ${TBB_COMMON_LINK_FLAGS} +- ${HWLOC_LIBRARY_DIRS} # pkg-config defined + ) + else() + target_link_libraries(${TBBBIND_NAME} + PRIVATE + ${TBB_LIB_LINK_FLAGS} + ${TBB_COMMON_LINK_FLAGS} +- ${HWLOC_LIBRARY_DIRS} # pkg-config defined + ) + endif() + +@@ -90,9 +89,9 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET) + endif() + endfunction() + +-if (NOT DEFINED HWLOC_TARGET_EXPLICITLY_DEFINED AND DEFINED HWLOC_LIBRARIES) ++if (NOT DEFINED HWLOC_TARGET_EXPLICITLY_DEFINED AND TARGET PkgConfig::HWLOC) + message(STATUS "The ${TBBBIND_LIBRARY_NAME} target will be configured using the HWLOC ${HWLOC_VERSION}") +- tbbbind_build(${TBBBIND_LIBRARY_NAME} ${HWLOC_LIBRARIES}) ++ tbbbind_build(${TBBBIND_LIBRARY_NAME} PkgConfig::HWLOC) + else() + tbbbind_build(tbbbind HWLOC::hwloc_1_11) + tbbbind_build(tbbbind_2_0 HWLOC::hwloc_2 ) diff --git a/packages/conan/recipes/onetbb/all/test_package/CMakeLists.txt b/packages/conan/recipes/onetbb/all/test_package/CMakeLists.txt new file mode 100644 index 00000000..b8ef9a43 --- /dev/null +++ b/packages/conan/recipes/onetbb/all/test_package/CMakeLists.txt @@ -0,0 +1,14 @@ +# Copyright (c) Contributors to the conan-center-index Project. All rights reserved. +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: MIT +# +# From: https://github.com/conan-io/conan-center-index/blob/c29c3a06d0c5d4fd98529a34586c4f60ab00f659/recipes/onetbb/all/test_package/CMakeLists.txt + +cmake_minimum_required(VERSION 3.15) +project(test_package LANGUAGES CXX) + +find_package(TBB REQUIRED CONFIG) + +add_executable(${PROJECT_NAME} test_package.cpp) +target_link_libraries(${PROJECT_NAME} PRIVATE TBB::tbb) +target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) diff --git a/packages/conan/recipes/onetbb/all/test_package/conanfile.py b/packages/conan/recipes/onetbb/all/test_package/conanfile.py new file mode 100644 index 00000000..83eefd19 --- /dev/null +++ b/packages/conan/recipes/onetbb/all/test_package/conanfile.py @@ -0,0 +1,32 @@ +# Copyright (c) Contributors to the conan-center-index Project. All rights reserved. +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: MIT +# +# From: https://github.com/conan-io/conan-center-index/blob/c29c3a06d0c5d4fd98529a34586c4f60ab00f659/recipes/onetbb/all/test_package/conanfile.py + +from conan import ConanFile +from conan.tools.build import can_run +from conan.tools.cmake import CMake, cmake_layout +import os + + +class TestPackageConan(ConanFile): + settings = "os", "arch", "compiler", "build_type" + generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv" + test_type = "explicit" + + def layout(self): + cmake_layout(self) + + def requirements(self): + self.requires(self.tested_reference_str) + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def test(self): + if can_run(self): + bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package") + self.run(bin_path, env="conanrun") diff --git a/packages/conan/recipes/onetbb/all/test_package/test_package.cpp b/packages/conan/recipes/onetbb/all/test_package/test_package.cpp new file mode 100644 index 00000000..456619cb --- /dev/null +++ b/packages/conan/recipes/onetbb/all/test_package/test_package.cpp @@ -0,0 +1,16 @@ +/* +# Copyright (c) Contributors to the conan-center-index Project. All rights reserved. +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: MIT +# +# From: https://github.com/conan-io/conan-center-index/blob/c29c3a06d0c5d4fd98529a34586c4f60ab00f659/recipes/onetbb/all/test_package/test_package.cpp +*/ + +#include +#include + +int main(){ + std::cout << "tbb runtime version: " << TBB_runtime_version() << "\n"; + std::cout << "tbb runtime interface version: " << TBB_runtime_interface_version() << "\n"; + return 0; +} diff --git a/packages/conan/recipes/onetbb/config.yml b/packages/conan/recipes/onetbb/config.yml new file mode 100644 index 00000000..75d87f04 --- /dev/null +++ b/packages/conan/recipes/onetbb/config.yml @@ -0,0 +1,41 @@ +# Copyright (c) Contributors to the conan-center-index Project. All rights reserved. +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: MIT +# +# From: https://github.com/conan-io/conan-center-index/blob/d034b32b3106d282c32f0a23314b5c6ba1b0fa69/recipes/onetbb/config.yml + +versions: + "2022.0.0": + folder: all + "2021.13.0": + folder: all + "2021.12.0": + folder: all + "2021.10.0": + folder: all + "2021.9.0": + folder: all + "2021.8.0": + folder: all + "2021.7.0": + folder: all + "2021.6.0": + folder: all + "2021.3.0": + folder: all + "2020_u3.3": + folder: "2020.x" + "2020_u3": + folder: "2020.x" + "2020_u2": + folder: "2020.x" + "2020_u1": + folder: "2020.x" + "2020.0": + folder: "2020.x" + "2019_u9": + folder: "2020.x" + "2019_u3": + folder: "2020.x" + "2018": + folder: "2020.x" diff --git a/packages/conan/recipes/opensubdiv/conanfile.py b/packages/conan/recipes/opensubdiv/conanfile.py index cb7d3bd9..60ea8e80 100644 --- a/packages/conan/recipes/opensubdiv/conanfile.py +++ b/packages/conan/recipes/opensubdiv/conanfile.py @@ -92,7 +92,12 @@ def requirements(self): self.requires(f"glfw/{os.environ['ASWF_GLFW_VERSION']}@{self.user}/{self.channel}") self.requires(f"glew/{os.environ['ASWF_GLEW_VERSION']}@{self.user}/{self.channel}") if self.options.with_tbb: - self.requires(f"tbb/{os.environ['ASWF_TBB_VERSION']}@{self.user}/{self.channel}") + # OpenSubdiv < 3.6.0 support only onettbb/2020.x.x + # https://github.com/PixarAnimationStudios/OpenSubdiv/pull/1317 + if Version(self.version) < "3.6.0": + self.requires("onetbb/2020.3.3", transitive_headers=True) + else: + self.requires("onetbb/2021.10.0", transitive_headers=True) def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) @@ -158,7 +163,10 @@ def package(self): rmdir(self, os.path.join(self.package_folder, "lib64", "pkgconfig")) if self.options.shared: # ASWF: libraries in lib64 - rm(self, "*.a", os.path.join(self.package_folder, "lib64")) + # ASWF: OpenSubDiv cmake set up for both static and dynamic, downstream consummers unhappy + # if static libs are missing + # rm(self, "*.a", os.path.join(self.package_folder, "lib64")) + pass def package_info(self): self.cpp_info.set_property("cmake_file_name", "OpenSubdiv") @@ -167,8 +175,7 @@ def package_info(self): self.cpp_info.components["osdcpu"].set_property("cmake_target_name", f"OpenSubdiv::osdcpu{target_suffix}") self.cpp_info.components["osdcpu"].libs = ["osdCPU"] if self.options.with_tbb: - # ASWF: until we rename to onetbb - self.cpp_info.components["osdcpu"].requires = ["tbb::tbb"] + self.cpp_info.components["osdcpu"].requires = ["onetbb::onetbb"] if self._osd_gpu_enabled: self.cpp_info.components["osdgpu"].set_property("cmake_target_name", f"OpenSubdiv::osdgpu{target_suffix}") diff --git a/packages/conan/recipes/partio/conandata.yml b/packages/conan/recipes/partio/conandata.yml index dd142eb4..12559e49 100644 --- a/packages/conan/recipes/partio/conandata.yml +++ b/packages/conan/recipes/partio/conandata.yml @@ -1,4 +1,11 @@ +# Copyright (c) Contributors to the conan-center-index Project. All rights reserved. +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: MIT + sources: + "1.19.0": + url: "https://github.com/wdas/partio/archive/v1.19.0.tar.gz" + sha256: "128913266a88a0939aaa4bc951ae4d4da1c380408bcc0ea9e7f526556afeaad0" "1.17.3": url: "https://github.com/wdas/partio/archive/v1.17.3.tar.gz" sha256: "08a571ca75cf133f373415dfd50b7d0e33a0dd1811dfb63409f0ae46652033c1" diff --git a/packages/conan/recipes/partio/conanfile.py b/packages/conan/recipes/partio/conanfile.py index 57f34e13..76496de8 100644 --- a/packages/conan/recipes/partio/conanfile.py +++ b/packages/conan/recipes/partio/conanfile.py @@ -6,6 +6,7 @@ from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout from conan.tools.files import apply_conandata_patches, collect_libs, copy, export_conandata_patches, get, rmdir from conan.tools.microsoft import is_msvc +from conan.tools.env import Environment import os required_conan_version = ">=1.38.0" @@ -49,21 +50,20 @@ def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) def generate(self): + env = Environment() + env.define("CXXFLAGS_STD", f"c++{self.settings.get_safe('compiler.cppstd')}") + env.vars(self).save_script("my_env") tc = CMakeToolchain(self) - tc.variables["CMAKE_INSTALL_LIBDIR"] = "lib64" # ASWF: DSOs in lib64 tc.generate() deps = CMakeDeps(self) deps.generate() - def _patch_sources(self): - apply_conandata_patches(self) - def build(self): - self._patch_sources() + apply_conandata_patches(self) cmake = CMake(self) cmake.configure() - cmake.build(cli_args=["--verbose"]) # ASWF FIXME + cmake.build() def package(self): copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses", self.name)) @@ -72,7 +72,9 @@ def package(self): rmdir(self, os.path.join(self.package_folder, "lib64", "pkgconfig")) def package_info(self): - self.cpp_info.set_property("cmake_target_name", "Partio::Partio") + self.cpp_info.set_property("cmake_find_mode", "both") + self.cpp_info.set_property("cmake_file_name", "partio") + self.cpp_info.set_property("cmake_target_name", "partio::partio") self.cpp_info.includedirs = ["include"] self.cpp_info.libs = collect_libs(self) self.cpp_info.requires = ["zlib::zlib", "cpython::cpython"] diff --git a/packages/conan/recipes/pyside/conandata.yml b/packages/conan/recipes/pyside/conandata.yml index f8c7dffe..bc5b3087 100644 --- a/packages/conan/recipes/pyside/conandata.yml +++ b/packages/conan/recipes/pyside/conandata.yml @@ -14,6 +14,9 @@ sources: "6.5.4": url: "https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.5.4-src/pyside-setup-opensource-src-6.5.4.tar.xz" sha256: "1bd5e63bede4ac2930579abd09a2803f8a508693d210c77efe7e838c8da360ae" + "6.5.5": + url: "https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.5.5-src/pyside-setup-opensource-src-6.5.5.tar.xz" + sha256: "915c35d365cfbfcdc24dad4d4882205f8206fc0d3d01c1fba2fd5736a4a64935" patches: "5.12.6": # typing-patch.zip from https://codereview.qt-project.org/changes/pyside%2Fpyside-setup~271412/revisions/4/patch?zip diff --git a/packages/conan/recipes/qt/conandata.yml b/packages/conan/recipes/qt/conandata.yml index 9ea306fa..309cc674 100644 --- a/packages/conan/recipes/qt/conandata.yml +++ b/packages/conan/recipes/qt/conandata.yml @@ -50,6 +50,26 @@ sources: - "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz" - "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz" sha256: "69d0348fef415da98aa890a34651e9cfb232f1bffcee289b7b4e21386bf36104" + "6.5.5": + url: + - "https://download.qt.io/official_releases/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://download.qt.io/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://mirrors.20i.com/pub/qt.io/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://mirrors.ukfast.co.uk/sites/qt.io/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://ftp.nluug.nl/languages/qt/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://mirror.netcologne.de/qtproject/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://qt-mirror.dannhauer.de/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://ftp.fau.de/qtproject/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://mirrors.dotsrc.org/qtproject/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://ftp.acc.umu.se/mirror/qt.io/qtproject/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://mirror.web4africa.ng/qt/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://qtproject.mirror.liquidtelecom.com/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://qt.mirror.constant.com/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://mirrors.cloud.tencent.com/qt/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://mirrors.sjtug.sjtu.edu.cn/qt/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + - "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/6.5/6.5.5/src/single/qt-everywhere-opensource-src-6.5.5.tar.xz" + sha256: "7383009d74c18fbe056ee5790e2377b0fad58bb2b560bb626958acf7b594b45c" "6.5.4": url: - "https://download.qt.io/official_releases/qt/6.5/6.5.4/src/single/qt-everywhere-opensource-src-6.5.4.tar.xz" diff --git a/packages/conan/settings/profiles_aswf/vfx2025 b/packages/conan/settings/profiles_aswf/vfx2025 index 85721ab6..6003694b 100644 --- a/packages/conan/settings/profiles_aswf/vfx2025 +++ b/packages/conan/settings/profiles_aswf/vfx2025 @@ -52,8 +52,9 @@ nasm/*: nasm/system@aswf/vfx2025 nspr/*: nspr/system@aswf/vfx2025 nss/*: nss/3.93@aswf/vfx2025 ocio/*: ocio/2.4.2@aswf/vfx2025 -oiio/*: oiio/3.0.5.0@aswf/vfx2025 +oiio/*: oiio/3.0.6.1@aswf/vfx2025 ogg/*: ogg/system@aswf/vfx2025 +onetbb/*: onetbb/2021.13.0@aswf/vfx2025 openal-soft/*: openal-soft/system@aswf/vfx2025 openexr/*: openexr/3.3.3@aswf/vfx2025 opengl/*: opengl/system@aswf/vfx2025 diff --git a/packages/conan/settings/profiles_aswftesting/ci_common5 b/packages/conan/settings/profiles_aswftesting/ci_common5 index 64dd3078..2b1418d9 100644 --- a/packages/conan/settings/profiles_aswftesting/ci_common5 +++ b/packages/conan/settings/profiles_aswftesting/ci_common5 @@ -13,7 +13,7 @@ clang/*:shared=False [tool_requires] [replace_requires] [replace_tool_requires] -cmake/*: cmake/3.31.6@aswftesting/ci_common5 +cmake/*: cmake/3.31.7@aswftesting/ci_common5 [platform_requires] [buildenv] GCC_INSTALL_DIR=/opt/rh/gcc-toolset-11/root/lib/gcc/x86_64-redhat-linux/11 diff --git a/packages/conan/settings/profiles_aswftesting/vfx2025 b/packages/conan/settings/profiles_aswftesting/vfx2025 index 63e0823d..501d6e39 100644 --- a/packages/conan/settings/profiles_aswftesting/vfx2025 +++ b/packages/conan/settings/profiles_aswftesting/vfx2025 @@ -52,8 +52,9 @@ nasm/*: nasm/system@aswftesting/vfx2025 nspr/*: nspr/system@aswftesting/vfx2025 nss/*: nss/3.93@aswftesting/vfx2025 ocio/*: ocio/2.4.2@aswftesting/vfx2025 -oiio/*: oiio/3.0.5.0@aswftesting/vfx2025 +oiio/*: oiio/3.0.6.1@aswftesting/vfx2025 ogg/*: ogg/system@aswftesting/vfx2025 +onetbb/*: onetbb/2021.13.0@aswftesting/vfx2025 openal-soft/*: openal-soft/system@aswftesting/vfx2025 openexr/*: openexr/3.3.3@aswftesting/vfx2025 opengl/*: opengl/system@aswftesting/vfx2025 diff --git a/packages/review/Dockerfile b/packages/review/Dockerfile index 6d66c822..b4306c72 100644 --- a/packages/review/Dockerfile +++ b/packages/review/Dockerfile @@ -19,7 +19,7 @@ ARG ASWF_PYBIND11_VERSION ARG ASWF_NUMPY_VERSION ARG ASWF_CPYTHON_VERSION ARG ASWF_PYTHON_MAJOR_MINOR_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_ALEMBIC_VERSION ARG ASWF_BLOSC_VERSION @@ -47,7 +47,7 @@ ARG ASWF_CPYTHON_VERSION ARG ASWF_PYTHON_MAJOR_MINOR_VERSION ARG ASWF_NUMPY_VERSION ARG ASWF_BOOST_VERSION -ARG ASWF_TBB_VERSION +ARG ASWF_ONETBB_VERSION ARG ASWF_PKG_ORG ARG ASWF_CONAN_CHANNEL ARG ASWF_VFXPLATFORM_VERSION @@ -57,7 +57,7 @@ ENV ASWF_CPYTHON_VERSION=${ASWF_CPYTHON_VERSION} ENV ASWF_PYTHON_MAJOR_MINOR_VERSION=${ASWF_PYTHON_MAJOR_MINOR_VERSION} ENV ASWF_NUMPY_VERSION=${ASWF_NUMPY_VERSION} ENV ASWF_BOOST_VERSION=${ASWF_BOOST_VERSION} -ENV ASWF_TBB_VERSION=${ASWF_TBB_VERSION} +ENV ASWF_ONETBB_VERSION=${ASWF_ONETBB_VERSION} ENV ASWF_VFXPLATFORM_VERSION=${ASWF_VFXPLATFORM_VERSION} COPY scripts/common/install_conanpackages.sh /tmp @@ -71,7 +71,7 @@ COPY < . [requires] expat/${ASWF_EXPAT_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} -tbb/${ASWF_TBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +onetbb/${ASWF_ONETBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} partio/${ASWF_PARTIO_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pybind11/${ASWF_PYBIND11_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} qt/${ASWF_QT_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} diff --git a/python/aswfdocker/data/versions.yaml b/python/aswfdocker/data/versions.yaml index fa8d309d..bf36936f 100644 --- a/python/aswfdocker/data/versions.yaml +++ b/python/aswfdocker/data/versions.yaml @@ -154,6 +154,7 @@ versions: ASWF_CMAKE_VERSION: "3.27.9" ASWF_NINJA_VERSION: "1.12.1" ASWF_SONAR_VERSION: "6.2.1.4610" + ASWF_YQ_VERSION: "4.45.2" ASWF_BASEOS_DISTRO: "rockylinux8" ASWF_BASEOS_IMAGE: "nvidia/cuda" "4-clang16": @@ -182,12 +183,13 @@ versions: ASWF_DTS_PREFIX: "gcc-toolset" ASWF_CONAN_VERSION: "2.14.0" ASWF_CONAN_PYTHON_VERSION: "3.11.11" - ASWF_CUDA_VERSION: "12.6.1" + ASWF_CUDA_VERSION: "12.6.3" ASWF_GLVND_VERSION: "1.7.0" ASWF_CCACHE_VERSION: "4.9.1" - ASWF_CMAKE_VERSION: "3.31.6" + ASWF_CMAKE_VERSION: "3.31.7" ASWF_NINJA_VERSION: "1.12.1" ASWF_SONAR_VERSION: "6.2.1.4610" + ASWF_YQ_VERSION: "4.45.2" ASWF_BASEOS_DISTRO: "rockylinux8" ASWF_BASEOS_IMAGE: "nvidia/cuda" "5-clang18": @@ -241,7 +243,7 @@ versions: ASWF_PYSIDE_CLANG_VERSION: "7.1.0" ASWF_PYTHON_MAJOR_MINOR_VERSION: "2.7" ASWF_QT_VERSION: "5.12.6" - ASWF_TBB_VERSION: "2018" + ASWF_ONETBB_VERSION: "2018" ASWF_USD_VERSION: "19.11" ASWF_VFXPLATFORM_VERSION: "2019" ASWF_CXX_STANDARD: "14" @@ -300,7 +302,7 @@ versions: ASWF_PYSIDE_CLANG_VERSION: "7.1.0" ASWF_PYTHON_MAJOR_MINOR_VERSION: "3.7" ASWF_QT_VERSION: "5.12.6" - ASWF_TBB_VERSION: "2019_u6" + ASWF_ONETBB_VERSION: "2019_u6" ASWF_USD_VERSION: "20.11" ASWF_VFXPLATFORM_VERSION: "2020" ASWF_CXX_STANDARD: "17" @@ -342,7 +344,7 @@ versions: ASWF_PYSIDE_VERSION: "5.15.2" ASWF_PYTHON_MAJOR_MINOR_VERSION: "3.7" ASWF_QT_VERSION: "5.15.2" - ASWF_TBB_VERSION: "2020_u2" + ASWF_ONETBB_VERSION: "2020_u2" ASWF_USD_VERSION: "21.05" ASWF_VFXPLATFORM_VERSION: "2021" ASWF_CXX_STANDARD: "17" @@ -389,7 +391,7 @@ versions: ASWF_PYSIDE_VERSION: "5.15.2" ASWF_PYTHON_MAJOR_MINOR_VERSION: "3.9" ASWF_QT_VERSION: "5.15.2" - ASWF_TBB_VERSION: "2020_u3" + ASWF_ONETBB_VERSION: "2020_u3" ASWF_USD_VERSION: "22.11" ASWF_VFXPLATFORM_VERSION: "2022" ASWF_CXX_STANDARD: "17" @@ -449,7 +451,7 @@ versions: ASWF_PYSIDE_CLANG_VERSION: "14.0.6" ASWF_PYTHON_MAJOR_MINOR_VERSION: "3.10" ASWF_QT_VERSION: "5.15.9" - ASWF_TBB_VERSION: "2020_u3" + ASWF_ONETBB_VERSION: "2020_u3" ASWF_USD_VERSION: "23.05" ASWF_VFXPLATFORM_VERSION: "2023" ASWF_CXX_STANDARD: "17" @@ -514,7 +516,6 @@ versions: ASWF_XORG_PROTO_VERSION: "system" ASWF_XZ_UTILS_VERSION: "system" # Packages not specified by VFX Platform - ASWF_ALEMBIC_VERSION: "1.8.6" ASWF_B2_VERSION: "5.2.1" ASWF_BLOSC_VERSION: "1.21.5" ASWF_BZIP2_VERSION: "1.0.8" @@ -541,8 +542,7 @@ versions: ASWF_MD4C_VERSION: "0.4.8" ASWF_MINIZIP_NG_VERSION: "4.0.8" ASWF_OPENSUBDIV_VERSION: "3.6.0" - ASWF_PARTIO_VERSION: "1.17.1" - ASWF_PTEX_VERSION: "2.4.2" + ASWF_PARTIO_VERSION: "1.19.0" ASWF_PUGIXML_VERSION: "1.14" ASWF_PYBIND11_VERSION: "2.12.0" ASWF_PYSTRING_VERSION: "1.1.4" @@ -553,14 +553,16 @@ versions: ASWF_ZLIB_VERSION: "1.3.1" ASWF_ZSTD_VERSION: "1.5.6" # Packages specified by VFX Platform + ASWF_ALEMBIC_VERSION: "1.8.6" ASWF_BOOST_VERSION: "1.82.0" ASWF_CPYTHON_VERSION: "3.11.11" ASWF_NUMPY_VERSION: "1.24.3" + ASWF_PTEX_VERSION: "2.4.2" ASWF_PYSIDE_VERSION: "6.5.4" ASWF_PYSIDE_CLANG_VERSION: "16.0.6" ASWF_PYTHON_MAJOR_MINOR_VERSION: "3.11" ASWF_QT_VERSION: "6.5.4" - ASWF_TBB_VERSION: "2020_u3" + ASWF_ONETBB_VERSION: "2020_u3" ASWF_VFXPLATFORM_VERSION: "2024" ASWF_CXX_STANDARD: "17" # ASWF packages @@ -636,7 +638,6 @@ versions: ASWF_XORG_PROTO_VERSION: "system" ASWF_XZ_UTILS_VERSION: "system" # Packages not specified by VFX Platform - ASWF_ALEMBIC_VERSION: "1.8.8" ASWF_B2_VERSION: "5.2.1" ASWF_BLOSC_VERSION: "1.21.6" ASWF_BZIP2_VERSION: "1.0.8" @@ -663,26 +664,27 @@ versions: ASWF_MD4C_VERSION: "0.4.8" ASWF_MINIZIP_NG_VERSION: "4.0.8" ASWF_OPENSUBDIV_VERSION: "3.6.0" - ASWF_PARTIO_VERSION: "1.17.3" - ASWF_PTEX_VERSION: "2.4.3" + ASWF_PARTIO_VERSION: "1.19.0" ASWF_PUGIXML_VERSION: "1.14" ASWF_PYBIND11_VERSION: "2.13.6" ASWF_PYSTRING_VERSION: "1.1.4" ASWF_SNAPPY_VERSION: "1.1.10" ASWF_TSL_ROBIN_MAP_VERSION: "1.3.0" - ASWF_USD_VERSION: "25.02a.eae7e67" + ASWF_USD_VERSION: "25.05" ASWF_YAML_CPP_VERSION: "0.8.0" ASWF_ZLIB_VERSION: "1.3.1" ASWF_ZSTD_VERSION: "1.5.6" # Packages specified by VFX Platform + ASWF_ALEMBIC_VERSION: "1.8.8" ASWF_BOOST_VERSION: "1.85.0" ASWF_CPYTHON_VERSION: "3.11.11" ASWF_NUMPY_VERSION: "1.26.4" + ASWF_ONETBB_VERSION: "2021.13.0" + ASWF_PTEX_VERSION: "2.4.3" ASWF_PYSIDE_VERSION: "6.5.4" ASWF_PYSIDE_CLANG_VERSION: "18.1.8" ASWF_PYTHON_MAJOR_MINOR_VERSION: "3.11" ASWF_QT_VERSION: "6.5.4" - ASWF_TBB_VERSION: "2020_u3" ASWF_VFXPLATFORM_VERSION: "2025" ASWF_CXX_STANDARD: "17" # ASWF packages @@ -690,11 +692,11 @@ versions: ASWF_MATERIALX_VERSION: "1.39.3" ASWF_OCIO_CONFIGS_VERSION: "1.0_r2" ASWF_OCIO_VERSION: "2.4.2" - ASWF_OIIO_VERSION: "3.0.5.0" + ASWF_OIIO_VERSION: "3.0.6.1" ASWF_OPENEXR_VERSION: "3.3.3" ASWF_OPENRV_VERSION: "2.1.0" ASWF_OPENVDB_VERSION: "12.0.0" - ASWF_OSL_VERSION: "1.14.5.0" + ASWF_OSL_VERSION: "1.14.5.1" ASWF_OTIO_VERSION: "0.17.0" "2025-clang18": parent_versions: ["5", "5-clang18", "2025"] @@ -723,20 +725,20 @@ ci-packages: - "3-clang15.2" - "4-clang16.2" - "4-clang17.2" - - "5-clang18.0" - - "5-clang19.0" + - "5-clang18.1" + - "5-clang19.1" ninja: - "1.3" - "2.2" - "3.2" - "4.2" - - "5.0" + - "5.1" cmake: - "1.3" - "2.2" - "3.2" - "4.2" - - "5.0" + - "5.1" cpython: - "2019.2" - "2020.2" @@ -744,7 +746,7 @@ ci-packages: - "2022.3" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" pybind11: - "2019.0" - "2020.0" @@ -752,13 +754,13 @@ ci-packages: - "2022.3" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" b2: - "2024.2" - - "2025.0" + - "2025.1" libbacktrace: - "2024.2" - - "2025.0" + - "2025.1" boost: - "2019.2" - "2020.2" @@ -766,15 +768,7 @@ ci-packages: - "2022.2" - "2023.2" - "2024.2" - - "2025.0" - tbb: - - "2019.2" - - "2020.2" - - "2021.2" - - "2022.1" - - "2023.2" - - "2024.2" - - "2025.0" + - "2025.1" cppunit: - "2019.2" - "2020.2" @@ -782,7 +776,7 @@ ci-packages: - "2022.1" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" glew: - "2019.2" - "2020.2" @@ -790,7 +784,7 @@ ci-packages: - "2022.1" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" glfw: - "2019.2" - "2020.2" @@ -798,7 +792,7 @@ ci-packages: - "2022.1" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" log4cplus: - "2019.2" - "2020.2" @@ -806,7 +800,7 @@ ci-packages: - "2022.1" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" gtest: - "2019.0" - "2020.0" @@ -814,7 +808,7 @@ ci-packages: - "2022.1" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" qt: - "2019.2" - "2020.2" @@ -822,7 +816,7 @@ ci-packages: - "2022.0" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" pyside: - "2019.2" - "2020.2" @@ -830,7 +824,7 @@ ci-packages: - "2022.1" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" blosc: - "2019.2" - "2020.2" @@ -838,7 +832,7 @@ ci-packages: - "2022.2" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" imath: - "2019.0" - "2020.0" @@ -846,7 +840,7 @@ ci-packages: - "2022.2" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" openexr: - "2019.2" - "2020.2" @@ -854,7 +848,7 @@ ci-packages: - "2022.3" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" alembic: - "2019.2" - "2020.2" @@ -862,7 +856,7 @@ ci-packages: - "2022.2" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" ocio: - "2019.2" - "2020.2" @@ -870,7 +864,7 @@ ci-packages: - "2022.2" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" oiio: - "2019.2" - "2020.2" @@ -878,7 +872,7 @@ ci-packages: - "2022.4" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" opensubdiv: - "2019.2" - "2020.2" @@ -886,7 +880,7 @@ ci-packages: - "2022.2" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" ptex: - "2019.2" - "2020.2" @@ -894,10 +888,10 @@ ci-packages: - "2022.2" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" openrv: - "2024.2" - - "2025.0" + - "2025.1" openvdb: - "2019.2" - "2020.2" @@ -905,7 +899,7 @@ ci-packages: - "2022.4" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" usd: - "2019.3" - "2020.2" @@ -913,7 +907,7 @@ ci-packages: - "2022.4" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" partio: - "2019.1" - "2020.1" @@ -921,7 +915,7 @@ ci-packages: - "2022.2" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" osl: - "2019.1" - "2020.1" @@ -929,7 +923,7 @@ ci-packages: - "2022.4" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" otio: - "2019.1" - "2020.1" @@ -937,7 +931,7 @@ ci-packages: - "2022.4" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" materialx: - "2019.0" - "2020.0" @@ -945,208 +939,216 @@ ci-packages: - "2022.1" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" expat: - "2024.2" - - "2025.0" + - "2025.1" md4c: - "2024.2" - - "2025.0" + - "2025.1" brotli: - "2024.2" - - "2025.0" + - "2025.1" dbus: - "2024.2" - - "2025.0" + - "2025.1" double-conversion: - "2024.2" - - "2025.0" + - "2025.1" bzip2: - "2024.2" - - "2025.0" + - "2025.1" fmt: - "2024.2" - - "2025.0" + - "2025.1" fontconfig: - "2024.2" - - "2025.0" + - "2025.1" freetype: - "2024.2" - - "2025.0" + - "2025.1" gdbm: - "2024.2" - - "2025.0" + - "2025.1" giflib: - "2024.2" - - "2025.0" + - "2025.1" glib: - "2024.2" - - "2025.0" + - "2025.1" highway: - "2024.2" - - "2025.0" + - "2025.1" icu: - "2024.2" - - "2025.0" + - "2025.1" lcms: - "2024.2" - - "2025.0" + - "2025.1" libalsa: - "2024.0" - - "2025.0" + - "2025.1" libaom-av1: - "2024.2" - - "2025.0" + - "2025.1" libdeflate: - "2024.2" - - "2025.0" + - "2025.1" libdrm: - "2024.2" - - "2025.0" + - "2025.1" libffi: - "2024.2" - - "2025.0" + - "2025.1" libiconv: - "2024.2" - - "2025.0" + - "2025.1" libjpeg-turbo: - "2024.2" - - "2025.0" + - "2025.1" libjxl: - "2024.2" - - "2025.0" + - "2025.1" libmp3lame: - "2024.2" - - "2025.0" + - "2025.1" libpng: - "2024.2" - - "2025.0" + - "2025.1" libsndfile: - "2024.2" - - "2025.0" + - "2025.1" libsquish: - "2024.2" - - "2025.0" + - "2025.1" libsvtav1: - "2024.2" - - "2025.0" + - "2025.1" libtiff: - "2024.2" - - "2025.0" + - "2025.1" libuhdr: - "2024.2" - - "2025.0" + - "2025.1" libvpx: - "2024.2" - - "2025.0" + - "2025.1" libwebp: - "2024.2" - - "2025.0" + - "2025.1" libxcrypt: - "2024.2" - - "2025.0" + - "2025.1" libxshmfence: - "2024.2" - - "2025.0" + - "2025.1" lz4: - "2024.2" - - "2025.0" + - "2025.1" minizip-ng: - "2024.2" - - "2025.0" + - "2025.1" mpdecimal: - "2024.2" - - "2025.0" + - "2025.1" mpg123: - "2024.2" - - "2025.0" + - "2025.1" nasm: - "2024.2" - - "2025.0" + - "2025.1" nspr: - "2024.2" - - "2025.0" + - "2025.1" nss: - "2024.2" - - "2025.0" + - "2025.1" ogg: - "2024.2" - - "2025.0" + - "2025.1" + onetbb: + - "2019.2" + - "2020.2" + - "2021.2" + - "2022.1" + - "2023.2" + - "2024.2" + - "2025.1" openal-soft: - "2024.2" - - "2025.0" + - "2025.1" opengl: - "2024.2" - - "2025.0" + - "2025.1" openjpeg: - "2024.2" - - "2025.0" + - "2025.1" openssl: - "2024.2" - - "2025.0" + - "2025.1" opus: - "2024.2" - - "2025.0" + - "2025.1" pcre2: - "2024.2" - - "2025.0" + - "2025.1" pugixml: - "2024.2" - - "2025.0" + - "2025.1" pulseaudio: - "2024.2" - - "2025.0" + - "2025.1" pystring: - "2024.2" - - "2025.0" + - "2025.1" snappy: - "2024.2" - - "2025.0" + - "2025.1" sqlite3: - "2024.2" - - "2025.0" + - "2025.1" tcl: - "2024.2" - - "2025.0" + - "2025.1" tk: - "2024.2" - - "2025.0" + - "2025.1" tsl-robin-map: - "2024.2" - - "2025.0" + - "2025.1" util-linux-libuuid: - "2024.2" - - "2025.0" + - "2025.1" vorbis: - "2024.2" - - "2025.0" + - "2025.1" vulkan-headers: - "2024.2" - - "2025.0" + - "2025.1" vulkan-loader: - "2024.2" - - "2025.0" + - "2025.1" xkbcommon: - "2024.2" - - "2025.0" + - "2025.1" xorg: - "2024.2" - - "2025.0" + - "2025.1" xorg-proto: - "2024.2" - - "2025.0" + - "2025.1" xz_utils: - "2024.2" - - "2025.0" + - "2025.1" yaml-cpp: - "2024.2" - - "2025.0" + - "2025.1" zlib: - "2024.2" - - "2025.0" + - "2025.1" zstd: - "2024.2" - - "2025.0" + - "2025.1" ci-images: common: @@ -1164,8 +1166,8 @@ ci-images: - "3-clang15.2" - "4-clang16.2" - "4-clang17.2" - - "5-clang18.0" - - "5-clang19.0" + - "5-clang18.1" + - "5-clang19.1" base: - "2019.9" - "2020.9" @@ -1173,7 +1175,7 @@ ci-images: - "2022.4" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" baseqt: - "2019.2" - "2020.2" @@ -1181,7 +1183,7 @@ ci-images: - "2022.4" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" openexr: - "2019.8" - "2020.8" @@ -1189,7 +1191,7 @@ ci-images: - "2022.3" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" ocio: - "2019.9" - "2020.8" @@ -1197,10 +1199,10 @@ ci-images: - "2022.4" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" oiio: - "2024.2" - - "2025.0" + - "2025.1" opencue: - "2019.10" - "2020.10" @@ -1208,7 +1210,7 @@ ci-images: - "2022.3" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" usd: - "2019.9" - "2020.8" @@ -1216,7 +1218,7 @@ ci-images: - "2022.4" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" otio: - "2019.3" - "2020.3" @@ -1224,15 +1226,15 @@ ci-images: - "2022.3" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" materialx: - "2022.1" - "2023.2" - "2024.2" - - "2025.0" + - "2025.1" openrv: - "2024.2" - - "2025.0" + - "2025.1" osl: - "2019-clang6.5" - "2019-clang7.5" @@ -1251,8 +1253,8 @@ ci-images: - "2023-clang15.2" - "2024-clang16.2" - "2024-clang17.2" - - "2025-clang18.0" - - "2025-clang19.0" + - "2025-clang18.1" + - "2025-clang19.1" openvdb: - "2019-clang6.8" - "2019-clang7.8" @@ -1269,8 +1271,8 @@ ci-images: - "2023-clang15.2" - "2024-clang16.2" - "2024-clang17.2" - - "2025-clang18.0" - - "2025-clang19.0" + - "2025-clang18.1" + - "2025-clang19.1" vfxall: - "2019-clang6.12" - "2019-clang7.12" @@ -1287,8 +1289,8 @@ ci-images: - "2023-clang15.2" - "2024-clang16.2" - "2024-clang17.2" - - "2025-clang18.0" - - "2025-clang19.0" + - "2025-clang18.1" + - "2025-clang19.1" groups: package: @@ -1310,7 +1312,6 @@ groups: - pcre2 - sqlite3 - tcl - - tk - util-linux-libuuid - vulkan-headers - vulkan-loader @@ -1329,10 +1330,11 @@ groups: - libiconv - libxcrypt - lz4 + - onetbb - pugixml - pystring - snappy - - tbb + - tk - tsl-robin-map - yaml-cpp - zlib @@ -1501,6 +1503,7 @@ conan_only: - ocio - oiio - ogg + - onetbb - openal-soft - openexr - opengl @@ -1519,7 +1522,6 @@ conan_only: - qt - snappy - sqlite3 - - tbb - tcl - tk - tsl-robin-map diff --git a/python/aswfdocker/tests/test_builder.py b/python/aswfdocker/tests/test_builder.py index 5a8462fb..4d7a04da 100644 --- a/python/aswfdocker/tests/test_builder.py +++ b/python/aswfdocker/tests/test_builder.py @@ -131,8 +131,6 @@ def test_image_base_2019clang_dict(self): "group": {"default": {"targets": ["ci-openvdb-2019-clang9"]}}, "target": { "ci-openvdb-2019-clang9": { - "context": ".", - "dockerfile": "ci-openvdb/Dockerfile", "args": { "ASWF_ALEMBIC_VERSION": "1.7.11", "ASWF_BASEOS_DISTRO": "centos7", @@ -143,10 +141,10 @@ def test_image_base_2019clang_dict(self): "ASWF_CLANG_MAJOR_VERSION": "9", "ASWF_CLANG_VERSION": "9.0.1", "ASWF_CMAKE_VERSION": "3.12.4", - "ASWF_CPPUNIT_VERSION": "1.14.0", "ASWF_CONAN_CHANNEL": "vfx2019", "ASWF_CONAN_PYTHON_VERSION": "3.9.11", "ASWF_CONAN_VERSION": "1.47.0", + "ASWF_CPPUNIT_VERSION": "1.14.0", "ASWF_CPYTHON_VERSION": "2.7.15", "ASWF_CUDA_VERSION": "10.2", "ASWF_CXX_STANDARD": "14", @@ -164,6 +162,7 @@ def test_image_base_2019clang_dict(self): "ASWF_OCIO_CONFIGS_VERSION": "1.0_r2", "ASWF_OCIO_VERSION": "1.1.0", "ASWF_OIIO_VERSION": "2.0.8", + "ASWF_ONETBB_VERSION": "2018", "ASWF_OPENEXR_VERSION": "2.3.0", "ASWF_OPENSUBDIV_VERSION": "3_3_3", "ASWF_OPENVDB_VERSION": "6.2.1", @@ -179,26 +178,27 @@ def test_image_base_2019clang_dict(self): "ASWF_PYTHON_MAJOR_MINOR_VERSION": "2.7", "ASWF_QT_VERSION": "5.12.6", "ASWF_SONAR_VERSION": "4.6.2.2472", - "ASWF_TBB_VERSION": "2018", "ASWF_USD_VERSION": "19.11", "ASWF_VERSION": openvdb_version, "ASWF_VFXPLATFORM_VERSION": "2019", "CI_COMMON_VERSION": "1", }, + "context": ".", + "dockerfile": "ci-openvdb/Dockerfile", "labels": { "org.opencontainers.image.created": constants.DEV_BUILD_DATE, "org.opencontainers.image.revision": constants.DEV_BUILD_DATE, }, - "tags": [ - f"{constants.DOCKER_REGISTRY}/aswflocaltesting/ci-openvdb:2019-clang9", - f"{constants.DOCKER_REGISTRY}/aswflocaltesting/ci-openvdb:{openvdb_version}", - ], "output": ["type=docker"], "secret": [ "id=conan_login_username,env=CONAN_LOGIN_USERNAME", "id=conan_password,env=CONAN_PASSWORD", ], - } + "tags": [ + f"{constants.DOCKER_REGISTRY}/aswflocaltesting/ci-openvdb:2019-clang9", + f"{constants.DOCKER_REGISTRY}/aswflocaltesting/ci-openvdb:{openvdb_version}", + ], + }, }, }, ) @@ -255,6 +255,7 @@ def test_image_base_2019_2020_dict(self): "ASWF_OCIO_CONFIGS_VERSION": "1.0_r2", "ASWF_OCIO_VERSION": "1.1.1", "ASWF_OIIO_VERSION": "2.1.13.0", + "ASWF_ONETBB_VERSION": "2019_u6", "ASWF_OPENEXR_VERSION": "2.4.0", "ASWF_OPENSUBDIV_VERSION": "3_4_3", "ASWF_OPENVDB_VERSION": "7.1.0", @@ -270,7 +271,6 @@ def test_image_base_2019_2020_dict(self): "ASWF_PYTHON_MAJOR_MINOR_VERSION": "3.7", "ASWF_QT_VERSION": "5.12.6", "ASWF_SONAR_VERSION": "4.6.2.2472", - "ASWF_TBB_VERSION": "2019_u6", "ASWF_USD_VERSION": "20.11", "ASWF_VERSION": base_versions[1], "ASWF_VFXPLATFORM_VERSION": "2020", @@ -324,6 +324,7 @@ def test_image_base_2019_2020_dict(self): "ASWF_OCIO_CONFIGS_VERSION": "1.0_r2", "ASWF_OCIO_VERSION": "1.1.0", "ASWF_OIIO_VERSION": "2.0.8", + "ASWF_ONETBB_VERSION": "2018", "ASWF_OPENEXR_VERSION": "2.3.0", "ASWF_OPENSUBDIV_VERSION": "3_3_3", "ASWF_OPENVDB_VERSION": "6.2.1", @@ -339,7 +340,6 @@ def test_image_base_2019_2020_dict(self): "ASWF_PYTHON_MAJOR_MINOR_VERSION": "2.7", "ASWF_QT_VERSION": "5.12.6", "ASWF_SONAR_VERSION": "4.6.2.2472", - "ASWF_TBB_VERSION": "2018", "ASWF_USD_VERSION": "19.11", "ASWF_VERSION": base_versions[0], "ASWF_VFXPLATFORM_VERSION": "2019", diff --git a/scripts/common/install_cudadevel.sh b/scripts/common/install_cudadevel.sh new file mode 100755 index 00000000..159ac9da --- /dev/null +++ b/scripts/common/install_cudadevel.sh @@ -0,0 +1,68 @@ +#!/usr/bin/env bash +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +# The nvidia/cuda:x.y.z-devel-rockylinux8 are layered on top of the nvidia/cuda:x.y.z-runtime-rockylinux8 +# images but include large components which are not needed for our build images. +# Specifically we want to skip installing (sizes are for version 12.6.3) +# - cuda-nsight-compute-x-y : 1GB (GUI profiling tool) +# - libcublas-devel-x-y : 930MB (large static libraries) +# - libcusparse-devel-x-y : 620MB (large static libraries) +# - libcufft-devel-x-y : 580MB (large static libraries) +# - libnpp-devel-x-y : 257MB (large static libraries) +# - libcusolver-devel-x-y : 195MB (large static libraries) +# +# A further complication is that these -devel RPMs are packaged as a meta RPM package, +# cuda-libraries-devel-x-y so we have to pick apart that meta package in order to install +# as many reasonably sized sub components as possible. +# +# This script is based on the Dockerfile which layers the -devel image on top of the -runtime image: +# https://gitlab.com/nvidia/container-images/cuda/-/raw/master/dist/12.6.3/rockylinux8/devel/Dockerfile +# +# Versions will need to be updated when a new version of CUDA is selected. +# + +NV_CUDA_LIB_VERSION="${ASWF_CUDA_VERSION}-1" +IFS='.' read -r CUDA_MAJOR CUDA_MINOR CUDA_PATCH <<< "${ASWF_CUDA_VERSION}" +declare -A NV_NVPROF_VERSION=( [12.6.1]=12.6.68-1 [12.6.3]=12.6.80-1 ) +NV_NVPROF_DEV_PACKAGE=cuda-nvprof-${CUDA_MAJOR}-${CUDA_MINOR}-${NV_NVPROF_VERSION[$ASWF_CUDA_VERSION]} +declare -A NV_NVML_DEV_VERSION=( [12.6.1]=12.6.68-1 [12.6.3]=12.6.77-1 ) +NV_NVML_DEV_PACKAGE=cuda-nvml-devel-${CUDA_MAJOR}-${CUDA_MINOR}-${NV_NVML_DEV_VERSION[$ASWF_CUDA_VERSION]} +declare -A NV_LIBNCCL_DEV_PACKAGE_VERSION=( [12.6.1]=2.22.3-1 [12.6.3]=2.23.4-1 ) +NV_LIBNCCL_DEV_PACKAGE=libnccl-devel-${NV_LIBNCCL_DEV_PACKAGE_VERSION[$ASWF_CUDA_VERSION]}+cuda${CUDA_MAJOR}.${CUDA_MINOR} + +# Query and filter the list of packages we want to install from the cuda-libraries-devel meta package + +NV_FILTERED_LIBRARIES_DEVEL=$(dnf repoquery --quiet --requires --resolve cuda-libraries-devel-${CUDA_MAJOR}-${CUDA_MINOR} | \ + sed -E '/(libcublas|libcusparse|libcufft|libnpp|libcusolver)-devel/d') + +# This is what the nvidia/cuda Dockerfile does, there is some redundancy since some of the packages +# are part of the cuda-libraries-devel meta package. +# +#RUN yum install -y \ +# make \ +# findutils \ +# cuda-command-line-tools-12-6-${NV_CUDA_LIB_VERSION} \ +# cuda-libraries-devel-12-6-${NV_CUDA_LIB_VERSION} \ +# cuda-minimal-build-12-6-${NV_CUDA_LIB_VERSION} \ +# cuda-cudart-devel-12-6-${NV_CUDA_CUDART_DEV_VERSION} \ +# ${NV_NVPROF_DEV_PACKAGE} \ +# cuda-nvml-devel-12-6-${NV_NVML_DEV_VERSION} \ +# libcublas-devel-12-6-${NV_LIBCUBLAS_DEV_VERSION} \ +# ${NV_LIBNPP_DEV_PACKAGE} \ +# ${NV_LIBNCCL_DEV_PACKAGE} \ +# ${NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE} \ +# && yum clean all \ +# && rm -rf /var/cache/yum/* + +dnf install -y \ + make \ + findutils \ + cuda-command-line-tools-${CUDA_MAJOR}-${CUDA_MINOR}-${NV_CUDA_LIB_VERSION} \ + $NV_FILTERED_LIBRARIES_DEVEL \ + cuda-minimal-build-${CUDA_MAJOR}-${CUDA_MINOR}-${NV_CUDA_LIB_VERSION} \ + ${NV_NVPROF_DEV_PACKAGE} \ + ${NV_NVML_DEV_PACKAGE} \ + ${NV_LIBNCCL_DEV_PACKAGE} \ + && dnf clean all \ + && rm -rf /var/cache/yum/* diff --git a/scripts/common/install_optix.sh b/scripts/common/install_optix.sh index 73f5c6a9..b5df05e3 100755 --- a/scripts/common/install_optix.sh +++ b/scripts/common/install_optix.sh @@ -16,56 +16,12 @@ set -ex OPTIX_SDK_PREFIX=/usr/local/NVIDIA-OptiX-SDK -# Optix SDK 7.0.0 does not have include package, download include files directly. - -OptiXDirs_70=( "include" "include/internal" "include/optixPaging" ) -OptiXHeaders_70=( \ -"internal/optix_7_device_impl.h" \ -"internal/optix_7_device_impl_exception.h" \ -"internal/optix_7_device_impl_transformations.h" \ -"optixPaging/optixPaging.cu" \ -"optixPaging/optixPaging.h" \ -"optixPaging/optixPagingImpl.cpp" \ -"optix.h" \ -"optix_7_device.h" \ -"optix_7_host.h" \ -"optix_7_types.h" \ -"optix_device.h" \ -"optix_function_table.h" \ -"optix_function_table_definition.h" \ -"optix_host.h" \ -"optix_stack_size.h" \ -"optix_stubs.h" \ -"optix_types.h") - -OPTIX_VERSION=7.0 -OPTIXLOC=https://developer.download.nvidia.com/redist/optix/v${OPTIX_VERSION} -for d in ${OptiXDirs_70[@]} -do - mkdir -p $OPTIX_SDK_PREFIX-$OPTIX_VERSION.0/$d -done -for f in ${OptiXHeaders_70[@]} -do - curl --retry 100 -m 120 --connect-timeout 30 \ - $OPTIXLOC/include/$f > $OPTIX_SDK_PREFIX-$OPTIX_VERSION.0/include/$f -done - -# No known open downloads for 7.1.0 or 7.2.0 - - -# Zip files for 7.3.0 and newer, with some variability in ZIP filename and directory prefix - -declare -A OPTIX_VERSION_ZIP=( [7.3]=7.3.0 [7.4]=7.4.0 [7.5]=7.5 [7.6]=7.6 [7.7]=7.7 [8.0]=8.0 [8.1]=8.1.0) -declare -A OPTIX_VERSION_DIR=( [7.3]="" [7.4]="" [7.5]="include" [7.6]="include" [7.7]="include" [8.0]="include" ) - -for OPTIX_VERSION in 7.3 7.4 7.5 7.6 7.7 8.0 8.1 +for OPTIX_VERSION in 7.0.0 7.1.0 7.2.0 7.3.0 7.4.0 7.5.0 7.6.0 7.7.0 8.0.0 8.1.0 9.0.0 do - OPTIXLOC=https://developer.download.nvidia.com/redist/optix/v${OPTIX_VERSION} - curl --retry 100 -m 120 --connect-timeout 30 \ - -o /tmp/OptiX-${OPTIX_VERSION}-Include.zip $OPTIXLOC/OptiX-${OPTIX_VERSION_ZIP[$OPTIX_VERSION]}-Include.zip - # Not all zip files are structured the same - OPTIX_INSTALL_DIR=$OPTIX_SDK_PREFIX-$OPTIX_VERSION.0/${OPTIX_VERSION_DIR[$OPTIX_VERSION]}/ + OPTIXLOC=https://github.com/NVIDIA/optix-dev/archive/refs/tags/v${OPTIX_VERSION}.tar.gz + OPTIX_INSTALL_DIR=${OPTIX_SDK_PREFIX}-${OPTIX_VERSION}/include mkdir -p $OPTIX_INSTALL_DIR - unzip -d $OPTIX_INSTALL_DIR /tmp/OptiX-${OPTIX_VERSION}-Include.zip + curl --retry 100 -m 120 --connect-timeout 30 \ + -sL $OPTIXLOC | (cd ${OPTIX_INSTALL_DIR} ; tar --strip-components=2 -x -z -f - optix-dev-${OPTIX_VERSION}/include ) done diff --git a/scripts/common/install_yq.sh b/scripts/common/install_yq.sh new file mode 100755 index 00000000..ca407e05 --- /dev/null +++ b/scripts/common/install_yq.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +# Install the yq command line tool for processing yaml files. +# Since it is written in Golang, and no RPM is currently in EPEL, +# we just install a binary. + +set -ex + +curl --output /usr/local/bin/yq -L https://github.com/mikefarah/yq/releases/download/v${ASWF_YQ_VERSION}/yq_linux_amd64 +chmod +x /usr/local/bin/yq diff --git a/scripts/vfx/build_usd.sh b/scripts/vfx/build_usd.sh index 0169dbc8..6aeac550 100755 --- a/scripts/vfx/build_usd.sh +++ b/scripts/vfx/build_usd.sh @@ -69,7 +69,7 @@ cmake \ -DPXR_ENABLE_MATERIALX_SUPPORT=ON \ -DPXR_BUILD_TESTS=OFF \ -DUSD_ROOT_DIR="${ASWF_INSTALL_PREFIX}" \ - -DPXR_BUILD_ALEMBIC_PLUGIN=OFF \ + -DPXR_BUILD_ALEMBIC_PLUGIN=ON \ -DPXR_BUILD_MAYA_PLUGIN=FALSE \ ${USD_UIC_PATH} \ ${USD_EXTRA_ARGS} \