From c756c6b97f73aacc143a84c1e8523011df495b57 Mon Sep 17 00:00:00 2001
From: ccalaza <c.gonzalez.calaza@fz-juelich.de>
Date: Tue, 16 May 2023 15:13:50 +0200
Subject: [PATCH] rm scipy-stack dependencies
---
.../Cirq-1.0.0-gcccoremkl-11.3.0-2022.1.0.eb | 27 ++++++++++++-------
...PyQuil-3.3.3-gcccoremkl-11.3.0-2022.1.0.eb | 4 ++-
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/Golden_Repo/c/cirq/Cirq-1.0.0-gcccoremkl-11.3.0-2022.1.0.eb b/Golden_Repo/c/cirq/Cirq-1.0.0-gcccoremkl-11.3.0-2022.1.0.eb
index 9e0ae92f6..2ce0b6f88 100644
--- a/Golden_Repo/c/cirq/Cirq-1.0.0-gcccoremkl-11.3.0-2022.1.0.eb
+++ b/Golden_Repo/c/cirq/Cirq-1.0.0-gcccoremkl-11.3.0-2022.1.0.eb
@@ -13,7 +13,8 @@ toolchainopts = {'pic': True}
dependencies = [
('Python', '3.10.4'),
- ('SciPy-Stack', '2022a'),
+ #('SciPy-Stack', '2022a'),
+ ('SciPy-bundle', '2022.05'),
('protobuf-python', '3.19.4'),
('networkx', '2.8.4'),
('tqdm', '4.64.0'),
@@ -28,15 +29,6 @@ exts_default_options = {
'sanity_pip_check': True,
}
-# This easyconfig cirq=1.0.0 works with Stage 2023's protobuf==3.19.4, but requires
-# different versions of the following packages than the ones provided by:
-# 1) TensorFlow:
-# different: google-auth==2.16.0, grpcio==1.51.1, cachetools=='5.2.1'
-# same: pyasn1-modules=='0.2.8', rsa==4.9
-# 2) tensorboard:
-# different: google-auth==2.11.1, grpcio==1.49.1, cachetools=='5.2.0'
-# same: pyasn1-modules=='0.2.8', rsa==4.9
-
exts_list = [
('pyasn1-modules', '0.2.8', {
@@ -122,4 +114,19 @@ exts_list = [
}),
]
+
+# This easyconfig cirq=1.0.0 works with Stage 2023's protobuf==3.19.4, but requires
+# different versions of the following packages than the ones provided by:
+# 1) TensorFlow:
+# different: google-auth==2.16.0, grpcio==1.51.1, cachetools=='5.2.1'
+# same: pyasn1-modules=='0.2.8', rsa==4.9
+# 2) tensorboard:
+# different: google-auth==2.11.1, grpcio==1.49.1, cachetools=='5.2.0'
+# same: pyasn1-modules=='0.2.8', rsa==4.9
+
+# Therefore we make Cirq conflict with TensorFLow or tensorboard if they are loaded simultaneously
+modluafooter = """
+conflict("TensorFlow", "tensorboard")
+"""
+
moduleclass = 'quantum'
diff --git a/Golden_Repo/p/PyQuil/PyQuil-3.3.3-gcccoremkl-11.3.0-2022.1.0.eb b/Golden_Repo/p/PyQuil/PyQuil-3.3.3-gcccoremkl-11.3.0-2022.1.0.eb
index cd1a2525d..7d1e6fb43 100644
--- a/Golden_Repo/p/PyQuil/PyQuil-3.3.3-gcccoremkl-11.3.0-2022.1.0.eb
+++ b/Golden_Repo/p/PyQuil/PyQuil-3.3.3-gcccoremkl-11.3.0-2022.1.0.eb
@@ -11,7 +11,9 @@ toolchainopts = {'pic': True}
dependencies = [
('Python', '3.10.4'),
- ('SciPy-Stack', '2022a'),
+ #('SciPy-Stack', '2022a'),
+ ('SciPy-bundle', '2022.05'),
+ ('IPython', '8.5.0'),
('networkx', '2.8.4'),
]
--
GitLab