zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: update Linux images in ML pipelines (#36766)

Browse Source 
Add missing openssl/curl/pkgconfig deps to py-tokenizers

Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>
This commit is contained in:
Adam J. Stewart 2023-04-17 10:42:03 -05:00 committed by GitHub
parent 19b55d6b27
commit 036695ac94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
View File

@ -906,7 +906,7 @@ tutorial-protected-build:
.ml-linux-x86_64-cpu-generate: .ml-linux-x86_64-cpu-generate:
extends: [ .ml-linux-x86_64-cpu, ".tags-x86_64_v4" ] extends: [ .ml-linux-x86_64-cpu, ".tags-x86_64_v4" ]
image: ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09 image: ghcr.io/spack/linux-ubuntu22.04-x86_64_v2:nightly
ml-linux-x86_64-cpu-pr-generate: ml-linux-x86_64-cpu-pr-generate:
extends: [ ".pr-generate", ".ml-linux-x86_64-cpu-generate" ] extends: [ ".pr-generate", ".ml-linux-x86_64-cpu-generate" ]
@ -946,7 +946,7 @@ ml-linux-x86_64-cpu-protected-build:
.ml-linux-x86_64-cuda-generate: .ml-linux-x86_64-cuda-generate:
extends: [ .ml-linux-x86_64-cuda, ".tags-x86_64_v4" ] extends: [ .ml-linux-x86_64-cuda, ".tags-x86_64_v4" ]
image: ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09 image: ghcr.io/spack/linux-ubuntu22.04-x86_64_v2:nightly
ml-linux-x86_64-cuda-pr-generate: ml-linux-x86_64-cuda-pr-generate:
extends: [ ".pr-generate", ".ml-linux-x86_64-cuda-generate" ] extends: [ ".pr-generate", ".ml-linux-x86_64-cuda-generate" ]
@ -986,7 +986,7 @@ ml-linux-x86_64-cuda-protected-build:
.ml-linux-x86_64-rocm-generate: .ml-linux-x86_64-rocm-generate:
extends: [ .ml-linux-x86_64-rocm, ".tags-x86_64_v4" ] extends: [ .ml-linux-x86_64-rocm, ".tags-x86_64_v4" ]
image: ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09 image: ghcr.io/spack/linux-ubuntu22.04-x86_64_v2:nightly
ml-linux-x86_64-rocm-pr-generate: ml-linux-x86_64-rocm-pr-generate:
extends: [ ".pr-generate", ".ml-linux-x86_64-rocm-generate" ] extends: [ ".pr-generate", ".ml-linux-x86_64-rocm-generate" ]

8
share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml
View File

@ -45,7 +45,6 @@ spack:
- py-torchdata - py-torchdata
- py-torchfile - py-torchfile
- py-torchgeo - py-torchgeo
- py-torchmeta
- py-torchmetrics - py-torchmetrics
- py-torchtext - py-torchtext
- py-torchvision - py-torchvision
@ -74,12 +73,15 @@ spack:
# - r-xgboost # - r-xgboost
- xgboost - xgboost
mirrors: { "mirror": "s3://spack-binaries/develop/ml-linux-x86_64-cpu" } mirrors:
mirror: s3://spack-binaries/develop/ml-linux-x86_64-cpu
ci: ci:
pipeline-gen: pipeline-gen:
- build-job: - build-job:
image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] } image:
name: ghcr.io/spack/linux-ubuntu22.04-x86_64_v2:nightly
entrypoint: ['']
cdash: cdash:
build-group: Machine Learning build-group: Machine Learning

8
share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml
View File

@ -48,7 +48,6 @@ spack:
- py-torchdata - py-torchdata
- py-torchfile - py-torchfile
- py-torchgeo - py-torchgeo
- py-torchmeta
- py-torchmetrics - py-torchmetrics
- py-torchtext - py-torchtext
- py-torchvision - py-torchvision
@ -77,12 +76,15 @@ spack:
# - r-xgboost # - r-xgboost
- xgboost - xgboost
mirrors: { "mirror": "s3://spack-binaries/develop/ml-linux-x86_64-cuda" } mirrors:
mirror: s3://spack-binaries/develop/ml-linux-x86_64-cpu
ci: ci:
pipeline-gen: pipeline-gen:
- build-job: - build-job:
image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] } image:
name: ghcr.io/spack/linux-ubuntu22.04-x86_64_v2:nightly
entrypoint: ['']
cdash: cdash:
build-group: Machine Learning build-group: Machine Learning

8
share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml
View File

@ -51,7 +51,6 @@ spack:
# - py-torchdata # - py-torchdata
# - py-torchfile # - py-torchfile
# - py-torchgeo # - py-torchgeo
# - py-torchmeta
# - py-torchmetrics # - py-torchmetrics
# - py-torchtext # - py-torchtext
# - py-torchvision # - py-torchvision
@ -80,12 +79,15 @@ spack:
# - r-xgboost # - r-xgboost
- xgboost - xgboost
mirrors: { "mirror": "s3://spack-binaries/develop/ml-linux-x86_64-rocm" } mirrors:
mirror: s3://spack-binaries/develop/ml-linux-x86_64-cpu
ci: ci:
pipeline-gen: pipeline-gen:
- build-job: - build-job:
image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] } image:
name: ghcr.io/spack/linux-ubuntu22.04-x86_64_v2:nightly
entrypoint: ['']
cdash: cdash:
build-group: Machine Learning build-group: Machine Learning

5
var/spack/repos/builtin/packages/py-tokenizers/package.py
View File

@ -27,3 +27,8 @@ class PyTokenizers(PythonPackage):
depends_on("rust@nightly", when="@:0.10", type="build") depends_on("rust@nightly", when="@:0.10", type="build")
# TODO: This package currently requires internet access to install. # TODO: This package currently requires internet access to install.
# cargo resolves dependencies, which includes openssl-sys somewhere, which needs
# system pkgconfig and openssl.
depends_on("pkgconfig", type="build")
depends_on("openssl")