From ba02a400587550b48db15d1443f8f39b020711c5 Mon Sep 17 00:00:00 2001 From: mrbenson Date: Thu, 4 Nov 2021 19:47:06 +0100 Subject: [PATCH 01/13] Create environment.yml --- environment.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 environment.yml diff --git a/environment.yml b/environment.yml new file mode 100644 index 00000000..b3180d3e --- /dev/null +++ b/environment.yml @@ -0,0 +1,9 @@ +name: example-environment +channels: + - conda-forge +dependencies: + - numpy + - psutil + - toolz + - matplotlib + From 41ec31612f75d9c95c775915a2985ab270760404 Mon Sep 17 00:00:00 2001 From: mrbenson Date: Thu, 4 Nov 2021 19:57:06 +0100 Subject: [PATCH 02/13] Update environment.yml --- environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index b3180d3e..5795f174 100644 --- a/environment.yml +++ b/environment.yml @@ -6,4 +6,5 @@ dependencies: - psutil - toolz - matplotlib - + - scipy + - pyvista From 6fbc6386e3c51ac565756dcb24c18b7c42b58e75 Mon Sep 17 00:00:00 2001 From: mrbenson Date: Fri, 5 Nov 2021 13:20:15 +0100 Subject: [PATCH 03/13] Create apt.txt --- apt.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 apt.txt diff --git a/apt.txt b/apt.txt new file mode 100644 index 00000000..e5f2b6eb --- /dev/null +++ b/apt.txt @@ -0,0 +1,2 @@ +libgl1-mesa-dev +xvfb From 8d3eda3974a72c61ba2183f7c5e9a8377f982c90 Mon Sep 17 00:00:00 2001 From: mrbenson Date: Fri, 5 Nov 2021 13:21:13 +0100 Subject: [PATCH 04/13] Create start --- start | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 start diff --git a/start b/start new file mode 100644 index 00000000..910f4516 --- /dev/null +++ b/start @@ -0,0 +1,8 @@ +#!/bin/bash +export DISPLAY=:99.0 +export VISTA_OFF_SCREEN=True +export VISTA_PLOT_THEME=document +which Xvfb +Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & +sleep 3 +exec "$@" From 8374a5a7bd23eb0ef7188e653c76bf34a9f38d42 Mon Sep 17 00:00:00 2001 From: mrbenson Date: Fri, 5 Nov 2021 13:31:00 +0100 Subject: [PATCH 05/13] Update environment.yml --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index 5795f174..b7d08af8 100644 --- a/environment.yml +++ b/environment.yml @@ -8,3 +8,4 @@ dependencies: - matplotlib - scipy - pyvista + - ipyvtklink From 6a133539e6a96a6ff11f4b9f7125404e65229e4b Mon Sep 17 00:00:00 2001 From: mrbenson Date: Wed, 10 Nov 2021 21:09:45 +0100 Subject: [PATCH 06/13] Update apt.txt --- apt.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apt.txt b/apt.txt index e5f2b6eb..63dbb430 100644 --- a/apt.txt +++ b/apt.txt @@ -1,2 +1,2 @@ -libgl1-mesa-dev -xvfb +#libgl1-mesa-dev +#xvfb From d86d1a6fafb155fa39be9410ea31cef4bee4fb79 Mon Sep 17 00:00:00 2001 From: mrbenson Date: Wed, 10 Nov 2021 21:10:05 +0100 Subject: [PATCH 07/13] Update start --- start | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/start b/start index 910f4516..fb40dcef 100644 --- a/start +++ b/start @@ -1,8 +1,8 @@ #!/bin/bash -export DISPLAY=:99.0 -export VISTA_OFF_SCREEN=True -export VISTA_PLOT_THEME=document -which Xvfb -Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & -sleep 3 -exec "$@" +#export DISPLAY=:99.0 +#export VISTA_OFF_SCREEN=True +#export VISTA_PLOT_THEME=document +#which Xvfb +#Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & +#sleep 3 +#exec "$@" From ddf4679bd0339add596198a149d828360b338e8b Mon Sep 17 00:00:00 2001 From: mrbenson Date: Wed, 10 Nov 2021 21:10:36 +0100 Subject: [PATCH 08/13] Update environment.yml --- environment.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/environment.yml b/environment.yml index b7d08af8..46e1ea66 100644 --- a/environment.yml +++ b/environment.yml @@ -2,10 +2,4 @@ name: example-environment channels: - conda-forge dependencies: - - numpy - - psutil - - toolz - - matplotlib - - scipy - - pyvista - - ipyvtklink + - spylizard From 95824dfa61b5f1abf6a582bc0c44f46558b673b2 Mon Sep 17 00:00:00 2001 From: mrbenson Date: Wed, 10 Nov 2021 21:15:40 +0100 Subject: [PATCH 09/13] Update environment.yml --- environment.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 46e1ea66..2aa2908f 100644 --- a/environment.yml +++ b/environment.yml @@ -2,4 +2,6 @@ name: example-environment channels: - conda-forge dependencies: - - spylizard +- pip + - pip: + - spylizard From bcc78ae8d42b561c99edab3abec82fa8d404ff50 Mon Sep 17 00:00:00 2001 From: mrbenson Date: Wed, 10 Nov 2021 21:16:28 +0100 Subject: [PATCH 10/13] Update environment.yml --- environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 2aa2908f..d7a5d1c5 100644 --- a/environment.yml +++ b/environment.yml @@ -3,5 +3,5 @@ channels: - conda-forge dependencies: - pip - - pip: - - spylizard +- pip: + - spylizard From 43e94df34a7fb665b69915c12a22f2c5fd4f0e5e Mon Sep 17 00:00:00 2001 From: hbadi Date: Sun, 29 Jan 2023 00:01:51 +0100 Subject: [PATCH 11/13] mesh::write --- api/python/src/mesh_wrapper.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/python/src/mesh_wrapper.cpp b/api/python/src/mesh_wrapper.cpp index 5f44e123..aa1de9ac 100644 --- a/api/python/src/mesh_wrapper.cpp +++ b/api/python/src/mesh_wrapper.cpp @@ -19,7 +19,9 @@ void init_mesh(py::module &m) .def("load", static_cast, int)>(&mesh::load), py::arg("inputshapes"), py::arg("verbosity")=1) .def("load", static_cast, int, int, int)>(&mesh::load), py::arg("inputshapes"), py::arg("globalgeometryskin"), py::arg("numoverlaplayers"), py::arg("verbosity")=1) - .def("write", &mesh::write, py::arg("name"), py::arg("physregs")=std::vector{-1}, py::arg("option")=1) + .def("write", static_cast(&mesh::write), py::arg("physreg"), py::arg("name")) + .def("write", static_cast, int)>(&mesh::write), py::arg("name"), py::arg("physregs")=std::vector{-1}, py::arg("option")=1) + .def("setadaptivity", &mesh::setadaptivity, py::arg("criterion"), py::arg("lownumsplits"), py::arg("highnumsplits")) From 1015c83507fbbc06ccbea45ef07db33323a4750c Mon Sep 17 00:00:00 2001 From: hbadi Date: Sun, 29 Jan 2023 00:21:09 +0100 Subject: [PATCH 12/13] MPI std::vector write --- api/python/src/slmpi_wrapper.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/api/python/src/slmpi_wrapper.cpp b/api/python/src/slmpi_wrapper.cpp index 81e42e64..9d85ffce 100644 --- a/api/python/src/slmpi_wrapper.cpp +++ b/api/python/src/slmpi_wrapper.cpp @@ -1,9 +1,16 @@ #include "sparselizard_wrapper.h" +PYBIND11_MAKE_OPAQUE(std::vector); +PYBIND11_MAKE_OPAQUE(std::vector); +PYBIND11_MAKE_OPAQUE(std::vector); + namespace py = pybind11; void init_slmpi(py::module &m) { + py::bind_vector >(m, "VecBool"); + py::bind_vector >(m, "VecInt"); + py::bind_vector >(m, "VecDouble"); m.def("isavailable", &slmpi::isavailable); From 02ad575ea574be218c2ac6296e445e17fc957d0b Mon Sep 17 00:00:00 2001 From: hbadi Date: Sun, 29 Jan 2023 00:28:30 +0100 Subject: [PATCH 13/13] delete extra files --- apt.txt | 2 -- environment.yml | 7 ------- start | 8 -------- 3 files changed, 17 deletions(-) delete mode 100644 apt.txt delete mode 100644 environment.yml delete mode 100644 start diff --git a/apt.txt b/apt.txt deleted file mode 100644 index 63dbb430..00000000 --- a/apt.txt +++ /dev/null @@ -1,2 +0,0 @@ -#libgl1-mesa-dev -#xvfb diff --git a/environment.yml b/environment.yml deleted file mode 100644 index d7a5d1c5..00000000 --- a/environment.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: example-environment -channels: - - conda-forge -dependencies: -- pip -- pip: - - spylizard diff --git a/start b/start deleted file mode 100644 index fb40dcef..00000000 --- a/start +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -#export DISPLAY=:99.0 -#export VISTA_OFF_SCREEN=True -#export VISTA_PLOT_THEME=document -#which Xvfb -#Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & -#sleep 3 -#exec "$@"