diff options
| author | mschouler <schouler.marc@gmail.com> | 2023-08-03 00:46:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-02 17:46:50 -0500 |
| commit | ba936574fc8acf95a6a28e0438634b15d85af599 (patch) | |
| tree | e744821bf2dbd7de220f4a4a668c3598834162e5 /var | |
| parent | c0d0603baa949153a78cfbfc398ad64f3bbc6423 (diff) | |
| download | spack-ba936574fc8acf95a6a28e0438634b15d85af599.tar.gz spack-ba936574fc8acf95a6a28e0438634b15d85af599.tar.bz2 spack-ba936574fc8acf95a6a28e0438634b15d85af599.tar.xz spack-ba936574fc8acf95a6a28e0438634b15d85af599.zip | |
py-melissa-core: add new versions and py-iterative-stats dependency (#38654)
* py-melissa-core: add new versions and py-iterative-stats dependency
* Enhance dependency specification
* Fix dependency specification
* Fix comment alignment
* Improve dependency specification style
* Enhance dependencies
* Fix mpi4py, py-cloudpickle and py-python-hostlist dependencies
* Update var/spack/repos/builtin/packages/py-melissa-core/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* Update var/spack/repos/builtin/packages/py-melissa-core/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* Update var/spack/repos/builtin/packages/py-melissa-core/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* Set develop version as preferred
* Update var/spack/repos/builtin/packages/py-melissa-core/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
---------
Co-authored-by: Marc Schouler <marc.schouler@inria.fr>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-melissa-core/package.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/py-melissa-core/package.py b/var/spack/repos/builtin/packages/py-melissa-core/package.py index fb2eab70ff..49fc451dca 100644 --- a/var/spack/repos/builtin/packages/py-melissa-core/package.py +++ b/var/spack/repos/builtin/packages/py-melissa-core/package.py @@ -17,7 +17,9 @@ class PyMelissaCore(PythonPackage): git = "https://gitlab.inria.fr/melissa/melissa.git" maintainers("robcaulk", "mschouler", "raffino") - version("develop", branch="develop") + version("develop", branch="develop", preferred=True) + version("joss", tag="JOSS_v2") + version("sc23", tag="SC23") # define variants for the deep learning server (torch, tf) variant( @@ -31,17 +33,24 @@ class PyMelissaCore(PythonPackage): depends_on("py-setuptools@46.4:", type=("build")) # requirements.txt (SA) depends_on("py-pyzmq@22.3.0:", type="run") - depends_on("py-mpi4py@3.1.3:", type="run") + depends_on("py-mpi4py@3.1.3:", when="@develop,joss", type="run") + depends_on("py-mpi4py@3.1.3", when="@sc23", type="run") depends_on("py-numpy@1.21:", type="run") depends_on("py-jsonschema@4.5:", type="run") - depends_on("py-python-rapidjson@1.8:", type="run") + depends_on("py-python-rapidjson@1.8:", when="@develop,joss", type="run") + depends_on("py-python-rapidjson@1.9:", when="@sc23", type="run") depends_on("py-scipy@1.10.0:", type="run") - depends_on("py-cloudpickle@2.2.0:", type="run") + depends_on("py-plotext@5.2.8:", type="run") + depends_on("py-cloudpickle@2.2.0:", type="run", when="@develop,joss") + depends_on("py-iterative-stats@0.1.0", type="run", when="@develop") + depends_on("py-iterative-stats@0.0.4", type="run", when="@joss") # requirements_deep_learning.txt (DL with torch) depends_on("py-tensorboard@2.10.0:", type="run", when="+torch") depends_on("py-matplotlib", type="run", when="+torch") depends_on("py-torch@1.12.1:", type="run", when="+torch") + depends_on("py-python-hostlist", type="run", when="@sc23+torch") # requirements_deep_learning.txt (DL with tensorflow) depends_on("py-tensorboard@2.10.0:", type="run", when="+tf") depends_on("py-matplotlib", type="run", when="+tf") depends_on("py-tensorflow@2.8.0:", type="run", when="+tf") + conflicts("@sc23", when="+tf", msg="tensorflow is only supported with newer versions") |