From ea6bfa93296f28b968e4f0fd6d1bf035bdbc464c Mon Sep 17 00:00:00 2001 From: Daniele Rapetti <5535617+Iximiel@users.noreply.github.com> Date: Tue, 5 Dec 2023 16:25:56 +0100 Subject: [PATCH] removed extra spaces, last cleaning of the code --- .github/workflows/dockerWF.yml | 1 - docker/rocky8 | 6 +++--- plugins/pycv/Makefile | 2 +- plugins/pycv/prepareMakeForDevelop.sh | 2 ++ plugins/pycv/standaloneCompile.sh | 2 ++ 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dockerWF.yml b/.github/workflows/dockerWF.yml index bf08839e0d..ae1d42618a 100644 --- a/.github/workflows/dockerWF.yml +++ b/.github/workflows/dockerWF.yml @@ -32,4 +32,3 @@ jobs: - name: PyCV tests run: | make -C docker ${{ matrix.variant }}-pycv - diff --git a/docker/rocky8 b/docker/rocky8 index d7568d3dba..ca37f92a05 100644 --- a/docker/rocky8 +++ b/docker/rocky8 @@ -36,11 +36,11 @@ RUN . ./.bashrc \ && pip3 install --user MDAnalysis==1.0.0 # && pip3 install --user numpy==1.19 -# # import plumed code. -# # assumes a file plumed2.tgz is present in the Dockerfile directory +# import plumed code. +# assumes a file plumed2.tgz is present in the Dockerfile directory COPY plumed2.tgz /home/plumed -# # build and test plumed (no install) +# build and test plumed (no install) RUN . ./.bashrc \ && module load mpi \ && export OMPI_MCA_btl_base_warn_component_unused=0 \ diff --git a/plugins/pycv/Makefile b/plugins/pycv/Makefile index cb8d29da0c..0bea212139 100644 --- a/plugins/pycv/Makefile +++ b/plugins/pycv/Makefile @@ -35,4 +35,4 @@ clean: check: all $(MAKE) -C regtest testclean - $(MAKE) -C regtest checkfail \ No newline at end of file + $(MAKE) -C regtest checkfail diff --git a/plugins/pycv/prepareMakeForDevelop.sh b/plugins/pycv/prepareMakeForDevelop.sh index 5b8645884e..3c8539e132 100755 --- a/plugins/pycv/prepareMakeForDevelop.sh +++ b/plugins/pycv/prepareMakeForDevelop.sh @@ -7,7 +7,9 @@ if [[ -z $PLUMED_KERNEL ]]; then fi if ! python3-config --embed >/dev/null 2>/dev/null; then +#TODO: verify that this does not give problems with conda echo "PyCV needs python to be built to be embedable" + echo "(compiling python with --enable-shared should be enough)" exit 1 fi diff --git a/plugins/pycv/standaloneCompile.sh b/plugins/pycv/standaloneCompile.sh index e9f7094a1d..b4266f1722 100755 --- a/plugins/pycv/standaloneCompile.sh +++ b/plugins/pycv/standaloneCompile.sh @@ -7,7 +7,9 @@ if [ ! -z "$conda_fixup" ]; then fi if ! python3-config --embed >/dev/null 2>/dev/null; then + #TODO: verify that this does not give problems with conda echo "PyCV needs python to be built to be embedable" + echo "(compiling python with --enable-shared should be enough)" exit 1 fi