summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2023-04-17 10:42:03 -0500
committerGitHub <noreply@github.com>2023-04-17 17:42:03 +0200
commit036695ac94bc767f7986add2824262ccee2b47f6 (patch)
treee3fbb496252002e2d1b0a72907a95f900064b7f3
parent19b55d6b27da859f11db315b213930c666b33c63 (diff)
downloadspack-036695ac94bc767f7986add2824262ccee2b47f6.tar.gz
spack-036695ac94bc767f7986add2824262ccee2b47f6.tar.bz2
spack-036695ac94bc767f7986add2824262ccee2b47f6.tar.xz
spack-036695ac94bc767f7986add2824262ccee2b47f6.zip
CI: update Linux images in ML pipelines (#36766)
Add missing openssl/curl/pkgconfig deps to py-tokenizers Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>
-rw-r--r--share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml6
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml8
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml8
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml8
-rw-r--r--var/spack/repos/builtin/packages/py-tokenizers/package.py5
5 files changed, 23 insertions, 12 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
index 4d1d303b9a..ce7e0f5186 100644
--- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
+++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
@@ -906,7 +906,7 @@ tutorial-protected-build:
.ml-linux-x86_64-cpu-generate:
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:
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:
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:
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:
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:
extends: [ ".pr-generate", ".ml-linux-x86_64-rocm-generate" ]
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml
index 6a13e9244f..eecc9562a2 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml
@@ -45,7 +45,6 @@ spack:
- py-torchdata
- py-torchfile
- py-torchgeo
- - py-torchmeta
- py-torchmetrics
- py-torchtext
- py-torchvision
@@ -74,12 +73,15 @@ spack:
# - r-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:
pipeline-gen:
- 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:
build-group: Machine Learning
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml
index eb58c80535..3f0b218dc4 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml
@@ -48,7 +48,6 @@ spack:
- py-torchdata
- py-torchfile
- py-torchgeo
- - py-torchmeta
- py-torchmetrics
- py-torchtext
- py-torchvision
@@ -77,12 +76,15 @@ spack:
# - r-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:
pipeline-gen:
- 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:
build-group: Machine Learning
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml
index 9523996c63..3d2ac4ccc7 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml
@@ -51,7 +51,6 @@ spack:
# - py-torchdata
# - py-torchfile
# - py-torchgeo
- # - py-torchmeta
# - py-torchmetrics
# - py-torchtext
# - py-torchvision
@@ -80,12 +79,15 @@ spack:
# - r-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:
pipeline-gen:
- 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:
build-group: Machine Learning
diff --git a/var/spack/repos/builtin/packages/py-tokenizers/package.py b/var/spack/repos/builtin/packages/py-tokenizers/package.py
index 5ee19d671a..c45f301c20 100644
--- a/var/spack/repos/builtin/packages/py-tokenizers/package.py
+++ b/var/spack/repos/builtin/packages/py-tokenizers/package.py
@@ -27,3 +27,8 @@ class PyTokenizers(PythonPackage):
depends_on("rust@nightly", when="@:0.10", type="build")
# 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")