From 135bf0852600d3530dfc4fa0298c7a7c2eaabbbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Tue, 24 Nov 2020 14:41:46 +0100 Subject: [PATCH 1/5] Update cyprecice.pxd --- cyprecice/cyprecice.pxd | 1 + 1 file changed, 1 insertion(+) diff --git a/cyprecice/cyprecice.pxd b/cyprecice/cyprecice.pxd index 0e6953db..6ad8ebda 100644 --- a/cyprecice/cyprecice.pxd +++ b/cyprecice/cyprecice.pxd @@ -6,6 +6,7 @@ The python module precice offers python language bindings to the C++ coupling li cimport numpy as np cimport cython cimport SolverInterface +from mpi4py import MPI from cpython.version cimport PY_MAJOR_VERSION # important for determining python version in order to properly normalize string input. See http://docs.cython.org/en/latest/src/tutorial/strings.html#general-notes-about-c-strings and https://github.com/precice/precice/issues/68 . From 45249a3dd09f8364631d383b317eba5a0f2fe78f Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Tue, 24 Nov 2020 15:54:23 +0100 Subject: [PATCH 2/5] Comment out from mpi4py import MPI --- cyprecice/cyprecice.pxd | 2 +- cyprecice/cyprecice.pyx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cyprecice/cyprecice.pxd b/cyprecice/cyprecice.pxd index 6ad8ebda..e2688e23 100644 --- a/cyprecice/cyprecice.pxd +++ b/cyprecice/cyprecice.pxd @@ -6,7 +6,7 @@ The python module precice offers python language bindings to the C++ coupling li cimport numpy as np cimport cython cimport SolverInterface -from mpi4py import MPI +# from mpi4py import MPI from cpython.version cimport PY_MAJOR_VERSION # important for determining python version in order to properly normalize string input. See http://docs.cython.org/en/latest/src/tutorial/strings.html#general-notes-about-c-strings and https://github.com/precice/precice/issues/68 . diff --git a/cyprecice/cyprecice.pyx b/cyprecice/cyprecice.pyx index 670ee759..58a06d64 100644 --- a/cyprecice/cyprecice.pyx +++ b/cyprecice/cyprecice.pyx @@ -7,7 +7,7 @@ The python module precice offers python language bindings to the C++ coupling li cimport cyprecice import numpy as np -from mpi4py import MPI +# from mpi4py import MPI from cpython.version cimport PY_MAJOR_VERSION # important for determining python version in order to properly normalize string input. See http://docs.cython.org/en/latest/src/tutorial/strings.html#general-notes-about-c-strings and https://github.com/precice/precice/issues/68 . From 6174e06e021ead5c7d1302e84bf1abf6167fbdce Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Mon, 28 Dec 2020 20:45:09 +0100 Subject: [PATCH 3/5] Revert "Comment out from mpi4py import MPI" This reverts commit 45249a3dd09f8364631d383b317eba5a0f2fe78f. --- cyprecice/cyprecice.pxd | 2 +- cyprecice/cyprecice.pyx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cyprecice/cyprecice.pxd b/cyprecice/cyprecice.pxd index e2688e23..6ad8ebda 100644 --- a/cyprecice/cyprecice.pxd +++ b/cyprecice/cyprecice.pxd @@ -6,7 +6,7 @@ The python module precice offers python language bindings to the C++ coupling li cimport numpy as np cimport cython cimport SolverInterface -# from mpi4py import MPI +from mpi4py import MPI from cpython.version cimport PY_MAJOR_VERSION # important for determining python version in order to properly normalize string input. See http://docs.cython.org/en/latest/src/tutorial/strings.html#general-notes-about-c-strings and https://github.com/precice/precice/issues/68 . diff --git a/cyprecice/cyprecice.pyx b/cyprecice/cyprecice.pyx index 58a06d64..670ee759 100644 --- a/cyprecice/cyprecice.pyx +++ b/cyprecice/cyprecice.pyx @@ -7,7 +7,7 @@ The python module precice offers python language bindings to the C++ coupling li cimport cyprecice import numpy as np -# from mpi4py import MPI +from mpi4py import MPI from cpython.version cimport PY_MAJOR_VERSION # important for determining python version in order to properly normalize string input. See http://docs.cython.org/en/latest/src/tutorial/strings.html#general-notes-about-c-strings and https://github.com/precice/precice/issues/68 . From f8c1a3bd35a90599584f0803fb00591bdd787cd7 Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Mon, 28 Dec 2020 20:50:43 +0100 Subject: [PATCH 4/5] Add openssh as dependency --- cyprecice/cyprecice.pxd | 1 - spack/var/spack/repos/builtin/packages/py-pyprecice/package.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/cyprecice/cyprecice.pxd b/cyprecice/cyprecice.pxd index 6ad8ebda..0e6953db 100644 --- a/cyprecice/cyprecice.pxd +++ b/cyprecice/cyprecice.pxd @@ -6,7 +6,6 @@ The python module precice offers python language bindings to the C++ coupling li cimport numpy as np cimport cython cimport SolverInterface -from mpi4py import MPI from cpython.version cimport PY_MAJOR_VERSION # important for determining python version in order to properly normalize string input. See http://docs.cython.org/en/latest/src/tutorial/strings.html#general-notes-about-c-strings and https://github.com/precice/precice/issues/68 . diff --git a/spack/var/spack/repos/builtin/packages/py-pyprecice/package.py b/spack/var/spack/repos/builtin/packages/py-pyprecice/package.py index ffa1f2f7..41bb8f09 100644 --- a/spack/var/spack/repos/builtin/packages/py-pyprecice/package.py +++ b/spack/var/spack/repos/builtin/packages/py-pyprecice/package.py @@ -34,6 +34,7 @@ class PyPyprecice(PythonPackage): variant("mpi", default=True, description="Enables MPI support") depends_on("mpi", when="+mpi") + depends_on("openssh") depends_on("precice", when="@develop") depends_on("precice@2.1.1", when="@2.1.1.1:2.1.1.99") depends_on("precice@2.1.0", when="@2.1.0.1:2.1.0.99") From c1ca2676922ddd483fc73ec837c69dff89d9d78d Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Mon, 28 Dec 2020 20:57:49 +0100 Subject: [PATCH 5/5] Add openssh --- spack/ci-spack-pyprecice-deps-1804.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack/ci-spack-pyprecice-deps-1804.dockerfile b/spack/ci-spack-pyprecice-deps-1804.dockerfile index 4b01733b..ada55360 100644 --- a/spack/ci-spack-pyprecice-deps-1804.dockerfile +++ b/spack/ci-spack-pyprecice-deps-1804.dockerfile @@ -3,6 +3,6 @@ FROM spack/ubuntu-bionic:latest RUN spack env create precice # Install dependencies for precice and py-pyprecice RUN spack env activate precice \ - && spack add boost@1.74.0 cmake@3.18.4 eigen@3.3.8 petsc@3.14.1 pkgconfig precice@develop py-setuptools py-wheel py-cython py-numpy py-mpi4py \ + && spack add boost@1.74.0 cmake@3.18.4 eigen@3.3.8 openssh petsc@3.14.1 pkgconfig precice@develop py-setuptools py-wheel py-cython py-numpy py-mpi4py \ && spack concretize -f \ && spack install