Skip to content

Commit

Permalink
removed extra spaces, last cleaning of the code
Browse files Browse the repository at this point in the history
  • Loading branch information
Iximiel committed Dec 5, 2023
1 parent c57690a commit ea6bfa9
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
1 change: 0 additions & 1 deletion .github/workflows/dockerWF.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ jobs:
- name: PyCV tests
run: |
make -C docker ${{ matrix.variant }}-pycv
6 changes: 3 additions & 3 deletions docker/rocky8
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion plugins/pycv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ clean:

check: all
$(MAKE) -C regtest testclean
$(MAKE) -C regtest checkfail
$(MAKE) -C regtest checkfail
2 changes: 2 additions & 0 deletions plugins/pycv/prepareMakeForDevelop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions plugins/pycv/standaloneCompile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit ea6bfa9

Please sign in to comment.