From f3bf3a5918a526b359c01fd38a6d8a811baa3397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCdepohl?= <lorenz.huedepohl@rzg.mpg.de>
Date: Mon, 6 Aug 2018 12:14:46 +0200
Subject: [PATCH] Add a prjconf-level macro with the cuda repo
---
mpcdf_common.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/mpcdf_common.py b/mpcdf_common.py
index 3e4344b..4cefbcf 100644
--- a/mpcdf_common.py
+++ b/mpcdf_common.py
@@ -300,6 +300,8 @@ def mpcdf_setup_repositories(api_url, project, distribution=None, parent=None, p
is_cuda = kwargs.pop("cuda", False)
is_cuda_mpi = kwargs.pop("cuda_mpi", False)
+ cuda_repo = kwargs.pop("cuda_repo", "")
+
have_compiler = is_compiler or is_mpi or is_cuda or is_cuda_mpi
have_mpi = is_mpi or is_cuda_mpi
have_cuda = is_cuda or is_cuda_mpi
@@ -338,6 +340,9 @@ def mpcdf_setup_repositories(api_url, project, distribution=None, parent=None, p
prjconf.append("%have_mpcdf_mpi {0}".format(1 if have_mpi else 0))
prjconf.append("%have_mpcdf_cuda {0}".format(1 if have_cuda else 0))
+ if is_cuda:
+ prjconf.append("%cuda_repository {0}".format(cuda_repo))
+
for macro, value in kwargs.items():
prjconf.append("%{0} {1}".format(macro, value))
@@ -358,7 +363,7 @@ def mpcdf_setup_repositories(api_url, project, distribution=None, parent=None, p
for cuda in cudas:
for compiler in filter(partial(valid_cuda, cuda), compilers):
- repo(cuda + "_" + compiler, (project, compiler), cuda=True)
+ repo(cuda + "_" + compiler, (project, compiler), cuda=True, cuda_repo=cuda)
for mpi in filter(partial(valid_mpi, compiler), mpis):
repo(cuda + "_" + mpi + "_" + compiler,
(project, cuda + "_" + compiler),
--
GitLab