From cd93cba98d7c610692ed3cb303066d07632c3b18 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Mon, 28 Feb 2022 14:50:57 +0100
Subject: [PATCH] Override the __cuda version on Linux builds Fixes #93 See:
https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-virtual.html
for more information on conda virtual packages
---
.gitlab-ci.yml | 3 +++
bob/devtools/data/gitlab-ci/docs.yaml | 2 ++
bob/devtools/data/gitlab-ci/nightlies.yaml | 3 +++
bob/devtools/data/gitlab-ci/noarch.yaml | 3 +++
bob/devtools/data/gitlab-ci/python-package.yaml | 2 ++
bob/devtools/data/gitlab-ci/single-package.yaml | 3 +++
6 files changed, 16 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2a3cd7e..f3ac3224 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,6 +84,9 @@ stages:
build_linux_bob_devel:
extends: .build_linux_template
+ variables:
+ # The version of cuda at Idiap
+ CONDA_OVERRIDE_CUDA: "11.6"
# run bob-devel test only when bob/devtools/data/conda_build_config.yaml changes
only:
changes:
diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index c0fd510c..fa252a42 100644
--- a/bob/devtools/data/gitlab-ci/docs.yaml
+++ b/bob/devtools/data/gitlab-ci/docs.yaml
@@ -8,6 +8,8 @@ variables:
CONDA_ROOT: "${CI_PROJECT_DIR}/miniconda"
BOOTSTRAP: "https://gitlab.idiap.ch/bob/bob.devtools/raw/master/bob/devtools/bootstrap.py"
TORCH_HOME: "${CI_PROJECT_DIR}/torch"
+ # The version of cuda at Idiap
+ CONDA_OVERRIDE_CUDA: "11.6"
# Definition of our build pipeline order
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index c40ab309..e0c268ec 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -45,6 +45,9 @@ stages:
- bob
- docker
image: quay.io/condaforge/linux-anvil-cos7-x86_64
+ variables:
+ # The version of cuda at Idiap
+ CONDA_OVERRIDE_CUDA: "11.6"
build_linux_38:
extends: .build_linux_template
diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml
index 9c8ee0dd..831846f4 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -113,6 +113,9 @@ build_macos_arm:
- bob
- docker
image: quay.io/condaforge/linux-anvil-cos7-x86_64
+ variables:
+ # The version of cuda at Idiap
+ CONDA_OVERRIDE_CUDA: "11.6"
.test_macos_intel_template:
diff --git a/bob/devtools/data/gitlab-ci/python-package.yaml b/bob/devtools/data/gitlab-ci/python-package.yaml
index 7a809176..59988d47 100644
--- a/bob/devtools/data/gitlab-ci/python-package.yaml
+++ b/bob/devtools/data/gitlab-ci/python-package.yaml
@@ -7,6 +7,8 @@ variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
PRE_COMMIT_HOME: "${CI_PROJECT_DIR}/.cache/pre-commit"
DEPLOY: "https://gitlab.idiap.ch/bob/bob.devtools/raw/master/bob/devtools/deploy.py"
+ # The version of cuda at Idiap
+ CONDA_OVERRIDE_CUDA: "11.6"
# Definition of our build pipeline order
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index b54157c6..6375dda2 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -58,6 +58,9 @@ stages:
paths:
- ${CONDA_ROOT}/conda-bld/linux-64/*.conda
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
+ variables:
+ # The version of cuda at Idiap
+ CONDA_OVERRIDE_CUDA: "11.6"
.build_macos_intel_template:
--
GitLab